[cig-commits] r21455 - in short/3D/PyLith/trunk: libsrc/pylith/materials unittests/libtests/materials
brad at geodynamics.org
brad at geodynamics.org
Wed Mar 6 15:57:23 PST 2013
Author: brad
Date: 2013-03-06 15:57:22 -0800 (Wed, 06 Mar 2013)
New Revision: 21455
Modified:
short/3D/PyLith/trunk/libsrc/pylith/materials/ElasticMaterial.cc
short/3D/PyLith/trunk/unittests/libtests/materials/TestElasticMaterial.cc
Log:
Code cleanup.
Modified: short/3D/PyLith/trunk/libsrc/pylith/materials/ElasticMaterial.cc
===================================================================
--- short/3D/PyLith/trunk/libsrc/pylith/materials/ElasticMaterial.cc 2013-03-06 23:57:08 UTC (rev 21454)
+++ short/3D/PyLith/trunk/libsrc/pylith/materials/ElasticMaterial.cc 2013-03-06 23:57:22 UTC (rev 21455)
@@ -104,11 +104,11 @@
assert(0 != _properties);
assert(0 != _stateVars);
- PetscSection propertiesSection = _properties->petscSection();
- Vec propertiesVec = _properties->localVector();
- PetscScalar *propertiesArray;
- PetscInt dof, off;
- PetscErrorCode err;
+ PetscSection propertiesSection = _properties->petscSection();
+ PetscVec propertiesVec = _properties->localVector();
+ PetscScalar *propertiesArray;
+ PetscInt dof, off;
+ PetscErrorCode err = 0;
assert(propertiesSection);assert(propertiesVec);
err = PetscSectionGetDof(propertiesSection, cell, &dof);CHECK_PETSC_ERROR(err);
@@ -119,11 +119,11 @@
err = VecRestoreArray(propertiesVec, &propertiesArray);CHECK_PETSC_ERROR(err);
if (hasStateVars()) {
- PetscSection stateVarsSection = _stateVars->petscSection();
- Vec stateVarsVec = _stateVars->localVector();
- PetscScalar *stateVarsArray;
- PetscInt dof, off;
- PetscErrorCode err;
+ PetscSection stateVarsSection = _stateVars->petscSection();
+ PetscVec stateVarsVec = _stateVars->localVector();
+ PetscScalar *stateVarsArray;
+ PetscInt dof, off;
+ PetscErrorCode err = 0;
assert(stateVarsSection);assert(stateVarsVec);
err = PetscSectionGetDof(stateVarsSection, cell, &dof);CHECK_PETSC_ERROR(err);
@@ -138,11 +138,11 @@
_initialStrainCell = 0.0;
if (0 != _initialFields) {
if (_initialFields->hasField("initial stress")) {
- PetscSection stressSection = _initialFields->get("initial stress").petscSection();
- Vec stressVec = _initialFields->get("initial stress").localVector();
- PetscScalar *stressArray;
- PetscInt dof, off;
- PetscErrorCode err;
+ PetscSection stressSection = _initialFields->get("initial stress").petscSection();
+ PetscVec stressVec = _initialFields->get("initial stress").localVector();
+ PetscScalar *stressArray;
+ PetscInt dof, off;
+ PetscErrorCode err = 0;
assert(stressSection);assert(stressVec);
err = PetscSectionGetDof(stressSection, cell, &dof);CHECK_PETSC_ERROR(err);
@@ -153,11 +153,11 @@
err = VecRestoreArray(stressVec, &stressArray);CHECK_PETSC_ERROR(err);
} // if
if (_initialFields->hasField("initial strain")) {
- PetscSection strainSection = _initialFields->get("initial strain").petscSection();
- Vec strainVec = _initialFields->get("initial strain").localVector();
- PetscScalar *strainArray;
- PetscInt dof, off;
- PetscErrorCode err;
+ PetscSection strainSection = _initialFields->get("initial strain").petscSection();
+ PetscVec strainVec = _initialFields->get("initial strain").localVector();
+ PetscScalar *strainArray;
+ PetscInt dof, off;
+ PetscErrorCode err = 0;
assert(strainSection);assert(strainVec);
err = PetscSectionGetDof(strainSection, cell, &dof);CHECK_PETSC_ERROR(err);
@@ -255,10 +255,10 @@
&_initialStrainCell[iQuad*_tensorSize], _tensorSize);
PetscSection stateVarsSection = _stateVars->petscSection();
- Vec stateVarsVec = _stateVars->localVector();
+ PetscVec stateVarsVec = _stateVars->localVector();
PetscScalar *stateVarsArray;
- PetscInt dof, off;
- PetscErrorCode err;
+ PetscInt dof, off;
+ PetscErrorCode err = 0;
assert(stateVarsSection);assert(stateVarsVec);
err = PetscSectionGetDof(stateVarsSection, cell, &dof);CHECK_PETSC_ERROR(err);
@@ -287,11 +287,11 @@
assert(_initialStrainCell.size() == numQuadPts*_tensorSize);
// Get cells associated with material
- DM dmMesh = mesh.dmMesh();
- IS cellIS;
+ PetscDM dmMesh = mesh.dmMesh();
+ PetscIS cellIS;
const PetscInt *cells;
- PetscInt numCells;
- PetscErrorCode err;
+ PetscInt numCells;
+ PetscErrorCode err = 0;
assert(dmMesh);
err = DMPlexGetStratumIS(dmMesh, "material-id", id(), &cellIS);CHECK_PETSC_ERROR(err);
@@ -299,9 +299,9 @@
err = ISGetIndices(cellIS, &cells);CHECK_PETSC_ERROR(err);
// Setup field if necessary.
- PetscSection fieldSection = PETSC_NULL;
- PetscVec fieldVec = PETSC_NULL;
- PetscScalar* fieldArray = PETSC_NULL;
+ PetscSection fieldSection = NULL;
+ PetscVec fieldVec = NULL;
+ PetscScalar* fieldArray = NULL;
PetscInt dof, off;
if (field) {
const int fiberDim = 1*numQuadPts;
@@ -392,12 +392,12 @@
assert(_initialStrainCell.size() == numQuadPts*_tensorSize);
// Get cells associated with material
- DM dmMesh = mesh.dmMesh();
+ PetscDM dmMesh = mesh.dmMesh();
assert(dmMesh);
- IS cellIS;
+ PetscIS cellIS;
const PetscInt *cells;
- PetscInt numCells;
- PetscErrorCode err;
+ PetscInt numCells;
+ PetscErrorCode err = 0;
err = DMPlexGetStratumIS(dmMesh, "material-id", id(), &cellIS);CHECK_PETSC_ERROR(err);
err = ISGetLocalSize(cellIS, &numCells);CHECK_PETSC_ERROR(err);
@@ -405,7 +405,7 @@
// Setup field if necessary.
PetscSection fieldSection;
- Vec fieldVec;
+ PetscVec fieldVec;
PetscScalar *fieldArray;
if (field) {
const int fiberDim = 1*numQuadPts;
@@ -441,7 +441,7 @@
const int numBasis = quadrature->numBasis();
scalar_array coordinatesCell(numBasis*spaceDim);
PetscSection coordSection;
- Vec coordVec;
+ PetscVec coordVec;
err = DMPlexGetCoordinateSection(dmMesh, &coordSection);CHECK_PETSC_ERROR(err);
err = DMGetCoordinatesLocal(dmMesh, &coordVec);CHECK_PETSC_ERROR(err);
@@ -451,8 +451,8 @@
for (PetscInt c = 0; c < numCells; ++c) {
const PetscInt cell = cells[c];
retrievePropsAndVars(cell);
- const PetscScalar *coords = PETSC_NULL;
- PetscInt coordsSize;
+ const PetscScalar *coords = NULL;
+ PetscInt coordsSize;
err = DMPlexVecGetClosure(dmMesh, coordSection, coordVec, cell, &coordsSize, &coords);CHECK_PETSC_ERROR(err);
for(PetscInt i = 0; i < coordsSize; ++i) {coordinatesCell[i] = coords[i];}
@@ -502,15 +502,15 @@
const int numQuadPts = _numQuadPts;
PetscSection fieldSection = field->petscSection();
- Vec fieldVec = field->localVector();
+ PetscVec fieldVec = field->localVector();
PetscScalar *fieldArray;
// Get cells associated with material
- DM dmMesh = mesh.dmMesh();
+ PetscDM dmMesh = mesh.dmMesh();
assert(dmMesh);
- IS cellIS;
+ PetscIS cellIS;
const PetscInt *cells;
- PetscInt numCells;
- PetscErrorCode err;
+ PetscInt numCells;
+ PetscErrorCode err = 0;
err = DMPlexGetStratumIS(dmMesh, "material-id", id(), &cellIS);CHECK_PETSC_ERROR(err);
err = ISGetLocalSize(cellIS, &numCells);CHECK_PETSC_ERROR(err);
@@ -613,11 +613,11 @@
// Get cells associated with material
const spatialdata::geocoords::CoordSys* cs = mesh.coordsys();
- DM dmMesh = mesh.dmMesh();
- IS cellIS;
+ PetscDM dmMesh = mesh.dmMesh();
+ PetscIS cellIS;
const PetscInt *cells;
- PetscInt numCells;
- PetscErrorCode err;
+ PetscInt numCells;
+ PetscErrorCode err = 0;
assert(dmMesh);
err = DMPlexGetStratumIS(dmMesh, "material-id", id(), &cellIS);CHECK_PETSC_ERROR(err);
@@ -627,7 +627,7 @@
#if !defined(PRECOMPUTE_GEOMETRY)
scalar_array coordinatesCell(numBasis*spaceDim);
PetscSection coordSection;
- Vec coordVec;
+ PetscVec coordVec;
err = DMPlexGetCoordinateSection(dmMesh, &coordSection);CHECK_PETSC_ERROR(err);
err = DMGetCoordinatesLocal(dmMesh, &coordVec);CHECK_PETSC_ERROR(err);
assert(coordSection);assert(coordVec);
@@ -646,7 +646,7 @@
initialStress.allocate();
initialStress.zero();
PetscSection initialStressSection = initialStress.petscSection();
- Vec initialStressVec = initialStress.localVector();
+ PetscVec initialStressVec = initialStress.localVector();
// Setup databases for querying
_dbInitialStress->open();
@@ -695,7 +695,7 @@
quadrature->retrieveGeometry(*c_iter);
#else
const PetscScalar *coords;
- PetscInt coordsSize;
+ PetscInt coordsSize;
err = DMPlexVecGetClosure(dmMesh, coordSection, coordVec, cell, &coordsSize, &coords);CHECK_PETSC_ERROR(err);
for(PetscInt i = 0; i < coordsSize; ++i) {coordinatesCell[i] = coords[i];}
quadrature->computeGeometry(coordinatesCell, cell);
@@ -766,11 +766,11 @@
// Get cells associated with material
const spatialdata::geocoords::CoordSys* cs = mesh.coordsys();
- DM dmMesh = mesh.dmMesh();
- IS cellIS;
+ PetscDM dmMesh = mesh.dmMesh();
+ PetscIS cellIS;
const PetscInt *cells;
- PetscInt numCells;
- PetscErrorCode err;
+ PetscInt numCells;
+ PetscErrorCode err = 0;
assert(dmMesh);
err = DMPlexGetStratumIS(dmMesh, "material-id", id(), &cellIS);CHECK_PETSC_ERROR(err);
@@ -780,7 +780,7 @@
#if !defined(PRECOMPUTE_GEOMETRY)
scalar_array coordinatesCell(numBasis*spaceDim);
PetscSection coordSection;
- Vec coordVec;
+ PetscVec coordVec;
err = DMPlexGetCoordinateSection(dmMesh, &coordSection);CHECK_PETSC_ERROR(err);
err = DMGetCoordinatesLocal(dmMesh, &coordVec);CHECK_PETSC_ERROR(err);
assert(coordSection);assert(coordVec);
@@ -799,7 +799,7 @@
initialStrain.allocate();
initialStrain.zero();
PetscSection initialStrainSection = initialStrain.petscSection();
- Vec initialStrainVec = initialStrain.localVector();
+ PetscVec initialStrainVec = initialStrain.localVector();
// Setup databases for querying
_dbInitialStrain->open();
@@ -848,7 +848,7 @@
quadrature->retrieveGeometry(*c_iter);
#else
const PetscScalar *coords;
- PetscInt coordsSize;
+ PetscInt coordsSize;
err = DMPlexVecGetClosure(dmMesh, coordSection, coordVec, cell, &coordsSize, &coords);CHECK_PETSC_ERROR(err);
for(PetscInt i = 0; i < coordsSize; ++i) {coordinatesCell[i] = coords[i];}
quadrature->computeGeometry(coordinatesCell, cell);
Modified: short/3D/PyLith/trunk/unittests/libtests/materials/TestElasticMaterial.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/materials/TestElasticMaterial.cc 2013-03-06 23:57:08 UTC (rev 21454)
+++ short/3D/PyLith/trunk/unittests/libtests/materials/TestElasticMaterial.cc 2013-03-06 23:57:22 UTC (rev 21455)
@@ -61,7 +61,7 @@
ElasticIsotropic3D material;
material.dbInitialStress(&db);
- CPPUNIT_ASSERT(0 != material._dbInitialStress);
+ CPPUNIT_ASSERT(material._dbInitialStress);
CPPUNIT_ASSERT_EQUAL(label, std::string(material._dbInitialStress->label()));
} // testDBInitialStress
@@ -77,7 +77,7 @@
ElasticIsotropic3D material;
material.dbInitialStrain(&db);
- CPPUNIT_ASSERT(0 != material._dbInitialStrain);
+ CPPUNIT_ASSERT(material._dbInitialStrain);
CPPUNIT_ASSERT_EQUAL(label, std::string(material._dbInitialStrain->label()));
} // testDBInitialStrain
@@ -93,11 +93,11 @@
// Get cells associated with material
const int materialId = 24;
- DM dmMesh = mesh.dmMesh();
- IS cellIS;
+ PetscDM dmMesh = mesh.dmMesh();
+ PetscIS cellIS;
const PetscInt *cells;
- PetscInt numCells;
- PetscErrorCode err;
+ PetscInt numCells;
+ PetscErrorCode err = 0;
assert(dmMesh);
err = DMPlexGetStratumIS(dmMesh, "material-id", materialId, &cellIS);CHECK_PETSC_ERROR(err);
@@ -110,7 +110,7 @@
const int numQuadPts = data.numLocs;
// Test initialStress field
- CPPUNIT_ASSERT(0 != material._initialFields);
+ CPPUNIT_ASSERT(material._initialFields);
PetscSection stressSection = material._initialFields->get("initial stress").petscSection();
Vec stressVec = material._initialFields->get("initial stress").localVector();
CPPUNIT_ASSERT(stressSection);CPPUNIT_ASSERT(stressVec);
@@ -120,7 +120,7 @@
CPPUNIT_ASSERT_EQUAL(fiberDim, dof);
const PylithScalar *initialStressE = data.initialStress;
PetscScalar *initialStress;
- CPPUNIT_ASSERT(0 != initialStressE);
+ CPPUNIT_ASSERT(initialStressE);
err = VecGetArray(stressVec, &initialStress);CHECK_PETSC_ERROR(err);
for(int i = 0; i < fiberDim; ++i) {
CPPUNIT_ASSERT_DOUBLES_EQUAL(1.0, initialStress[off+i]/initialStressE[i]*data.pressureScale, tolerance);
@@ -128,7 +128,7 @@
err = VecRestoreArray(stressVec, &initialStress);CHECK_PETSC_ERROR(err);
// Test initialStrain field
- CPPUNIT_ASSERT(0 != material._initialFields);
+ CPPUNIT_ASSERT(material._initialFields);
PetscSection strainSection = material._initialFields->get("initial strain").petscSection();
Vec strainVec = material._initialFields->get("initial strain").localVector();
fiberDim = numQuadPts * tensorSize;
@@ -137,7 +137,7 @@
CPPUNIT_ASSERT_EQUAL(fiberDim, dof);
const PylithScalar *initialStrainE = data.initialStrain;
PetscScalar *initialStrain;
- CPPUNIT_ASSERT(0 != initialStrainE);
+ CPPUNIT_ASSERT(initialStrainE);
err = VecGetArray(strainVec, &initialStrain);CHECK_PETSC_ERROR(err);
for(int i = 0; i < fiberDim; ++i) {
CPPUNIT_ASSERT_DOUBLES_EQUAL(1.0, initialStrain[off+i]/initialStrainE[i], tolerance);
@@ -196,11 +196,11 @@
// Get cells associated with material
const int materialId = 24;
- DM dmMesh = mesh.dmMesh();
- IS cellIS;
+ PetscDM dmMesh = mesh.dmMesh();
+ PetscIS cellIS;
const PetscInt *cells;
- PetscInt numCells;
- PetscErrorCode err;
+ PetscInt numCells;
+ PetscErrorCode err = 0;
assert(dmMesh);
err = DMPlexGetStratumIS(dmMesh, "material-id", materialId, &cellIS);CHECK_PETSC_ERROR(err);
@@ -219,7 +219,7 @@
// Test cell arrays
const PylithScalar* propertiesE = data.propertiesNondim;
- CPPUNIT_ASSERT(0 != propertiesE);
+ CPPUNIT_ASSERT(propertiesE);
const scalar_array& properties = material._propertiesCell;
size_t size = data.numLocs*data.numPropsQuadPt;
CPPUNIT_ASSERT_EQUAL(size, properties.size());
@@ -238,7 +238,7 @@
tolerance);
const PylithScalar* initialStressE = data.initialStress;
- CPPUNIT_ASSERT(0 != initialStressE);
+ CPPUNIT_ASSERT(initialStressE);
const scalar_array& initialStress = material._initialStressCell;
size = data.numLocs*tensorSize;
CPPUNIT_ASSERT_EQUAL(size, initialStress.size());
@@ -247,7 +247,7 @@
tolerance);
const PylithScalar* initialStrainE = data.initialStrain;
- CPPUNIT_ASSERT(0 != initialStrainE);
+ CPPUNIT_ASSERT(initialStrainE);
const scalar_array& initialStrain = material._initialStrainCell;
size = data.numLocs*tensorSize;
CPPUNIT_ASSERT_EQUAL(size, initialStrain.size());
@@ -268,11 +268,11 @@
// Get cells associated with material
const int materialId = 24;
- DM dmMesh = mesh.dmMesh();
- IS cellIS;
+ PetscDM dmMesh = mesh.dmMesh();
+ PetscIS cellIS;
const PetscInt *cells;
- PetscInt numCells;
- PetscErrorCode err;
+ PetscInt numCells;
+ PetscErrorCode err = 0;
assert(dmMesh);
err = DMPlexGetStratumIS(dmMesh, "material-id", materialId, &cellIS);CHECK_PETSC_ERROR(err);
@@ -289,7 +289,7 @@
const int numQuadPts = data.numLocs;
const PylithScalar* densityE = data.density;
- CPPUNIT_ASSERT(0 != densityE);
+ CPPUNIT_ASSERT(densityE);
const size_t size = numQuadPts;
CPPUNIT_ASSERT_EQUAL(size, density.size());
const PylithScalar tolerance = 1.0e-06;
@@ -309,11 +309,11 @@
// Get cells associated with material
const int materialId = 24;
- DM dmMesh = mesh.dmMesh();
- IS cellIS;
+ PetscDM dmMesh = mesh.dmMesh();
+ PetscIS cellIS;
const PetscInt *cells;
- PetscInt numCells;
- PetscErrorCode err;
+ PetscInt numCells;
+ PetscErrorCode err = 0;
assert(dmMesh);
err = DMPlexGetStratumIS(dmMesh, "material-id", materialId, &cellIS);CHECK_PETSC_ERROR(err);
@@ -333,7 +333,7 @@
const scalar_array& stress = material.calcStress(strain);
const PylithScalar* stressE = data.stress;
- CPPUNIT_ASSERT(0 != stressE);
+ CPPUNIT_ASSERT(stressE);
const size_t size = numQuadPts * tensorSize;
CPPUNIT_ASSERT_EQUAL(size, stress.size());
const PylithScalar tolerance = 1.0e-06;
@@ -353,10 +353,10 @@
// Get cells associated with material
const int materialId = 24;
- DM dmMesh = mesh.dmMesh();
- IS cellIS;
+ PetscDM dmMesh = mesh.dmMesh();
+ PetscIS cellIS;
const PetscInt *cells;
- PetscInt numCells;
+ PetscInt numCells;
PetscErrorCode err;
assert(dmMesh);
@@ -393,7 +393,7 @@
} // switch
const PylithScalar* elasticConstsE = data.elasticConsts;
- CPPUNIT_ASSERT(0 != elasticConstsE);
+ CPPUNIT_ASSERT(elasticConstsE);
const size_t size = numQuadPts * numElasticConsts;
CPPUNIT_ASSERT_EQUAL(size, elasticConsts.size());
const PylithScalar tolerance = 1.0e-06;
@@ -423,11 +423,11 @@
// Get cells associated with material
const int materialId = 24;
- DM dmMesh = mesh.dmMesh();
- IS cellIS;
+ PetscDM dmMesh = mesh.dmMesh();
+ PetscIS cellIS;
const PetscInt *cells;
- PetscInt numCells;
- PetscErrorCode err;
+ PetscInt numCells;
+ PetscErrorCode err = 0;
assert(dmMesh);
err = DMPlexGetStratumIS(dmMesh, "material-id", materialId, &cellIS);CHECK_PETSC_ERROR(err);
@@ -521,8 +521,8 @@
void
pylith::materials::TestElasticMaterial::test_calcDensity(void)
{ // _testCalcDensity
- CPPUNIT_ASSERT(0 != _matElastic);
- CPPUNIT_ASSERT(0 != _dataElastic);
+ CPPUNIT_ASSERT(_matElastic);
+ CPPUNIT_ASSERT(_dataElastic);
const ElasticMaterialData* data = _dataElastic;
const int numLocs = data->numLocs;
@@ -555,8 +555,8 @@
void
pylith::materials::TestElasticMaterial::test_calcStress(void)
{ // _testCalcStress
- CPPUNIT_ASSERT(0 != _matElastic);
- CPPUNIT_ASSERT(0 != _dataElastic);
+ CPPUNIT_ASSERT(_matElastic);
+ CPPUNIT_ASSERT(_dataElastic);
const ElasticMaterialData* data = _dataElastic;
const bool computeStateVars = true;
@@ -594,7 +594,7 @@
computeStateVars);
const PylithScalar* stressE = &data->stress[iLoc*tensorSize];
- CPPUNIT_ASSERT(0 != stressE);
+ CPPUNIT_ASSERT(stressE);
const PylithScalar tolerance = (8 == sizeof(PylithScalar)) ? 1.0e-06 : 1.0e-04;
for (int i=0; i < tensorSize; ++i)
@@ -612,8 +612,8 @@
void
pylith::materials::TestElasticMaterial::test_calcElasticConsts(void)
{ // _testCalcElasticConsts
- CPPUNIT_ASSERT(0 != _matElastic);
- CPPUNIT_ASSERT(0 != _dataElastic);
+ CPPUNIT_ASSERT(_matElastic);
+ CPPUNIT_ASSERT(_dataElastic);
const ElasticMaterialData* data = _dataElastic;
int numConsts = 0;
@@ -664,7 +664,7 @@
&initialStrain[0], initialStrain.size());
const PylithScalar* elasticConstsE = &data->elasticConsts[iLoc*numConsts];
- CPPUNIT_ASSERT(0 != elasticConstsE);
+ CPPUNIT_ASSERT(elasticConstsE);
const PylithScalar tolerance = (sizeof(double) == sizeof(PylithScalar)) ? 1.0e-06 : 1.0e-05;
for (int i=0; i < numConsts; ++i)
@@ -684,8 +684,8 @@
void
pylith::materials::TestElasticMaterial::test_updateStateVars(void)
{ // test_updateStateVars
- CPPUNIT_ASSERT(0 != _matElastic);
- CPPUNIT_ASSERT(0 != _dataElastic);
+ CPPUNIT_ASSERT(_matElastic);
+ CPPUNIT_ASSERT(_dataElastic);
const ElasticMaterialData* data = _dataElastic;
const bool computeStateVars = true;
@@ -740,8 +740,8 @@
void
pylith::materials::TestElasticMaterial::test_stableTimeStepImplicit(void)
{ // test_stableTimeStepImplicit
- CPPUNIT_ASSERT(0 != _matElastic);
- CPPUNIT_ASSERT(0 != _dataElastic);
+ CPPUNIT_ASSERT(_matElastic);
+ CPPUNIT_ASSERT(_dataElastic);
const ElasticMaterialData* data = _dataElastic;
const PylithScalar dt =
@@ -759,8 +759,8 @@
void
pylith::materials::TestElasticMaterial::test_stableTimeStepExplicit(void)
{ // test_stableTimeStepExplicit
- CPPUNIT_ASSERT(0 != _matElastic);
- CPPUNIT_ASSERT(0 != _dataElastic);
+ CPPUNIT_ASSERT(_matElastic);
+ CPPUNIT_ASSERT(_dataElastic);
const ElasticMaterialData* data = _dataElastic;
const PylithScalar minCellWidth = 1000.0;
@@ -799,9 +799,9 @@
ElasticStrain1D* material,
const ElasticStrain1DData* data)
{ // _initialize
- CPPUNIT_ASSERT(0 != mesh);
- CPPUNIT_ASSERT(0 != material);
- CPPUNIT_ASSERT(0 != data);
+ CPPUNIT_ASSERT(mesh);
+ CPPUNIT_ASSERT(material);
+ CPPUNIT_ASSERT(data);
meshio::MeshIOAscii iohandler;
iohandler.filename("data/line3.mesh");
@@ -847,11 +847,11 @@
// Get cells associated with material
const int materialId = 24;
- DM dmMesh = mesh->dmMesh();
- IS cellIS;
+ PetscDM dmMesh = mesh->dmMesh();
+ PetscIS cellIS;
const PetscInt *cells;
- PetscInt numCells;
- PetscErrorCode err;
+ PetscInt numCells;
+ PetscErrorCode err = 0;
assert(dmMesh);
err = DMPlexGetStratumIS(dmMesh, "material-id", materialId, &cellIS);CHECK_PETSC_ERROR(err);
More information about the CIG-COMMITS
mailing list