[cig-commits] r22071 - in short/3D/PyLith/trunk/unittests/libtests: faults feassemble
knepley at geodynamics.org
knepley at geodynamics.org
Tue May 14 21:53:51 PDT 2013
Author: knepley
Date: 2013-05-14 21:53:50 -0700 (Tue, 14 May 2013)
New Revision: 22071
Modified:
short/3D/PyLith/trunk/unittests/libtests/faults/TestFaultCohesiveKin.cc
short/3D/PyLith/trunk/unittests/libtests/feassemble/TestElasticityExplicit.cc
short/3D/PyLith/trunk/unittests/libtests/feassemble/TestElasticityExplicitLgDeform.cc
short/3D/PyLith/trunk/unittests/libtests/feassemble/TestElasticityExplicitTet4.cc
short/3D/PyLith/trunk/unittests/libtests/feassemble/TestElasticityExplicitTri3.cc
short/3D/PyLith/trunk/unittests/libtests/feassemble/TestElasticityImplicit.cc
short/3D/PyLith/trunk/unittests/libtests/feassemble/TestElasticityImplicitLgDeform.cc
Log:
Getting tests to work with plain C PETSc
Modified: short/3D/PyLith/trunk/unittests/libtests/faults/TestFaultCohesiveKin.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/faults/TestFaultCohesiveKin.cc 2013-05-15 03:40:25 UTC (rev 22070)
+++ short/3D/PyLith/trunk/unittests/libtests/faults/TestFaultCohesiveKin.cc 2013-05-15 04:53:50 UTC (rev 22071)
@@ -165,7 +165,7 @@
// Check fault mesh sizes
CPPUNIT_ASSERT_EQUAL(_data->cellDim, fault.dimension());
- CPPUNIT_ASSERT_EQUAL(_data->numBasis, fault.dimension() == 0 ? fault.numCorners()+1 : fault.numCorners());
+ CPPUNIT_ASSERT_EQUAL(_data->numBasis, fault.numCorners());
CPPUNIT_ASSERT_EQUAL(_data->numFaultVertices, fault.numVertices());
CPPUNIT_ASSERT_EQUAL(_data->numCohesiveCells, fault.numCells());
Modified: short/3D/PyLith/trunk/unittests/libtests/feassemble/TestElasticityExplicit.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/feassemble/TestElasticityExplicit.cc 2013-05-15 03:40:25 UTC (rev 22070)
+++ short/3D/PyLith/trunk/unittests/libtests/feassemble/TestElasticityExplicit.cc 2013-05-15 04:53:50 UTC (rev 22071)
@@ -371,14 +371,13 @@
const PylithScalar dt = _data->dt;
// Setup mesh
- topology::MeshOps::createDMMesh(mesh, _data->cellDim);
- PetscDM dmMesh = mesh->dmMesh();CPPUNIT_ASSERT(dmMesh);
+ PetscDM dmMesh;
// Cells and vertices
- const bool interpolate = false;
+ const PetscBool interpolate = PETSC_FALSE;
PetscErrorCode err;
- err = DMPlexBuildFromCellList_Private(dmMesh, _data->numCells, _data->numVertices, _data->numBasis, _data->cells);PYLITH_CHECK_ERROR(err);
- err = DMPlexBuildCoordinates_Private(dmMesh, _data->spaceDim, _data->numCells, _data->numVertices, _data->vertices);PYLITH_CHECK_ERROR(err);
+ err = DMPlexCreateFromCellList(PETSC_COMM_WORLD, _data->cellDim, _data->numCells, _data->numVertices, _data->numBasis, interpolate, _data->cells, _data->spaceDim, _data->vertices, &dmMesh);PYLITH_CHECK_ERROR(err);
+ mesh->dmMesh(dmMesh, "domain");
// Material ids
PetscInt cStart, cEnd, c;
Modified: short/3D/PyLith/trunk/unittests/libtests/feassemble/TestElasticityExplicitLgDeform.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/feassemble/TestElasticityExplicitLgDeform.cc 2013-05-15 03:40:25 UTC (rev 22070)
+++ short/3D/PyLith/trunk/unittests/libtests/feassemble/TestElasticityExplicitLgDeform.cc 2013-05-15 04:53:50 UTC (rev 22071)
@@ -264,14 +264,13 @@
const PylithScalar dt = _data->dt;
// Setup mesh
- topology::MeshOps::createDMMesh(mesh, _data->cellDim);
- PetscDM dmMesh = mesh->dmMesh();CPPUNIT_ASSERT(dmMesh);
+ PetscDM dmMesh;
// Cells and vertices
- const bool interpolate = false;
+ const PetscBool interpolate = PETSC_FALSE;
PetscErrorCode err;
- err = DMPlexBuildFromCellList_Private(dmMesh, _data->numCells, _data->numVertices, _data->numBasis, _data->cells);PYLITH_CHECK_ERROR(err);
- err = DMPlexBuildCoordinates_Private(dmMesh, _data->spaceDim, _data->numCells, _data->numVertices, _data->vertices);PYLITH_CHECK_ERROR(err);
+ err = DMPlexCreateFromCellList(PETSC_COMM_WORLD, _data->cellDim, _data->numCells, _data->numVertices, _data->numBasis, interpolate, _data->cells, _data->spaceDim, _data->vertices, &dmMesh);PYLITH_CHECK_ERROR(err);
+ mesh->dmMesh(dmMesh, "domain");
// Material ids
PetscInt cStart, cEnd, c;
Modified: short/3D/PyLith/trunk/unittests/libtests/feassemble/TestElasticityExplicitTet4.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/feassemble/TestElasticityExplicitTet4.cc 2013-05-15 03:40:25 UTC (rev 22070)
+++ short/3D/PyLith/trunk/unittests/libtests/feassemble/TestElasticityExplicitTet4.cc 2013-05-15 04:53:50 UTC (rev 22071)
@@ -358,14 +358,13 @@
const PylithScalar dt = _data->dt;
// Setup mesh
- topology::MeshOps::createDMMesh(mesh, _data->cellDim);
- PetscDM dmMesh = mesh->dmMesh();CPPUNIT_ASSERT(dmMesh);
+ PetscDM dmMesh;
// Cells and vertices
- const bool interpolate = false;
+ const PetscBool interpolate = PETSC_FALSE;
PetscErrorCode err;
- err = DMPlexBuildFromCellList_Private(dmMesh, _data->numCells, _data->numVertices, _data->numBasis, _data->cells);PYLITH_CHECK_ERROR(err);
- err = DMPlexBuildCoordinates_Private(dmMesh, _data->spaceDim, _data->numCells, _data->numVertices, _data->vertices);PYLITH_CHECK_ERROR(err);
+ err = DMPlexCreateFromCellList(PETSC_COMM_WORLD, _data->cellDim, _data->numCells, _data->numVertices, _data->numBasis, interpolate, _data->cells, _data->spaceDim, _data->vertices, &dmMesh);PYLITH_CHECK_ERROR(err);
+ mesh->dmMesh(dmMesh, "domain");
// Material ids
PetscInt cStart, cEnd, c;
Modified: short/3D/PyLith/trunk/unittests/libtests/feassemble/TestElasticityExplicitTri3.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/feassemble/TestElasticityExplicitTri3.cc 2013-05-15 03:40:25 UTC (rev 22070)
+++ short/3D/PyLith/trunk/unittests/libtests/feassemble/TestElasticityExplicitTri3.cc 2013-05-15 04:53:50 UTC (rev 22071)
@@ -357,14 +357,13 @@
const PylithScalar dt = _data->dt;
// Setup mesh
- topology::MeshOps::createDMMesh(mesh, _data->cellDim);
- PetscDM dmMesh = mesh->dmMesh();CPPUNIT_ASSERT(dmMesh);
+ PetscDM dmMesh;
// Cells and vertices
- const bool interpolate = false;
+ const PetscBool interpolate = PETSC_FALSE;
PetscErrorCode err;
- err = DMPlexBuildFromCellList_Private(dmMesh, _data->numCells, _data->numVertices, _data->numBasis, _data->cells);PYLITH_CHECK_ERROR(err);
- err = DMPlexBuildCoordinates_Private(dmMesh, _data->spaceDim, _data->numCells, _data->numVertices, _data->vertices);PYLITH_CHECK_ERROR(err);
+ err = DMPlexCreateFromCellList(PETSC_COMM_WORLD, _data->cellDim, _data->numCells, _data->numVertices, _data->numBasis, interpolate, _data->cells, _data->spaceDim, _data->vertices, &dmMesh);PYLITH_CHECK_ERROR(err);
+ mesh->dmMesh(dmMesh, "domain");
// Material ids
PetscInt cStart, cEnd, c;
Modified: short/3D/PyLith/trunk/unittests/libtests/feassemble/TestElasticityImplicit.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/feassemble/TestElasticityImplicit.cc 2013-05-15 03:40:25 UTC (rev 22070)
+++ short/3D/PyLith/trunk/unittests/libtests/feassemble/TestElasticityImplicit.cc 2013-05-15 04:53:50 UTC (rev 22071)
@@ -342,14 +342,13 @@
const int spaceDim = _data->spaceDim;
// Setup mesh
- topology::MeshOps::createDMMesh(mesh, _data->cellDim);
- PetscDM dmMesh = mesh->dmMesh();CPPUNIT_ASSERT(dmMesh);
+ PetscDM dmMesh;
// Cells and vertices
- const bool interpolate = false;
+ const PetscBool interpolate = PETSC_FALSE;
PetscErrorCode err;
- err = DMPlexBuildFromCellList_Private(dmMesh, _data->numCells, _data->numVertices, _data->numBasis, _data->cells);PYLITH_CHECK_ERROR(err);
- err = DMPlexBuildCoordinates_Private(dmMesh, _data->spaceDim, _data->numCells, _data->numVertices, _data->vertices);PYLITH_CHECK_ERROR(err);
+ err = DMPlexCreateFromCellList(PETSC_COMM_WORLD, _data->cellDim, _data->numCells, _data->numVertices, _data->numBasis, interpolate, _data->cells, _data->spaceDim, _data->vertices, &dmMesh);PYLITH_CHECK_ERROR(err);
+ mesh->dmMesh(dmMesh, "domain");
// Material ids
PetscInt cStart, cEnd;
Modified: short/3D/PyLith/trunk/unittests/libtests/feassemble/TestElasticityImplicitLgDeform.cc
===================================================================
--- short/3D/PyLith/trunk/unittests/libtests/feassemble/TestElasticityImplicitLgDeform.cc 2013-05-15 03:40:25 UTC (rev 22070)
+++ short/3D/PyLith/trunk/unittests/libtests/feassemble/TestElasticityImplicitLgDeform.cc 2013-05-15 04:53:50 UTC (rev 22071)
@@ -264,13 +264,13 @@
const int spaceDim = _data->spaceDim;
// Setup mesh
- topology::MeshOps::createDMMesh(mesh, _data->cellDim);
- PetscDM dmMesh = mesh->dmMesh();CPPUNIT_ASSERT(dmMesh);
+ PetscDM dmMesh;
// Cells and vertices
+ const PetscBool interpolate = PETSC_FALSE;
PetscErrorCode err;
- err = DMPlexBuildFromCellList_Private(dmMesh, _data->numCells, _data->numVertices, _data->numBasis, _data->cells);PYLITH_CHECK_ERROR(err);
- err = DMPlexBuildCoordinates_Private(dmMesh, _data->spaceDim, _data->numCells, _data->numVertices, _data->vertices);PYLITH_CHECK_ERROR(err);
+ err = DMPlexCreateFromCellList(PETSC_COMM_WORLD, _data->cellDim, _data->numCells, _data->numVertices, _data->numBasis, interpolate, _data->cells, _data->spaceDim, _data->vertices, &dmMesh);PYLITH_CHECK_ERROR(err);
+ mesh->dmMesh(dmMesh, "domain");
// Material ids
PetscInt cStart, cEnd;
More information about the CIG-COMMITS
mailing list