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

[tan2 at geodynamics.org]

Author: tan2
Date: 2009-08-11 10:35:23 -0700 (Tue, 11 Aug 2009)
New Revision: 15527

Modified:
   mc/3D/CitcomS/trunk/lib/Topo_gravity.c
Log:
Adding augmented Lagrangian component of stiffness matrix in cbf topo

Modified: mc/3D/CitcomS/trunk/lib/Topo_gravity.c
===================================================================
--- mc/3D/CitcomS/trunk/lib/Topo_gravity.c	2009-08-11 17:30:32 UTC (rev 15526)
+++ mc/3D/CitcomS/trunk/lib/Topo_gravity.c	2009-08-11 17:35:23 UTC (rev 15527)
@@ -991,10 +991,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);