[cig-commits] r7877 - in mc/3D/CitcomS/trunk: lib module

[tan2 at geodynamics.org]

Author: tan2
Date: 2007-08-23 13:18:18 -0700 (Thu, 23 Aug 2007)
New Revision: 7877

Modified:
   mc/3D/CitcomS/trunk/lib/Composition_related.c
   mc/3D/CitcomS/trunk/lib/Tracer_setup.c
   mc/3D/CitcomS/trunk/module/setProperties.c
Log:
Avoid reading unused input parameters

Modified: mc/3D/CitcomS/trunk/lib/Composition_related.c
===================================================================
--- mc/3D/CitcomS/trunk/lib/Composition_related.c	2007-08-23 20:17:33 UTC (rev 7876)
+++ mc/3D/CitcomS/trunk/lib/Composition_related.c	2007-08-23 20:18:18 UTC (rev 7877)
@@ -49,7 +49,7 @@
 		  &(E->composition.ichemical_buoyancy),
 		  "1,0,nomax",m);
 
-    if (E->composition.ichemical_buoyancy) {
+    if (E->control.tracer && E->composition.ichemical_buoyancy) {
 
         /* ibuoy_type=0 (absolute method) */
         /* ibuoy_type=1 (ratio method) */

Modified: mc/3D/CitcomS/trunk/lib/Tracer_setup.c
===================================================================
--- mc/3D/CitcomS/trunk/lib/Tracer_setup.c	2007-08-23 20:17:33 UTC (rev 7876)
+++ mc/3D/CitcomS/trunk/lib/Tracer_setup.c	2007-08-23 20:18:18 UTC (rev 7877)
@@ -139,29 +139,32 @@
 
         input_int("ic_method_for_flavors",
 		  &(E->trace.ic_method_for_flavors),"0,0,nomax",m);
-        switch(E->trace.ic_method_for_flavors){
-	case 0:			/* layer */
-          E->trace.z_interface = (double*) malloc((E->trace.nflavors-1)
-                                                  *sizeof(double));
-          for(i=0; i<E->trace.nflavors-1; i++)
-              E->trace.z_interface[i] = 0.7;
 
-          input_double_vector("z_interface", E->trace.nflavors-1,
-                              E->trace.z_interface, m);
-	  break;
-	case 1:			/* from grid in top n materials */
-	  input_string("ictracer_grd_file",E->trace.ggrd_file,"",m); /* file from which to read */
-	  input_int("ictracer_grd_layers",&(E->trace.ggrd_layers),"2",m); /* which top layers to use */
-	  break;
-	default:
-	  fprintf(stderr,"ic_method_for_flavors %i undefined\n",E->trace.ic_method_for_flavors);
-	  parallel_process_termination();
-	  break;
-	}
 
+        if (E->trace.nflavors > 1) {
+            switch(E->trace.ic_method_for_flavors){
+            case 0:			/* layer */
+                E->trace.z_interface = (double*) malloc((E->trace.nflavors-1)
+                                                        *sizeof(double));
+                for(i=0; i<E->trace.nflavors-1; i++)
+                    E->trace.z_interface[i] = 0.7;
 
+                input_double_vector("z_interface", E->trace.nflavors-1,
+                                    E->trace.z_interface, m);
+                break;
+            case 1:			/* from grid in top n materials */
+                input_string("ictracer_grd_file",E->trace.ggrd_file,"",m); /* file from which to read */
+                input_int("ictracer_grd_layers",&(E->trace.ggrd_layers),"2",m); /* which top layers to use */
+                break;
+            default:
+                fprintf(stderr,"ic_method_for_flavors %i undefined\n",E->trace.ic_method_for_flavors);
+                parallel_process_termination();
+                break;
+            }
+        }
 
 
+
         if(E->parallel.nprocxy == 12)
             full_tracer_input(E);
 

Modified: mc/3D/CitcomS/trunk/module/setProperties.c
===================================================================
--- mc/3D/CitcomS/trunk/module/setProperties.c	2007-08-23 20:17:33 UTC (rev 7876)
+++ mc/3D/CitcomS/trunk/module/setProperties.c	2007-08-23 20:18:18 UTC (rev 7877)
@@ -609,7 +609,7 @@
     getIntProperty(properties, "tracer_flavors", E->trace.nflavors, fp);
 
     getIntProperty(properties, "ic_method_for_flavors", E->trace.ic_method_for_flavors, fp);
-    if (E->trace.ic_method_for_flavors == 0) {
+    if (E->trace.nflavors > 1 && E->trace.ic_method_for_flavors == 0) {
         E->trace.z_interface = (double*) malloc((E->trace.nflavors-1)
                                                 *sizeof(double));
 
@@ -619,7 +619,7 @@
     getIntProperty(properties, "chemical_buoyancy",
                    E->composition.ichemical_buoyancy, fp);
 
-    if (E->composition.ichemical_buoyancy==1) {
+    if (E->control.tracer && E->composition.ichemical_buoyancy==1) {
         getIntProperty(properties, "buoy_type", E->composition.ibuoy_type, fp);
 
         if (E->composition.ibuoy_type==0)