[cig-commits] r6519 - in short/3D/PyLith/trunk/unittests/libtests:
feassemble materials meshio
brad at geodynamics.org
brad at geodynamics.org
Sat Apr 7 13:35:41 PDT 2007
Author: brad
Date: 2007-04-07 13:35:40 -0700 (Sat, 07 Apr 2007)
New Revision: 6519
Modified:
short/3D/PyLith/trunk/unittests/libtests/feassemble/TestIntegrator.cc
short/3D/PyLith/trunk/unittests/libtests/feassemble/TestQuadrature.cc
short/3D/PyLith/trunk/unittests/libtests/materials/TestElasticMaterial.cc
short/3D/PyLith/trunk/unittests/libtests/materials/TestMaterial.cc
short/3D/PyLith/trunk/unittests/libtests/meshio/TestMeshIO.cc
short/3D/PyLith/trunk/unittests/libtests/meshio/TestMeshIO.hh
Log:
Updated unit tests to account for changes in Sieve.
Modified: short/3D/PyLith/trunk/unittests/libtests/feassemble/TestIntegrator.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/feassemble/TestIntegrator.cc 2007-04-07 19:05:26 UTC (rev 6518)
+++ short/3D/PyLith/trunk/unittests/libtests/feassemble/TestIntegrator.cc 2007-04-07 20:35:40 UTC (rev 6519)
@@ -76,7 +76,7 @@
* @param data Integrator data
*/
static
- ALE::Obj<ALE::Field::Mesh>
+ ALE::Obj<ALE::Mesh>
_setupMesh(const IntegratorData& data);
}; // _TestIntegrator
@@ -89,7 +89,7 @@
{ // _testIntegrateAction
CPPUNIT_ASSERT(false);
- typedef ALE::Field::Mesh Mesh;
+ typedef ALE::Mesh Mesh;
typedef Mesh::real_section_type real_section_type;
ALE::Obj<Mesh> mesh = _TestIntegrator::_setupMesh(data);
@@ -148,7 +148,7 @@
{ // _testIntegrate
CPPUNIT_ASSERT(false);
- typedef ALE::Field::Mesh Mesh;
+ typedef ALE::Mesh Mesh;
typedef Mesh::real_section_type real_section_type;
journal::debug_t debug("TestIntegrator");
@@ -255,8 +255,8 @@
ALE::Obj<ALE::Mesh>
pylith::feassemble::_TestIntegrator::_setupMesh(const IntegratorData& data)
{ // _setupMesh
- typedef ALE::Field::Mesh Mesh;
- typedef Meh::sieve_type sieve_type;
+ typedef ALE::Mesh Mesh;
+ typedef Mesh::sieve_type sieve_type;
const int cellDim = data.cellDim;
const int numCorners = data.numCorners;
@@ -272,11 +272,11 @@
ALE::Obj<sieve_type> sieve = new sieve_type(mesh->comm());
const bool interpolate = false;
- ALE::New::SieveBuilder<Mesh>::buildTopology(sieve, cellDim, numCells,
+ ALE::SieveBuilder<Mesh>::buildTopology(sieve, cellDim, numCells,
const_cast<int*>(cells), numVertices, interpolate, numCorners);
mesh->setSieve(sieve);
mesh->stratify();
- ALE::New::SieveBuilder<Mesh>::buildCoordinatesNew(mesh, spaceDim, vertCoords);
+ ALE::SieveBuilder<Mesh>::buildCoordinates(mesh, spaceDim, vertCoords);
return mesh;
} // _setupMesh
Modified: short/3D/PyLith/trunk/unittests/libtests/feassemble/TestQuadrature.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/feassemble/TestQuadrature.cc 2007-04-07 19:05:26 UTC (rev 6518)
+++ short/3D/PyLith/trunk/unittests/libtests/feassemble/TestQuadrature.cc 2007-04-07 20:35:40 UTC (rev 6519)
@@ -232,17 +232,17 @@
cellDim, numCorners, numQuadPts, spaceDim);
// Create mesh with test cell
- typedef ALE::Field::Mesh Mesh;
- typedef ALE::Field::Mesh::sieve_type sieve_type;
+ typedef ALE::Mesh Mesh;
+ typedef ALE::Mesh::sieve_type sieve_type;
ALE::Obj<Mesh> mesh = new Mesh(PETSC_COMM_WORLD, cellDim);
ALE::Obj<sieve_type> sieve = new sieve_type(mesh->comm());
const bool interpolate = false;
- ALE::New::SieveBuilder<Mesh>::buildTopology(sieve, cellDim, numCells,
+ ALE::SieveBuilder<Mesh>::buildTopology(sieve, cellDim, numCells,
(int*) cells, numVertices, interpolate, numCorners);
mesh->setSieve(sieve);
mesh->stratify();
- ALE::New::SieveBuilder<Mesh>::buildCoordinatesNew(mesh, spaceDim, vertCoords);
+ ALE::SieveBuilder<Mesh>::buildCoordinates(mesh, spaceDim, vertCoords);
// Check values from computeGeometry()
const ALE::Obj<Mesh::label_sequence>& elements = mesh->heightStratum(0);
Modified: short/3D/PyLith/trunk/unittests/libtests/materials/TestElasticMaterial.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/materials/TestElasticMaterial.cc 2007-04-07 19:05:26 UTC (rev 6518)
+++ short/3D/PyLith/trunk/unittests/libtests/materials/TestElasticMaterial.cc 2007-04-07 20:35:40 UTC (rev 6519)
@@ -47,7 +47,7 @@
void
pylith::materials::TestElasticMaterial::testCalcDensity(void)
{ // testCalcDensity
- typedef ALE::Field::Mesh Mesh;
+ typedef ALE::Mesh Mesh;
typedef Mesh::sieve_type sieve_type;
typedef Mesh::real_section_type real_section_type;
@@ -67,11 +67,11 @@
ALE::Obj<sieve_type> sieve = new sieve_type(mesh->comm());
const bool interpolate = false;
- ALE::New::SieveBuilder<Mesh>::buildTopology(sieve, cellDim, numCells,
+ ALE::SieveBuilder<Mesh>::buildTopology(sieve, cellDim, numCells,
const_cast<int*>(cells), numVertices, interpolate, numCorners);
mesh->setSieve(sieve);
mesh->stratify();
- ALE::New::SieveBuilder<Mesh>::buildCoordinatesNew(mesh, spaceDim, vertCoords);
+ ALE::SieveBuilder<Mesh>::buildCoordinates(mesh, spaceDim, vertCoords);
} // create mesh
// Get cells associated with material
@@ -133,7 +133,7 @@
void
pylith::materials::TestElasticMaterial::testCalcStress(void)
{ // testCalcProperties
- typedef ALE::Field::Mesh Mesh;
+ typedef ALE::Mesh Mesh;
typedef Mesh::sieve_type sieve_type;
typedef Mesh::real_section_type real_section_type;
@@ -153,11 +153,11 @@
ALE::Obj<sieve_type> sieve = new sieve_type(mesh->comm());
const bool interpolate = false;
- ALE::New::SieveBuilder<Mesh>::buildTopology(sieve, cellDim, numCells,
+ ALE::SieveBuilder<Mesh>::buildTopology(sieve, cellDim, numCells,
const_cast<int*>(cells), numVertices, interpolate, numCorners);
mesh->setSieve(sieve);
mesh->stratify();
- ALE::New::SieveBuilder<Mesh>::buildCoordinatesNew(mesh, spaceDim, vertCoords);
+ ALE::SieveBuilder<Mesh>::buildCoordinates(mesh, spaceDim, vertCoords);
} // create mesh
// Get cells associated with material
@@ -224,7 +224,7 @@
void
pylith::materials::TestElasticMaterial::testCalcDerivElastic(void)
{ // testCalcDerivElastic
- typedef ALE::Field::Mesh Mesh;
+ typedef ALE::Mesh Mesh;
typedef Mesh::sieve_type sieve_type;
typedef Mesh::real_section_type real_section_type;
@@ -244,11 +244,11 @@
ALE::Obj<sieve_type> sieve = new sieve_type(mesh->comm());
const bool interpolate = false;
- ALE::New::SieveBuilder<Mesh>::buildTopology(sieve, cellDim, numCells,
+ ALE::SieveBuilder<Mesh>::buildTopology(sieve, cellDim, numCells,
const_cast<int*>(cells), numVertices, interpolate, numCorners);
mesh->setSieve(sieve);
mesh->stratify();
- ALE::New::SieveBuilder<Mesh>::buildCoordinatesNew(mesh, spaceDim, vertCoords);
+ ALE::SieveBuilder<Mesh>::buildCoordinates(mesh, spaceDim, vertCoords);
} // create mesh
// Get cells associated with material
Modified: short/3D/PyLith/trunk/unittests/libtests/materials/TestMaterial.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/materials/TestMaterial.cc 2007-04-07 19:05:26 UTC (rev 6518)
+++ short/3D/PyLith/trunk/unittests/libtests/materials/TestMaterial.cc 2007-04-07 20:35:40 UTC (rev 6519)
@@ -75,7 +75,7 @@
void
pylith::materials::TestMaterial::testInitialize(void)
{ // testInitialize
- typedef ALE::Field::Mesh Mesh;
+ typedef ALE::Mesh Mesh;
typedef Mesh::sieve_type sieve_type;
typedef Mesh::label_type label_type;
typedef Mesh::real_section_type real_section_type;
@@ -97,11 +97,12 @@
ALE::Obj<sieve_type> sieve = new sieve_type(mesh->comm());
const bool interpolate = false;
- ALE::New::SieveBuilder<Mesh>::buildTopology(sieve, cellDim, numCells,
- const_cast<int*>(cells), numVertices, interpolate, numCorners);
+ ALE::SieveBuilder<Mesh>::buildTopology(sieve, cellDim, numCells,
+ const_cast<int*>(cells), numVertices,
+ interpolate, numCorners);
mesh->setSieve(sieve);
mesh->stratify();
- ALE::New::SieveBuilder<Mesh>::buildCoordinatesNew(mesh, spaceDim, vertCoords);
+ ALE::SieveBuilder<Mesh>::buildCoordinates(mesh, spaceDim, vertCoords);
} // create mesh
Modified: short/3D/PyLith/trunk/unittests/libtests/meshio/TestMeshIO.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/meshio/TestMeshIO.cc 2007-04-07 19:05:26 UTC (rev 6518)
+++ short/3D/PyLith/trunk/unittests/libtests/meshio/TestMeshIO.cc 2007-04-07 20:35:40 UTC (rev 6519)
@@ -14,16 +14,14 @@
#include "TestMeshIO.hh" // Implementation of class methods
-#include <Mesh.hh>
-
#include "data/MeshData.hh"
// ----------------------------------------------------------------------
// Get simple mesh for testing I/O.
-ALE::Obj<ALE::Field::Mesh>*
+ALE::Obj<ALE::Mesh>*
pylith::meshio::TestMeshIO::createMesh(const MeshData& data)
{ // createMesh
- typedef ALE::Field::Mesh Mesh;
+ typedef ALE::Mesh Mesh;
typedef Mesh::sieve_type sieve_type;
typedef Mesh::label_type label_type;
@@ -49,11 +47,12 @@
ALE::Obj<sieve_type> sieve = new sieve_type(mesh->comm());
const bool interpolate = false;
- ALE::New::SieveBuilder<Mesh>::buildTopology(sieve, cellDim, numCells,
- const_cast<int*>(cells), numVertices, interpolate, numCorners);
+ ALE::SieveBuilder<Mesh>::buildTopology(sieve, cellDim, numCells,
+ const_cast<int*>(cells), numVertices,
+ interpolate, numCorners);
mesh->setSieve(sieve);
mesh->stratify();
- ALE::New::SieveBuilder<Mesh>::buildCoordinatesNew(mesh, spaceDim, vertCoords);
+ ALE::SieveBuilder<Mesh>::buildCoordinates(mesh, spaceDim, vertCoords);
const ALE::Obj<Mesh::label_sequence>& cellsMesh = mesh->heightStratum(0);
@@ -75,7 +74,7 @@
pylith::meshio::TestMeshIO::checkVals(const ALE::Obj<Mesh>& mesh,
const MeshData& data)
{ // checkVals
- typedef ALE::Field::Mesh::label_type label_type;
+ typedef ALE::Mesh::label_type label_type;
// Check mesh dimension
CPPUNIT_ASSERT_EQUAL(data.cellDim, mesh->getDimension());
Modified: short/3D/PyLith/trunk/unittests/libtests/meshio/TestMeshIO.hh
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/meshio/TestMeshIO.hh 2007-04-07 19:05:26 UTC (rev 6518)
+++ short/3D/PyLith/trunk/unittests/libtests/meshio/TestMeshIO.hh 2007-04-07 20:35:40 UTC (rev 6519)
@@ -23,7 +23,7 @@
#include <cppunit/extensions/HelperMacros.h>
-#include <Mesh.hh>
+#include <petscmesh.h>
/// Namespace for pylith package
namespace pylith {
@@ -39,7 +39,7 @@
// PUBLIC TYPEDEFS ////////////////////////////////////////////////////
public :
- typedef ALE::Field::Mesh Mesh;
+ typedef ALE::Mesh Mesh;
typedef Mesh::sieve_type sieve_type;
// PUBLIC METHODS /////////////////////////////////////////////////////
More information about the cig-commits
mailing list