[cig-commits] r8294 - in short/3D/PyLith/trunk/libsrc: faults feassemble

[brad at geodynamics.org]

Author: brad
Date: 2007-11-13 22:11:56 -0800 (Tue, 13 Nov 2007)
New Revision: 8294

Modified:
   short/3D/PyLith/trunk/libsrc/faults/FaultCohesiveKin.cc
   short/3D/PyLith/trunk/libsrc/feassemble/ElasticityExplicit.cc
   short/3D/PyLith/trunk/libsrc/feassemble/ElasticityImplicit.cc
Log:
Worked on cleaning up differences b/t numCorners and numBasis to permit using p2+ basis functions with p1 geometry.

Modified: short/3D/PyLith/trunk/libsrc/faults/FaultCohesiveKin.cc
===================================================================
--- short/3D/PyLith/trunk/libsrc/faults/FaultCohesiveKin.cc	2007-11-14 01:31:05 UTC (rev 8293)
+++ short/3D/PyLith/trunk/libsrc/faults/FaultCohesiveKin.cc	2007-11-14 06:11:56 UTC (rev 8294)
@@ -627,7 +627,7 @@
 	<< "'.";
     throw std::runtime_error(msg.str());
   } // if
-  const int numCorners = _quadrature->numBasis();
+  const int numCorners = _quadrature->refGeometry().numCorners();
   const ALE::Obj<ALE::Mesh::label_sequence>& cells = 
     mesh->getLabelStratum("material-id", id());
   assert(!cells.isNull());

Modified: short/3D/PyLith/trunk/libsrc/feassemble/ElasticityExplicit.cc
===================================================================
--- short/3D/PyLith/trunk/libsrc/feassemble/ElasticityExplicit.cc	2007-11-14 01:31:05 UTC (rev 8293)
+++ short/3D/PyLith/trunk/libsrc/feassemble/ElasticityExplicit.cc	2007-11-14 06:11:56 UTC (rev 8294)
@@ -16,6 +16,7 @@
 
 #include "Quadrature.hh" // USES Quadrature
 #include "Elasticity.hh" // USES Elasticity
+#include "CellGeometry.hh" // USES CellGeometry
 
 #include "pylith/materials/ElasticMaterial.hh" // USES ElasticMaterial
 #include "pylith/topology/FieldsManager.hh" // USES FieldsManager
@@ -499,7 +500,7 @@
 	<< ".";
     throw std::runtime_error(msg.str());
   } // if
-  const int numCorners = _quadrature->numBasis();
+  const int numCorners = _quadrature->refGeometry().numCorners();
   const ALE::Obj<ALE::Mesh::label_sequence>& cells = 
     mesh->getLabelStratum("material-id", _material->id());
   assert(!cells.isNull());

Modified: short/3D/PyLith/trunk/libsrc/feassemble/ElasticityImplicit.cc
===================================================================
--- short/3D/PyLith/trunk/libsrc/feassemble/ElasticityImplicit.cc	2007-11-14 01:31:05 UTC (rev 8293)
+++ short/3D/PyLith/trunk/libsrc/feassemble/ElasticityImplicit.cc	2007-11-14 06:11:56 UTC (rev 8294)
@@ -16,6 +16,7 @@
 
 #include "Quadrature.hh" // USES Quadrature
 #include "Elasticity.hh" // USES Elasticity
+#include "CellGeometry.hh" // USES CellGeometry
 
 #include "pylith/materials/ElasticMaterial.hh" // USES ElasticMaterial
 #include "pylith/topology/FieldsManager.hh" // USES FieldsManager
@@ -558,7 +559,7 @@
 	<< ".";
     throw std::runtime_error(msg.str());
   } // if
-  const int numCorners = _quadrature->numBasis();
+  const int numCorners = _quadrature->refGeometry().numCorners();
   const ALE::Obj<ALE::Mesh::label_sequence>& cells = 
     mesh->getLabelStratum("material-id", _material->id());
   assert(!cells.isNull());