[cig-commits] r19373 - mc/3D/CitcomS/branches/v3.1/lib

[tan2 at geodynamics.org]

Author: tan2
Date: 2012-01-16 13:25:08 -0800 (Mon, 16 Jan 2012)
New Revision: 19373

Modified:
   mc/3D/CitcomS/branches/v3.1/lib/Initial_temperature.c
   mc/3D/CitcomS/branches/v3.1/lib/Output_h5.c
   mc/3D/CitcomS/branches/v3.1/lib/Regional_boundary_conditions.c
Log:
Merged r18932, r19073, and r19192 from trunk to v3.1 branch

Modified: mc/3D/CitcomS/branches/v3.1/lib/Initial_temperature.c
===================================================================
--- mc/3D/CitcomS/branches/v3.1/lib/Initial_temperature.c	2012-01-16 21:21:30 UTC (rev 19372)
+++ mc/3D/CitcomS/branches/v3.1/lib/Initial_temperature.c	2012-01-16 21:25:08 UTC (rev 19373)
@@ -420,10 +420,10 @@
         kk = E->convection.load_depth[p];
         con = E->convection.perturb_mag[p];
 
-        if ( (kk < 1) || (kk >= gnoz) ) continue; /* layer kk is outside domain */
+        if ( (kk < 1) || (kk > gnoz) ) continue; /* layer kk is outside domain */
 
         k = kk - E->lmesh.nzs + 1; /* convert global nz to local nz */
-        if ( (k < 1) || (k >= noz) ) continue; /* layer k is not inside this proc. */
+        if ( (k < 1) || (k > noz) ) continue; /* layer k is not inside this proc. */
         if (E->parallel.me_loc[1] == 0 && E->parallel.me_loc[2] == 0
             && E->sphere.capid[1] == 1 )
             fprintf(stderr,"Initial temperature perturbation:  layer=%d  mag=%g  l=%d  m=%d\n", kk, con, ll, mm);

Modified: mc/3D/CitcomS/branches/v3.1/lib/Output_h5.c
===================================================================
--- mc/3D/CitcomS/branches/v3.1/lib/Output_h5.c	2012-01-16 21:21:30 UTC (rev 19372)
+++ mc/3D/CitcomS/branches/v3.1/lib/Output_h5.c	2012-01-16 21:25:08 UTC (rev 19373)
@@ -2099,6 +2099,8 @@
             /*free((*field)->data);*/
             free(*field);
         }
+
+    return 0;
 }
 
 

Modified: mc/3D/CitcomS/branches/v3.1/lib/Regional_boundary_conditions.c
===================================================================
--- mc/3D/CitcomS/branches/v3.1/lib/Regional_boundary_conditions.c	2012-01-16 21:21:30 UTC (rev 19372)
+++ mc/3D/CitcomS/branches/v3.1/lib/Regional_boundary_conditions.c	2012-01-16 21:25:08 UTC (rev 19373)
@@ -366,7 +366,7 @@
           node2 = i +(j-1)*E->lmesh.noz + (E->lmesh.noy-1)*E->lmesh.noz*E->lmesh.nox;
           E->node[m][node2] = E->node[m][node2] & (~TBY);
           E->node[m][node2] = E->node[m][node2] | FBY;
-          E->sphere.cap[m].TB[3][node2] = 0.0;
+          E->sphere.cap[m].TB[2][node2] = 0.0;
           }    /* end loop for i and j */
 
   return;