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

[tan2 at geodynamics.org]

Author: tan2
Date: 2009-10-05 12:05:33 -0700 (Mon, 05 Oct 2009)
New Revision: 15743

Modified:
   mc/3D/CitcomS/trunk/lib/Instructions.c
Log:
Refactoring z_layer input validation.


Modified: mc/3D/CitcomS/trunk/lib/Instructions.c
===================================================================
--- mc/3D/CitcomS/trunk/lib/Instructions.c	2009-10-05 19:05:04 UTC (rev 15742)
+++ mc/3D/CitcomS/trunk/lib/Instructions.c	2009-10-05 19:05:33 UTC (rev 15743)
@@ -423,20 +423,7 @@
      jumps, they may or may not be identical with the phase changes */
   E->viscosity.zbase_layer[0] = E->viscosity.zbase_layer[1] = -999;
   input_float_vector("z_layer",E->viscosity.num_mat,(E->viscosity.zbase_layer),m);
-  if((fabs(E->viscosity.zbase_layer[0]+999) < 1e-5) && 
-     (fabs(E->viscosity.zbase_layer[1]+999) < 1e-5)){
-    /* 
-       no z_layer input found  
-    */
-    if(E->viscosity.num_mat != 4)
-      myerror(E,"error: either use z_layer for non dim layer depths, or set num_mat to four");
 
-    E->viscosity.zbase_layer[0] = E->viscosity.zlith;
-    E->viscosity.zbase_layer[1] = E->viscosity.z410;
-    E->viscosity.zbase_layer[2] = E->viscosity.zlm;
-    E->viscosity.zbase_layer[3] = E->viscosity.zcmb;
-  }
-
   /*  the start age and initial subduction history   */
   input_float("start_age",&(E->control.start_age),"0.0",m);
   input_int("reset_startage",&(E->control.reset_startage),"0",m);
@@ -760,6 +747,20 @@
       if(E->parallel.me == 0)
 	 fprintf(stderr,"\nWARNING: The input parameters impose boundary velocity, but also remove angular momentum/rigid rotation!\n\n");
     }
+
+    /* no z_layer input found */
+    if((fabs(E->viscosity.zbase_layer[0]+999) < 1e-5) &&
+       (fabs(E->viscosity.zbase_layer[1]+999) < 1e-5)) {
+
+        if(E->viscosity.num_mat != 4)
+            myerror(E,"error: either use z_layer for non dim layer depths, or set num_mat to four");
+
+        E->viscosity.zbase_layer[0] = E->viscosity.zlith;
+        E->viscosity.zbase_layer[1] = E->viscosity.z410;
+        E->viscosity.zbase_layer[2] = E->viscosity.zlm;
+        E->viscosity.zbase_layer[3] = E->viscosity.zcmb;
+    }
+
     return;
 }