[cig-commits] r21707 - in short/3D/PyLith/trunk/unittests/libtests: friction materials topology utils
brad at geodynamics.org
brad at geodynamics.org
Wed Apr 3 14:56:18 PDT 2013
Author: brad
Date: 2013-04-03 14:56:18 -0700 (Wed, 03 Apr 2013)
New Revision: 21707
Modified:
short/3D/PyLith/trunk/unittests/libtests/friction/TestFrictionModel.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/topology/TestSolutionFields.cc
short/3D/PyLith/trunk/unittests/libtests/utils/TestEventLogger.cc
Log:
Code cleanup. Add PYLITH_METHOD_BEGIN/END.
Modified: short/3D/PyLith/trunk/unittests/libtests/friction/TestFrictionModel.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/friction/TestFrictionModel.cc 2013-04-03 19:31:24 UTC (rev 21706)
+++ short/3D/PyLith/trunk/unittests/libtests/friction/TestFrictionModel.cc 2013-04-03 21:56:18 UTC (rev 21707)
@@ -176,10 +176,10 @@
const materials::Metadata::ParamDescription& property = metadata.getProperty(i);
topology::Field<topology::SubMesh>& prop = friction._fieldsPropsStateVars->get(property.name.c_str());
topology::VecVisitorMesh propVisitor(prop);
- const PetscScalar* propArray = propVisitor.localArray();
+ const PetscScalar* propArray = propVisitor.localArray();CPPUNIT_ASSERT(propArray);
const PetscInt off = propVisitor.sectionOffset(v);
- CPPUNIT_ASSERT(1 == propVisitor.sectionDof(v));
+ CPPUNIT_ASSERT_EQUAL(1, propVisitor.sectionDof(v));
if (0.0 != propertiesE[index]) {
CPPUNIT_ASSERT_DOUBLES_EQUAL(1.0, propArray[off]/propertiesE[index], tolerance);
} else {
@@ -213,7 +213,7 @@
const topology::Field<topology::SubMesh>& frictionField = friction.getField("friction_coefficient");
topology::VecVisitorMesh frictionVisitor(frictionField);
- PetscScalar *frictionArray = frictionVisitor.localArray();
+ PetscScalar *frictionArray = frictionVisitor.localArray();CPPUNIT_ASSERT(frictionArray);
PetscDM dmMesh = frictionField.mesh().dmMesh();CPPUNIT_ASSERT(dmMesh);
topology::Stratum depthStratum(dmMesh, topology::Stratum::DEPTH, 0);
@@ -280,11 +280,9 @@
(0 == numStateVars && 0 == stateVarsE) );
for (size_t i=0; i < numStateVars; ++i)
if (0.0 != stateVarsE[i])
- CPPUNIT_ASSERT_DOUBLES_EQUAL(1.0, fieldsVertex[index++]/stateVarsE[i],
- tolerance);
+ CPPUNIT_ASSERT_DOUBLES_EQUAL(1.0, fieldsVertex[index++]/stateVarsE[i], tolerance);
else
- CPPUNIT_ASSERT_DOUBLES_EQUAL(stateVarsE[i], fieldsVertex[index++],
- tolerance);
+ CPPUNIT_ASSERT_DOUBLES_EQUAL(stateVarsE[i], fieldsVertex[index++], tolerance);
PYLITH_METHOD_END;
} // testRetrievePropsStateVars
@@ -404,12 +402,12 @@
const materials::Metadata::ParamDescription& stateVar = metadata.getStateVar(i);
topology::Field<topology::SubMesh>& stateVarField = friction._fieldsPropsStateVars->get(stateVar.name.c_str());
topology::VecVisitorMesh stateVarVisitor(stateVarField);
- PetscScalar *fieldsArray = stateVarVisitor.localArray();
+ PetscScalar *fieldsArray = stateVarVisitor.localArray();CPPUNIT_ASSERT(fieldsArray);
const PetscInt off = stateVarVisitor.sectionOffset(vertex);
- CPPUNIT_ASSERT(1 == stateVarVisitor.sectionDof(vertex));
+ CPPUNIT_ASSERT_EQUAL(1, stateVarVisitor.sectionDof(vertex));
CPPUNIT_ASSERT_DOUBLES_EQUAL(stateVarsUpdatedE[i], fieldsArray[off], tolerance);
- }
+ } // for
} // Test with friction model with state variables (slip weakening)
PYLITH_METHOD_END;
@@ -517,12 +515,9 @@
const PylithScalar tolerance = 1.0e-06;
for (int i=0; i < propertiesSize; ++i) {
if (fabs(propertiesNondimE[i]) > tolerance)
- CPPUNIT_ASSERT_DOUBLES_EQUAL(1.0,
- properties[i]/propertiesNondimE[i],
- tolerance);
+ CPPUNIT_ASSERT_DOUBLES_EQUAL(1.0, properties[i]/propertiesNondimE[i], tolerance);
else
- CPPUNIT_ASSERT_DOUBLES_EQUAL(propertiesNondimE[i], properties[i],
- tolerance);
+ CPPUNIT_ASSERT_DOUBLES_EQUAL(propertiesNondimE[i], properties[i], tolerance);
} // for
} // for
@@ -554,12 +549,9 @@
const PylithScalar tolerance = 1.0e-06;
for (int i=0; i < propertiesSize; ++i) {
if (fabs(propertiesE[i]) > tolerance)
- CPPUNIT_ASSERT_DOUBLES_EQUAL(1.0,
- properties[i]/propertiesE[i],
- tolerance);
+ CPPUNIT_ASSERT_DOUBLES_EQUAL(1.0, properties[i]/propertiesE[i], tolerance);
else
- CPPUNIT_ASSERT_DOUBLES_EQUAL(propertiesE[i], properties[i],
- tolerance);
+ CPPUNIT_ASSERT_DOUBLES_EQUAL(propertiesE[i], properties[i], tolerance);
} // for
} // for
@@ -606,12 +598,9 @@
const PylithScalar tolerance = 1.0e-06;
for (int i=0; i < stateVarsSize; ++i) {
if (fabs(stateVarsE[i]) > tolerance)
- CPPUNIT_ASSERT_DOUBLES_EQUAL(1.0,
- stateVars[i]/stateVarsE[i],
- tolerance);
+ CPPUNIT_ASSERT_DOUBLES_EQUAL(1.0, stateVars[i]/stateVarsE[i], tolerance);
else
- CPPUNIT_ASSERT_DOUBLES_EQUAL(stateVarsE[i], stateVars[i],
- tolerance);
+ CPPUNIT_ASSERT_DOUBLES_EQUAL(stateVarsE[i], stateVars[i], tolerance);
} // for
} // for
@@ -645,12 +634,9 @@
const PylithScalar tolerance = 1.0e-06;
for (int i=0; i < stateVarsSize; ++i) {
if (fabs(stateVarsNondimE[i]) > tolerance)
- CPPUNIT_ASSERT_DOUBLES_EQUAL(1.0,
- stateVars[i]/stateVarsNondimE[i],
- tolerance);
+ CPPUNIT_ASSERT_DOUBLES_EQUAL(1.0, stateVars[i]/stateVarsNondimE[i], tolerance);
else
- CPPUNIT_ASSERT_DOUBLES_EQUAL(stateVarsNondimE[i], stateVars[i],
- tolerance);
+ CPPUNIT_ASSERT_DOUBLES_EQUAL(stateVarsNondimE[i], stateVars[i], tolerance);
} // for
} // for
@@ -684,12 +670,9 @@
const PylithScalar tolerance = 1.0e-06;
for (int i=0; i < stateVarsSize; ++i) {
if (fabs(stateVarsE[i]) > tolerance)
- CPPUNIT_ASSERT_DOUBLES_EQUAL(1.0,
- stateVars[i]/stateVarsE[i],
- tolerance);
+ CPPUNIT_ASSERT_DOUBLES_EQUAL(1.0, stateVars[i]/stateVarsE[i], tolerance);
else
- CPPUNIT_ASSERT_DOUBLES_EQUAL(stateVarsE[i], stateVars[i],
- tolerance);
+ CPPUNIT_ASSERT_DOUBLES_EQUAL(stateVarsE[i], stateVars[i], tolerance);
} // for
} // for
@@ -789,11 +772,9 @@
<< std::endl;
#endif
if (0.0 != stateVarsE[i])
- CPPUNIT_ASSERT_DOUBLES_EQUAL(1.0, stateVars[i]/stateVarsE[i],
- tolerance);
+ CPPUNIT_ASSERT_DOUBLES_EQUAL(1.0, stateVars[i]/stateVarsE[i], tolerance);
else
- CPPUNIT_ASSERT_DOUBLES_EQUAL(stateVarsE[i], stateVars[i],
- tolerance);
+ CPPUNIT_ASSERT_DOUBLES_EQUAL(stateVarsE[i], stateVars[i], tolerance);
} // for
} // for
Modified: short/3D/PyLith/trunk/unittests/libtests/materials/TestElasticMaterial.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/materials/TestElasticMaterial.cc 2013-04-03 19:31:24 UTC (rev 21706)
+++ short/3D/PyLith/trunk/unittests/libtests/materials/TestElasticMaterial.cc 2013-04-03 21:56:18 UTC (rev 21707)
@@ -42,8 +42,6 @@
#include <cstring> // USES memcpy()
-//#define PRECOMPUTE_GEOMETRY
-
// ----------------------------------------------------------------------
CPPUNIT_TEST_SUITE_REGISTRATION( pylith::materials::TestElasticMaterial );
@@ -52,6 +50,8 @@
void
pylith::materials::TestElasticMaterial::testDBInitialStress(void)
{ // testDBInitialStress
+ PYLITH_METHOD_BEGIN;
+
const std::string& label = "my_database";
spatialdata::spatialdb::SimpleDB db;
db.label(label.c_str());
@@ -61,6 +61,8 @@
CPPUNIT_ASSERT(material._dbInitialStress);
CPPUNIT_ASSERT_EQUAL(label, std::string(material._dbInitialStress->label()));
+
+ PYLITH_METHOD_END;
} // testDBInitialStress
// ----------------------------------------------------------------------
@@ -68,6 +70,8 @@
void
pylith::materials::TestElasticMaterial::testDBInitialStrain(void)
{ // testDBInitialStrain
+ PYLITH_METHOD_BEGIN;
+
const std::string& label = "my_database";
spatialdata::spatialdb::SimpleDB db;
db.label(label.c_str());
@@ -77,6 +81,8 @@
CPPUNIT_ASSERT(material._dbInitialStrain);
CPPUNIT_ASSERT_EQUAL(label, std::string(material._dbInitialStrain->label()));
+
+ PYLITH_METHOD_END;
} // testDBInitialStrain
// ----------------------------------------------------------------------
@@ -84,6 +90,8 @@
void
pylith::materials::TestElasticMaterial::testInitialize(void)
{ // testInitialize
+ PYLITH_METHOD_BEGIN;
+
topology::Mesh mesh;
ElasticStrain1D material;
ElasticStrain1DData data;
@@ -167,6 +175,8 @@
} // switch
size = data.numLocs*numElasticConsts;
CPPUNIT_ASSERT_EQUAL(size, material._elasticConstsCell.size());
+
+ PYLITH_METHOD_END;
} // testInitialize
// ----------------------------------------------------------------------
@@ -174,6 +184,8 @@
void
pylith::materials::TestElasticMaterial::testRetrievePropsAndVars(void)
{ // testRetrievePropsAndVars
+ PYLITH_METHOD_BEGIN;
+
topology::Mesh mesh;
ElasticStrain1D material;
ElasticStrain1DData data;
@@ -231,6 +243,8 @@
for (size_t i=0; i < size; ++i)
CPPUNIT_ASSERT_DOUBLES_EQUAL(1.0, initialStrain[i]/initialStrainE[i],
tolerance);
+
+ PYLITH_METHOD_END;
} // testRetrievePropsAndVars
// ----------------------------------------------------------------------
@@ -238,6 +252,8 @@
void
pylith::materials::TestElasticMaterial::testCalcDensity(void)
{ // testCalcDensity
+ PYLITH_METHOD_BEGIN;
+
topology::Mesh mesh;
ElasticStrain1D material;
ElasticStrain1DData data;
@@ -264,6 +280,8 @@
const PylithScalar tolerance = 1.0e-06;
for (size_t i=0; i < size; ++i)
CPPUNIT_ASSERT_DOUBLES_EQUAL(1.0, density[i]/densityE[i]*data.densityScale, tolerance);
+
+ PYLITH_METHOD_END;
} // testCalcDensity
// ----------------------------------------------------------------------
@@ -271,6 +289,8 @@
void
pylith::materials::TestElasticMaterial::testCalcStress(void)
{ // testCalcStress
+ PYLITH_METHOD_BEGIN;
+
topology::Mesh mesh;
ElasticStrain1D material;
ElasticStrain1DData data;
@@ -300,6 +320,8 @@
const PylithScalar tolerance = 1.0e-06;
for (size_t i=0; i < size; ++i)
CPPUNIT_ASSERT_DOUBLES_EQUAL(1.0, stress[i]/stressE[i]*data.pressureScale, tolerance);
+
+ PYLITH_METHOD_END;
} // testCalcStress
// ----------------------------------------------------------------------
@@ -307,6 +329,8 @@
void
pylith::materials::TestElasticMaterial::testCalcDerivElastic(void)
{ // testCalcDerivElastic
+ PYLITH_METHOD_BEGIN;
+
topology::Mesh mesh;
ElasticStrain1D material;
ElasticStrain1DData data;
@@ -353,6 +377,8 @@
for (size_t i=0; i < size; ++i)
CPPUNIT_ASSERT_DOUBLES_EQUAL(1.0, elasticConsts[i]/elasticConstsE[i]*data.pressureScale,
tolerance);
+
+ PYLITH_METHOD_END;
} // testCalcDerivElastic
// ----------------------------------------------------------------------
@@ -360,8 +386,12 @@
void
pylith::materials::TestElasticMaterial::testUpdateStateVars(void)
{ // testUpdateStateVars
+ PYLITH_METHOD_BEGIN;
+
std::cout << "\n\nWARNING!! WARNING!! WARNING!!\n"
"Need to implement using material with state variables.\n\n";
+
+ PYLITH_METHOD_END;
} // testUpdateStateVars
// ----------------------------------------------------------------------
@@ -369,6 +399,8 @@
void
pylith::materials::TestElasticMaterial::testStableTimeStepImplicit(void)
{ // testStableTimeStepImplicit
+ PYLITH_METHOD_BEGIN;
+
topology::Mesh mesh;
ElasticStrain1D material;
ElasticStrain1DData data;
@@ -388,6 +420,8 @@
const PylithScalar tolerance = 1.0e-06;
const PylithScalar dtE = data.dtStableImplicit;
CPPUNIT_ASSERT_DOUBLES_EQUAL(1.0, dt/dtE, tolerance);
+
+ PYLITH_METHOD_END;
} // testStableTimeStepImplicit
// ----------------------------------------------------------------------
@@ -395,6 +429,8 @@
void
pylith::materials::TestElasticMaterial::testStableTimeStepExplicit(void)
{ // testStableTimeStepExplicit
+ PYLITH_METHOD_BEGIN;
+
topology::Mesh mesh;
ElasticStrain1D material;
ElasticStrain1DData data;
@@ -439,6 +475,8 @@
const PylithScalar tolerance = 1.0e-06;
const PylithScalar dtE = 2.0 / 5196.15242;
CPPUNIT_ASSERT_DOUBLES_EQUAL(1.0, dt/dtE, tolerance);
+
+ PYLITH_METHOD_END;
} // testStableTimeStepExplicit
// ----------------------------------------------------------------------
@@ -446,9 +484,13 @@
void
pylith::materials::TestElasticMaterial::setUp(void)
{ // setUp
+ PYLITH_METHOD_BEGIN;
+
TestMaterial::setUp();
_matElastic = 0;
_dataElastic = 0;
+
+ PYLITH_METHOD_END;
} // setUp
// ----------------------------------------------------------------------
@@ -456,9 +498,13 @@
void
pylith::materials::TestElasticMaterial::tearDown(void)
{ // tearDown
+ PYLITH_METHOD_BEGIN;
+
TestMaterial::tearDown();
delete _matElastic; _matElastic = 0;
delete _dataElastic; _dataElastic = 0;
+
+ PYLITH_METHOD_END;
} // tearDown
// ----------------------------------------------------------------------
@@ -466,6 +512,8 @@
void
pylith::materials::TestElasticMaterial::test_calcDensity(void)
{ // _testCalcDensity
+ PYLITH_METHOD_BEGIN;
+
CPPUNIT_ASSERT(_matElastic);
CPPUNIT_ASSERT(_dataElastic);
const ElasticMaterialData* data = _dataElastic;
@@ -493,6 +541,8 @@
const PylithScalar tolerance = 1.0e-06;
CPPUNIT_ASSERT_DOUBLES_EQUAL(1.0, density/densityE, tolerance);
} // for
+
+ PYLITH_METHOD_END;
} // _testCalcDensity
// ----------------------------------------------------------------------
@@ -500,6 +550,8 @@
void
pylith::materials::TestElasticMaterial::test_calcStress(void)
{ // _testCalcStress
+ PYLITH_METHOD_BEGIN;
+
CPPUNIT_ASSERT(_matElastic);
CPPUNIT_ASSERT(_dataElastic);
const ElasticMaterialData* data = _dataElastic;
@@ -550,6 +602,8 @@
CPPUNIT_ASSERT_DOUBLES_EQUAL(stressE[i], stress[i],
tolerance);
} // for
+
+ PYLITH_METHOD_END;
} // _testCalcStress
// ----------------------------------------------------------------------
@@ -557,6 +611,8 @@
void
pylith::materials::TestElasticMaterial::test_calcElasticConsts(void)
{ // _testCalcElasticConsts
+ PYLITH_METHOD_BEGIN;
+
CPPUNIT_ASSERT(_matElastic);
CPPUNIT_ASSERT(_dataElastic);
const ElasticMaterialData* data = _dataElastic;
@@ -622,6 +678,8 @@
tolerance*stressScale);
} // if/else
} // for
+
+ PYLITH_METHOD_END;
} // _testCalcElasticConsts
// ----------------------------------------------------------------------
@@ -629,6 +687,8 @@
void
pylith::materials::TestElasticMaterial::test_updateStateVars(void)
{ // test_updateStateVars
+ PYLITH_METHOD_BEGIN;
+
CPPUNIT_ASSERT(_matElastic);
CPPUNIT_ASSERT(_dataElastic);
const ElasticMaterialData* data = _dataElastic;
@@ -678,6 +738,8 @@
CPPUNIT_ASSERT_DOUBLES_EQUAL(stateVarsE[i], stateVars[i],
tolerance);
} // for
+
+ PYLITH_METHOD_END;
} // test_updateStateVars
// ----------------------------------------------------------------------
@@ -685,6 +747,8 @@
void
pylith::materials::TestElasticMaterial::test_stableTimeStepImplicit(void)
{ // test_stableTimeStepImplicit
+ PYLITH_METHOD_BEGIN;
+
CPPUNIT_ASSERT(_matElastic);
CPPUNIT_ASSERT(_dataElastic);
const ElasticMaterialData* data = _dataElastic;
@@ -697,6 +761,8 @@
const PylithScalar tolerance = 1.0e-06;
CPPUNIT_ASSERT_DOUBLES_EQUAL(1.0, dt/dtE, tolerance);
+
+ PYLITH_METHOD_END;
} // test_stableTimeStepImplicit
// ----------------------------------------------------------------------
@@ -704,6 +770,8 @@
void
pylith::materials::TestElasticMaterial::test_stableTimeStepExplicit(void)
{ // test_stableTimeStepExplicit
+ PYLITH_METHOD_BEGIN;
+
CPPUNIT_ASSERT(_matElastic);
CPPUNIT_ASSERT(_dataElastic);
const ElasticMaterialData* data = _dataElastic;
@@ -720,6 +788,8 @@
const PylithScalar tolerance = 1.0e-06;
CPPUNIT_ASSERT_DOUBLES_EQUAL(dtE, dt, tolerance); // TEMPORARY
CPPUNIT_ASSERT_DOUBLES_EQUAL(1.0, dt/dtE, tolerance);
+
+ PYLITH_METHOD_END;
} // test_stableTimeStepExplicit
// ----------------------------------------------------------------------
@@ -727,6 +797,8 @@
void
pylith::materials::TestElasticMaterial::setupNormalizer(void)
{ // setupNormalizer
+ PYLITH_METHOD_BEGIN;
+
spatialdata::units::Nondimensional normalizer;
normalizer.lengthScale(_data->lengthScale);
normalizer.pressureScale(_data->pressureScale);
@@ -734,6 +806,8 @@
normalizer.densityScale(_data->densityScale);
_material->normalizer(normalizer);
_matElastic->normalizer(normalizer);
+
+ PYLITH_METHOD_END;
} // setupNormalizer
// ----------------------------------------------------------------------
@@ -743,6 +817,8 @@
ElasticStrain1D* material,
const ElasticStrain1DData* data)
{ // _initialize
+ PYLITH_METHOD_BEGIN;
+
CPPUNIT_ASSERT(mesh);
CPPUNIT_ASSERT(material);
CPPUNIT_ASSERT(data);
@@ -804,10 +880,6 @@
// Compute geometry for cells
quadrature.initializeGeometry();
-#if defined(PRECOMPUTE_GEOMETRY)
- int_array cellsTmp(cells, numCells);
- quadrature.computeGeometry(*mesh, cellsTmp);
-#endif
err = ISRestoreIndices(cellIS, &cells);CHECK_PETSC_ERROR(err);
err = ISDestroy(&cellIS);CHECK_PETSC_ERROR(err);
@@ -837,6 +909,8 @@
material->dbInitialStrain(&dbStrain);
material->initialize(*mesh, &quadrature);
+
+ PYLITH_METHOD_END;
} // _initialize
Modified: short/3D/PyLith/trunk/unittests/libtests/materials/TestMaterial.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/materials/TestMaterial.cc 2013-04-03 19:31:24 UTC (rev 21706)
+++ short/3D/PyLith/trunk/unittests/libtests/materials/TestMaterial.cc 2013-04-03 21:56:18 UTC (rev 21707)
@@ -43,8 +43,6 @@
#include <cassert> // USES assert()
#include <cmath> // USES sqrt()
-//#define PRECOMPUTE_GEOMETRY
-
// ----------------------------------------------------------------------
CPPUNIT_TEST_SUITE_REGISTRATION( pylith::materials::TestMaterial );
@@ -53,11 +51,15 @@
void
pylith::materials::TestMaterial::testID(void)
{ // testID
+ PYLITH_METHOD_BEGIN;
+
const int id = 346;
ElasticIsotropic3D material;
material.id(id);
- CPPUNIT_ASSERT(id == material.id());
+ CPPUNIT_ASSERT_EQUAL(id, material.id());
+
+ PYLITH_METHOD_END;
} // testID
// ----------------------------------------------------------------------
@@ -65,11 +67,15 @@
void
pylith::materials::TestMaterial::testLabel(void)
{ // testLabel
+ PYLITH_METHOD_BEGIN;
+
const std::string& label = "the database";
ElasticIsotropic3D material;
material.label(label.c_str());
CPPUNIT_ASSERT_EQUAL(label, std::string(material.label()));
+
+ PYLITH_METHOD_END;
} // testLabel
// ----------------------------------------------------------------------
@@ -77,11 +83,15 @@
void
pylith::materials::TestMaterial::testTimeStep(void)
{ // testTimeStep
+ PYLITH_METHOD_BEGIN;
+
const PylithScalar dt = 2.0;
ElasticIsotropic3D material;
material.timeStep(dt);
CPPUNIT_ASSERT_EQUAL(dt, material.timeStep());
+
+ PYLITH_METHOD_END;
} // testTimeStep
// ----------------------------------------------------------------------
@@ -89,6 +99,8 @@
void
pylith::materials::TestMaterial::testDBProperties(void)
{ // testDBProperties
+ PYLITH_METHOD_BEGIN;
+
const std::string& label = "my_database";
spatialdata::spatialdb::SimpleDB db;
db.label(label.c_str());
@@ -98,6 +110,8 @@
CPPUNIT_ASSERT(material._dbProperties);
CPPUNIT_ASSERT_EQUAL(label, std::string(material._dbProperties->label()));
+
+ PYLITH_METHOD_END;
} // testDBProperties
// ----------------------------------------------------------------------
@@ -105,6 +119,8 @@
void
pylith::materials::TestMaterial::testDBStateVars(void)
{ // testDBStateVars
+ PYLITH_METHOD_BEGIN;
+
const std::string& label = "my_database";
spatialdata::spatialdb::SimpleDB db;
db.label(label.c_str());
@@ -114,6 +130,8 @@
CPPUNIT_ASSERT(material._dbInitialState);
CPPUNIT_ASSERT_EQUAL(label, std::string(material._dbInitialState->label()));
+
+ PYLITH_METHOD_END;
} // testDBStateVars
// ----------------------------------------------------------------------
@@ -121,6 +139,8 @@
void
pylith::materials::TestMaterial::testNormalizer(void)
{ // testNormalizer
+ PYLITH_METHOD_BEGIN;
+
spatialdata::units::Nondimensional normalizer;
const double lengthScale = 2.0;
normalizer.lengthScale(lengthScale);
@@ -130,6 +150,8 @@
CPPUNIT_ASSERT(material._normalizer);
CPPUNIT_ASSERT_EQUAL(lengthScale, material._normalizer->lengthScale());
+
+ PYLITH_METHOD_END;
} // testNormalizer
// ----------------------------------------------------------------------
@@ -137,6 +159,8 @@
void
pylith::materials::TestMaterial::testNeedNewJacobian(void)
{ // testNeedNewJacobian
+ PYLITH_METHOD_BEGIN;
+
ElasticIsotropic3D material;
bool flag = false;
@@ -146,6 +170,8 @@
flag = true;
material._needNewJacobian = flag;
CPPUNIT_ASSERT_EQUAL(flag, material.needNewJacobian());
+
+ PYLITH_METHOD_END;
} // testNeedNewJacobian
// ----------------------------------------------------------------------
@@ -153,6 +179,8 @@
void
pylith::materials::TestMaterial::testIsJacobianSymmetric(void)
{ // testIsJacobianSymmetric
+ PYLITH_METHOD_BEGIN;
+
ElasticIsotropic3D material;
CPPUNIT_ASSERT_EQUAL(true, material.isJacobianSymmetric());
@@ -160,6 +188,8 @@
bool flag = false;
material._isJacobianSymmetric = flag;
CPPUNIT_ASSERT_EQUAL(flag, material.isJacobianSymmetric());
+
+ PYLITH_METHOD_END;
} // testIsJacobianSymmetric
// ----------------------------------------------------------------------
@@ -167,6 +197,8 @@
void
pylith::materials::TestMaterial::testInitialize(void)
{ // testInitialize
+ PYLITH_METHOD_BEGIN;
+
// Setup mesh
topology::Mesh mesh;
meshio::MeshIOAscii iohandler;
@@ -226,10 +258,6 @@
// Compute geometry for cells
quadrature.initializeGeometry();
-#if defined(PRECOMPUTE_GEOMETRY)
- int_array cellsTmp(cells, numCells);
- quadrature.computeGeometry(mesh, cellsTmp);
-#endif
spatialdata::spatialdb::SimpleDB db;
spatialdata::spatialdb::SimpleIOAscii dbIO;
@@ -273,8 +301,7 @@
// density
for (int i=0; i < numQuadPts; ++i) {
const int index = i*material._numPropsQuadPt + p_density;
- CPPUNIT_ASSERT_DOUBLES_EQUAL(1.0, propertiesArray[off+index]/densityE[i]*densityScale,
- tolerance);
+ CPPUNIT_ASSERT_DOUBLES_EQUAL(1.0, propertiesArray[off+index]/densityE[i]*densityScale, tolerance);
} // for
// mu
@@ -286,9 +313,10 @@
// lambda
for (int i=0; i < numQuadPts; ++i) {
const int index = i*material._numPropsQuadPt + p_lambda;
- CPPUNIT_ASSERT_DOUBLES_EQUAL(1.0, propertiesArray[off+index]/lambdaE[i]*pressureScale,
- tolerance);
+ CPPUNIT_ASSERT_DOUBLES_EQUAL(1.0, propertiesArray[off+index]/lambdaE[i]*pressureScale, tolerance);
} // for
+
+ PYLITH_METHOD_END;
} // testInitialize
// ----------------------------------------------------------------------
@@ -296,8 +324,12 @@
void
pylith::materials::TestMaterial::setUp(void)
{ // setUp
+ PYLITH_METHOD_BEGIN;
+
_material = 0;
_data = 0;
+
+ PYLITH_METHOD_END;
} // setUp
// ----------------------------------------------------------------------
@@ -305,8 +337,12 @@
void
pylith::materials::TestMaterial::tearDown(void)
{ // tearDown
+ PYLITH_METHOD_BEGIN;
+
delete _material; _material = 0;
delete _data; _data = 0;
+
+ PYLITH_METHOD_END;
} // tearDown
// ----------------------------------------------------------------------
@@ -314,7 +350,11 @@
void
pylith::materials::TestMaterial::testDimension(void)
{ // testDimension
+ PYLITH_METHOD_BEGIN;
+
CPPUNIT_ASSERT_EQUAL(_data->dimension, _material->dimension());
+
+ PYLITH_METHOD_END;
} // testDimension
// ----------------------------------------------------------------------
@@ -322,6 +362,8 @@
void
pylith::materials::TestMaterial::testTensorSize(void)
{ // testTensorSize
+ PYLITH_METHOD_BEGIN;
+
int tensorSize = 0;
const int dimension = _data->dimension;
switch(dimension)
@@ -341,6 +383,8 @@
CPPUNIT_ASSERT(tensorSize > 0);
CPPUNIT_ASSERT_EQUAL(tensorSize, _material->tensorSize());
+
+ PYLITH_METHOD_END;
} // testTensorSize
// ----------------------------------------------------------------------
@@ -348,6 +392,8 @@
void
pylith::materials::TestMaterial::testDBToProperties(void)
{ // testDBToProperties
+ PYLITH_METHOD_BEGIN;
+
CPPUNIT_ASSERT(_material);
CPPUNIT_ASSERT(_data);
@@ -378,14 +424,13 @@
const PylithScalar tolerance = 1.0e-06;
for (int i=0; i < propertiesSize; ++i) {
if (fabs(propertiesE[i]) > tolerance)
- CPPUNIT_ASSERT_DOUBLES_EQUAL(1.0,
- properties[i]/propertiesE[i],
- tolerance);
+ CPPUNIT_ASSERT_DOUBLES_EQUAL(1.0, properties[i]/propertiesE[i], tolerance);
else
- CPPUNIT_ASSERT_DOUBLES_EQUAL(propertiesE[i], properties[i],
- tolerance);
+ CPPUNIT_ASSERT_DOUBLES_EQUAL(propertiesE[i], properties[i], tolerance);
} // for
} // for
+
+ PYLITH_METHOD_END;
} // testDBToProperties
// ----------------------------------------------------------------------
@@ -393,6 +438,8 @@
void
pylith::materials::TestMaterial::testNonDimProperties(void)
{ // testNonDimProperties
+ PYLITH_METHOD_BEGIN;
+
CPPUNIT_ASSERT(_material);
CPPUNIT_ASSERT(_data);
@@ -414,14 +461,13 @@
const PylithScalar tolerance = 1.0e-06;
for (int i=0; i < propertiesSize; ++i) {
if (fabs(propertiesNondimE[i]) > tolerance)
- CPPUNIT_ASSERT_DOUBLES_EQUAL(1.0,
- properties[i]/propertiesNondimE[i],
- tolerance);
+ CPPUNIT_ASSERT_DOUBLES_EQUAL(1.0, properties[i]/propertiesNondimE[i], tolerance);
else
- CPPUNIT_ASSERT_DOUBLES_EQUAL(propertiesNondimE[i], properties[i],
- tolerance);
+ CPPUNIT_ASSERT_DOUBLES_EQUAL(propertiesNondimE[i], properties[i], tolerance);
} // for
} // for
+
+ PYLITH_METHOD_END;
} // testNonDimProperties
// ----------------------------------------------------------------------
@@ -429,6 +475,8 @@
void
pylith::materials::TestMaterial::testDimProperties(void)
{ // testDimProperties
+ PYLITH_METHOD_BEGIN;
+
CPPUNIT_ASSERT(_material);
CPPUNIT_ASSERT(_data);
@@ -449,14 +497,13 @@
const PylithScalar tolerance = 1.0e-06;
for (int i=0; i < propertiesSize; ++i) {
if (fabs(propertiesE[i]) > tolerance)
- CPPUNIT_ASSERT_DOUBLES_EQUAL(1.0,
- properties[i]/propertiesE[i],
- tolerance);
+ CPPUNIT_ASSERT_DOUBLES_EQUAL(1.0, properties[i]/propertiesE[i], tolerance);
else
- CPPUNIT_ASSERT_DOUBLES_EQUAL(propertiesE[i], properties[i],
- tolerance);
+ CPPUNIT_ASSERT_DOUBLES_EQUAL(propertiesE[i], properties[i], tolerance);
} // for
} // for
+
+ PYLITH_METHOD_END;
} // testDimProperties
// ----------------------------------------------------------------------
@@ -464,6 +511,8 @@
void
pylith::materials::TestMaterial::testDBToStateVars(void)
{ // testDBToStateVars
+ PYLITH_METHOD_BEGIN;
+
CPPUNIT_ASSERT(_material);
CPPUNIT_ASSERT(_data);
@@ -497,14 +546,13 @@
const PylithScalar tolerance = 1.0e-06;
for (int i=0; i < stateVarsSize; ++i) {
if (fabs(stateVarsE[i]) > tolerance)
- CPPUNIT_ASSERT_DOUBLES_EQUAL(1.0,
- stateVars[i]/stateVarsE[i],
- tolerance);
+ CPPUNIT_ASSERT_DOUBLES_EQUAL(1.0, stateVars[i]/stateVarsE[i], tolerance);
else
- CPPUNIT_ASSERT_DOUBLES_EQUAL(stateVarsE[i], stateVars[i],
- tolerance);
+ CPPUNIT_ASSERT_DOUBLES_EQUAL(stateVarsE[i], stateVars[i], tolerance);
} // for
} // for
+
+ PYLITH_METHOD_END;
} // testDBToStateVars
// ----------------------------------------------------------------------
@@ -512,6 +560,8 @@
void
pylith::materials::TestMaterial::testNonDimStateVars(void)
{ // testNonDimStateVars
+ PYLITH_METHOD_BEGIN;
+
CPPUNIT_ASSERT(_material);
CPPUNIT_ASSERT(_data);
@@ -533,14 +583,14 @@
const PylithScalar tolerance = 1.0e-06;
for (int i=0; i < stateVarsSize; ++i) {
if (fabs(stateVarsNondimE[i]) > tolerance)
- CPPUNIT_ASSERT_DOUBLES_EQUAL(1.0,
- stateVars[i]/stateVarsNondimE[i],
- tolerance);
+ CPPUNIT_ASSERT_DOUBLES_EQUAL(1.0, stateVars[i]/stateVarsNondimE[i], tolerance);
else
CPPUNIT_ASSERT_DOUBLES_EQUAL(stateVarsNondimE[i], stateVars[i],
tolerance);
} // for
} // for
+
+ PYLITH_METHOD_END;
} // testNonDimStateVars
// ----------------------------------------------------------------------
@@ -548,6 +598,8 @@
void
pylith::materials::TestMaterial::testDimStateVars(void)
{ // testDimStateVars
+ PYLITH_METHOD_BEGIN;
+
CPPUNIT_ASSERT(_material);
CPPUNIT_ASSERT(_data);
@@ -569,14 +621,13 @@
const PylithScalar tolerance = 1.0e-06;
for (int i=0; i < stateVarsSize; ++i) {
if (fabs(stateVarsE[i]) > tolerance)
- CPPUNIT_ASSERT_DOUBLES_EQUAL(1.0,
- stateVars[i]/stateVarsE[i],
- tolerance);
+ CPPUNIT_ASSERT_DOUBLES_EQUAL(1.0, stateVars[i]/stateVarsE[i], tolerance);
else
- CPPUNIT_ASSERT_DOUBLES_EQUAL(stateVarsE[i], stateVars[i],
- tolerance);
+ CPPUNIT_ASSERT_DOUBLES_EQUAL(stateVarsE[i], stateVars[i], tolerance);
} // for
} // for
+
+ PYLITH_METHOD_END;
} // testDimStateVars
Modified: short/3D/PyLith/trunk/unittests/libtests/topology/TestSolutionFields.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/topology/TestSolutionFields.cc 2013-04-03 19:31:24 UTC (rev 21706)
+++ short/3D/PyLith/trunk/unittests/libtests/topology/TestSolutionFields.cc 2013-04-03 21:56:18 UTC (rev 21707)
@@ -21,6 +21,8 @@
#include "TestSolutionFields.hh" // Implementation of class methods
#include "pylith/topology/SolutionFields.hh" // USES SolutionFields
+#include "pylith/topology/Stratum.hh" // USES Stratum
+#include "pylith/topology/VisitorMesh.hh" // USES VecVisitorMesh
#include "pylith/meshio/MeshIOAscii.hh" // USES MeshIOAscii
@@ -70,13 +72,7 @@
Mesh mesh;
_initialize(&mesh);
SolutionFields manager(mesh);
- DM dmMesh = mesh.dmMesh();
- PetscErrorCode err;
- CPPUNIT_ASSERT(dmMesh);
- PetscInt vStart, vEnd;
- err = DMPlexGetDepthStratum(dmMesh, 0, &vStart, &vEnd);CHECK_PETSC_ERROR(err);
-
const char* labels[] = { "field A", "field B", "field C" };
const int size = 3;
const int fiberDimA = 2;
@@ -90,18 +86,22 @@
Field<Mesh>& fieldB = manager.get(labels[1]);
Field<Mesh>& fieldC = manager.get(labels[2]);
fieldA.newSection(FieldBase::VERTICES_FIELD, fiberDimA);
-
+ fieldA.allocate();
+
fieldB.newSection(fieldA, fiberDimB);
+ fieldB.allocate();
fieldC.newSection(fieldB, fiberDimC);
+ fieldC.allocate();
manager.solutionName(labels[1]);
- const Field<Mesh>& solution = manager.solution();
- PetscSection section = solution.petscSection();
- CPPUNIT_ASSERT(section);
- PetscInt dof;
- err = PetscSectionGetDof(section, vStart, &dof);CHECK_PETSC_ERROR(err);
- CPPUNIT_ASSERT_EQUAL(fiberDimB, dof);
+ PetscDM dmMesh = mesh.dmMesh();CPPUNIT_ASSERT(dmMesh);
+ Stratum verticesStratum(dmMesh, Stratum::DEPTH, 0);
+ const PetscInt vStart = verticesStratum.begin();
+
+ VecVisitorMesh solutionVisitor(manager.solution());
+ CPPUNIT_ASSERT_EQUAL(fiberDimB, solutionVisitor.sectionDof(vStart));
+
PYLITH_METHOD_END;
} // testSolution
Modified: short/3D/PyLith/trunk/unittests/libtests/utils/TestEventLogger.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/utils/TestEventLogger.cc 2013-04-03 19:31:24 UTC (rev 21706)
+++ short/3D/PyLith/trunk/unittests/libtests/utils/TestEventLogger.cc 2013-04-03 21:56:18 UTC (rev 21707)
@@ -22,6 +22,7 @@
#include "pylith/utils/EventLogger.hh" // USES EventLogger
+#include "pylith/utils/petscerror.h" // USES PYLITH_METHOD_BEGIN/END
// ----------------------------------------------------------------------
CPPUNIT_TEST_SUITE_REGISTRATION( pylith::utils::TestEventLogger );
@@ -31,7 +32,11 @@
void
pylith::utils::TestEventLogger::testConstructor(void)
{ // testConstructor
+ PYLITH_METHOD_BEGIN;
+
EventLogger logger;
+
+ PYLITH_METHOD_END;
} // testConstructor
// ----------------------------------------------------------------------
@@ -39,12 +44,16 @@
void
pylith::utils::TestEventLogger::testClassName(void)
{ // testClassName
+ PYLITH_METHOD_BEGIN;
+
EventLogger logger;
CPPUNIT_ASSERT_EQUAL(std::string(""), std::string(logger.className()));
const std::string& name = "my name";
logger.className(name.c_str());
CPPUNIT_ASSERT_EQUAL(name, std::string(logger.className()));
+
+ PYLITH_METHOD_END;
} // testClassName
// ----------------------------------------------------------------------
@@ -52,11 +61,15 @@
void
pylith::utils::TestEventLogger::testInitialize(void)
{ // testInitialize
+ PYLITH_METHOD_BEGIN;
+
EventLogger logger;
logger.className("my class");
CPPUNIT_ASSERT_EQUAL(0, logger._classId);
logger.initialize();
CPPUNIT_ASSERT(0 != logger._classId);
+
+ PYLITH_METHOD_END;
} // testInitialize
// ----------------------------------------------------------------------
@@ -64,6 +77,8 @@
void
pylith::utils::TestEventLogger::testRegisterEvent(void)
{ // testRegisterEvent
+ PYLITH_METHOD_BEGIN;
+
EventLogger logger;
logger.className("my class");
logger.initialize();
@@ -82,6 +97,8 @@
CPPUNIT_ASSERT_EQUAL(std::string(events[i]), e_iter->first);
CPPUNIT_ASSERT_EQUAL(ids[i], e_iter->second);
} // for
+
+ PYLITH_METHOD_END;
} // testRegisterEvent
// ----------------------------------------------------------------------
@@ -89,6 +106,8 @@
void
pylith::utils::TestEventLogger::testEventId(void)
{ // testEventId
+ PYLITH_METHOD_BEGIN;
+
EventLogger logger;
logger.className("my class");
logger.initialize();
@@ -109,6 +128,8 @@
e_iter != logger._events.end();
++e_iter, ++i)
CPPUNIT_ASSERT_EQUAL(e_iter->second, ids[i]);
+
+ PYLITH_METHOD_END;
} // testEventId
// ----------------------------------------------------------------------
@@ -116,6 +137,8 @@
void
pylith::utils::TestEventLogger::testEventLogging(void)
{ // testEventLogging
+ PYLITH_METHOD_BEGIN;
+
EventLogger logger;
logger.className("my class");
logger.initialize();
@@ -141,6 +164,8 @@
logger.eventBegin(event2);
logger.eventEnd(event2);
logger.eventEnd(event);
+
+ PYLITH_METHOD_END;
} // testEventLogging
// ----------------------------------------------------------------------
@@ -148,6 +173,8 @@
void
pylith::utils::TestEventLogger::testRegisterStage(void)
{ // testRegisterStage
+ PYLITH_METHOD_BEGIN;
+
EventLogger logger;
logger.className("my class");
logger.initialize();
@@ -166,6 +193,8 @@
CPPUNIT_ASSERT_EQUAL(std::string(stages[i]), s_iter->first);
CPPUNIT_ASSERT_EQUAL(ids[i], s_iter->second);
} // for
+
+ PYLITH_METHOD_END;
} // testRegisterStage
// ----------------------------------------------------------------------
@@ -173,6 +202,8 @@
void
pylith::utils::TestEventLogger::testStageId(void)
{ // testStageId
+ PYLITH_METHOD_BEGIN;
+
EventLogger logger;
logger.className("my class");
logger.initialize();
@@ -197,6 +228,8 @@
const int idNew = logger.stageId("stage D2");
CPPUNIT_ASSERT_EQUAL(idNew, logger.stageId("stage D2"));
+
+ PYLITH_METHOD_END;
} // testStageId
// ----------------------------------------------------------------------
@@ -204,6 +237,8 @@
void
pylith::utils::TestEventLogger::testStageLogging(void)
{ // testStageLogging
+ PYLITH_METHOD_BEGIN;
+
EventLogger logger;
logger.className("my class");
logger.initialize();
@@ -229,6 +264,8 @@
logger.stagePush(stage2);
logger.stagePop();
logger.stagePop();
+
+ PYLITH_METHOD_END;
} // testStageLogging
More information about the CIG-COMMITS
mailing list