[cig-commits] r21874 - short/3D/PyLith/trunk/unittests/libtests/meshio
brad at geodynamics.org
brad at geodynamics.org
Tue Apr 16 15:27:25 PDT 2013
Author: brad
Date: 2013-04-16 15:27:25 -0700 (Tue, 16 Apr 2013)
New Revision: 21874
Modified:
short/3D/PyLith/trunk/unittests/libtests/meshio/TestCellFilterAvg.cc
short/3D/PyLith/trunk/unittests/libtests/meshio/TestExodusII.cc
short/3D/PyLith/trunk/unittests/libtests/meshio/TestHDF5.cc
short/3D/PyLith/trunk/unittests/libtests/meshio/TestMeshIO.cc
short/3D/PyLith/trunk/unittests/libtests/meshio/TestMeshIOCubit.cc
short/3D/PyLith/trunk/unittests/libtests/meshio/TestMeshIOLagrit.cc
short/3D/PyLith/trunk/unittests/libtests/meshio/TestXdmf.cc
Log:
Code cleanup.
Modified: short/3D/PyLith/trunk/unittests/libtests/meshio/TestCellFilterAvg.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/meshio/TestCellFilterAvg.cc 2013-04-16 15:59:00 UTC (rev 21873)
+++ short/3D/PyLith/trunk/unittests/libtests/meshio/TestCellFilterAvg.cc 2013-04-16 22:27:25 UTC (rev 21874)
@@ -21,6 +21,8 @@
#include "TestCellFilterAvg.hh" // Implementation of class methods
#include "pylith/topology/Mesh.hh" // USES Mesh
+#include "pylith/topology/Stratum.hh" // USES Stratum
+#include "pylith/topology/VisitorMesh.hh" // USES VisitorMesh
#include "pylith/meshio/CellFilterAvg.hh"
#include "pylith/meshio/MeshIOAscii.hh" // USES MeshIOAscii
@@ -45,8 +47,7 @@
void
pylith::meshio::TestCellFilterAvg::testFilter(void)
{ // testFilter
- typedef pylith::topology::Mesh::SieveMesh SieveMesh;
- typedef pylith::topology::Mesh::RealSection RealSection;
+ PYLITH_METHOD_BEGIN;
const char* filename = "data/quad4.mesh";
const int fiberDim = 2;
@@ -100,29 +101,21 @@
field.vectorFieldType(fieldType);
field.label(label.c_str());
- DM dmMesh = mesh.dmMesh();
- PetscInt cStart, cEnd;
- PetscErrorCode err;
+ PetscDM dmMesh = mesh.dmMesh();CPPUNIT_ASSERT(dmMesh);
+ topology::Stratum cellsStratum(dmMesh, topology::Stratum::HEIGHT, 0);
+ const PetscInt cStart = cellsStratum.begin();
+ const PetscInt cEnd = cellsStratum.end();
- CPPUNIT_ASSERT(dmMesh);
- err = DMPlexGetHeightStratum(dmMesh, 0, &cStart, &cEnd);CHECK_PETSC_ERROR(err);
+ topology::VecVisitorMesh fieldVisitor(field);
+ PetscScalar* fieldArray = fieldVisitor.localArray();CPPUNIT_ASSERT(fieldArray);
+ for(PetscInt c = cStart, index = 0; c < cEnd; ++c) {
+ const PetscInt off = fieldVisitor.sectionOffset(c);
+ CPPUNIT_ASSERT_EQUAL(fiberDim, fieldVisitor.sectionDof(c));
- PetscSection section = field.petscSection();
- Vec vec = field.localVector();
- PetscScalar *a;
- CPPUNIT_ASSERT(section);CPPUNIT_ASSERT(vec);
- CPPUNIT_ASSERT_EQUAL(ncells, cEnd-cStart);
- err = VecGetArray(vec, &a);CHECK_PETSC_ERROR(err);
- for(PetscInt c = cStart; c < cEnd; ++c) {
- PetscInt dof, off;
-
- err = PetscSectionGetDof(section, c, &dof);CHECK_PETSC_ERROR(err);
- err = PetscSectionGetOffset(section, c, &off);CHECK_PETSC_ERROR(err);
- for(PetscInt d = 0; d < dof; ++d) {
- a[off+d] = fieldValues[(c-cStart)*dof+d];
- }
+ for(PetscInt d = 0; d < fiberDim; ++d, ++index) {
+ fieldArray[off+d] = fieldValues[index];
+ } // for
} // for
- err = VecRestoreArray(vec, &a);CHECK_PETSC_ERROR(err);
feassemble::Quadrature<topology::Mesh> quadrature;
quadrature.initialize(basis, numQuadPts, numBasis,
@@ -135,26 +128,23 @@
filter.quadrature(&quadrature);
const topology::Field<topology::Mesh>& fieldF = filter.filter(field);
- PetscSection sectionF = fieldF.petscSection();
- Vec vecF = fieldF.localVector();
- CPPUNIT_ASSERT(sectionF);CPPUNIT_ASSERT(vecF);
CPPUNIT_ASSERT_EQUAL(fieldTypeE, fieldF.vectorFieldType());
CPPUNIT_ASSERT_EQUAL(label, std::string(fieldF.label()));
- const PylithScalar tolerance = 1.0e-06;
- err = VecGetArray(vecF, &a);CHECK_PETSC_ERROR(err);
- for(PetscInt c = cStart; c < cEnd; ++c) {
- PetscInt dof, off;
+ topology::VecVisitorMesh fieldFVisitor(fieldF);
+ const PetscScalar* fieldFArray = fieldFVisitor.localArray();CPPUNIT_ASSERT(fieldFArray);
- err = PetscSectionGetDof(sectionF, c, &dof);CHECK_PETSC_ERROR(err);
- err = PetscSectionGetOffset(sectionF, c, &off);CHECK_PETSC_ERROR(err);
- CPPUNIT_ASSERT_EQUAL(fiberDimE, dof);
- for(PetscInt d = 0; d < dof; ++d) {
- CPPUNIT_ASSERT_DOUBLES_EQUAL(1.0, a[off+d]/fieldValuesE[(c-cStart)*dof+d], tolerance);
+ const PylithScalar tolerance = 1.0e-06;
+ for(PetscInt c = cStart, index = 0; c < cEnd; ++c) {
+ const PetscInt off = fieldFVisitor.sectionOffset(c);
+ CPPUNIT_ASSERT_EQUAL(fiberDimE, fieldFVisitor.sectionDof(c));
+ for(PetscInt d = 0; d < fiberDimE; ++d, ++index) {
+ CPPUNIT_ASSERT_DOUBLES_EQUAL(1.0, fieldFArray[off+d]/fieldValuesE[index], tolerance);
}
} // for
- err = VecRestoreArray(vecF, &a);CHECK_PETSC_ERROR(err);
+
+ PYLITH_METHOD_END;
} // testFilter
Modified: short/3D/PyLith/trunk/unittests/libtests/meshio/TestExodusII.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/meshio/TestExodusII.cc 2013-04-16 15:59:00 UTC (rev 21873)
+++ short/3D/PyLith/trunk/unittests/libtests/meshio/TestExodusII.cc 2013-04-16 22:27:25 UTC (rev 21874)
@@ -23,6 +23,7 @@
#include "pylith/meshio/ExodusII.hh"
#include "pylith/utils/array.hh" // USES int_array, scalar_array, string_vector
+#include "pylith/utils/petscerror.h" // USES PYLITH_METHOD_BEGIN/END
// ----------------------------------------------------------------------
CPPUNIT_TEST_SUITE_REGISTRATION( pylith::meshio::TestExodusII );
@@ -32,7 +33,11 @@
void
pylith::meshio::TestExodusII::testConstructor(void)
{ // testConstructor
+ PYLITH_METHOD_BEGIN;
+
ExodusII exofile;
+
+ PYLITH_METHOD_END;
} // testConstructor
// ----------------------------------------------------------------------
@@ -40,11 +45,15 @@
void
pylith::meshio::TestExodusII::testFilename(void)
{ // testFilename
+ PYLITH_METHOD_BEGIN;
+
ExodusII exofile;
const char* filename = "hi.txt";
exofile.filename(filename);
CPPUNIT_ASSERT(0 == strcmp(filename, exofile.filename()));
+
+ PYLITH_METHOD_END;
} // testFilename
// ----------------------------------------------------------------------
@@ -52,11 +61,15 @@
void
pylith::meshio::TestExodusII::testOpenClose(void)
{ // testOpenClose
+ PYLITH_METHOD_BEGIN;
+
ExodusII exofile("data/twotri3_13.0.exo");
CPPUNIT_ASSERT(exofile._file);
exofile.close();
CPPUNIT_ASSERT(!exofile._file);
+
+ PYLITH_METHOD_END;
} // testOpenClose
// ----------------------------------------------------------------------
@@ -64,10 +77,14 @@
void
pylith::meshio::TestExodusII::testHasDim(void)
{ // testHasDim
+ PYLITH_METHOD_BEGIN;
+
ExodusII exofile("data/twotri3_13.0.exo");
CPPUNIT_ASSERT(exofile.hasDim("num_dim"));
CPPUNIT_ASSERT(!exofile.hasDim("abcdefghijklm"));
+
+ PYLITH_METHOD_END;
} // testHasDim
// ----------------------------------------------------------------------
@@ -75,10 +92,14 @@
void
pylith::meshio::TestExodusII::testHasAtt(void)
{ // testHasAtt
+ PYLITH_METHOD_BEGIN;
+
ExodusII exofile("data/twotri3_13.0.exo");
CPPUNIT_ASSERT(exofile.hasAtt("version"));
CPPUNIT_ASSERT(!exofile.hasAtt("abcdefghijklm"));
+
+ PYLITH_METHOD_END;
} // testHasAtt
// ----------------------------------------------------------------------
@@ -86,10 +107,14 @@
void
pylith::meshio::TestExodusII::testHasVar(void)
{ // testHasVar
+ PYLITH_METHOD_BEGIN;
+
ExodusII exofile("data/twotri3_13.0.exo");
CPPUNIT_ASSERT(exofile.hasVar("connect1"));
CPPUNIT_ASSERT(!exofile.hasVar("abcdefghijklm"));
+
+ PYLITH_METHOD_END;
} // testHasVar
// ----------------------------------------------------------------------
@@ -97,6 +122,8 @@
void
pylith::meshio::TestExodusII::testGetVarDouble(void)
{ // testGetVarDouble
+ PYLITH_METHOD_BEGIN;
+
const PylithScalar coordsE[8] = { -1.0, 0.0, 0.0, 1.0,
0.0, -1.0, 1.0, 0.0 };
@@ -113,6 +140,8 @@
const PylithScalar tolerance = 1.0e-06;
for (int i=0; i < size; ++i)
CPPUNIT_ASSERT_DOUBLES_EQUAL(coordsE[i], coords[i], tolerance);
+
+ PYLITH_METHOD_END;
} // testGetVarDouble
// ----------------------------------------------------------------------
@@ -120,6 +149,8 @@
void
pylith::meshio::TestExodusII::testGetVarInt(void)
{ // testGetVarDouble
+ PYLITH_METHOD_BEGIN;
+
const int connectE[3] = { 3, 2, 4 };
const int ndims = 2;
@@ -134,6 +165,8 @@
for (int i=0; i < size; ++i)
CPPUNIT_ASSERT_EQUAL(connectE[i], connect[i]);
+
+ PYLITH_METHOD_END;
} // testGetVarDouble
// ----------------------------------------------------------------------
@@ -141,6 +174,8 @@
void
pylith::meshio::TestExodusII::testGetVarString(void)
{ // testGetVarString
+ PYLITH_METHOD_BEGIN;
+
const char* namesE[2] = { "x", "y" };
const int dim = 2;
@@ -151,6 +186,8 @@
for (int i=0; i < dim; ++i)
CPPUNIT_ASSERT_EQUAL(std::string(namesE[i]), names[i]);
+
+ PYLITH_METHOD_END;
} // testGetVarString
Modified: short/3D/PyLith/trunk/unittests/libtests/meshio/TestHDF5.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/meshio/TestHDF5.cc 2013-04-16 15:59:00 UTC (rev 21873)
+++ short/3D/PyLith/trunk/unittests/libtests/meshio/TestHDF5.cc 2013-04-16 22:27:25 UTC (rev 21874)
@@ -22,6 +22,8 @@
#include "pylith/meshio/HDF5.hh" // USES HDF5
+#include "pylith/utils/petscerror.h" // USES PYLITH_METHOD_BEGIN/END
+
#if H5_VERS_MAJOR == 1 && H5_VERS_MINOR >= 8
#define PYLITH_HDF5_USE_API_18
#endif
@@ -34,6 +36,8 @@
void
pylith::meshio::TestHDF5::testConstructor(void)
{ // testConstructor
+ PYLITH_METHOD_BEGIN;
+
HDF5 one;
CPPUNIT_ASSERT(-1 == one._file);
@@ -43,6 +47,8 @@
HDF5 three("test.h5", H5F_ACC_RDONLY);
CPPUNIT_ASSERT(three._file >= 0);
+
+ PYLITH_METHOD_END;
} // testConstructor
// ----------------------------------------------------------------------
@@ -50,6 +56,8 @@
void
pylith::meshio::TestHDF5::testOpenClose(void)
{ // testOpenClose
+ PYLITH_METHOD_BEGIN;
+
HDF5 h5;
CPPUNIT_ASSERT(-1 == h5._file);
@@ -67,6 +75,8 @@
h5.close();
CPPUNIT_ASSERT(-1 == h5._file);
CPPUNIT_ASSERT(!h5.isOpen());
+
+ PYLITH_METHOD_END;
} // testOpenClose
// ----------------------------------------------------------------------
@@ -74,6 +84,8 @@
void
pylith::meshio::TestHDF5::testHasGroup(void)
{ // testHasGroup
+ PYLITH_METHOD_BEGIN;
+
HDF5 h5("test.h5", H5F_ACC_TRUNC);
h5.createGroup("/mygroup");
@@ -83,6 +95,8 @@
CPPUNIT_ASSERT(h5.hasGroup("/mygroup"));
CPPUNIT_ASSERT(!h5.hasGroup("/notmygroup"));
h5.close();
+
+ PYLITH_METHOD_END;
} // testHasGroup
// ----------------------------------------------------------------------
@@ -90,6 +104,8 @@
void
pylith::meshio::TestHDF5::testHasDataset(void)
{ // testHasDataset
+ PYLITH_METHOD_BEGIN;
+
HDF5 h5("test.h5", H5F_ACC_TRUNC);
const hsize_t ndims = 1;
@@ -101,6 +117,8 @@
CPPUNIT_ASSERT(h5.hasDataset("/data"));
CPPUNIT_ASSERT(!h5.hasDataset("/nodata"));
h5.close();
+
+ PYLITH_METHOD_END;
} // testHasDataset
// ----------------------------------------------------------------------
@@ -108,6 +126,8 @@
void
pylith::meshio::TestHDF5::testGetDatasetDims(void)
{ // testGetDatasetDims
+ PYLITH_METHOD_BEGIN;
+
HDF5 h5("test.h5", H5F_ACC_TRUNC);
const int ndimsE = 2;
@@ -127,6 +147,8 @@
CPPUNIT_ASSERT_EQUAL(dimsE[i], dims[i]);
delete[] dims; dims = 0;
+
+ PYLITH_METHOD_END;
} // testGetDatasetDims
// ----------------------------------------------------------------------
@@ -134,6 +156,8 @@
void
pylith::meshio::TestHDF5::testGetGroupDatasets(void)
{ // testGetGroupDatasets
+ PYLITH_METHOD_BEGIN;
+
const int ngroupsE = 3;
const char* namesE[3] = { "dataA",
"dataB",
@@ -158,6 +182,8 @@
CPPUNIT_ASSERT_EQUAL(ngroupsE, ngroups);
for (int i=0; i < ngroups; ++i)
CPPUNIT_ASSERT_EQUAL(std::string(namesE[i]), names[i]);
+
+ PYLITH_METHOD_END;
} // testGetGroupDatasets
// ----------------------------------------------------------------------
@@ -165,6 +191,8 @@
void
pylith::meshio::TestHDF5::testCreateGroup(void)
{ // testCreateGroup
+ PYLITH_METHOD_BEGIN;
+
HDF5 h5("test.h5", H5F_ACC_TRUNC);
h5.createGroup("/mygroup");
@@ -180,6 +208,8 @@
herr_t err = H5Gclose(group);
CPPUNIT_ASSERT(err >= 0);
h5.close();
+
+ PYLITH_METHOD_END;
} // testCreateGroup
// ----------------------------------------------------------------------
@@ -187,6 +217,8 @@
void
pylith::meshio::TestHDF5::testAttributeScalar(void)
{ // testAttributeScalar
+ PYLITH_METHOD_BEGIN;
+
HDF5 h5("test.h5", H5F_ACC_TRUNC);
const hsize_t ndims = 1;
@@ -203,6 +235,8 @@
h5.readAttribute("/data", "myscalar", (void*)&scalar, H5T_NATIVE_DOUBLE);
CPPUNIT_ASSERT_DOUBLES_EQUAL(scalarE, scalar, tolerance);
h5.close();
+
+ PYLITH_METHOD_END;
} // testAttributeScalar
// ----------------------------------------------------------------------
@@ -210,6 +244,8 @@
void
pylith::meshio::TestHDF5::testAttributeString(void)
{ // testAttributeString
+ PYLITH_METHOD_BEGIN;
+
HDF5 h5("test.h5", H5F_ACC_TRUNC);
const hsize_t ndims = 1;
@@ -224,6 +260,8 @@
std::string value = h5.readAttribute("/data", "mystring");
CPPUNIT_ASSERT_EQUAL(valueE, value);
h5.close();
+
+ PYLITH_METHOD_END;
} // testAttributeString
// ----------------------------------------------------------------------
@@ -231,6 +269,8 @@
void
pylith::meshio::TestHDF5::testCreateDataset(void)
{ // testCreateDataset
+ PYLITH_METHOD_BEGIN;
+
HDF5 h5("test.h5", H5F_ACC_TRUNC);
const hsize_t ndims = 2;
@@ -257,6 +297,8 @@
err = H5Gclose(group);
CPPUNIT_ASSERT(err >= 0);
h5.close();
+
+ PYLITH_METHOD_END;
} // testCreateDataset
// ----------------------------------------------------------------------
@@ -264,6 +306,8 @@
void
pylith::meshio::TestHDF5::testDatasetChunk(void)
{ // testDatasetChunk
+ PYLITH_METHOD_BEGIN;
+
const int ndimsE = 3;
const hsize_t dimsE[ndimsE] = { 4, 2, 3 };
const hsize_t dimsChunkE[ndimsE] = { 1, 2, 3 };
@@ -308,6 +352,8 @@
delete[] valuesE; valuesE = 0;
h5.close();
+
+ PYLITH_METHOD_END;
} // testDatasetChunk
// ----------------------------------------------------------------------
@@ -315,6 +361,8 @@
void
pylith::meshio::TestHDF5::testDatasetRawExternal(void)
{ // testDatasetRawExternal
+ PYLITH_METHOD_BEGIN;
+
const int ndimsE = 2;
const hsize_t dimsE[ndimsE] = { 6, 3 };
hsize_t dims[ndimsE];
@@ -379,6 +427,8 @@
err = H5Gclose(group);
CPPUNIT_ASSERT(err >= 0);
h5.close();
+
+ PYLITH_METHOD_END;
} // testDatasetRawExternal
Modified: short/3D/PyLith/trunk/unittests/libtests/meshio/TestMeshIO.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/meshio/TestMeshIO.cc 2013-04-16 15:59:00 UTC (rev 21873)
+++ short/3D/PyLith/trunk/unittests/libtests/meshio/TestMeshIO.cc 2013-04-16 22:27:25 UTC (rev 21874)
@@ -40,7 +40,11 @@
void
pylith::meshio::TestMeshIO::setUp(void)
{ // setUp
+ PYLITH_METHOD_BEGIN;
+
_mesh = 0;
+
+ PYLITH_METHOD_END;
} // setUp
// ----------------------------------------------------------------------
@@ -48,7 +52,11 @@
void
pylith::meshio::TestMeshIO::tearDown(void)
{ // tearDown
+ PYLITH_METHOD_BEGIN;
+
delete _mesh; _mesh = 0;
+
+ PYLITH_METHOD_END;
} // tearDown
// ----------------------------------------------------------------------
Modified: short/3D/PyLith/trunk/unittests/libtests/meshio/TestMeshIOCubit.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/meshio/TestMeshIOCubit.cc 2013-04-16 15:59:00 UTC (rev 21873)
+++ short/3D/PyLith/trunk/unittests/libtests/meshio/TestMeshIOCubit.cc 2013-04-16 22:27:25 UTC (rev 21874)
@@ -43,7 +43,11 @@
void
pylith::meshio::TestMeshIOCubit::testConstructor(void)
{ // testConstructor
+ PYLITH_METHOD_BEGIN;
+
MeshIOCubit iohandler;
+
+ PYLITH_METHOD_END;
} // testConstructor
// ----------------------------------------------------------------------
@@ -51,8 +55,12 @@
void
pylith::meshio::TestMeshIOCubit::testDebug(void)
{ // testDebug
+ PYLITH_METHOD_BEGIN;
+
MeshIOCubit iohandler;
_testDebug(iohandler);
+
+ PYLITH_METHOD_END;
} // testDebug
// ----------------------------------------------------------------------
@@ -60,8 +68,12 @@
void
pylith::meshio::TestMeshIOCubit::testInterpolate(void)
{ // testInterpolate
+ PYLITH_METHOD_BEGIN;
+
MeshIOCubit iohandler;
_testInterpolate(iohandler);
+
+ PYLITH_METHOD_END;
} // testInterpolate
// ----------------------------------------------------------------------
@@ -69,11 +81,15 @@
void
pylith::meshio::TestMeshIOCubit::testFilename(void)
{ // testFilename
+ PYLITH_METHOD_BEGIN;
+
MeshIOCubit iohandler;
const char* filename = "hi.txt";
iohandler.filename(filename);
CPPUNIT_ASSERT(0 == strcasecmp(filename, iohandler.filename()));
+
+ PYLITH_METHOD_END;
} // testFilename
// ----------------------------------------------------------------------
@@ -81,9 +97,13 @@
void
pylith::meshio::TestMeshIOCubit::testReadTri(void)
{ // testReadTri
+ PYLITH_METHOD_BEGIN;
+
MeshDataCubitTri data;
_testRead(data, "data/twotri3_12.2.exo");
_testRead(data, "data/twotri3_13.0.exo");
+
+ PYLITH_METHOD_END;
} // testReadTri
// ----------------------------------------------------------------------
@@ -91,9 +111,13 @@
void
pylith::meshio::TestMeshIOCubit::testReadQuad(void)
{ // testReadQuad
+ PYLITH_METHOD_BEGIN;
+
MeshDataCubitQuad data;
_testRead(data, "data/twoquad4_12.2.exo");
_testRead(data, "data/twoquad4_13.0.exo");
+
+ PYLITH_METHOD_END;
} // testReadQuad
// ----------------------------------------------------------------------
@@ -101,9 +125,13 @@
void
pylith::meshio::TestMeshIOCubit::testReadTet(void)
{ // testReadTet
+ PYLITH_METHOD_BEGIN;
+
MeshDataCubitTet data;
_testRead(data, "data/twotet4_12.2.exo");
_testRead(data, "data/twotet4_13.0.exo");
+
+ PYLITH_METHOD_END;
} // testReadTet
// ----------------------------------------------------------------------
@@ -111,9 +139,13 @@
void
pylith::meshio::TestMeshIOCubit::testReadHex(void)
{ // testReadHex
+ PYLITH_METHOD_BEGIN;
+
MeshDataCubitHex data;
_testRead(data, "data/twohex8_12.2.exo");
_testRead(data, "data/twohex8_13.0.exo");
+
+ PYLITH_METHOD_END;
} // testReadHex
// ----------------------------------------------------------------------
@@ -122,6 +154,8 @@
pylith::meshio::TestMeshIOCubit::_testRead(const MeshData& data,
const char* filename)
{ // _testRead
+ PYLITH_METHOD_BEGIN;
+
MeshIOCubit iohandler;
iohandler.filename(filename);
iohandler.useNodesetNames(true);
@@ -132,6 +166,8 @@
// Make sure mesh matches data
_checkVals(data);
+
+ PYLITH_METHOD_END;
} // _testRead
// ----------------------------------------------------------------------
@@ -139,16 +175,18 @@
void
pylith::meshio::TestMeshIOCubit::testOrientLine(void)
{ // testOrientLine
+ PYLITH_METHOD_BEGIN;
+
// No change in cells exepected
const int meshDim = 1;
const int numCells = 2;
const int numCorners = 2;
- const int cellsOrig[] = {
+ const int cellsOrig[numCells*numCorners] = {
0, 1,
2, 3
};
- const int cellsE[] = {
+ const int cellsE[numCells*numCorners] = {
0, 1,
2, 3
};
@@ -160,6 +198,8 @@
CPPUNIT_ASSERT_EQUAL(size, int(cells.size()));
for (int i=0; i < size; ++i)
CPPUNIT_ASSERT_EQUAL(cellsE[i], cells[i]);
+
+ PYLITH_METHOD_END;
} // testOrientLine
// ----------------------------------------------------------------------
@@ -167,16 +207,18 @@
void
pylith::meshio::TestMeshIOCubit::testOrientTri(void)
{ // testOrientTri
+ PYLITH_METHOD_BEGIN;
+
// No changes
const int meshDim = 2;
const int numCells = 2;
const int numCorners = 3;
- const int cellsOrig[] = {
+ const int cellsOrig[numCells*numCorners] = {
0, 1, 2,
3, 4, 5
};
- const int cellsE[] = {
+ const int cellsE[numCells*numCorners] = {
0, 1, 2,
3, 4, 5
};
@@ -188,6 +230,8 @@
CPPUNIT_ASSERT_EQUAL(size, int(cells.size()));
for (int i=0; i < size; ++i)
CPPUNIT_ASSERT_EQUAL(cellsE[i], cells[i]);
+
+ PYLITH_METHOD_END;
} // testOrientTri
// ----------------------------------------------------------------------
@@ -195,16 +239,18 @@
void
pylith::meshio::TestMeshIOCubit::testOrientQuad(void)
{ // testOrientQuad
+ PYLITH_METHOD_BEGIN;
+
// Expect no change.
const int meshDim = 2;
const int numCells = 2;
const int numCorners = 4;
- const int cellsOrig[] = {
+ const int cellsOrig[numCells*numCorners] = {
0, 1, 2, 3,
6, 7, 8, 9
};
- const int cellsE[] = {
+ const int cellsE[numCells*numCorners] = {
0, 1, 2, 3,
6, 7, 8, 9
};
@@ -216,6 +262,8 @@
CPPUNIT_ASSERT_EQUAL(size, int(cells.size()));
for (int i=0; i < size; ++i)
CPPUNIT_ASSERT_EQUAL(cellsE[i], cells[i]);
+
+ PYLITH_METHOD_END;
} // testOrientQuad
// ----------------------------------------------------------------------
@@ -223,16 +271,18 @@
void
pylith::meshio::TestMeshIOCubit::testOrientTet(void)
{ // testOrientTet
+ PYLITH_METHOD_BEGIN;
+
// No change in cells exepected
const int meshDim = 3;
const int numCells = 2;
const int numCorners = 4;
- const int cellsOrig[] = {
+ const int cellsOrig[numCells*numCorners] = {
0, 1, 2, 3,
3, 4, 5, 6
};
- const int cellsE[] = {
+ const int cellsE[numCells*numCorners] = {
0, 1, 2, 3,
3, 4, 5, 6
};
@@ -244,6 +294,8 @@
CPPUNIT_ASSERT_EQUAL(size, int(cells.size()));
for (int i=0; i < size; ++i)
CPPUNIT_ASSERT_EQUAL(cellsE[i], cells[i]);
+
+ PYLITH_METHOD_END;
} // testOrientTet
// ----------------------------------------------------------------------
@@ -251,6 +303,8 @@
void
pylith::meshio::TestMeshIOCubit::testOrientHex(void)
{ // testOrientHex
+ PYLITH_METHOD_BEGIN;
+
// Expect no change.
const int meshDim = 3;
@@ -272,6 +326,8 @@
CPPUNIT_ASSERT_EQUAL(size, int(cells.size()));
for (int i=0; i < size; ++i)
CPPUNIT_ASSERT_EQUAL(cellsE[i], cells[i]);
+
+ PYLITH_METHOD_END;
} // testOrientHex
Modified: short/3D/PyLith/trunk/unittests/libtests/meshio/TestMeshIOLagrit.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/meshio/TestMeshIOLagrit.cc 2013-04-16 15:59:00 UTC (rev 21873)
+++ short/3D/PyLith/trunk/unittests/libtests/meshio/TestMeshIOLagrit.cc 2013-04-16 22:27:25 UTC (rev 21874)
@@ -46,7 +46,11 @@
void
pylith::meshio::TestMeshIOLagrit::testConstructor(void)
{ // testConstructor
+ PYLITH_METHOD_BEGIN;
+
MeshIOLagrit iohandler;
+
+ PYLITH_METHOD_END;
} // testConstructor
// ----------------------------------------------------------------------
@@ -54,8 +58,12 @@
void
pylith::meshio::TestMeshIOLagrit::testDebug(void)
{ // testDebug
+ PYLITH_METHOD_BEGIN;
+
MeshIOLagrit iohandler;
_testDebug(iohandler);
+
+ PYLITH_METHOD_END;
} // testDebug
// ----------------------------------------------------------------------
@@ -63,8 +71,12 @@
void
pylith::meshio::TestMeshIOLagrit::testInterpolate(void)
{ // testInterpolate
+ PYLITH_METHOD_BEGIN;
+
MeshIOLagrit iohandler;
_testInterpolate(iohandler);
+
+ PYLITH_METHOD_END;
} // testInterpolate
// ----------------------------------------------------------------------
@@ -72,6 +84,8 @@
void
pylith::meshio::TestMeshIOLagrit::testFilename(void)
{ // testFilename
+ PYLITH_METHOD_BEGIN;
+
MeshIOLagrit iohandler;
const char* filenameGmv = "hi.txt";
@@ -81,6 +95,8 @@
CPPUNIT_ASSERT(0 == strcasecmp(filenameGmv, iohandler.filenameGmv()));
CPPUNIT_ASSERT(0 == strcasecmp(filenamePset, iohandler.filenamePset()));
+
+ PYLITH_METHOD_END;
} // testFilename
// ----------------------------------------------------------------------
@@ -88,10 +104,14 @@
void
pylith::meshio::TestMeshIOLagrit::testReadTetAscii(void)
{ // testReadTetAscii
+ PYLITH_METHOD_BEGIN;
+
MeshDataLagritTet data;
const char* filenameGmv = "data/cube2_ascii.gmv";
const char* filenamePset = "data/cube2_ascii.pset";
_testRead(data, filenameGmv, filenamePset);
+
+ PYLITH_METHOD_END;
} // testReadTetAscii
// ----------------------------------------------------------------------
@@ -99,10 +119,14 @@
void
pylith::meshio::TestMeshIOLagrit::testReadTetBinary(void)
{ // testReadTetBinary
+ PYLITH_METHOD_BEGIN;
+
MeshDataLagritTet data;
const char* filenameGmv = "data/cube2_binary.gmv";
const char* filenamePset = "data/cube2_binary.pset";
_testRead(data, filenameGmv, filenamePset);
+
+ PYLITH_METHOD_END;
} // testReadTetBinary
// ----------------------------------------------------------------------
@@ -110,12 +134,16 @@
void
pylith::meshio::TestMeshIOLagrit::testReadTetBinary32on64(void)
{ // testReadTetBinary32on64
+ PYLITH_METHOD_BEGIN;
+
MeshDataLagritTet data;
const char* filenameGmv = "data/cube2_binary_32on64.gmv";
const char* filenamePset = "data/cube2_binary_32on64.pset";
const bool ioInt32 = true;
const bool isRecordHeader32Bit = false;
_testRead(data, filenameGmv, filenamePset, ioInt32, isRecordHeader32Bit);
+
+ PYLITH_METHOD_END;
} // testReadTetBinary32on64
// ----------------------------------------------------------------------
@@ -123,12 +151,16 @@
void
pylith::meshio::TestMeshIOLagrit::testReadTetBinary64(void)
{ // testReadTetBinary64
+ PYLITH_METHOD_BEGIN;
+
MeshDataLagritTet data;
const char* filenameGmv = "data/cube2_binary_64.gmv";
const char* filenamePset = "data/cube2_binary_64.pset";
const bool ioInt32 = false;
const bool isRecordHeader32Bit = false;
_testRead(data, filenameGmv, filenamePset, ioInt32, isRecordHeader32Bit);
+
+ PYLITH_METHOD_END;
} // testReadTetBinary64
// ----------------------------------------------------------------------
@@ -140,6 +172,8 @@
const bool ioInt32,
const bool isRecordHeader32Bit)
{ // _testRead
+ PYLITH_METHOD_BEGIN;
+
MeshIOLagrit iohandler;
iohandler.filenameGmv(filenameGmv);
iohandler.filenamePset(filenamePset);
@@ -160,6 +194,8 @@
// Make sure mesh matches data
_checkVals(data);
+
+ PYLITH_METHOD_END;
} // _testRead
// ----------------------------------------------------------------------
@@ -167,16 +203,18 @@
void
pylith::meshio::TestMeshIOLagrit::testOrientAsciiTet(void)
{ // testOrientAsciiTet
+ PYLITH_METHOD_BEGIN;
+
// Expect vertices 1 and 2 to be swapped (not change to vertices 0 and 3)
const int meshDim = 3;
const int numCells = 2;
const int numCorners = 4;
- const int cellsOrig[] = {
+ const int cellsOrig[numCells*numCorners] = {
0, 1, 2, 3,
3, 4, 5, 6
};
- const int cellsE[] = {
+ const int cellsE[numCells*numCorners] = {
0, 2, 1, 3,
3, 5, 4, 6
};
@@ -188,6 +226,8 @@
CPPUNIT_ASSERT_EQUAL(size, int(cells.size()));
for (int i=0; i < size; ++i)
CPPUNIT_ASSERT_EQUAL(cellsE[i], cells[i]);
+
+ PYLITH_METHOD_END;
} // testOrientAsciiTet
// ----------------------------------------------------------------------
@@ -195,16 +235,18 @@
void
pylith::meshio::TestMeshIOLagrit::testOrientBinaryTet(void)
{ // testOrientBinaryTet
+ PYLITH_METHOD_BEGIN;
+
// No change in cells exepected
const int meshDim = 3;
const int numCells = 2;
const int numCorners = 4;
- const int cellsOrig[] = {
+ const int cellsOrig[numCells*numCorners] = {
0, 1, 2, 3,
3, 4, 5, 6
};
- const int cellsE[] = {
+ const int cellsE[numCells*numCorners] = {
0, 1, 2, 3,
3, 4, 5, 6
};
@@ -216,6 +258,8 @@
CPPUNIT_ASSERT_EQUAL(size, int(cells.size()));
for (int i=0; i < size; ++i)
CPPUNIT_ASSERT_EQUAL(cellsE[i], cells[i]);
+
+ PYLITH_METHOD_END;
} // testOrientBinaryTet
Modified: short/3D/PyLith/trunk/unittests/libtests/meshio/TestXdmf.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/meshio/TestXdmf.cc 2013-04-16 15:59:00 UTC (rev 21873)
+++ short/3D/PyLith/trunk/unittests/libtests/meshio/TestXdmf.cc 2013-04-16 22:27:25 UTC (rev 21874)
@@ -22,6 +22,8 @@
#include "pylith/meshio/Xdmf.hh" // USES Xdmf
+#include "pylith/utils/petscerror.h" // USES PYLITH_METHOD_BEGIN/END
+
#include <cstring> // USES strcmp()
// ----------------------------------------------------------------------
@@ -32,7 +34,11 @@
void
pylith::meshio::TestXdmf::testConstructor(void)
{ // testConstructor
+ PYLITH_METHOD_BEGIN;
+
Xdmf one;
+
+ PYLITH_METHOD_END;
} // testConstructor
// ----------------------------------------------------------------------
@@ -40,6 +46,7 @@
void
pylith::meshio::TestXdmf::testWriteTri3Vertex(void)
{ // testWriteTri3Vertex
+ PYLITH_METHOD_BEGIN;
const char* filenameHDF5 = "data/tri3_vertex.h5";
const char* filenameXdmf = "tri3_vertex.xmf";
@@ -48,6 +55,8 @@
metafile.write(filenameXdmf, filenameHDF5);
_checkFile(filenameXdmf);
+
+ PYLITH_METHOD_END;
} // testWriteTri3Vertex
// ----------------------------------------------------------------------
@@ -55,6 +64,8 @@
void
pylith::meshio::TestXdmf::testWriteTri3Cell(void)
{ // testWriteTri3Cell
+ PYLITH_METHOD_BEGIN;
+
const char* filenameHDF5 = "data/tri3_cell.h5";
const char* filenameXdmf = "tri3_cell.xmf";
@@ -62,6 +73,8 @@
metafile.write(filenameXdmf, filenameHDF5);
_checkFile(filenameXdmf);
+
+ PYLITH_METHOD_END;
} // testWriteTri3Cell
// ----------------------------------------------------------------------
@@ -69,6 +82,7 @@
void
pylith::meshio::TestXdmf::testWriteQuad4Vertex(void)
{ // testWriteQuad4Vertex
+ PYLITH_METHOD_BEGIN;
const char* filenameHDF5 = "data/quad4_vertex.h5";
const char* filenameXdmf = "quad4_vertex.xmf";
@@ -77,6 +91,8 @@
metafile.write(filenameXdmf, filenameHDF5);
_checkFile(filenameXdmf);
+
+ PYLITH_METHOD_END;
} // testWriteQuad4Vertex
// ----------------------------------------------------------------------
@@ -84,6 +100,8 @@
void
pylith::meshio::TestXdmf::testWriteQuad4Cell(void)
{ // testWriteQuad4Cell
+ PYLITH_METHOD_BEGIN;
+
const char* filenameHDF5 = "data/quad4_cell.h5";
const char* filenameXdmf = "quad4_cell.xmf";
@@ -91,6 +109,8 @@
metafile.write(filenameXdmf, filenameHDF5);
_checkFile(filenameXdmf);
+
+ PYLITH_METHOD_END;
} // testWriteQuad4Cell
// ----------------------------------------------------------------------
@@ -98,6 +118,8 @@
void
pylith::meshio::TestXdmf::testWriteTet4Vertex(void)
{ // testWriteTet4Vertex
+ PYLITH_METHOD_BEGIN;
+
const char* filenameHDF5 = "data/tet4_vertex.h5";
const char* filenameXdmf = "tet4_vertex.xmf";
@@ -105,6 +127,8 @@
metafile.write(filenameXdmf, filenameHDF5);
_checkFile(filenameXdmf);
+
+ PYLITH_METHOD_END;
} // testWriteTet4Vertex
// ----------------------------------------------------------------------
@@ -112,6 +136,8 @@
void
pylith::meshio::TestXdmf::testWriteTet4Cell(void)
{ // testWriteTet4Cell
+ PYLITH_METHOD_BEGIN;
+
const char* filenameHDF5 = "data/tet4_cell.h5";
const char* filenameXdmf = "tet4_cell.xmf";
@@ -119,6 +145,8 @@
metafile.write(filenameXdmf, filenameHDF5);
_checkFile(filenameXdmf);
+
+ PYLITH_METHOD_END;
} // testWriteTet4Cell
// ----------------------------------------------------------------------
@@ -126,6 +154,8 @@
void
pylith::meshio::TestXdmf::testWriteHex8Vertex(void)
{ // testWriteHex8Vertex
+ PYLITH_METHOD_BEGIN;
+
const char* filenameHDF5 = "data/hex8_vertex.h5";
const char* filenameXdmf = "hex8_vertex.xmf";
@@ -133,6 +163,8 @@
metafile.write(filenameXdmf, filenameHDF5);
_checkFile(filenameXdmf);
+
+ PYLITH_METHOD_END;
} // testWriteHex8Vertex
// ----------------------------------------------------------------------
@@ -140,6 +172,8 @@
void
pylith::meshio::TestXdmf::testWriteHex8Cell(void)
{ // testWriteHex8Cell
+ PYLITH_METHOD_BEGIN;
+
const char* filenameHDF5 = "data/hex8_cell.h5";
const char* filenameXdmf = "hex8_cell.xmf";
@@ -147,6 +181,8 @@
metafile.write(filenameXdmf, filenameHDF5);
_checkFile(filenameXdmf);
+
+ PYLITH_METHOD_END;
} // testWriteHex8Cell
// ----------------------------------------------------------------------
@@ -154,6 +190,8 @@
void
pylith::meshio::TestXdmf::_checkFile(const char* filename)
{ // _checkFile
+ PYLITH_METHOD_BEGIN;
+
const std::string filenameE = std::string("data/") + std::string(filename);
std::ifstream fileInE(filenameE.c_str());
@@ -180,6 +218,8 @@
fileInE.close();
fileIn.close();
+
+ PYLITH_METHOD_END;
} // _checkFile
More information about the CIG-COMMITS
mailing list