[cig-commits] r16465 - short/3D/PyLith/trunk/unittests/libtests/faults

[brad at geodynamics.org]

Author: brad
Date: 2010-03-30 14:41:16 -0700 (Tue, 30 Mar 2010)
New Revision: 16465

Modified:
   short/3D/PyLith/trunk/unittests/libtests/faults/TestFaultCohesive.cc
   short/3D/PyLith/trunk/unittests/libtests/faults/TestFaultCohesiveDyn.cc
   short/3D/PyLith/trunk/unittests/libtests/faults/TestFaultCohesiveKin.cc
Log:
Fixed bugs in nondimensionalizing mesh (should be after adjusting topology).

Modified: short/3D/PyLith/trunk/unittests/libtests/faults/TestFaultCohesive.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/faults/TestFaultCohesive.cc	2010-03-30 21:40:34 UTC (rev 16464)
+++ short/3D/PyLith/trunk/unittests/libtests/faults/TestFaultCohesive.cc	2010-03-30 21:41:16 UTC (rev 16465)
@@ -21,6 +21,9 @@
 #include "pylith/utils/array.hh" // USES int_array, double_array
 #include "pylith/meshio/MeshIOAscii.hh" // USES MeshIOAscii
 
+#include "spatialdata/units/Nondimensional.hh" // USES Nondimensional
+#include "spatialdata/geocoords/CSCart.hh" // USES CSCart
+
 #include "data/CohesiveDataLine2.hh" // USES CohesiveDataLine2
 #include "data/CohesiveDataTri3.hh" // USES CohesiveDataTri3
 #include "data/CohesiveDataTri3b.hh" // USES CohesiveDataTri3b
@@ -491,6 +494,13 @@
   iohandler.interpolate(false);
   iohandler.read(&mesh);
 
+  spatialdata::geocoords::CSCart cs;
+  spatialdata::units::Nondimensional normalizer;
+  cs.setSpaceDim(mesh.dimension());
+  cs.initialize();
+  mesh.coordsys(&cs);
+  mesh.nondimensionalize(normalizer);
+  
   CPPUNIT_ASSERT(0 != fault);
   int firstFaultVertex    = 0;
   int firstLagrangeVertex = mesh.sieveMesh()->getIntSection("fault")->size();

Modified: short/3D/PyLith/trunk/unittests/libtests/faults/TestFaultCohesiveDyn.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/faults/TestFaultCohesiveDyn.cc	2010-03-30 21:40:34 UTC (rev 16464)
+++ short/3D/PyLith/trunk/unittests/libtests/faults/TestFaultCohesiveDyn.cc	2010-03-30 21:41:16 UTC (rev 16465)
@@ -689,13 +689,6 @@
   
   //mesh->debug(true); // DEBUGGING
   
-  spatialdata::geocoords::CSCart cs;
-  spatialdata::units::Nondimensional normalizer;
-  cs.setSpaceDim(mesh->dimension());
-  cs.initialize();
-  mesh->coordsys(&cs);
-  mesh->nondimensionalize(normalizer);
-  
   _quadrature->initialize(_data->basis, _data->numQuadPts, _data->numBasis,
 			  _data->basisDeriv,
 			  _data->numQuadPts, _data->numBasis, _data->cellDim,
@@ -743,6 +736,13 @@
   fault->adjustTopology(mesh, &firstFaultVertex, &firstLagrangeVertex,
 			&firstFaultCell, _flipFault);
   
+  spatialdata::geocoords::CSCart cs;
+  spatialdata::units::Nondimensional normalizer;
+  cs.setSpaceDim(mesh->dimension());
+  cs.initialize();
+  mesh->coordsys(&cs);
+  mesh->nondimensionalize(normalizer);
+  
   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/TestFaultCohesiveKin.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/faults/TestFaultCohesiveKin.cc	2010-03-30 21:40:34 UTC (rev 16464)
+++ short/3D/PyLith/trunk/unittests/libtests/faults/TestFaultCohesiveKin.cc	2010-03-30 21:41:16 UTC (rev 16465)
@@ -991,13 +991,6 @@
   
   //mesh->debug(true); // DEBUGGING
   
-  spatialdata::geocoords::CSCart cs;
-  spatialdata::units::Nondimensional normalizer;
-  cs.setSpaceDim(mesh->dimension());
-  cs.initialize();
-  mesh->coordsys(&cs);
-  mesh->nondimensionalize(normalizer);
-  
   _quadrature->initialize(_data->basis, _data->numQuadPts, _data->numBasis,
 			  _data->basisDeriv,
 			  _data->numQuadPts, _data->numBasis, _data->cellDim,
@@ -1050,6 +1043,13 @@
   fault->eqsrcs(const_cast<const char**>(names), nsrcs, sources, nsrcs);
   fault->adjustTopology(mesh, &firstFaultVertex, &firstLagrangeVertex, &firstFaultCell, _flipFault);
   
+  spatialdata::geocoords::CSCart cs;
+  spatialdata::units::Nondimensional normalizer;
+  cs.setSpaceDim(mesh->dimension());
+  cs.initialize();
+  mesh->coordsys(&cs);
+  mesh->nondimensionalize(normalizer);
+
   const double upDir[] = { 0.0, 0.0, 1.0 };
   const double normalDir[] = { 1.0, 0.0, 0.0 };