[cig-commits] r16419 - short/3D/PyLith/trunk/libsrc/faults

[brad at geodynamics.org]

Author: brad
Date: 2010-03-15 01:38:45 -0700 (Mon, 15 Mar 2010)
New Revision: 16419

Modified:
   short/3D/PyLith/trunk/libsrc/faults/FaultCohesiveDyn.cc
   short/3D/PyLith/trunk/libsrc/faults/FaultCohesiveLagrange.cc
Log:
Started debugging adjustSolnLumped() for friction case.

Modified: short/3D/PyLith/trunk/libsrc/faults/FaultCohesiveDyn.cc
===================================================================
--- short/3D/PyLith/trunk/libsrc/faults/FaultCohesiveDyn.cc	2010-03-15 02:33:21 UTC (rev 16418)
+++ short/3D/PyLith/trunk/libsrc/faults/FaultCohesiveDyn.cc	2010-03-15 08:38:45 UTC (rev 16419)
@@ -695,6 +695,14 @@
 				       jacobianVertexN,
 				       jacobianVertexP);
 
+    
+    std::cout << "adjusted solution, lagrangeT: "
+	      << lagrangeTVertex[0]
+	      << ", " << lagrangeTVertex[1]
+	      << "; lagrangeTIncr: "
+	      << lagrangeTIncrVertex[0]
+	      << ", " << lagrangeTIncrVertex[1] << std::endl;
+
     // Compute Lagrange multiplier at time t+dt
     lagrangeTpdtVertex = lagrangeTVertex + lagrangeTIncrVertex;
     dLagrangeTpdtVertex = 0.0;
@@ -717,6 +725,15 @@
 					 jacobianVertexN, jacobianVertexP,
 					 *areaVertex);
 
+    std::cout << "constrain solution, dLagrangeTpdtVertex: " 
+	      << dLagrangeTpdtVertex[0]
+	      << ", " << dLagrangeTpdtVertex[1]
+	      << "; slipVertex: " << slipVertex[0]
+	      << ", " << slipVertex[1]
+	      << "; tractionTpdtVertex: " << tractionTpdtVertex[0]
+	      << ", " << tractionTpdtVertex[1]
+	      << std::endl;
+
     lagrangeTIncrVertex += dLagrangeTpdtVertex;
 
     switch (spaceDim) { // switch
@@ -832,8 +849,13 @@
 
     assert(lagrangeTIncrVertex.size() == 
 	   dispTIncrSection->getFiberDimension(v_lagrange));
-    dispTIncrSection->updateAddPoint(v_lagrange, &lagrangeTIncrVertex[0]);
+    dispTIncrSection->updatePoint(v_lagrange, &lagrangeTIncrVertex[0]);
 
+    // Update the slip estimate based on adjustment to the Lagrange
+    // multiplier values.
+    assert(slipVertex.size() ==
+        slipSection->getFiberDimension(v_fault));
+    slipSection->updatePoint(v_fault, &slipVertex[0]);
 #if defined(DETAILED_EVENT_LOGGING)
     _logger->eventEnd(updateEvent);
 #endif

Modified: short/3D/PyLith/trunk/libsrc/faults/FaultCohesiveLagrange.cc
===================================================================
--- short/3D/PyLith/trunk/libsrc/faults/FaultCohesiveLagrange.cc	2010-03-15 02:33:21 UTC (rev 16418)
+++ short/3D/PyLith/trunk/libsrc/faults/FaultCohesiveLagrange.cc	2010-03-15 08:38:45 UTC (rev 16419)
@@ -679,7 +679,7 @@
 
     assert(lagrangeIncrVertex.size() == 
 	   dispTIncrSection->getFiberDimension(v_lagrange));
-    dispTIncrSection->updateAddPoint(v_lagrange, &lagrangeIncrVertex[0]);
+    dispTIncrSection->updatePoint(v_lagrange, &lagrangeIncrVertex[0]);
 
 #if defined(DETAILED_EVENT_LOGGING)
     _logger->eventEnd(updateEvent);