[cig-commits] r21080 - in short/3D/PyLith/branches/v1.7-trunk: doc/developer libsrc/pylith/faults tests/2d

[brad at geodynamics.org]

Author: brad
Date: 2012-11-27 12:16:42 -0800 (Tue, 27 Nov 2012)
New Revision: 21080

Added:
   short/3D/PyLith/branches/v1.7-trunk/tests/2d/nonplanar/
Modified:
   short/3D/PyLith/branches/v1.7-trunk/doc/developer/howto_mergefromstable.txt
   short/3D/PyLith/branches/v1.7-trunk/libsrc/pylith/faults/FaultCohesiveLagrange.cc
Log:
Merge from stable.

Modified: short/3D/PyLith/branches/v1.7-trunk/doc/developer/howto_mergefromstable.txt
===================================================================
--- short/3D/PyLith/branches/v1.7-trunk/doc/developer/howto_mergefromstable.txt	2012-11-27 20:09:43 UTC (rev 21079)
+++ short/3D/PyLith/branches/v1.7-trunk/doc/developer/howto_mergefromstable.txt	2012-11-27 20:16:42 UTC (rev 21080)
@@ -7,7 +7,7 @@
 svn log | less
 
 # Merge from stable branch.
-svn merge -r REV_FROM_LAST_MERGE:HEAD svn+ssh://svn@geodynamics.org/cig/short/3D/PyLith/branches/v1.7-stable .
+svn merge -r REV_FROM_LAST_MERGE:HEAD svn+ssh://svn@geodynamics.org/cig/short/3D/PyLith/branches/v1.8-stable .
 
 
 

Modified: short/3D/PyLith/branches/v1.7-trunk/libsrc/pylith/faults/FaultCohesiveLagrange.cc
===================================================================
--- short/3D/PyLith/branches/v1.7-trunk/libsrc/pylith/faults/FaultCohesiveLagrange.cc	2012-11-27 20:09:43 UTC (rev 21079)
+++ short/3D/PyLith/branches/v1.7-trunk/libsrc/pylith/faults/FaultCohesiveLagrange.cc	2012-11-27 20:16:42 UTC (rev 21080)
@@ -829,6 +829,13 @@
     const int v_negative = _cohesiveVertices[iVertex].negative;
     const int v_positive = _cohesiveVertices[iVertex].positive;
 
+    // Set Lagrange multiplier value. Value from preliminary solve is
+    // bogus due to artificial diagonal entry.
+    dispTIncrVertexL = 0.0;
+    assert(dispTIncrVertexL.size() == 
+	   dispTIncrSection->getFiberDimension(v_lagrange));
+    dispTIncrSection->updatePoint(v_lagrange, &dispTIncrVertexL[0]);
+
     // Compute contribution only if Lagrange constraint is local.
     if (!globalOrder->isLocal(v_lagrange))
       continue;
@@ -910,8 +917,8 @@
     // Set Lagrange multiplier value. Value from preliminary solve is
     // bogus due to artificial diagonal entry.
     assert(dispTIncrVertexL.size() == 
-	   dispTIncrSection->getFiberDimension(v_lagrange));
-    dispTIncrSection->updatePoint(v_lagrange, &dispTIncrVertexL[0]);
+	   dispTIncrAdjSection->getFiberDimension(v_lagrange));
+    dispTIncrAdjSection->updatePoint(v_lagrange, &dispTIncrVertexL[0]);
 
 #if defined(DETAILED_EVENT_LOGGING)
     _logger->eventEnd(updateEvent);

Copied: short/3D/PyLith/branches/v1.7-trunk/tests/2d/nonplanar (from rev 21079, short/3D/PyLith/branches/v1.8-stable/tests/2d/nonplanar)