[cig-commits] r16123 - in short/3D/PyLith/trunk: libsrc/faults unittests/libtests/faults unittests/libtests/faults/data

[brad at geodynamics.org]

Author: brad
Date: 2009-12-30 13:24:35 -0800 (Wed, 30 Dec 2009)
New Revision: 16123

Modified:
   short/3D/PyLith/trunk/libsrc/faults/FaultCohesiveDynL.cc
   short/3D/PyLith/trunk/libsrc/faults/FaultCohesiveKin.cc
   short/3D/PyLith/trunk/unittests/libtests/faults/TestFaultCohesiveDynL.cc
   short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveDynLDataTri3.cc
Log:
Fixed some small bugs in unit tests for friction.

Modified: short/3D/PyLith/trunk/libsrc/faults/FaultCohesiveDynL.cc
===================================================================
--- short/3D/PyLith/trunk/libsrc/faults/FaultCohesiveDynL.cc	2009-12-30 21:03:30 UTC (rev 16122)
+++ short/3D/PyLith/trunk/libsrc/faults/FaultCohesiveDynL.cc	2009-12-30 21:24:35 UTC (rev 16123)
@@ -1653,16 +1653,21 @@
     
     // Get sections.
     const ALE::Obj<RealSection>& coordinates =
-      faultSieveMesh->getRealSection("coordinates_dimensioned");
+      faultSieveMesh->getRealSection("coordinates");
     assert(!coordinates.isNull());
     const spatialdata::geocoords::CoordSys* cs = _faultMesh->coordsys();
     
+    const double lengthScale = _normalizer->lengthScale();
+
     // Loop over vertices in fault mesh and perform queries.
     for (SieveSubMesh::label_sequence::iterator v_iter = verticesBegin;
 	 v_iter != verticesEnd;
 	 ++v_iter) {
       coordinates->restrictPoint(*v_iter, 
 				 &coordsVertex[0], coordsVertex.size());
+      // Dimensionalize coordinates
+      _normalizer->dimensionalize(&coordsVertex[0], coordsVertex.size(),
+				  lengthScale);
       
       tractionVertex = 0.0;
       const int err = _dbInitialTract->query(&tractionVertex[0], spaceDim,

Modified: short/3D/PyLith/trunk/libsrc/faults/FaultCohesiveKin.cc
===================================================================
--- short/3D/PyLith/trunk/libsrc/faults/FaultCohesiveKin.cc	2009-12-30 21:03:30 UTC (rev 16122)
+++ short/3D/PyLith/trunk/libsrc/faults/FaultCohesiveKin.cc	2009-12-30 21:24:35 UTC (rev 16123)
@@ -29,7 +29,6 @@
 
 #include "spatialdata/geocoords/CoordSys.hh" // USES CoordSys
 #include "spatialdata/spatialdb/SpatialDB.hh" // USES SpatialDB
-#include "spatialdata/units/Nondimensional.hh" // USES Nondimensional
 
 #include <cmath> // USES pow(), sqrt()
 #include <strings.h> // USES strcasecmp()

Modified: short/3D/PyLith/trunk/unittests/libtests/faults/TestFaultCohesiveDynL.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/faults/TestFaultCohesiveDynL.cc	2009-12-30 21:03:30 UTC (rev 16122)
+++ short/3D/PyLith/trunk/unittests/libtests/faults/TestFaultCohesiveDynL.cc	2009-12-30 21:24:35 UTC (rev 16123)
@@ -173,7 +173,7 @@
     for (SieveSubMesh::label_sequence::iterator v_iter = verticesBegin;
         v_iter != verticesEnd;
         ++v_iter, ++iVertex) {
-      const int fiberDim = orientationSection->getFiberDimension(*v_iter);
+      const int fiberDim = tractionSection->getFiberDimension(*v_iter);
       CPPUNIT_ASSERT_EQUAL(spaceDim, fiberDim);
       const double* tractionVertex = tractionSection->restrictPoint(*v_iter);
       CPPUNIT_ASSERT(0 != tractionVertex);
@@ -473,7 +473,8 @@
   fault->label(_data->label);
   fault->quadrature(_quadrature);
   
-  fault->adjustTopology(mesh, &firstFaultVertex, &firstLagrangeVertex, &firstFaultCell, _flipFault);
+  fault->adjustTopology(mesh, &firstFaultVertex, &firstLagrangeVertex,
+			&firstFaultCell, _flipFault);
   
   const double upDir[] = { 0.0, 0.0, 1.0 };
   const double normalDir[] = { 1.0, 0.0, 0.0 };

Modified: short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveDynLDataTri3.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveDynLDataTri3.cc	2009-12-30 21:03:30 UTC (rev 16122)
+++ short/3D/PyLith/trunk/unittests/libtests/faults/data/CohesiveDynLDataTri3.cc	2009-12-30 21:24:35 UTC (rev 16123)
@@ -246,7 +246,6 @@
   1.0,
 };
 
-// :TODO: Normalize by shear modulus
 const double pylith::faults::CohesiveDynLDataTri3::_initialTractions[] = {
   1.0, -2.0,
   1.1, -2.1,