[cig-commits] r14002 - short/3D/PyLith/branches/pylith-swig/unittests/libtests/bc
brad at geodynamics.org
brad at geodynamics.org
Sun Feb 1 13:53:46 PST 2009
Author: brad
Date: 2009-02-01 13:53:46 -0800 (Sun, 01 Feb 2009)
New Revision: 14002
Modified:
short/3D/PyLith/branches/pylith-swig/unittests/libtests/bc/Makefile.am
short/3D/PyLith/branches/pylith-swig/unittests/libtests/bc/TestDirichletBC.cc
short/3D/PyLith/branches/pylith-swig/unittests/libtests/bc/TestDirichletBCMulti.cc
short/3D/PyLith/branches/pylith-swig/unittests/libtests/bc/TestDirichletBoundary.cc
short/3D/PyLith/branches/pylith-swig/unittests/libtests/bc/TestDirichletBoundary.hh
short/3D/PyLith/branches/pylith-swig/unittests/libtests/bc/TestDirichletBoundaryHex8.hh
short/3D/PyLith/branches/pylith-swig/unittests/libtests/bc/TestDirichletBoundaryQuad4.hh
short/3D/PyLith/branches/pylith-swig/unittests/libtests/bc/TestDirichletBoundaryTet4.hh
short/3D/PyLith/branches/pylith-swig/unittests/libtests/bc/TestDirichletBoundaryTri3.hh
Log:
Updated unit tests for changes to topology objects.
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-01 18:07:33 UTC (rev 14001)
+++ short/3D/PyLith/branches/pylith-swig/unittests/libtests/bc/Makefile.am 2009-02-01 21:53:46 UTC (rev 14002)
@@ -32,13 +32,13 @@
TestDirichletBCMulti.cc \
TestDirichletBCMultiTri3.cc \
TestDirichletBCMultiTet4.cc \
+ TestDirichletBoundary.cc \
+ TestDirichletBoundaryTri3.cc \
+ TestDirichletBoundaryQuad4.cc \
+ TestDirichletBoundaryTet4.cc \
+ TestDirichletBoundaryHex8.cc \
test_bc.cc
-# TestDirichletBoundary.cc \
-# TestDirichletBoundaryTri3.cc
-# TestDirichletBoundaryQuad4.cc \
-# TestDirichletBoundaryTet4.cc \
-# TestDirichletBoundaryHex8.cc \
# TestDirichletBoundaryMulti.cc \
# TestDirichletBoundaryMultiTri3.cc \
# TestDirichletBoundaryMultiTet4.cc
Modified: short/3D/PyLith/branches/pylith-swig/unittests/libtests/bc/TestDirichletBC.cc
===================================================================
--- short/3D/PyLith/branches/pylith-swig/unittests/libtests/bc/TestDirichletBC.cc 2009-02-01 18:07:33 UTC (rev 14001)
+++ short/3D/PyLith/branches/pylith-swig/unittests/libtests/bc/TestDirichletBC.cc 2009-02-01 21:53:46 UTC (rev 14002)
@@ -19,9 +19,8 @@
#include "data/DirichletData.hh" // USES DirichletData
#include "pylith/topology/Mesh.hh" // USES Mesh
-#include "pylith/topology/FieldUniform.hh" // USES Field
+#include "pylith/topology/Field.hh" // USES Field
#include "pylith/meshio/MeshIOAscii.hh" // USES MeshIOAscii
-#include "pylith/utils/sievetypes.hh" // USES PETSc Mesh
#include "spatialdata/geocoords/CSCart.hh" // USES CSCart
#include "spatialdata/spatialdb/SimpleDB.hh" // USES SimpleDB
@@ -127,9 +126,9 @@
CPPUNIT_ASSERT(!vertices.isNull());
const int fiberDim = _data->numDOF;
- topology::Field field(sieveMesh);
+ topology::Field field(mesh);
field.newSection(vertices, fiberDim);
- const ALE::Obj<SieveRealSection>& fieldSection = field.section();
+ const ALE::Obj<MeshRealSection>& fieldSection = field.section();
CPPUNIT_ASSERT(!fieldSection.isNull());
bc.setConstraintSizes(field, mesh);
@@ -172,13 +171,13 @@
CPPUNIT_ASSERT(!vertices.isNull());
const int fiberDim = _data->numDOF;
- topology::Field field(sieveMesh);
+ topology::Field field(mesh);
field.newSection(vertices, fiberDim);
- const ALE::Obj<SieveRealSection>& fieldSection = field.section();
+ const ALE::Obj<MeshRealSection>& fieldSection = field.section();
CPPUNIT_ASSERT(!fieldSection.isNull());
bc.setConstraintSizes(field, mesh);
- sieveMesh->allocate(fieldSection);
+ field.allocate();
bc.setConstraints(field, mesh);
const int numCells = sieveMesh->heightStratum(0)->size();
@@ -219,13 +218,13 @@
CPPUNIT_ASSERT(!vertices.isNull());
const int fiberDim = _data->numDOF;
- topology::Field field(sieveMesh);
+ topology::Field field(mesh);
field.newSection(vertices, fiberDim);
- const ALE::Obj<SieveRealSection>& fieldSection = field.section();
+ const ALE::Obj<MeshRealSection>& fieldSection = field.section();
CPPUNIT_ASSERT(!fieldSection.isNull());
bc.setConstraintSizes(field, mesh);
- sieveMesh->allocate(fieldSection);
+ field.allocate();
bc.setConstraints(field, mesh);
const double tolerance = 1.0e-06;
@@ -236,7 +235,7 @@
v_iter != vertices->end();
++v_iter) {
const int fiberDim = fieldSection->getFiberDimension(*v_iter);
- const SieveRealSection::value_type* values =
+ const MeshRealSection::value_type* values =
sieveMesh->restrictClosure(fieldSection, *v_iter);
for (int i=0; i < fiberDim; ++i)
CPPUNIT_ASSERT_DOUBLES_EQUAL(0.0, values[i], tolerance);
@@ -267,7 +266,7 @@
v_iter != vertices->end();
++v_iter) {
const int fiberDim = fieldSection->getFiberDimension(*v_iter);
- const SieveRealSection::value_type* values =
+ const MeshRealSection::value_type* values =
sieveMesh->restrictClosure(fieldSection, *v_iter);
if (*v_iter != _data->constrainedPoints[iConstraint] + offset) {
Modified: short/3D/PyLith/branches/pylith-swig/unittests/libtests/bc/TestDirichletBCMulti.cc
===================================================================
--- short/3D/PyLith/branches/pylith-swig/unittests/libtests/bc/TestDirichletBCMulti.cc 2009-02-01 18:07:33 UTC (rev 14001)
+++ short/3D/PyLith/branches/pylith-swig/unittests/libtests/bc/TestDirichletBCMulti.cc 2009-02-01 21:53:46 UTC (rev 14002)
@@ -19,7 +19,7 @@
#include "data/DirichletDataMulti.hh" // USES DirichletData
#include "pylith/topology/Mesh.hh" // USES Mesh
-#include "pylith/topology/FieldUniform.hh" // USES Field
+#include "pylith/topology/Field.hh" // USES Field
#include "pylith/meshio/MeshIOAscii.hh" // USES MeshIOAscii
#include "pylith/utils/sievetypes.hh" // USES PETSc Mesh
@@ -63,9 +63,9 @@
CPPUNIT_ASSERT(!vertices.isNull());
const int fiberDim = _data->numDOF;
- topology::Field field(sieveMesh);
+ topology::Field field(mesh);
field.newSection(vertices, fiberDim);
- const ALE::Obj<SieveRealSection>& fieldSection = field.section();
+ const ALE::Obj<MeshRealSection>& fieldSection = field.section();
CPPUNIT_ASSERT(!fieldSection.isNull());
bcA.setConstraintSizes(field, mesh);
@@ -104,9 +104,9 @@
CPPUNIT_ASSERT(!vertices.isNull());
const int fiberDim = _data->numDOF;
- topology::Field field(sieveMesh);
+ topology::Field field(mesh);
field.newSection(vertices, fiberDim);
- const ALE::Obj<SieveRealSection>& fieldSection = field.section();
+ const ALE::Obj<MeshRealSection>& fieldSection = field.section();
CPPUNIT_ASSERT(!fieldSection.isNull());
bcA.setConstraintSizes(field, mesh);
@@ -151,15 +151,15 @@
CPPUNIT_ASSERT(!vertices.isNull());
const int fiberDim = _data->numDOF;
- topology::Field field(sieveMesh);
+ topology::Field field(mesh);
field.newSection(vertices, fiberDim);
- const ALE::Obj<SieveRealSection>& fieldSection = field.section();
+ const ALE::Obj<MeshRealSection>& fieldSection = field.section();
CPPUNIT_ASSERT(!fieldSection.isNull());
bcA.setConstraintSizes(field, mesh);
bcB.setConstraintSizes(field, mesh);
bcC.setConstraintSizes(field, mesh);
- sieveMesh->allocate(fieldSection);
+ field.allocate();
bcA.setConstraints(field, mesh);
bcB.setConstraints(field, mesh);
bcC.setConstraints(field, mesh);
@@ -172,7 +172,7 @@
v_iter != vertices->end();
++v_iter) {
const int fiberDim = fieldSection->getFiberDimension(*v_iter);
- const SieveRealSection::value_type* values =
+ const MeshRealSection::value_type* values =
sieveMesh->restrictClosure(fieldSection, *v_iter);
for (int i=0; i < fiberDim; ++i)
CPPUNIT_ASSERT_DOUBLES_EQUAL(0.0, values[i], tolerance);
@@ -190,7 +190,7 @@
v_iter != vertices->end();
++v_iter) {
const int fiberDim = fieldSection->getFiberDimension(*v_iter);
- const SieveRealSection::value_type* values =
+ const MeshRealSection::value_type* values =
sieveMesh->restrictClosure(fieldSection, *v_iter);
for (int iDOF=0; iDOF < fiberDim; ++iDOF)
CPPUNIT_ASSERT_DOUBLES_EQUAL(_data->field[i++], values[iDOF], tolerance);
Modified: short/3D/PyLith/branches/pylith-swig/unittests/libtests/bc/TestDirichletBoundary.cc
===================================================================
--- short/3D/PyLith/branches/pylith-swig/unittests/libtests/bc/TestDirichletBoundary.cc 2009-02-01 18:07:33 UTC (rev 14001)
+++ short/3D/PyLith/branches/pylith-swig/unittests/libtests/bc/TestDirichletBoundary.cc 2009-02-01 21:53:46 UTC (rev 14002)
@@ -17,8 +17,12 @@
#include "pylith/bc/DirichletBoundary.hh" // USES DirichletBoundary
#include "data/DirichletData.hh" // USES DirichletData
+
+#include "pylith/topology/Mesh.hh" // USES Mesh
+#include "pylith/topology/Field.hh" // USES Field
+#include "pylith/topology/SubMesh.hh" // USES SubMesh
+#include "pylith/topology/FieldSubMesh.hh" // USES FieldSubMesh
#include "pylith/meshio/MeshIOAscii.hh" // USES MeshIOAscii
-#include "pylith/utils/sievetypes.hh" // USES PETSc Mesh
#include "spatialdata/geocoords/CSCart.hh" // USES CSCart
#include "spatialdata/spatialdb/SimpleDB.hh" // USES SimpleDB
@@ -53,47 +57,30 @@
} // testConstructor
// ----------------------------------------------------------------------
-// Test fixedDOF()
-void
-pylith::bc::TestDirichletBoundary::testFixedDOF(void)
-{ // testfixedDOF
- DirichletBoundary bc;
-
- const size_t numDOF = 4;
- const int dof[] = { 0, 2, 3, 5 };
- int_array fixedDOF(dof, numDOF);
- bc.fixedDOF(fixedDOF);
-
- CPPUNIT_ASSERT_EQUAL(numDOF, bc._fixedDOF.size());
- for (int i=0; i < numDOF; ++i)
- CPPUNIT_ASSERT_EQUAL(fixedDOF[i], bc._fixedDOF[i]);
-} // testFixedDOF
-
-#include <iostream>
-// ----------------------------------------------------------------------
// Test initialize().
void
pylith::bc::TestDirichletBoundary::testInitialize(void)
{ // testInitialize
- ALE::Obj<Mesh> mesh;
+ topology::Mesh mesh;
DirichletBoundary bc;
_initialize(&mesh, &bc);
CPPUNIT_ASSERT(0 != _data);
- const int numCells = mesh->heightStratum(0)->size();
+ const int numCells = mesh.sieveMesh()->heightStratum(0)->size();
const int numFixedDOF = _data->numFixedDOF;
const size_t numBoundary = _data->numConstrainedPts;
// Check vertices in boundary mesh
- const ALE::Obj<SubMesh::label_sequence>& vertices =
- bc._boundaryMesh->depthStratum(0);
- const SubMesh::label_sequence::iterator verticesEnd = vertices->end();
+ const ALE::Obj<SieveSubMesh>& sieveMesh = bc._boundaryMesh->sieveMesh();
+ const ALE::Obj<SieveSubMesh::label_sequence>& vertices =
+ sieveMesh->depthStratum(0);
+ const SieveSubMesh::label_sequence::iterator verticesEnd = vertices->end();
const int offset = numCells;
if (numFixedDOF > 0) {
int i = 0;
- for (SubMesh::label_sequence::iterator v_iter=vertices->begin();
+ for (SieveSubMesh::label_sequence::iterator v_iter=vertices->begin();
v_iter != verticesEnd;
++v_iter, ++i) {
CPPUNIT_ASSERT_EQUAL(_data->constrainedPoints[i]+offset, *v_iter);
@@ -101,191 +88,24 @@
CPPUNIT_ASSERT_EQUAL(int(numBoundary), i);
} // if
- // Check initial and rate values
- int i = 0;
- for (SubMesh::label_sequence::iterator v_iter=vertices->begin();
- v_iter != verticesEnd;
- ++v_iter) {
- CPPUNIT_ASSERT_EQUAL(2*numFixedDOF,
- bc._values->getFiberDimension(*v_iter));
+ // Check values
+ const size_t size = numBoundary * numFixedDOF;
+ CPPUNIT_ASSERT_EQUAL(size, bc._valuesInitial.size());
+ const double tolerance = 1.0e-06;
+ for (int i=0; i < size; ++i)
+ CPPUNIT_ASSERT_DOUBLES_EQUAL(_data->valuesInitial[i], bc._valuesInitial[i],
+ tolerance);
- const real_section_type::value_type* values =
- bc._values->restrictPoint(*v_iter);
-
- const double tolerance = 1.0e-06;
- for (int iDOF=0; iDOF < numFixedDOF; ++iDOF, ++i)
- CPPUNIT_ASSERT_DOUBLES_EQUAL(_data->valuesInitial[i], values[iDOF],
- tolerance);
- for (int iDOF=0; iDOF < numFixedDOF; ++iDOF)
- CPPUNIT_ASSERT_DOUBLES_EQUAL(_data->valueRate, values[numFixedDOF+iDOF],
- tolerance);
- } // for
+ CPPUNIT_ASSERT_EQUAL(size, bc._valuesRate.size());
+ for (int i=0; i < size; ++i)
+ CPPUNIT_ASSERT_DOUBLES_EQUAL(_data->valueRate, bc._valuesRate[i],
+ tolerance);
} // testInitialize
// ----------------------------------------------------------------------
-// Test setConstraintSizes().
void
-pylith::bc::TestDirichletBoundary::testSetConstraintSizes(void)
-{ // testSetConstraintSizes
- ALE::Obj<Mesh> mesh;
- DirichletBoundary bc;
- _initialize(&mesh, &bc);
-
- const ALE::Obj<real_section_type>& field = mesh->getRealSection("field");
- const ALE::Obj<Mesh::label_sequence>& vertices = mesh->depthStratum(0);
- field->setChart(mesh->getSieve()->getChart());
- field->setFiberDimension(vertices, _data->numDOF);
- bc.setConstraintSizes(field, mesh);
-
- CPPUNIT_ASSERT(0 != _data);
-
- const int numCells = mesh->heightStratum(0)->size();
- const int offset = numCells;
- int iConstraint = 0;
- for (Mesh::label_sequence::iterator v_iter = vertices->begin();
- v_iter != vertices->end();
- ++v_iter) {
- if (*v_iter != _data->constrainedPoints[iConstraint] + offset) {
- CPPUNIT_ASSERT_EQUAL(_data->numDOF, field->getFiberDimension(*v_iter));
- CPPUNIT_ASSERT_EQUAL(0, field->getConstraintDimension(*v_iter));
- } else {
- CPPUNIT_ASSERT_EQUAL(_data->numDOF, field->getFiberDimension(*v_iter));
- CPPUNIT_ASSERT_EQUAL(_data->numFixedDOF,
- field->getConstraintDimension(*v_iter));
- ++iConstraint;
- } // if/else
- } // for
-} // testSetConstraintSizes
-
-// ----------------------------------------------------------------------
-// Test setConstraints().
-void
-pylith::bc::TestDirichletBoundary::testSetConstraints(void)
-{ // testSetConstraints
- ALE::Obj<Mesh> mesh;
- DirichletBoundary bc;
- _initialize(&mesh, &bc);
-
- const ALE::Obj<real_section_type>& field = mesh->getRealSection("field");
- const ALE::Obj<Mesh::label_sequence>& vertices = mesh->depthStratum(0);
- field->setChart(mesh->getSieve()->getChart());
- field->setFiberDimension(vertices, _data->numDOF);
- bc.setConstraintSizes(field, mesh);
- mesh->allocate(field);
- bc.setConstraints(field, mesh);
-
- CPPUNIT_ASSERT(0 != _data);
-
- const int numCells = mesh->heightStratum(0)->size();
- const int offset = numCells;
- int iConstraint = 0;
- for (Mesh::label_sequence::iterator v_iter = vertices->begin();
- v_iter != vertices->end();
- ++v_iter) {
- const int* fixedDOF = field->getConstraintDof(*v_iter);
- if (*v_iter != _data->constrainedPoints[iConstraint] + offset) {
- CPPUNIT_ASSERT_EQUAL(0, field->getConstraintDimension(*v_iter));
- //CPPUNIT_ASSERT(0 == fixedDOF);
- } else {
- CPPUNIT_ASSERT(0 != fixedDOF);
- CPPUNIT_ASSERT_EQUAL(_data->numFixedDOF,
- field->getConstraintDimension(*v_iter));
- for (int iDOF=0; iDOF < _data->numFixedDOF; ++iDOF)
- CPPUNIT_ASSERT_EQUAL(_data->fixedDOF[iDOF], fixedDOF[iDOF]);
- ++iConstraint;
- } // if/else
- } // for
-} // testSetConstraints
-
-// ----------------------------------------------------------------------
-// Test setField().
-void
-pylith::bc::TestDirichletBoundary::testSetField(void)
-{ // testSetField
- ALE::Obj<Mesh> mesh;
- DirichletBoundary bc;
- _initialize(&mesh, &bc);
-
- const ALE::Obj<real_section_type>& field = mesh->getRealSection("field");
- const ALE::Obj<Mesh::label_sequence>& vertices = mesh->depthStratum(0);
- field->setChart(mesh->getSieve()->getChart());
- field->setFiberDimension(vertices, _data->numDOF);
- bc.setConstraintSizes(field, mesh);
- mesh->allocate(field);
- bc.setConstraints(field, mesh);
-
- CPPUNIT_ASSERT(0 != _data);
- const double tolerance = 1.0e-06;
-
- // All values should be zero.
- field->zero();
- for (Mesh::label_sequence::iterator v_iter = vertices->begin();
- v_iter != vertices->end();
- ++v_iter) {
- const int fiberDim = field->getFiberDimension(*v_iter);
- const real_section_type::value_type* values =
- mesh->restrictClosure(field, *v_iter);
- for (int i=0; i < fiberDim; ++i)
- CPPUNIT_ASSERT_DOUBLES_EQUAL(0.0, values[i], tolerance);
- } // for
-
- // Only unconstrained values should be zero.
- const double t = 1.0;
- bc.setField(t, field, mesh);
-
- // Create list of unconstrained DOF at constrained DOF
- const int numFreeDOF = _data->numDOF - _data->numFixedDOF;
- int_array freeDOF(numFreeDOF);
- int index = 0;
- for (int iDOF=0; iDOF < _data->numDOF; ++iDOF) {
- bool free = true;
- for (int iFixed=0; iFixed < _data->numFixedDOF; ++iFixed)
- if (iDOF == _data->fixedDOF[iFixed])
- free = false;
- if (free)
- freeDOF[index] = iDOF;
- } // for
-
- const int numCells = mesh->heightStratum(0)->size();
- const int offset = numCells;
- const int numFixedDOF = _data->numFixedDOF;
- int iConstraint = 0;
- for (Mesh::label_sequence::iterator v_iter = vertices->begin();
- v_iter != vertices->end();
- ++v_iter) {
- const int fiberDim = field->getFiberDimension(*v_iter);
- const real_section_type::value_type* values =
- mesh->restrictClosure(field, *v_iter);
-
- if (*v_iter != _data->constrainedPoints[iConstraint] + offset) {
- // unconstrained point
- for (int i=0; i < fiberDim; ++i)
- CPPUNIT_ASSERT_DOUBLES_EQUAL(0.0, values[i], tolerance);
- } else {
- // constrained point
-
- // check unconstrained DOF
- for (int iDOF=0; iDOF < numFreeDOF; ++iDOF)
- CPPUNIT_ASSERT_DOUBLES_EQUAL(0.0, values[freeDOF[iDOF]], tolerance);
-
- // check constrained DOF
- for (int iDOF=0; iDOF < numFixedDOF; ++iDOF) {
- const int index = iConstraint * numFixedDOF + iDOF;
- const double valueE = (t > _data->tRef) ?
- _data->valuesInitial[index] + (t-_data->tRef)*_data->valueRate :
- _data->valuesInitial[index];
- CPPUNIT_ASSERT_DOUBLES_EQUAL(valueE, values[_data->fixedDOF[iDOF]],
- tolerance);
- } // for
- ++iConstraint;
- } // if/else
- } // for
-} // testSetField
-
-// ----------------------------------------------------------------------
-void
-pylith::bc::TestDirichletBoundary::_initialize(ALE::Obj<Mesh>* mesh,
- DirichletBoundary* const bc) const
+pylith::bc::TestDirichletBoundary::_initialize(topology::Mesh* mesh,
+ DirichletBoundary* const bc) const
{ // _initialize
CPPUNIT_ASSERT(0 != _data);
CPPUNIT_ASSERT(0 != bc);
@@ -293,11 +113,11 @@
meshio::MeshIOAscii iohandler;
iohandler.filename(_data->meshFilename);
iohandler.read(mesh);
- CPPUNIT_ASSERT(!mesh->isNull());
spatialdata::geocoords::CSCart cs;
- cs.setSpaceDim((*mesh)->getDimension());
+ cs.setSpaceDim(mesh->dimension());
cs.initialize();
+ mesh->coordsys(&cs);
spatialdata::spatialdb::SimpleDB db("TestDirichletBoundary initial");
spatialdata::spatialdb::SimpleIOAscii dbIO;
@@ -313,16 +133,14 @@
const int numValues = 3;
dbRate.setData(names, values, numValues);
- int_array fixedDOF(_data->fixedDOF, _data->numFixedDOF);
- const double upDirVals[] = { 0.0, 0.0, 1.0 };
- double_array upDir(upDirVals, 3);
+ const double upDir[] = { 0.0, 0.0, 1.0 };
bc->label(_data->label);
bc->db(&db);
bc->dbRate(&dbRate);
bc->referenceTime(_data->tRef);
- bc->fixedDOF(fixedDOF);
- bc->initialize(*mesh, &cs, upDir);
+ bc->fixedDOF(_data->fixedDOF, _data->numFixedDOF);
+ bc->initialize(*mesh, upDir);
} // _initialize
Modified: short/3D/PyLith/branches/pylith-swig/unittests/libtests/bc/TestDirichletBoundary.hh
===================================================================
--- short/3D/PyLith/branches/pylith-swig/unittests/libtests/bc/TestDirichletBoundary.hh 2009-02-01 18:07:33 UTC (rev 14001)
+++ short/3D/PyLith/branches/pylith-swig/unittests/libtests/bc/TestDirichletBoundary.hh 2009-02-01 21:53:46 UTC (rev 14002)
@@ -23,8 +23,6 @@
#include <cppunit/extensions/HelperMacros.h>
-#include "pylith/utils/sievetypes.hh" // USES PETSc Mesh
-
/// Namespace for pylith package
namespace pylith {
namespace bc {
@@ -33,6 +31,10 @@
class DirichletBoundary;
class DirichletData;
} // bc
+
+ namespace topology {
+ class Mesh; // USES Mesh
+ } // topology
} // pylith
/// C++ unit testing for DirichletBoundary.
@@ -42,7 +44,6 @@
// CPPUNIT TEST SUITE /////////////////////////////////////////////////
CPPUNIT_TEST_SUITE( TestDirichletBoundary );
CPPUNIT_TEST( testConstructor );
- CPPUNIT_TEST( testFixedDOF );
CPPUNIT_TEST_SUITE_END();
// PUBLIC METHODS /////////////////////////////////////////////////////
@@ -57,21 +58,9 @@
/// Test constructor.
void testConstructor(void);
- /// Test fixedDOF().
- void testFixedDOF(void);
-
/// Test initialize().
void testInitialize(void);
- /// Test setConstraintSizes().
- void testSetConstraintSizes(void);
-
- /// Test setConstraints().
- void testSetConstraints(void);
-
- /// Test setField().
- void testSetField(void);
-
// PROTECTED MEMBERS //////////////////////////////////////////////////
protected :
@@ -85,7 +74,7 @@
* @param mesh PETSc mesh to initialize
* @param bc DirichletBoundary boundary condition to initialize.
*/
- void _initialize(ALE::Obj<Mesh>* mesh,
+ void _initialize(topology::Mesh* mesh,
DirichletBoundary* const bc) const;
}; // class TestDirichletBoundary
Modified: short/3D/PyLith/branches/pylith-swig/unittests/libtests/bc/TestDirichletBoundaryHex8.hh
===================================================================
--- short/3D/PyLith/branches/pylith-swig/unittests/libtests/bc/TestDirichletBoundaryHex8.hh 2009-02-01 18:07:33 UTC (rev 14001)
+++ short/3D/PyLith/branches/pylith-swig/unittests/libtests/bc/TestDirichletBoundaryHex8.hh 2009-02-01 21:53:46 UTC (rev 14002)
@@ -37,9 +37,6 @@
// CPPUNIT TEST SUITE /////////////////////////////////////////////////
CPPUNIT_TEST_SUB_SUITE( TestDirichletBoundaryHex8, TestDirichletBoundary );
CPPUNIT_TEST( testInitialize );
- CPPUNIT_TEST( testSetConstraintSizes );
- CPPUNIT_TEST( testSetConstraints );
- CPPUNIT_TEST( testSetField );
CPPUNIT_TEST_SUITE_END();
// PUBLIC METHODS /////////////////////////////////////////////////////
Modified: short/3D/PyLith/branches/pylith-swig/unittests/libtests/bc/TestDirichletBoundaryQuad4.hh
===================================================================
--- short/3D/PyLith/branches/pylith-swig/unittests/libtests/bc/TestDirichletBoundaryQuad4.hh 2009-02-01 18:07:33 UTC (rev 14001)
+++ short/3D/PyLith/branches/pylith-swig/unittests/libtests/bc/TestDirichletBoundaryQuad4.hh 2009-02-01 21:53:46 UTC (rev 14002)
@@ -37,9 +37,6 @@
// CPPUNIT TEST SUITE /////////////////////////////////////////////////
CPPUNIT_TEST_SUB_SUITE( TestDirichletBoundaryQuad4, TestDirichletBoundary );
CPPUNIT_TEST( testInitialize );
- CPPUNIT_TEST( testSetConstraintSizes );
- CPPUNIT_TEST( testSetConstraints );
- CPPUNIT_TEST( testSetField );
CPPUNIT_TEST_SUITE_END();
// PUBLIC METHODS /////////////////////////////////////////////////////
Modified: short/3D/PyLith/branches/pylith-swig/unittests/libtests/bc/TestDirichletBoundaryTet4.hh
===================================================================
--- short/3D/PyLith/branches/pylith-swig/unittests/libtests/bc/TestDirichletBoundaryTet4.hh 2009-02-01 18:07:33 UTC (rev 14001)
+++ short/3D/PyLith/branches/pylith-swig/unittests/libtests/bc/TestDirichletBoundaryTet4.hh 2009-02-01 21:53:46 UTC (rev 14002)
@@ -37,9 +37,6 @@
// CPPUNIT TEST SUITE /////////////////////////////////////////////////
CPPUNIT_TEST_SUB_SUITE( TestDirichletBoundaryTet4, TestDirichletBoundary );
CPPUNIT_TEST( testInitialize );
- CPPUNIT_TEST( testSetConstraintSizes );
- CPPUNIT_TEST( testSetConstraints );
- CPPUNIT_TEST( testSetField );
CPPUNIT_TEST_SUITE_END();
// PUBLIC METHODS /////////////////////////////////////////////////////
Modified: short/3D/PyLith/branches/pylith-swig/unittests/libtests/bc/TestDirichletBoundaryTri3.hh
===================================================================
--- short/3D/PyLith/branches/pylith-swig/unittests/libtests/bc/TestDirichletBoundaryTri3.hh 2009-02-01 18:07:33 UTC (rev 14001)
+++ short/3D/PyLith/branches/pylith-swig/unittests/libtests/bc/TestDirichletBoundaryTri3.hh 2009-02-01 21:53:46 UTC (rev 14002)
@@ -37,9 +37,6 @@
// CPPUNIT TEST SUITE /////////////////////////////////////////////////
CPPUNIT_TEST_SUB_SUITE( TestDirichletBoundaryTri3, TestDirichletBoundary );
CPPUNIT_TEST( testInitialize );
- CPPUNIT_TEST( testSetConstraintSizes );
- CPPUNIT_TEST( testSetConstraints );
- CPPUNIT_TEST( testSetField );
CPPUNIT_TEST_SUITE_END();
// PUBLIC METHODS /////////////////////////////////////////////////////
More information about the CIG-COMMITS
mailing list