[cig-commits] r21875 - in short/3D/PyLith/trunk: libsrc/pylith/meshio unittests/libtests/meshio
brad at geodynamics.org
brad at geodynamics.org
Tue Apr 16 16:03:07 PDT 2013
Author: brad
Date: 2013-04-16 16:03:07 -0700 (Tue, 16 Apr 2013)
New Revision: 21875
Modified:
short/3D/PyLith/trunk/libsrc/pylith/meshio/DataWriterHDF5.cc
short/3D/PyLith/trunk/unittests/libtests/meshio/TestDataWriterHDF5.cc
short/3D/PyLith/trunk/unittests/libtests/meshio/TestDataWriterHDF5MatMeshCases.cc
short/3D/PyLith/trunk/unittests/libtests/meshio/TestDataWriterHDF5Mesh.cc
short/3D/PyLith/trunk/unittests/libtests/meshio/TestDataWriterHDF5MeshCases.cc
short/3D/PyLith/trunk/unittests/libtests/meshio/TestDataWriterHDF5SubMesh.cc
short/3D/PyLith/trunk/unittests/libtests/meshio/TestDataWriterHDF5SubMeshCases.cc
Log:
Code cleanup.
Modified: short/3D/PyLith/trunk/libsrc/pylith/meshio/DataWriterHDF5.cc
===================================================================
--- short/3D/PyLith/trunk/libsrc/pylith/meshio/DataWriterHDF5.cc 2013-04-16 22:27:25 UTC (rev 21874)
+++ short/3D/PyLith/trunk/libsrc/pylith/meshio/DataWriterHDF5.cc 2013-04-16 23:03:07 UTC (rev 21875)
@@ -51,11 +51,15 @@
void
pylith::meshio::DataWriterHDF5<mesh_type, field_type>::deallocate(void)
{ // deallocate
+ PYLITH_METHOD_BEGIN;
+
DataWriter<mesh_type, field_type>::deallocate();
PetscErrorCode err = 0;
err = PetscViewerDestroy(&_viewer); CHECK_PETSC_ERROR(err);
err = VecDestroy(&_tstamp); CHECK_PETSC_ERROR(err);
+
+ PYLITH_METHOD_END;
} // deallocate
// ----------------------------------------------------------------------
@@ -204,6 +208,7 @@
err = VecView(cellVec, _viewer);CHECK_PETSC_ERROR(err);
err = PetscViewerHDF5PopGroup(_viewer);CHECK_PETSC_ERROR(err);
err = VecDestroy(&cellVec);CHECK_PETSC_ERROR(err);
+ err = ISRestoreIndices(globalVertexNumbers, &gvertex);CHECK_PETSC_ERROR(err);
hid_t h5 = -1;
err = PetscViewerHDF5GetFileId(_viewer, &h5); CHECK_PETSC_ERROR(err);
Modified: short/3D/PyLith/trunk/unittests/libtests/meshio/TestDataWriterHDF5.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/meshio/TestDataWriterHDF5.cc 2013-04-16 22:27:25 UTC (rev 21874)
+++ short/3D/PyLith/trunk/unittests/libtests/meshio/TestDataWriterHDF5.cc 2013-04-16 23:03:07 UTC (rev 21875)
@@ -21,6 +21,7 @@
#include "TestDataWriterHDF5.hh" // Implementation of class methods
#include "pylith/utils/types.hh" // HASA PylithScalar
+#include "pylith/utils/petscerror.h" // HASA PYLITH_METHOD_BEGIN/END
#include <hdf5.h> // USES HDF5 API
@@ -35,10 +36,11 @@
const H5O_info_t* info,
void* data)
{ // checkObject
+ PYLITH_METHOD_BEGIN;
+
CPPUNIT_ASSERT(info);
CPPUNIT_ASSERT(data);
-
hid_t* file = (hid_t*) data;
CPPUNIT_ASSERT(H5Iis_valid(*file));
herr_t err = 0;
@@ -94,8 +96,7 @@
CPPUNIT_ASSERT(size > 0);
//const hid_t scalartype = (sizeof(double) == sizeof(PylithScalar)) ?
// H5T_NATIVE_DOUBLE : H5T_NATIVE_DOUBLE;
- err = H5Dread(dataset, H5T_NATIVE_DOUBLE, H5S_ALL, H5S_ALL,
- H5P_DEFAULT, (void*) data);
+ err = H5Dread(dataset, H5T_NATIVE_DOUBLE, H5S_ALL, H5S_ALL, H5P_DEFAULT, (void*) data);
CPPUNIT_ASSERT(err >= 0);
err = H5Sclose(dataspace);
@@ -128,7 +129,7 @@
CPPUNIT_ASSERT(false);
} // switch
- return 0;
+ PYLITH_METHOD_RETURN(0);
} // checkObject
// ----------------------------------------------------------------------
@@ -136,6 +137,7 @@
void
pylith::meshio::TestDataWriterHDF5::checkFile(const char* filename)
{ // checkFile
+ PYLITH_METHOD_BEGIN;
const std::string filenameE = "data/" + std::string(filename);
@@ -161,6 +163,7 @@
err = H5Fclose(file);
CPPUNIT_ASSERT(err >= 0);
+ PYLITH_METHOD_END;
} // checkFile
Modified: short/3D/PyLith/trunk/unittests/libtests/meshio/TestDataWriterHDF5MatMeshCases.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/meshio/TestDataWriterHDF5MatMeshCases.cc 2013-04-16 22:27:25 UTC (rev 21874)
+++ short/3D/PyLith/trunk/unittests/libtests/meshio/TestDataWriterHDF5MatMeshCases.cc 2013-04-16 23:03:07 UTC (rev 21875)
@@ -26,6 +26,7 @@
#include "data/DataWriterHDF5DataMatMeshTet4.hh"
#include "data/DataWriterHDF5DataMatMeshHex8.hh"
+#include "pylith/utils/petscerror.h" // USES PYLITH_METHOD_BEGIN/END
// ----------------------------------------------------------------------
CPPUNIT_TEST_SUITE_REGISTRATION( pylith::meshio::TestDataWriterHDF5MatMeshLine2 );
@@ -40,10 +41,14 @@
void
pylith::meshio::TestDataWriterHDF5MatMeshLine2::setUp(void)
{ // setUp
+ PYLITH_METHOD_BEGIN;
+
TestDataWriterHDF5Mesh::setUp();
_data = new DataWriterHDF5DataMatMeshLine2;
_flipFault = false;
_initialize();
+
+ PYLITH_METHOD_END;
} // setUp
@@ -52,10 +57,14 @@
void
pylith::meshio::TestDataWriterHDF5MatMeshTri3::setUp(void)
{ // setUp
+ PYLITH_METHOD_BEGIN;
+
TestDataWriterHDF5Mesh::setUp();
_data = new DataWriterHDF5DataMatMeshTri3;
_flipFault = true;
_initialize();
+
+ PYLITH_METHOD_END;
} // setUp
@@ -64,10 +73,14 @@
void
pylith::meshio::TestDataWriterHDF5MatMeshQuad4::setUp(void)
{ // setUp
+ PYLITH_METHOD_BEGIN;
+
TestDataWriterHDF5Mesh::setUp();
_data = new DataWriterHDF5DataMatMeshQuad4;
_flipFault = false;
_initialize();
+
+ PYLITH_METHOD_END;
} // setUp
@@ -76,10 +89,14 @@
void
pylith::meshio::TestDataWriterHDF5MatMeshTet4::setUp(void)
{ // setUp
+ PYLITH_METHOD_BEGIN;
+
TestDataWriterHDF5Mesh::setUp();
_data = new DataWriterHDF5DataMatMeshTet4;
_flipFault = false;
_initialize();
+
+ PYLITH_METHOD_END;
} // setUp
@@ -88,10 +105,14 @@
void
pylith::meshio::TestDataWriterHDF5MatMeshHex8::setUp(void)
{ // setUp
+ PYLITH_METHOD_BEGIN;
+
TestDataWriterHDF5Mesh::setUp();
_data = new DataWriterHDF5DataMatMeshHex8;
_flipFault = true;
_initialize();
+
+ PYLITH_METHOD_END;
} // setUp
Modified: short/3D/PyLith/trunk/unittests/libtests/meshio/TestDataWriterHDF5Mesh.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/meshio/TestDataWriterHDF5Mesh.cc 2013-04-16 22:27:25 UTC (rev 21874)
+++ short/3D/PyLith/trunk/unittests/libtests/meshio/TestDataWriterHDF5Mesh.cc 2013-04-16 23:03:07 UTC (rev 21875)
@@ -38,7 +38,11 @@
void
pylith::meshio::TestDataWriterHDF5Mesh::setUp(void)
{ // setUp
+ PYLITH_METHOD_BEGIN;
+
TestDataWriterMesh::setUp();
+
+ PYLITH_METHOD_END;
} // setUp
// ----------------------------------------------------------------------
@@ -46,7 +50,11 @@
void
pylith::meshio::TestDataWriterHDF5Mesh::tearDown(void)
{ // tearDown
+ PYLITH_METHOD_BEGIN;
+
TestDataWriterMesh::tearDown();
+
+ PYLITH_METHOD_END;
} // tearDown
// ----------------------------------------------------------------------
@@ -54,9 +62,13 @@
void
pylith::meshio::TestDataWriterHDF5Mesh::testConstructor(void)
{ // testConstructor
+ PYLITH_METHOD_BEGIN;
+
DataWriterHDF5<topology::Mesh, MeshField> writer;
- CPPUNIT_ASSERT(0 == writer._viewer);
+ CPPUNIT_ASSERT(!writer._viewer);
+
+ PYLITH_METHOD_END;
} // testConstructor
// ----------------------------------------------------------------------
@@ -64,11 +76,15 @@
void
pylith::meshio::TestDataWriterHDF5Mesh::testFilename(void)
{ // testDebug
+ PYLITH_METHOD_BEGIN;
+
DataWriterHDF5<topology::Mesh, MeshField> writer;
const char* filename = "data.h5";
writer.filename(filename);
CPPUNIT_ASSERT_EQUAL(std::string(filename), writer._filename);
+
+ PYLITH_METHOD_END;
} // testFilename
// ----------------------------------------------------------------------
@@ -76,16 +92,18 @@
void
pylith::meshio::TestDataWriterHDF5Mesh::testOpenClose(void)
{ // testTimeStep
- CPPUNIT_ASSERT(0 != _mesh);
- CPPUNIT_ASSERT(0 != _data);
+ PYLITH_METHOD_BEGIN;
+ CPPUNIT_ASSERT(_mesh);
+ CPPUNIT_ASSERT(_data);
+
DataWriterHDF5<topology::Mesh, MeshField> writer;
writer.filename(_data->timestepFilename);
const PylithScalar t = _data->time;
const int numTimeSteps = 1;
- if (0 == _data->cellsLabel) {
+ if (!_data->cellsLabel) {
writer.open(*_mesh, numTimeSteps);
} else {
const char* label = _data->cellsLabel;
@@ -96,6 +114,8 @@
writer.close();
checkFile(_data->timestepFilename);
+
+ PYLITH_METHOD_END;
} // testTimeStep
// ----------------------------------------------------------------------
@@ -103,9 +123,11 @@
void
pylith::meshio::TestDataWriterHDF5Mesh::testWriteVertexField(void)
{ // testWriteVertexField
- CPPUNIT_ASSERT(0 != _mesh);
- CPPUNIT_ASSERT(0 != _data);
+ PYLITH_METHOD_BEGIN;
+ CPPUNIT_ASSERT(_mesh);
+ CPPUNIT_ASSERT(_data);
+
DataWriterHDF5<topology::Mesh, MeshField> writer;
topology::Fields<MeshField> vertexFields(*_mesh);
@@ -119,7 +141,7 @@
const int nfields = _data->numVertexFields;
const int numTimeSteps = 1;
- if (0 == _data->cellsLabel) {
+ if (!_data->cellsLabel) {
writer.open(*_mesh, numTimeSteps);
writer.openTimeStep(t, *_mesh);
} else {
@@ -136,6 +158,8 @@
writer.close();
checkFile(_data->vertexFilename);
+
+ PYLITH_METHOD_END;
} // testWriteVertexField
// ----------------------------------------------------------------------
@@ -143,9 +167,11 @@
void
pylith::meshio::TestDataWriterHDF5Mesh::testWriteCellField(void)
{ // testWriteCellField
- CPPUNIT_ASSERT(0 != _mesh);
- CPPUNIT_ASSERT(0 != _data);
+ PYLITH_METHOD_BEGIN;
+ CPPUNIT_ASSERT(_mesh);
+ CPPUNIT_ASSERT(_data);
+
DataWriterHDF5<topology::Mesh, MeshField> writer;
topology::Fields<MeshField> cellFields(*_mesh);
@@ -159,7 +185,7 @@
const int nfields = _data->numCellFields;
const int numTimeSteps = 1;
- if (0 == _data->cellsLabel) {
+ if (!_data->cellsLabel) {
writer.open(*_mesh, numTimeSteps);
writer.openTimeStep(t, *_mesh);
for (int i=0; i < nfields; ++i) {
@@ -180,12 +206,16 @@
writer.close();
checkFile(_data->cellFilename);
+
+ PYLITH_METHOD_END;
} // testWriteCellField
// ----------------------------------------------------------------------
// Test _hdf5Filename.
void pylith::meshio::TestDataWriterHDF5Mesh::testHdf5Filename(void)
{ // testHdf5Filename
+ PYLITH_METHOD_BEGIN;
+
DataWriterHDF5<topology::Mesh, MeshField> writer;
// Append info to filename if number of time steps is 0.
@@ -202,6 +232,8 @@
writer._filename = "output_abcd.h5";
CPPUNIT_ASSERT_EQUAL(std::string("output_abcd.h5"),
writer._hdf5Filename());
+
+ PYLITH_METHOD_END;
} // testHdf5Filename
Modified: short/3D/PyLith/trunk/unittests/libtests/meshio/TestDataWriterHDF5MeshCases.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/meshio/TestDataWriterHDF5MeshCases.cc 2013-04-16 22:27:25 UTC (rev 21874)
+++ short/3D/PyLith/trunk/unittests/libtests/meshio/TestDataWriterHDF5MeshCases.cc 2013-04-16 23:03:07 UTC (rev 21875)
@@ -26,6 +26,7 @@
#include "data/DataWriterHDF5DataMeshTet4.hh"
#include "data/DataWriterHDF5DataMeshHex8.hh"
+#include "pylith/utils/petscerror.h" // USES PYLITH_METHOD_BEGIN/END
// ----------------------------------------------------------------------
CPPUNIT_TEST_SUITE_REGISTRATION( pylith::meshio::TestDataWriterHDF5MeshLine2 );
@@ -40,10 +41,14 @@
void
pylith::meshio::TestDataWriterHDF5MeshLine2::setUp(void)
{ // setUp
+ PYLITH_METHOD_BEGIN;
+
TestDataWriterHDF5Mesh::setUp();
_data = new DataWriterHDF5DataMeshLine2;
_flipFault = false;
_initialize();
+
+ PYLITH_METHOD_END;
} // setUp
@@ -52,10 +57,14 @@
void
pylith::meshio::TestDataWriterHDF5MeshTri3::setUp(void)
{ // setUp
+ PYLITH_METHOD_BEGIN;
+
TestDataWriterHDF5Mesh::setUp();
_data = new DataWriterHDF5DataMeshTri3;
_flipFault = true;
_initialize();
+
+ PYLITH_METHOD_END;
} // setUp
@@ -64,10 +73,14 @@
void
pylith::meshio::TestDataWriterHDF5MeshQuad4::setUp(void)
{ // setUp
+ PYLITH_METHOD_BEGIN;
+
TestDataWriterHDF5Mesh::setUp();
_data = new DataWriterHDF5DataMeshQuad4;
_flipFault = false;
_initialize();
+
+ PYLITH_METHOD_END;
} // setUp
@@ -76,10 +89,14 @@
void
pylith::meshio::TestDataWriterHDF5MeshTet4::setUp(void)
{ // setUp
+ PYLITH_METHOD_BEGIN;
+
TestDataWriterHDF5Mesh::setUp();
_data = new DataWriterHDF5DataMeshTet4;
_flipFault = false;
_initialize();
+
+ PYLITH_METHOD_END;
} // setUp
@@ -88,10 +105,14 @@
void
pylith::meshio::TestDataWriterHDF5MeshHex8::setUp(void)
{ // setUp
+ PYLITH_METHOD_BEGIN;
+
TestDataWriterHDF5Mesh::setUp();
_data = new DataWriterHDF5DataMeshHex8;
_flipFault = true;
_initialize();
+
+ PYLITH_METHOD_END;
} // setUp
Modified: short/3D/PyLith/trunk/unittests/libtests/meshio/TestDataWriterHDF5SubMesh.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/meshio/TestDataWriterHDF5SubMesh.cc 2013-04-16 22:27:25 UTC (rev 21874)
+++ short/3D/PyLith/trunk/unittests/libtests/meshio/TestDataWriterHDF5SubMesh.cc 2013-04-16 23:03:07 UTC (rev 21875)
@@ -41,7 +41,11 @@
void
pylith::meshio::TestDataWriterHDF5SubMesh::setUp(void)
{ // setUp
+ PYLITH_METHOD_BEGIN;
+
TestDataWriterSubMesh::setUp();
+
+ PYLITH_METHOD_END;
} // setUp
// ----------------------------------------------------------------------
@@ -49,7 +53,11 @@
void
pylith::meshio::TestDataWriterHDF5SubMesh::tearDown(void)
{ // tearDown
+ PYLITH_METHOD_BEGIN;
+
TestDataWriterSubMesh::tearDown();
+
+ PYLITH_METHOD_END;
} // tearDown
// ----------------------------------------------------------------------
@@ -57,9 +65,13 @@
void
pylith::meshio::TestDataWriterHDF5SubMesh::testConstructor(void)
{ // testConstructor
+ PYLITH_METHOD_BEGIN;
+
DataWriterHDF5<topology::SubMesh, MeshField> writer;
- CPPUNIT_ASSERT(0 == writer._viewer);
+ CPPUNIT_ASSERT(!writer._viewer);
+
+ PYLITH_METHOD_END;
} // testConstructor
// ----------------------------------------------------------------------
@@ -67,16 +79,18 @@
void
pylith::meshio::TestDataWriterHDF5SubMesh::testOpenClose(void)
{ // testOpenClose
- CPPUNIT_ASSERT(0 != _mesh);
- CPPUNIT_ASSERT(0 != _data);
+ PYLITH_METHOD_BEGIN;
+ CPPUNIT_ASSERT(_mesh);
+ CPPUNIT_ASSERT(_data);
+
DataWriterHDF5<topology::SubMesh, MeshField> writer;
writer.filename(_data->timestepFilename);
const PylithScalar t = _data->time;
const int numTimeSteps = 1;
- if (0 == _data->cellsLabel) {
+ if (!_data->cellsLabel) {
writer.open(*_submesh, numTimeSteps);
} else {
const char* label = _data->cellsLabel;
@@ -87,6 +101,8 @@
writer.close();
checkFile(_data->timestepFilename);
+
+ PYLITH_METHOD_END;
} // testOpenClose
// ----------------------------------------------------------------------
@@ -94,9 +110,11 @@
void
pylith::meshio::TestDataWriterHDF5SubMesh::testWriteVertexField(void)
{ // testWriteVertexField
- CPPUNIT_ASSERT(0 != _mesh);
- CPPUNIT_ASSERT(0 != _data);
+ PYLITH_METHOD_BEGIN;
+ CPPUNIT_ASSERT(_mesh);
+ CPPUNIT_ASSERT(_data);
+
DataWriterHDF5<topology::SubMesh, MeshField> writer;
topology::Fields<MeshField> vertexFields(*_mesh);
@@ -110,7 +128,7 @@
const int nfields = _data->numVertexFields;
const int numTimeSteps = 1;
- if (0 == _data->cellsLabel) {
+ if (!_data->cellsLabel) {
writer.open(*_submesh, numTimeSteps);
writer.openTimeStep(t, *_submesh);
} else {
@@ -127,6 +145,8 @@
writer.close();
checkFile(_data->vertexFilename);
+
+ PYLITH_METHOD_END;
} // testWriteVertexField
// ----------------------------------------------------------------------
@@ -134,9 +154,11 @@
void
pylith::meshio::TestDataWriterHDF5SubMesh::testWriteCellField(void)
{ // testWriteCellField
- CPPUNIT_ASSERT(0 != _mesh);
- CPPUNIT_ASSERT(0 != _data);
+ PYLITH_METHOD_BEGIN;
+ CPPUNIT_ASSERT(_mesh);
+ CPPUNIT_ASSERT(_data);
+
DataWriterHDF5<topology::SubMesh, SubMeshField> writer;
topology::Fields<SubMeshField> cellFields(*_submesh);
@@ -150,7 +172,7 @@
const int nfields = _data->numCellFields;
const int numTimeSteps = 1;
- if (0 == _data->cellsLabel) {
+ if (!_data->cellsLabel) {
writer.open(*_submesh, numTimeSteps);
writer.openTimeStep(t, *_submesh);
for (int i=0; i < nfields; ++i) {
@@ -171,6 +193,8 @@
writer.close();
checkFile(_data->cellFilename);
+
+ PYLITH_METHOD_END;
} // testWriteCellField
Modified: short/3D/PyLith/trunk/unittests/libtests/meshio/TestDataWriterHDF5SubMeshCases.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/meshio/TestDataWriterHDF5SubMeshCases.cc 2013-04-16 22:27:25 UTC (rev 21874)
+++ short/3D/PyLith/trunk/unittests/libtests/meshio/TestDataWriterHDF5SubMeshCases.cc 2013-04-16 23:03:07 UTC (rev 21875)
@@ -26,6 +26,7 @@
#include "data/DataWriterHDF5DataSubMeshTet4.hh"
#include "data/DataWriterHDF5DataSubMeshHex8.hh"
+#include "pylith/utils/petscerror.h" // USES PYLITH_METHOD_BEGIN/END
// ----------------------------------------------------------------------
CPPUNIT_TEST_SUITE_REGISTRATION( pylith::meshio::TestDataWriterHDF5SubMeshLine2 );
@@ -40,10 +41,14 @@
void
pylith::meshio::TestDataWriterHDF5SubMeshLine2::setUp(void)
{ // setUp
+ PYLITH_METHOD_BEGIN;
+
TestDataWriterHDF5SubMesh::setUp();
_data = new DataWriterHDF5DataSubMeshLine2;
_flipFault = false;
_initialize();
+
+ PYLITH_METHOD_END;
} // setUp
@@ -52,10 +57,14 @@
void
pylith::meshio::TestDataWriterHDF5SubMeshTri3::setUp(void)
{ // setUp
+ PYLITH_METHOD_BEGIN;
+
TestDataWriterHDF5SubMesh::setUp();
_data = new DataWriterHDF5DataSubMeshTri3;
_flipFault = true;
_initialize();
+
+ PYLITH_METHOD_END;
} // setUp
@@ -64,10 +73,14 @@
void
pylith::meshio::TestDataWriterHDF5SubMeshQuad4::setUp(void)
{ // setUp
+ PYLITH_METHOD_BEGIN;
+
TestDataWriterHDF5SubMesh::setUp();
_data = new DataWriterHDF5DataSubMeshQuad4;
_flipFault = false;
_initialize();
+
+ PYLITH_METHOD_END;
} // setUp
@@ -76,10 +89,14 @@
void
pylith::meshio::TestDataWriterHDF5SubMeshTet4::setUp(void)
{ // setUp
+ PYLITH_METHOD_BEGIN;
+
TestDataWriterHDF5SubMesh::setUp();
_data = new DataWriterHDF5DataSubMeshTet4;
_flipFault = false;
_initialize();
+
+ PYLITH_METHOD_END;
} // setUp
@@ -88,10 +105,14 @@
void
pylith::meshio::TestDataWriterHDF5SubMeshHex8::setUp(void)
{ // setUp
+ PYLITH_METHOD_BEGIN;
+
TestDataWriterHDF5SubMesh::setUp();
_data = new DataWriterHDF5DataSubMeshHex8;
_flipFault = true;
_initialize();
+
+ PYLITH_METHOD_END;
} // setUp
More information about the CIG-COMMITS
mailing list