[cig-commits] r7847 - mc/3D/CitcomS/trunk/lib

[becker at geodynamics.org]

Author: becker
Date: 2007-08-19 17:11:29 -0700 (Sun, 19 Aug 2007)
New Revision: 7847

Modified:
   mc/3D/CitcomS/trunk/lib/Advection_diffusion.c
   mc/3D/CitcomS/trunk/lib/Tracer_setup.c
Log:
Made CDEPV and Q0.enriched work only with ncomp=1 for now.


Modified: mc/3D/CitcomS/trunk/lib/Advection_diffusion.c
===================================================================
--- mc/3D/CitcomS/trunk/lib/Advection_diffusion.c	2007-08-19 23:54:46 UTC (rev 7846)
+++ mc/3D/CitcomS/trunk/lib/Advection_diffusion.c	2007-08-20 00:11:29 UTC (rev 7847)
@@ -517,13 +517,10 @@
     /* should we add a compositional contribution? */
     if(E->control.tracer_enriched){
       /* XXX: change Q and Q0 to be a vector of ncomp elements */
-      for(j=0;j<E->composition.ncomp;j++) {
-
-        /* Q = Q0 for C = 0, Q = Q0ER for C = 1, and linearly in
-           between  */
-        Q *= (1.0 - E->composition.comp_el[m][j][el]);
-        Q += E->composition.comp_el[m][j][el] * E->control.Q0ER;
-      }
+      /* Q = Q0 for C = 0, Q = Q0ER for C = 1, and linearly in
+	 between  */
+      Q *= (1.0 - E->composition.comp_el[m][0][el]);
+      Q += E->composition.comp_el[m][0][el] * E->control.Q0ER;
     }
 
 

Modified: mc/3D/CitcomS/trunk/lib/Tracer_setup.c
===================================================================
--- mc/3D/CitcomS/trunk/lib/Tracer_setup.c	2007-08-19 23:54:46 UTC (rev 7846)
+++ mc/3D/CitcomS/trunk/lib/Tracer_setup.c	2007-08-20 00:11:29 UTC (rev 7847)
@@ -90,6 +90,8 @@
     input_boolean("tracer_enriched",
 		  &(E->control.tracer_enriched),"off",m);
     if(E->control.tracer_enriched){
+      if(E->composition.ncomp != 1)
+	myerror(E,"enriched tracers cannot deal with more than one composition");
       if(!E->control.tracer)	/* check here so that we can get away
 				   with only one if statement in
 				   Advection_diffusion */