[cig-commits] r14812 - in short/3D/PyLith/branches/pylith-swig: . libsrc/faults unittests/libtests/faults

[brad at geodynamics.org]

Author: brad
Date: 2009-04-28 17:49:04 -0700 (Tue, 28 Apr 2009)
New Revision: 14812

Modified:
   short/3D/PyLith/branches/pylith-swig/TODO
   short/3D/PyLith/branches/pylith-swig/libsrc/faults/FaultCohesiveKin.cc
   short/3D/PyLith/branches/pylith-swig/unittests/libtests/faults/TestFaultCohesiveKin.cc
Log:
Fixed fault bugs. Finished updating fault C++ unit tests.

Modified: short/3D/PyLith/branches/pylith-swig/TODO
===================================================================
--- short/3D/PyLith/branches/pylith-swig/TODO	2009-04-28 23:04:38 UTC (rev 14811)
+++ short/3D/PyLith/branches/pylith-swig/TODO	2009-04-29 00:49:04 UTC (rev 14812)
@@ -7,7 +7,6 @@
 0. SWIG conversion [Brad]
 
   (1) Faults
-    Use visitors in FaultCohesiveKin
 
   (2) Output
     TestDataWriterVTKFaultMesh
@@ -25,8 +24,8 @@
 
   (6) Tidy up
 
-    Check use of label_sequence.
-    label_sequence - iterators are cached, so use sequence or cache begin/end to maintain access
+    Check use of label_sequence.  label_sequence - iterators are
+    cached, so use sequence or cache begin/end to maintain access
 
     Cleanup use of heightStratum() and depthStratum().
 

Modified: short/3D/PyLith/branches/pylith-swig/libsrc/faults/FaultCohesiveKin.cc
===================================================================
--- short/3D/PyLith/branches/pylith-swig/libsrc/faults/FaultCohesiveKin.cc	2009-04-28 23:04:38 UTC (rev 14811)
+++ short/3D/PyLith/branches/pylith-swig/libsrc/faults/FaultCohesiveKin.cc	2009-04-29 00:49:04 UTC (rev 14812)
@@ -276,7 +276,7 @@
       const int indexK = iConstraint + 2*numConstraintVert;
 
       const double pseudoStiffness = stiffnessCell[iConstraint];
-      assert(areaAssembledCell[iConstraint] > 0);
+      //assert(areaAssembledCell[iConstraint] > 0);
       const double wt = pseudoStiffness * 
 	areaCell[iConstraint] / areaAssembledCell[iConstraint];
       
@@ -924,7 +924,7 @@
       for (SieveSubMesh::label_sequence::iterator v_iter=verticesBegin;
 	   v_iter != verticesEnd;
 	   ++v_iter) {
-	orientationSection->restrictPoint(*vertices->begin(), &orientationVertex[0],
+	orientationSection->restrictPoint(*v_iter, &orientationVertex[0],
 					  orientationVertex.size());
 	assert(9 == orientationSection->getFiberDimension(*v_iter));
 	// Flip up-dip direction
@@ -1081,6 +1081,7 @@
 	areaCell[iBasis] += dArea;
       } // for
     } // for
+    areaVisitor.clear();
     faultSieveMesh->updateAdd(*c_iter, areaVisitor);
 
     PetscLogFlops( numQuadPts*(1+numBasis*2) );
@@ -1091,8 +1092,8 @@
 
 #if 0 // DEBUGGING
   area.view("AREA");
-  _faultMesh->getSendOverlap()->view("Send fault overlap");
-  _faultMesh->getRecvOverlap()->view("Receive fault overlap");
+  //_faultMesh->getSendOverlap()->view("Send fault overlap");
+  //_faultMesh->getRecvOverlap()->view("Receive fault overlap");
 #endif
 } // _calcArea
 

Modified: short/3D/PyLith/branches/pylith-swig/unittests/libtests/faults/TestFaultCohesiveKin.cc
===================================================================
--- short/3D/PyLith/branches/pylith-swig/unittests/libtests/faults/TestFaultCohesiveKin.cc	2009-04-28 23:04:38 UTC (rev 14811)
+++ short/3D/PyLith/branches/pylith-swig/unittests/libtests/faults/TestFaultCohesiveKin.cc	2009-04-29 00:49:04 UTC (rev 14812)
@@ -162,7 +162,7 @@
   CPPUNIT_ASSERT_EQUAL(_data->numConstraintVert, iVertex);
 
   // Check orientation
-  fault._fields->get("orientation").view("ORIENTATION"); // DEBUGGING
+  //fault._fields->get("orientation").view("ORIENTATION"); // DEBUGGING
   const ALE::Obj<RealSection>& orientationSection = 
     fault._fields->get("orientation").section();
   CPPUNIT_ASSERT(!orientationSection.isNull());
@@ -301,7 +301,7 @@
     fault.useSolnIncr(true);
     fault.integrateResidual(residual, t, &fields);
 
-    residual.view("RESIDUAL"); // DEBUGGING
+    //residual.view("RESIDUAL"); // DEBUGGING
 
     // Check values
     const double* valsE = _data->valsResidualIncr;