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

[becker at geodynamics.org]

Author: becker
Date: 2008-07-24 11:21:37 -0700 (Thu, 24 Jul 2008)
New Revision: 12473

Modified:
   mc/3D/CitcomS/trunk/lib/Instructions.c
Log:
Both Eh and I were right and now the z_layer check should be finally fixed. 



Modified: mc/3D/CitcomS/trunk/lib/Instructions.c
===================================================================
--- mc/3D/CitcomS/trunk/lib/Instructions.c	2008-07-24 18:13:22 UTC (rev 12472)
+++ mc/3D/CitcomS/trunk/lib/Instructions.c	2008-07-24 18:21:37 UTC (rev 12473)
@@ -441,13 +441,14 @@
      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((E->viscosity.zbase_layer[0] == E->viscosity.zbase_layer[1])&&
-     (fabs(E->viscosity.zbase_layer[1]-999) < 1e-5)){
+  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;