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

[brad at geodynamics.org]

Author: brad
Date: 2010-03-09 13:06:46 -0800 (Tue, 09 Mar 2010)
New Revision: 16394

Modified:
   short/3D/PyLith/trunk/libsrc/faults/FaultCohesiveDyn.cc
Log:
More work on imposing initial fault tractions in integrateResidualAssembled().

Modified: short/3D/PyLith/trunk/libsrc/faults/FaultCohesiveDyn.cc
===================================================================
--- short/3D/PyLith/trunk/libsrc/faults/FaultCohesiveDyn.cc	2010-03-09 19:34:23 UTC (rev 16393)
+++ short/3D/PyLith/trunk/libsrc/faults/FaultCohesiveDyn.cc	2010-03-09 21:06:46 UTC (rev 16394)
@@ -146,6 +146,8 @@
   assert(0 != fields);
   assert(0 != _fields);
 
+  FaultCohesiveLagrange::integrateResidualAssembled(residual, t, fields);
+
   // No contribution if no initial tractions are specified.
   if (0 == _dbInitialTract)
     return;
@@ -165,6 +167,7 @@
   const int numVertices = _cohesiveVertices.size();
   for (int iVertex=0; iVertex < numVertices; ++iVertex) {
     const int v_fault = _cohesiveVertices[iVertex].fault;
+    const int v_lagrange = _cohesiveVertices[iVertex].lagrange;
     const int v_negative = _cohesiveVertices[iVertex].negative;
     const int v_positive = _cohesiveVertices[iVertex].positive;
 
@@ -174,6 +177,7 @@
 					&forcesInitialVertex[0],
 					forcesInitialVertex.size());
 
+#if 0
     residualVertex = forcesInitialVertex;
     assert(residualVertex.size() == 
 	   residualSection->getFiberDimension(v_positive));
@@ -183,6 +187,12 @@
     assert(residualVertex.size() == 
 	   residualSection->getFiberDimension(v_negative));
     residualSection->updatePoint(v_negative, &residualVertex[0]);
+#else
+    residualVertex = forcesInitialVertex;
+    assert(residualVertex.size() == 
+	   residualSection->getFiberDimension(v_lagrange));
+    residualSection->updatePoint(v_lagrange, &residualVertex[0]);
+#endif
   } // for
 
   PetscLogFlops(numVertices*spaceDim);