[cig-commits] r7398 - mc/3D/CitcomS/trunk/module

[tan2 at geodynamics.org]

Author: tan2
Date: 2007-06-22 16:43:21 -0700 (Fri, 22 Jun 2007)
New Revision: 7398

Modified:
   mc/3D/CitcomS/trunk/module/setProperties.c
Log:
Forgot to commit module/setProperties.c in r7289. This should fix issue115 in the pyre version also.

Modified: mc/3D/CitcomS/trunk/module/setProperties.c
===================================================================
--- mc/3D/CitcomS/trunk/module/setProperties.c	2007-06-22 23:41:05 UTC (rev 7397)
+++ mc/3D/CitcomS/trunk/module/setProperties.c	2007-06-22 23:43:21 UTC (rev 7398)
@@ -572,29 +572,24 @@
 
     getIntProperty(properties, "tracer", E->control.tracer, fp);
 
-    if(E->control.restart)
-        E->trace.ic_method = 2;
-    else {
+    getIntProperty(properties, "tracer_ic_method",
+                   E->trace.ic_method, fp);
 
-        getIntProperty(properties, "tracer_ic_method",
-                       E->trace.ic_method, fp);
-
-        if (E->trace.ic_method==0) {
-            getIntProperty(properties, "tracers_per_element",
-                           E->trace.itperel, fp);
-        }
-        else if (E->trace.ic_method==1) {
-            getStringProperty(properties, "tracer_file",
-                              E->trace.tracer_file, fp);
-        }
-        else if (E->trace.ic_method==2) {
-        }
-        else {
-            fprintf(stderr,"Sorry, tracer_ic_method only 0, 1 and 2 available\n");
-            fflush(stderr);
-            parallel_process_termination();
-        }
+    if (E->trace.ic_method==0) {
+        getIntProperty(properties, "tracers_per_element",
+                       E->trace.itperel, fp);
     }
+    else if (E->trace.ic_method==1) {
+        getStringProperty(properties, "tracer_file",
+                          E->trace.tracer_file, fp);
+    }
+    else if (E->trace.ic_method==2) {
+    }
+    else {
+        fprintf(stderr,"Sorry, tracer_ic_method only 0, 1 and 2 available\n");
+        fflush(stderr);
+        parallel_process_termination();
+    }
 
     getIntProperty(properties, "tracer_flavors", E->trace.nflavors, fp);