[cig-commits] r14990 - in short/3D/PyLith/trunk: libsrc/bc libsrc/faults pylith/problems unittests/libtests/materials

[brad at geodynamics.org]

Author: brad
Date: 2009-05-12 15:30:48 -0700 (Tue, 12 May 2009)
New Revision: 14990

Modified:
   short/3D/PyLith/trunk/libsrc/bc/AbsorbingDampers.cc
   short/3D/PyLith/trunk/libsrc/bc/Neumann.cc
   short/3D/PyLith/trunk/libsrc/faults/FaultCohesiveKin.cc
   short/3D/PyLith/trunk/pylith/problems/Formulation.py
   short/3D/PyLith/trunk/unittests/libtests/materials/TestElasticMaterial.cc
   short/3D/PyLith/trunk/unittests/libtests/materials/TestMaterial.cc
Log:
Fixed bugs in setting up quadrature engine.

Modified: short/3D/PyLith/trunk/libsrc/bc/AbsorbingDampers.cc
===================================================================
--- short/3D/PyLith/trunk/libsrc/bc/AbsorbingDampers.cc	2009-05-12 21:57:28 UTC (rev 14989)
+++ short/3D/PyLith/trunk/libsrc/bc/AbsorbingDampers.cc	2009-05-12 22:30:48 UTC (rev 14990)
@@ -170,6 +170,7 @@
   const spatialdata::geocoords::CoordSys* cs = _boundaryMesh->coordsys();
 
   // Compute quadrature information
+  _quadrature->initializeGeometry();
   _quadrature->computeGeometry(*_boundaryMesh, cells);
 
   for(SieveSubMesh::label_sequence::iterator c_iter = cellsBegin;

Modified: short/3D/PyLith/trunk/libsrc/bc/Neumann.cc
===================================================================
--- short/3D/PyLith/trunk/libsrc/bc/Neumann.cc	2009-05-12 21:57:28 UTC (rev 14989)
+++ short/3D/PyLith/trunk/libsrc/bc/Neumann.cc	2009-05-12 22:30:48 UTC (rev 14990)
@@ -181,6 +181,7 @@
   const double pressureScale = _normalizer->pressureScale();
 
   // Compute quadrature information
+  _quadrature->initializeGeometry();
   _quadrature->computeGeometry(*_boundaryMesh, cells);
 
   // Loop over cells in boundary mesh, compute orientations, and then

Modified: short/3D/PyLith/trunk/libsrc/faults/FaultCohesiveKin.cc
===================================================================
--- short/3D/PyLith/trunk/libsrc/faults/FaultCohesiveKin.cc	2009-05-12 21:57:28 UTC (rev 14989)
+++ short/3D/PyLith/trunk/libsrc/faults/FaultCohesiveKin.cc	2009-05-12 22:30:48 UTC (rev 14990)
@@ -144,6 +144,7 @@
   assert(!cells.isNull());
   const SieveSubMesh::label_sequence::iterator cellsBegin = cells->begin();
   const SieveSubMesh::label_sequence::iterator cellsEnd = cells->end();
+  _quadrature->initializeGeometry();
   _quadrature->computeGeometry(*_faultMesh, cells);
 
   // Compute orientation at vertices in fault mesh.

Modified: short/3D/PyLith/trunk/pylith/problems/Formulation.py
===================================================================
--- short/3D/PyLith/trunk/pylith/problems/Formulation.py	2009-05-12 21:57:28 UTC (rev 14989)
+++ short/3D/PyLith/trunk/pylith/problems/Formulation.py	2009-05-12 22:30:48 UTC (rev 14990)
@@ -67,7 +67,7 @@
 
     import pyre.inventory
 
-    matrixType = pyre.inventory.property("matrix_type", default="unknown")
+    matrixType = pyre.inventory.str("matrix_type", default="unknown")
     matrixType.meta['tip'] = "Type of PETSc sparse matrix."
 
     viewJacobian = pyre.inventory.bool("view_jacobian", default=False)

Modified: short/3D/PyLith/trunk/unittests/libtests/materials/TestElasticMaterial.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/materials/TestElasticMaterial.cc	2009-05-12 21:57:28 UTC (rev 14989)
+++ short/3D/PyLith/trunk/unittests/libtests/materials/TestElasticMaterial.cc	2009-05-12 22:30:48 UTC (rev 14990)
@@ -710,6 +710,7 @@
     sieveMesh->getLabelStratum("material-id", materialId);
 
   // Compute geometry for cells
+  quadrature.initializeGeometry();
   quadrature.computeGeometry(*mesh, cells);
 
   spatialdata::spatialdb::SimpleDB db;

Modified: short/3D/PyLith/trunk/unittests/libtests/materials/TestMaterial.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/materials/TestMaterial.cc	2009-05-12 21:57:28 UTC (rev 14989)
+++ short/3D/PyLith/trunk/unittests/libtests/materials/TestMaterial.cc	2009-05-12 22:30:48 UTC (rev 14990)
@@ -193,6 +193,7 @@
     sieveMesh->getLabelStratum("material-id", materialId);
 
   // Compute geometry for cells
+  quadrature.initializeGeometry();
   quadrature.computeGeometry(mesh, cells);
 
   spatialdata::spatialdb::SimpleDB db;