[cig-commits] r14057 - in short/3D/PyLith/branches/pylith-swig: libsrc/bc libsrc/feassemble unittests/libtests/bc
brad at geodynamics.org
brad at geodynamics.org
Mon Feb 16 14:27:33 PST 2009
Author: brad
Date: 2009-02-16 14:27:33 -0800 (Mon, 16 Feb 2009)
New Revision: 14057
Modified:
short/3D/PyLith/branches/pylith-swig/libsrc/bc/Neumann.cc
short/3D/PyLith/branches/pylith-swig/libsrc/feassemble/Integrator.cc
short/3D/PyLith/branches/pylith-swig/libsrc/feassemble/Quadrature.cc
short/3D/PyLith/branches/pylith-swig/unittests/libtests/bc/Makefile.am
short/3D/PyLith/branches/pylith-swig/unittests/libtests/bc/TestNeumann.cc
short/3D/PyLith/branches/pylith-swig/unittests/libtests/bc/TestNeumann.hh
short/3D/PyLith/branches/pylith-swig/unittests/libtests/bc/TestNeumannHex8.cc
short/3D/PyLith/branches/pylith-swig/unittests/libtests/bc/TestNeumannLine2.cc
short/3D/PyLith/branches/pylith-swig/unittests/libtests/bc/TestNeumannQuad4.cc
short/3D/PyLith/branches/pylith-swig/unittests/libtests/bc/TestNeumannTet4.cc
short/3D/PyLith/branches/pylith-swig/unittests/libtests/bc/TestNeumannTri3.cc
Log:
Fixed some bugs and updated Neumann bc libtests.
Modified: short/3D/PyLith/branches/pylith-swig/libsrc/bc/Neumann.cc
===================================================================
--- short/3D/PyLith/branches/pylith-swig/libsrc/bc/Neumann.cc 2009-02-16 04:00:41 UTC (rev 14056)
+++ short/3D/PyLith/branches/pylith-swig/libsrc/bc/Neumann.cc 2009-02-16 22:27:33 UTC (rev 14057)
@@ -105,7 +105,7 @@
// Create section for traction vector in global coordinates
const feassemble::CellGeometry& cellGeometry = _quadrature->refGeometry();
- const int cellDim = _quadrature->cellDim();
+ const int cellDim = _quadrature->cellDim() > 0 ? _quadrature->cellDim() : 1;
const int numBasis = _quadrature->numBasis();
const int numQuadPts = _quadrature->numQuadPts();
const int spaceDim = cellGeometry.spaceDim();
@@ -118,7 +118,7 @@
// Containers for orientation information
const int orientationSize = spaceDim * spaceDim;
- const int jacobianSize = (cellDim > 0) ? spaceDim * cellDim : 1;
+ const int jacobianSize = spaceDim * cellDim;
double_array jacobian(jacobianSize);
double jacobianDet = 0;
double_array orientation(orientationSize);
@@ -173,8 +173,7 @@
const ALE::Obj<SubRealSection>& tractSection = _tractions->section();
assert(!tractSection.isNull());
- const ALE::Obj<topology::Mesh::SieveMesh>& sieveMesh = mesh.sieveMesh();
- const spatialdata::geocoords::CoordSys* cs = mesh.coordsys();
+ const spatialdata::geocoords::CoordSys* cs = _boundaryMesh->coordsys();
assert(0 != _normalizer);
const double lengthScale = _normalizer->lengthScale();
@@ -194,8 +193,8 @@
quadPtsGlobal = quadPtsNondim;
_normalizer->dimensionalize(&quadPtsGlobal[0], quadPtsGlobal.size(),
lengthScale);
-
- sieveMesh->restrictClosure(*c_iter, coordsVisitor);
+ coordsVisitor.clear();
+ submesh->restrictClosure(*c_iter, coordsVisitor);
cellTractionsGlobal = 0.0;
for(int iQuad=0, iRef=0, iSpace=0; iQuad < numQuadPts;
@@ -273,7 +272,6 @@
assert(quadWts.size() == numQuadPts);
const int numBasis = _quadrature->numBasis();
const int spaceDim = _quadrature->spaceDim();
- const int cellDim = _quadrature->cellDim();
// Allocate vectors for cell values.
_initCellVector();
Modified: short/3D/PyLith/branches/pylith-swig/libsrc/feassemble/Integrator.cc
===================================================================
--- short/3D/PyLith/branches/pylith-swig/libsrc/feassemble/Integrator.cc 2009-02-16 04:00:41 UTC (rev 14056)
+++ short/3D/PyLith/branches/pylith-swig/libsrc/feassemble/Integrator.cc 2009-02-16 22:27:33 UTC (rev 14057)
@@ -49,7 +49,7 @@
pylith::feassemble::Integrator<quadrature_type>::quadrature(const quadrature_type* q)
{ // quadrature
delete _quadrature;
- _quadrature = (0 != q) ? q->clone() : 0;
+ _quadrature = (0 != q) ? new quadrature_type(*q) : 0;
// Deallocate cell vector and matrix since size may change
_cellVector.resize(0);
Modified: short/3D/PyLith/branches/pylith-swig/libsrc/feassemble/Quadrature.cc
===================================================================
--- short/3D/PyLith/branches/pylith-swig/libsrc/feassemble/Quadrature.cc 2009-02-16 04:00:41 UTC (rev 14056)
+++ short/3D/PyLith/branches/pylith-swig/libsrc/feassemble/Quadrature.cc 2009-02-16 22:27:33 UTC (rev 14057)
@@ -103,7 +103,9 @@
const typename RealSection::chart_type& chart = section->getChart();
// Allocate field and cell buffer for Jacobian at quadrature points
- fiberDim = _numQuadPts * _cellDim * _spaceDim;
+ fiberDim = (_cellDim > 0) ?
+ _numQuadPts * _cellDim * _spaceDim :
+ _numQuadPts * 1 * _spaceDim;
_jacobianField = new topology::Field<mesh_type>(mesh);
assert(0 != _jacobianField);
_jacobianField->newSection(chart, fiberDim);
@@ -162,6 +164,7 @@
for(typename label_sequence::iterator c_iter = cells->begin();
c_iter != cellsEnd;
++c_iter) {
+ coordsVisitor.clear();
sieveMesh->restrictClosure(*c_iter, coordsVisitor);
const double* cellVertexCoords = coordsVisitor.getValues();
assert(0 != cellVertexCoords);
Modified: short/3D/PyLith/branches/pylith-swig/unittests/libtests/bc/Makefile.am
===================================================================
--- short/3D/PyLith/branches/pylith-swig/unittests/libtests/bc/Makefile.am 2009-02-16 04:00:41 UTC (rev 14056)
+++ short/3D/PyLith/branches/pylith-swig/unittests/libtests/bc/Makefile.am 2009-02-16 22:27:33 UTC (rev 14057)
@@ -38,6 +38,11 @@
TestDirichletBoundaryTet4.cc \
TestDirichletBoundaryHex8.cc \
TestNeumann.cc \
+ TestNeumannLine2.cc \
+ TestNeumannTri3.cc \
+ TestNeumannQuad4.cc \
+ TestNeumannTet4.cc \
+ TestNeumannHex8.cc \
test_bc.cc
@@ -47,12 +52,6 @@
# TestAbsorbingDampersQuad4.cc \
# TestAbsorbingDampersTet4.cc \
# TestAbsorbingDampersHex8.cc \
-# TestNeumannLine2.cc \
-# TestNeumannTri3.cc \
-# TestNeumannQuad4.cc \
-# TestNeumannTet4.cc \
-# TestNeumannHex8.cc
-
# TestBoundaryMesh.cc \
# TestBoundaryMeshTri3.cc \
# TestBoundaryMeshQuad4.cc \
Modified: short/3D/PyLith/branches/pylith-swig/unittests/libtests/bc/TestNeumann.cc
===================================================================
--- short/3D/PyLith/branches/pylith-swig/unittests/libtests/bc/TestNeumann.cc 2009-02-16 04:00:41 UTC (rev 14056)
+++ short/3D/PyLith/branches/pylith-swig/unittests/libtests/bc/TestNeumann.cc 2009-02-16 22:27:33 UTC (rev 14057)
@@ -18,10 +18,11 @@
#include "data/NeumannData.hh" // USES NeumannData
+#include "pylith/topology/Mesh.hh" // USES Mesh
#include "pylith/feassemble/Quadrature.hh" // USES Quadrature
+#include "pylith/topology/SubMesh.hh" // USES SubMesh
+#include "pylith/meshio/MeshIOAscii.hh" // USES MeshIOAscii
#include "pylith/topology/SolutionFields.hh" // USES SolutionFields
-#include "pylith/meshio/MeshIOAscii.hh" // USES MeshIOAscii
-#include "pylith/topology/Mesh.hh" // USES PETSc Mesh
#include "spatialdata/geocoords/CSCart.hh" // USES CSCart
#include "spatialdata/spatialdb/SimpleDB.hh" // USES SimpleDB
@@ -33,12 +34,20 @@
CPPUNIT_TEST_SUITE_REGISTRATION( pylith::bc::TestNeumann );
// ----------------------------------------------------------------------
+typedef pylith::topology::SubMesh::SieveMesh SieveMesh;
+typedef pylith::topology::SubMesh::RealSection RealSection;
+typedef pylith::topology::SubMesh::SieveMesh SieveSubMesh;
+typedef pylith::topology::SubMesh::RealSection SubRealSection;
+typedef pylith::topology::SubMesh::RestrictVisitor RestrictVisitor;
+
+// ----------------------------------------------------------------------
// Setup testing data.
void
pylith::bc::TestNeumann::setUp(void)
{ // setUp
_data = 0;
- _quadrature = 0;
+ _quadrature = new feassemble::Quadrature<topology::SubMesh>();
+ CPPUNIT_ASSERT(0 != _quadrature);
} // setUp
// ----------------------------------------------------------------------
@@ -70,14 +79,16 @@
CPPUNIT_ASSERT(0 != _data);
- const topology::SubMesh& boundaryMesh = bc._boundaryMesh;
+ const topology::SubMesh& boundaryMesh = *bc._boundaryMesh;
const ALE::Obj<SieveSubMesh>& submesh = boundaryMesh.sieveMesh();
// Check boundary mesh
CPPUNIT_ASSERT(!submesh.isNull());
const int cellDim = boundaryMesh.dimension();
- const ALE::Obj<SubMesh::label_sequence>& cells = submesh->heightStratum(1);
+ const int numCorners = _data->numCorners;
+ const int spaceDim = _data->spaceDim;
+ const ALE::Obj<SieveSubMesh::label_sequence>& cells = submesh->heightStratum(1);
const int numBoundaryVertices = submesh->depthStratum(0)->size();
const int numBoundaryCells = cells->size();
@@ -86,12 +97,11 @@
CPPUNIT_ASSERT_EQUAL(_data->numBoundaryCells, numBoundaryCells);
const int boundaryDepth = submesh->depth()-1; // depth of boundary cells
- const ALE::Obj<RealSection>& coordinates =
- mesh->getRealSection("coordinates");
+ const ALE::Obj<SubRealSection>& coordinates =
+ submesh->getRealSection("coordinates");
RestrictVisitor coordsVisitor(*coordinates, numCorners*spaceDim);
// coordinates->view("Mesh coordinates from TestNeumann::testInitialize");
- const int spaceDim = _data->spaceDim;
const int numBasis = bc._quadrature->numBasis();
const int cellVertSize = _data->numCorners * spaceDim;
double_array cellVertices(cellVertSize);
@@ -100,14 +110,14 @@
// check cell vertices
int iCell = 0;
- for(SubMesh::label_sequence::iterator c_iter = cells->begin();
+ for(SieveSubMesh::label_sequence::iterator c_iter = cells->begin();
c_iter != cells->end();
++c_iter) {
const int numCorners = submesh->getNumCellCorners(*c_iter, boundaryDepth);
CPPUNIT_ASSERT_EQUAL(_data->numCorners, numCorners);
- coordsVisitor.clear(); //??
- boundaryMesh->restrictClosure(coordinates, coordsVisitor);
+ coordsVisitor.clear();
+ submesh->restrictClosure(*c_iter, coordsVisitor);
double vert =0.0;
double vertE =0.0;
const double* cellVertices = coordsVisitor.getValues();
@@ -132,9 +142,9 @@
const int fiberDim = numQuadPts * spaceDim;
double_array tractionsCell(fiberDim);
int index = 0;
- const ALE::Obj<RealSection>& tractionSection = bc._tractions->section();
+ const ALE::Obj<SubRealSection>& tractionSection = bc._tractions->section();
- for(SubMesh::label_sequence::iterator c_iter = cells->begin();
+ for(SieveSubMesh::label_sequence::iterator c_iter = cells->begin();
c_iter != cells->end();
++c_iter) {
tractionSection->restrictPoint(*c_iter,
@@ -151,7 +161,6 @@
} // testInitialize
-#if 0
// ----------------------------------------------------------------------
// Test integrateResidual().
void
@@ -159,32 +168,31 @@
{ // testIntegrateResidual
CPPUNIT_ASSERT(0 != _data);
- ALE::Obj<Mesh> mesh;
+ topology::Mesh mesh;
Neumann bc;
- topology::FieldsManager fields(mesh);
+ topology::SolutionFields fields(mesh);
_initialize(&mesh, &bc, &fields);
- spatialdata::geocoords::CSCart cs;
- cs.setSpaceDim(mesh->getDimension());
- cs.initialize();
+ topology::Field<topology::Mesh>& residual = fields.get("residual");
+ const double t = 0.0;
+ bc.integrateResidual(residual, t, &fields);
- const ALE::Obj<real_section_type>& residual = fields.getReal("residual");
- CPPUNIT_ASSERT(!residual.isNull());
+ const ALE::Obj<SieveMesh>& sieveMesh = mesh.sieveMesh();
+ CPPUNIT_ASSERT(!sieveMesh.isNull());
+ CPPUNIT_ASSERT(!sieveMesh->depthStratum(0).isNull());
- const int spaceDim = _data->spaceDim;
-
- const double t = 0.0;
- bc.integrateResidual(residual, t, &fields, mesh, &cs);
-
const double* valsE = _data->valsResidual;
- const int totalNumVertices = mesh->depthStratum(0)->size();
+ const int totalNumVertices = sieveMesh->depthStratum(0)->size();
const int sizeE = _data->spaceDim * totalNumVertices;
- const double* vals = residual->restrictSpace();
- const int size = residual->sizeWithBC();
+ const ALE::Obj<RealSection>& residualSection = residual.section();
+ CPPUNIT_ASSERT(!residualSection.isNull());
+
+ const double* vals = residualSection->restrictSpace();
+ const int size = residualSection->sizeWithBC();
CPPUNIT_ASSERT_EQUAL(sizeE, size);
- //residual->view("RESIDUAL");
+ //residual.view("RESIDUAL");
const double tolerance = 1.0e-06;
// std::cout << "computed residuals: " << std::endl;
@@ -194,18 +202,18 @@
CPPUNIT_ASSERT_DOUBLES_EQUAL(1.0, vals[i]/valsE[i], tolerance);
else
CPPUNIT_ASSERT_DOUBLES_EQUAL(valsE[i], vals[i], tolerance);
-
} // testIntegrateResidual
// ----------------------------------------------------------------------
void
-pylith::bc::TestNeumann::_initialize(ALE::Obj<Mesh>* mesh,
+pylith::bc::TestNeumann::_initialize(topology::Mesh* mesh,
Neumann* const bc,
- topology::FieldsManager* fields) const
+ topology::SolutionFields* fields) const
{ // _initialize
CPPUNIT_ASSERT(0 != _data);
CPPUNIT_ASSERT(0 != mesh);
CPPUNIT_ASSERT(0 != bc);
+ CPPUNIT_ASSERT(0 != fields);
CPPUNIT_ASSERT(0 != _quadrature);
try {
@@ -213,12 +221,12 @@
meshio::MeshIOAscii iohandler;
iohandler.filename(_data->meshFilename);
iohandler.read(mesh);
- CPPUNIT_ASSERT(!mesh->isNull());
// Set up coordinates
spatialdata::geocoords::CSCart cs;
- cs.setSpaceDim((*mesh)->getDimension());
+ cs.setSpaceDim(mesh->dimension());
cs.initialize();
+ mesh->coordsys(&cs);
// Set up quadrature
_quadrature->initialize(_data->basis, _data->basisDerivRef, _data->quadPts,
@@ -232,33 +240,34 @@
db.ioHandler(&dbIO);
db.queryType(spatialdata::spatialdb::SimpleDB::LINEAR);
- const double upDirVals[] = { 0.0, 0.0, 1.0 };
- double_array upDir(upDirVals, 3);
+ const double upDir[] = { 0.0, 0.0, 1.0 };
bc->quadrature(_quadrature);
bc->label(_data->label);
bc->db(&db);
- bc->initialize(*mesh, &cs, upDir);
+ bc->initialize(*mesh, upDir);
// Set up fields
CPPUNIT_ASSERT(0 != fields);
- fields->addReal("residual");
- fields->addReal("dispTBctpdt");
+ fields->add("residual");
+ fields->add("dispTBctpdt");
+ fields->solutionField("dispTBctpdt");
- const ALE::Obj<real_section_type>& residual = fields->getReal("residual");
- CPPUNIT_ASSERT(!residual.isNull());
- residual->setChart((*mesh)->getSieve()->getChart());
- residual->setFiberDimension((*mesh)->depthStratum(0), _data->spaceDim);
- (*mesh)->allocate(residual);
- residual->zero();
+ topology::Field<topology::Mesh>& residual = fields->get("residual");
+ const ALE::Obj<SieveMesh>& sieveMesh = mesh->sieveMesh();
+ CPPUNIT_ASSERT(!sieveMesh.isNull());
+ const ALE::Obj<SieveMesh::label_sequence>& vertices =
+ sieveMesh->depthStratum(0);
+ CPPUNIT_ASSERT(!vertices.isNull());
+ residual.newSection(vertices, _data->spaceDim);
+ residual.allocate();
+ residual.zero();
+
fields->copyLayout("residual");
- const ALE::Obj<real_section_type>& dispTBctpdt =
- fields->getReal("dispTBctpdt");
- CPPUNIT_ASSERT(!dispTBctpdt.isNull());
} catch (const ALE::Exception& err) {
throw std::runtime_error(err.msg());
} // catch
} // _initialize
-#endif
+
// End of file
Modified: short/3D/PyLith/branches/pylith-swig/unittests/libtests/bc/TestNeumann.hh
===================================================================
--- short/3D/PyLith/branches/pylith-swig/unittests/libtests/bc/TestNeumann.hh 2009-02-16 04:00:41 UTC (rev 14056)
+++ short/3D/PyLith/branches/pylith-swig/unittests/libtests/bc/TestNeumann.hh 2009-02-16 22:27:33 UTC (rev 14057)
@@ -25,7 +25,7 @@
#include "pylith/bc/bcfwd.hh" // forward declarations
#include "pylith/topology/topologyfwd.hh" // forward declarations
-#include "pylith/topology/feassemblefwd.hh" // forward declarations
+#include "pylith/feassemble/feassemblefwd.hh" // forward declarations
/// Namespace for pylith package
namespace pylith {
@@ -66,7 +66,7 @@
protected :
NeumannData* _data; ///< Data for testing
- feassemble::Quadrature<topology::Mesh>* _quadrature; ///< Used in testing.
+ feassemble::Quadrature<topology::SubMesh>* _quadrature; ///< Used in testing.
// PRIVATE METHODS ////////////////////////////////////////////////////
private :
Modified: short/3D/PyLith/branches/pylith-swig/unittests/libtests/bc/TestNeumannHex8.cc
===================================================================
--- short/3D/PyLith/branches/pylith-swig/unittests/libtests/bc/TestNeumannHex8.cc 2009-02-16 04:00:41 UTC (rev 14056)
+++ short/3D/PyLith/branches/pylith-swig/unittests/libtests/bc/TestNeumannHex8.cc 2009-02-16 22:27:33 UTC (rev 14057)
@@ -16,7 +16,8 @@
#include "data/NeumannDataHex8.hh" // USES NeumannDataHex8
-#include "pylith/feassemble/Quadrature2Din3D.hh" // USES Quadrature2Din3D
+#include "pylith/topology/SubMesh.hh" // USES SubMesh
+#include "pylith/feassemble/Quadrature.hh" // USES Quadrature
#include "pylith/feassemble/GeometryQuad3D.hh" // USES GeometryQuad3D
// ----------------------------------------------------------------------
@@ -27,10 +28,10 @@
void
pylith::bc::TestNeumannHex8::setUp(void)
{ // setUp
+ TestNeumann::setUp();
_data = new NeumannDataHex8();
- _quadrature = new feassemble::Quadrature2Din3D();
+ feassemble::GeometryQuad3D geometry;
CPPUNIT_ASSERT(0 != _quadrature);
- feassemble::GeometryQuad3D geometry;
_quadrature->refGeometry(&geometry);
} // setUp
Modified: short/3D/PyLith/branches/pylith-swig/unittests/libtests/bc/TestNeumannLine2.cc
===================================================================
--- short/3D/PyLith/branches/pylith-swig/unittests/libtests/bc/TestNeumannLine2.cc 2009-02-16 04:00:41 UTC (rev 14056)
+++ short/3D/PyLith/branches/pylith-swig/unittests/libtests/bc/TestNeumannLine2.cc 2009-02-16 22:27:33 UTC (rev 14057)
@@ -16,7 +16,8 @@
#include "data/NeumannDataLine2.hh" // USES NeumannDataLine2
-#include "pylith/feassemble/Quadrature0D.hh" // USES Quadrature0D
+#include "pylith/topology/SubMesh.hh" // USES SubMesh
+#include "pylith/feassemble/Quadrature.hh" // USES Quadrature
#include "pylith/feassemble/GeometryPoint1D.hh" // USES GeometryPoint1D
// ----------------------------------------------------------------------
@@ -27,10 +28,10 @@
void
pylith::bc::TestNeumannLine2::setUp(void)
{ // setUp
+ TestNeumann::setUp();
_data = new NeumannDataLine2();
- _quadrature = new feassemble::Quadrature0D();
+ feassemble::GeometryPoint1D geometry;
CPPUNIT_ASSERT(0 != _quadrature);
- feassemble::GeometryPoint1D geometry;
_quadrature->refGeometry(&geometry);
} // setUp
Modified: short/3D/PyLith/branches/pylith-swig/unittests/libtests/bc/TestNeumannQuad4.cc
===================================================================
--- short/3D/PyLith/branches/pylith-swig/unittests/libtests/bc/TestNeumannQuad4.cc 2009-02-16 04:00:41 UTC (rev 14056)
+++ short/3D/PyLith/branches/pylith-swig/unittests/libtests/bc/TestNeumannQuad4.cc 2009-02-16 22:27:33 UTC (rev 14057)
@@ -16,7 +16,8 @@
#include "data/NeumannDataQuad4.hh" // USES NeumannDataQuad4
-#include "pylith/feassemble/Quadrature1Din2D.hh" // USES Quadrature1Din2D
+#include "pylith/topology/SubMesh.hh" // USES SubMesh
+#include "pylith/feassemble/Quadrature.hh" // USES Quadrature
#include "pylith/feassemble/GeometryLine2D.hh" // USES GeometryLine2D
// ----------------------------------------------------------------------
@@ -27,10 +28,10 @@
void
pylith::bc::TestNeumannQuad4::setUp(void)
{ // setUp
+ TestNeumann::setUp();
_data = new NeumannDataQuad4();
- _quadrature = new feassemble::Quadrature1Din2D();
+ feassemble::GeometryLine2D geometry;
CPPUNIT_ASSERT(0 != _quadrature);
- feassemble::GeometryLine2D geometry;
_quadrature->refGeometry(&geometry);
} // setUp
Modified: short/3D/PyLith/branches/pylith-swig/unittests/libtests/bc/TestNeumannTet4.cc
===================================================================
--- short/3D/PyLith/branches/pylith-swig/unittests/libtests/bc/TestNeumannTet4.cc 2009-02-16 04:00:41 UTC (rev 14056)
+++ short/3D/PyLith/branches/pylith-swig/unittests/libtests/bc/TestNeumannTet4.cc 2009-02-16 22:27:33 UTC (rev 14057)
@@ -16,7 +16,8 @@
#include "data/NeumannDataTet4.hh" // USES NeumannDataTet4
-#include "pylith/feassemble/Quadrature2Din3D.hh" // USES Quadrature2Din3D
+#include "pylith/topology/SubMesh.hh" // USES SubMesh
+#include "pylith/feassemble/Quadrature.hh" // USES Quadrature
#include "pylith/feassemble/GeometryTri3D.hh" // USES GeometryTri3D
// ----------------------------------------------------------------------
@@ -27,10 +28,10 @@
void
pylith::bc::TestNeumannTet4::setUp(void)
{ // setUp
+ TestNeumann::setUp();
_data = new NeumannDataTet4();
- _quadrature = new feassemble::Quadrature2Din3D();
+ feassemble::GeometryTri3D geometry;
CPPUNIT_ASSERT(0 != _quadrature);
- feassemble::GeometryTri3D geometry;
_quadrature->refGeometry(&geometry);
} // setUp
Modified: short/3D/PyLith/branches/pylith-swig/unittests/libtests/bc/TestNeumannTri3.cc
===================================================================
--- short/3D/PyLith/branches/pylith-swig/unittests/libtests/bc/TestNeumannTri3.cc 2009-02-16 04:00:41 UTC (rev 14056)
+++ short/3D/PyLith/branches/pylith-swig/unittests/libtests/bc/TestNeumannTri3.cc 2009-02-16 22:27:33 UTC (rev 14057)
@@ -16,7 +16,8 @@
#include "data/NeumannDataTri3.hh" // USES NeumannDataTri3
-#include "pylith/feassemble/Quadrature1Din2D.hh" // USES Quadrature1Din2D
+#include "pylith/topology/SubMesh.hh" // USES SubMesh
+#include "pylith/feassemble/Quadrature.hh" // USES Quadrature
#include "pylith/feassemble/GeometryLine2D.hh" // USES GeometryLine2D
// ----------------------------------------------------------------------
@@ -27,10 +28,10 @@
void
pylith::bc::TestNeumannTri3::setUp(void)
{ // setUp
+ TestNeumann::setUp();
_data = new NeumannDataTri3();
- _quadrature = new feassemble::Quadrature1Din2D();
+ feassemble::GeometryLine2D geometry;
CPPUNIT_ASSERT(0 != _quadrature);
- feassemble::GeometryLine2D geometry;
_quadrature->refGeometry(&geometry);
} // setUp
More information about the CIG-COMMITS
mailing list