[cig-commits] r19369 - in mc/3D/CitcomS/branches/v3.1: CitcomS/Solver lib

[tan2 at geodynamics.org]

Author: tan2
Date: 2012-01-16 12:39:04 -0800 (Mon, 16 Jan 2012)
New Revision: 19369

Modified:
   mc/3D/CitcomS/branches/v3.1/CitcomS/Solver/CoupledSolver.py
   mc/3D/CitcomS/branches/v3.1/lib/Topo_gravity.c
Log:
Merged r15527 and r15643 from trunk to v3.1 branch

Modified: mc/3D/CitcomS/branches/v3.1/CitcomS/Solver/CoupledSolver.py
===================================================================
--- mc/3D/CitcomS/branches/v3.1/CitcomS/Solver/CoupledSolver.py	2012-01-16 20:37:01 UTC (rev 19368)
+++ mc/3D/CitcomS/branches/v3.1/CitcomS/Solver/CoupledSolver.py	2012-01-16 20:39:04 UTC (rev 19369)
@@ -85,6 +85,9 @@
     def advectTracers(self):
         # override Solver.advectTracers, since tracer module
         # doesn't work in coupled run
+        if self.communicator.rank == 0:
+            import sys
+            sys.stderr.write('WARNING: CoupledSolver is incompatible with tracer advection. Tracer advection is disabled!!!\n')
         return
 
 

Modified: mc/3D/CitcomS/branches/v3.1/lib/Topo_gravity.c
===================================================================
--- mc/3D/CitcomS/branches/v3.1/lib/Topo_gravity.c	2012-01-16 20:37:01 UTC (rev 19368)
+++ mc/3D/CitcomS/branches/v3.1/lib/Topo_gravity.c	2012-01-16 20:39:04 UTC (rev 19369)
@@ -947,10 +947,19 @@
          eu [m*dims+2] = VV[3][m+1];
          }
 
+      /* The statement order is important:
+         elb must be executed before el when calling get_elt_f().
+         Otherwise, construct_c3x3matrix_el() would be skipped incorrectly. */
       get_elt_f(E,elb,eltfb,1,j);
       get_elt_f(E,el,eltf,1,j);
+
       get_elt_k(E,elb,eltkb,lev,j,1);
       get_elt_k(E,el,eltk,lev,j,1);
+
+      if (E->control.augmented_Lagr) {
+          get_aug_k(E,elb,eltkb,lev,1);
+          get_aug_k(E,el,eltk,lev,1);
+      }
 //      get_elt_g(E,elb,eltgb,lev,j);
 //      get_elt_g(E,el,eltg,lev,j);