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

[becker at geodynamics.org]

Author: becker
Date: 2008-07-24 11:13:22 -0700 (Thu, 24 Jul 2008)
New Revision: 12472

Modified:
   mc/3D/CitcomS/trunk/lib/Instructions.c
   mc/3D/CitcomS/trunk/lib/Viscosity_structures.c
Log:
Fixed typo that provided assignment of zbase_layer thanks to Eh.



Modified: mc/3D/CitcomS/trunk/lib/Instructions.c
===================================================================
--- mc/3D/CitcomS/trunk/lib/Instructions.c	2008-07-24 17:48:22 UTC (rev 12471)
+++ mc/3D/CitcomS/trunk/lib/Instructions.c	2008-07-24 18:13:22 UTC (rev 12472)
@@ -442,7 +442,7 @@
   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)){
+     (fabs(E->viscosity.zbase_layer[1]-999) < 1e-5)){
     /* 
        no z_layer input found  
     */

Modified: mc/3D/CitcomS/trunk/lib/Viscosity_structures.c
===================================================================
--- mc/3D/CitcomS/trunk/lib/Viscosity_structures.c	2008-07-24 17:48:22 UTC (rev 12471)
+++ mc/3D/CitcomS/trunk/lib/Viscosity_structures.c	2008-07-24 18:13:22 UTC (rev 12472)
@@ -270,7 +270,7 @@
     for(m=1;m<=E->sphere.caps_per_proc;m++)
         for(i=1;i<=E->lmesh.nel;i++)
             for(jj=1;jj<=vpoints[E->mesh.nsd];jj++)
-                EEta[m][ (i-1)*vpoints[E->mesh.nsd]+jj ]=E->viscosity.N0[E->mat[m][i]-1];
+                EEta[m][ (i-1)*vpoints[E->mesh.nsd]+jj ] = E->viscosity.N0[E->mat[m][i]-1];
 
     return;
 }
@@ -499,8 +499,10 @@
 	      EEta[m][ (i-1)*vpts + jj ] = tempa*
 		exp( E->viscosity.E[l]*(E->viscosity.T[l] - temp) +
 		     zzz *  E->viscosity.Z[l]);
-	      //fprintf(stderr,"N0 %11g T %11g T0 %11g E %11g z %11g km Z %11g mat: %i log10(eta): %11g\n",
-	      //tempa,temp,E->viscosity.T[l],E->viscosity.E[l], zzz *E->data.radius_km ,E->viscosity.Z[l],l+1,log10(EEta[m][ (i-1)*vpts + jj ]));
+	      //if(E->parallel.me == 0)
+	      //	fprintf(stderr,"z %11g km mat %i N0 %11g T %11g T0 %11g E %11g Z %11g mat: %i log10(eta): %11g\n",
+	      //		zzz *E->data.radius_km ,l+1,
+	      //	tempa,temp,E->viscosity.T[l],E->viscosity.E[l], E->viscosity.Z[l],l+1,log10(EEta[m][ (i-1)*vpts + jj ]));
 	    }
 	  }
         break;