[cig-commits] [commit] knepley/upgrade-petsc-3.5: Change DMPlexGet/SetDImension() to DMGet/SetDimension() (eca13b5)

[cig_noreply at geodynamics.org]

Repository : https://github.com/geodynamics/pylith

On branch  : knepley/upgrade-petsc-3.5
Link       : https://github.com/geodynamics/pylith/compare/0000000000000000000000000000000000000000...eca13b5d0727368f31306d919a251408efaa3283

>---------------------------------------------------------------

commit eca13b5d0727368f31306d919a251408efaa3283
Author: Matthew G. Knepley <knepley at gmail.com>
Date:   Fri Aug 22 13:52:20 2014 -0500

    Change DMPlexGet/SetDImension() to DMGet/SetDimension()


>---------------------------------------------------------------

eca13b5d0727368f31306d919a251408efaa3283
 libsrc/pylith/faults/CohesiveTopology.cc | 2 +-
 libsrc/pylith/faults/FaultCohesive.cc    | 2 +-
 libsrc/pylith/topology/Field.cc          | 4 ++--
 libsrc/pylith/topology/Mesh.cc           | 2 +-
 libsrc/pylith/topology/Mesh.icc          | 2 +-
 libsrc/pylith/topology/MeshOps.cc        | 2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/libsrc/pylith/faults/CohesiveTopology.cc b/libsrc/pylith/faults/CohesiveTopology.cc
index 6f3bae0..3359796 100644
--- a/libsrc/pylith/faults/CohesiveTopology.cc
+++ b/libsrc/pylith/faults/CohesiveTopology.cc
@@ -73,7 +73,7 @@ pylith::faults::CohesiveTopology::create(topology::Mesh* mesh,
   PetscErrorCode err;
 
   // Fix over-aggressive completion of boundary label
-  err = DMPlexGetDimension(dm, &dim);PYLITH_CHECK_ERROR(err);
+  err = DMGetDimension(dm, &dim);PYLITH_CHECK_ERROR(err);
   if (faultBdLabel && (dim > 2)) {
     PetscIS         bdIS;
     const PetscInt *bd;
diff --git a/libsrc/pylith/faults/FaultCohesive.cc b/libsrc/pylith/faults/FaultCohesive.cc
index 8b09134..f65a38d 100644
--- a/libsrc/pylith/faults/FaultCohesive.cc
+++ b/libsrc/pylith/faults/FaultCohesive.cc
@@ -139,7 +139,7 @@ pylith::faults::FaultCohesive::adjustTopology(topology::Mesh* const mesh,
             << "' for fault interface condition.";
         throw std::runtime_error(msg.str());
       } // if
-      err = DMPlexGetDimension(dmMesh, &dim);PYLITH_CHECK_ERROR(err);
+      err = DMGetDimension(dmMesh, &dim);PYLITH_CHECK_ERROR(err);
       err = DMPlexGetDepth(dmMesh, &depth);PYLITH_CHECK_ERROR(err);
       err = MPI_Allreduce(&depth, &gdepth, 1, MPIU_INT, MPI_MAX, mesh->comm());PYLITH_CHECK_ERROR(err);
       err = DMPlexGetLabel(dmMesh, charlabel, &groupField);PYLITH_CHECK_ERROR(err);
diff --git a/libsrc/pylith/topology/Field.cc b/libsrc/pylith/topology/Field.cc
index d5d5099..630afef 100644
--- a/libsrc/pylith/topology/Field.cc
+++ b/libsrc/pylith/topology/Field.cc
@@ -990,8 +990,8 @@ pylith::topology::Field::createScatterWithBC(const Mesh& mesh,
   PetscInt numExcludes = (cMax >= 0 ? 1 : 0) + (vMax >= 0 ? 1 : 0);
 
   err = DMGetDefaultSection(_dm, &section);PYLITH_CHECK_ERROR(err);
-  err = DMPlexGetDimension(dm,  &dim);PYLITH_CHECK_ERROR(err);
-  err = DMPlexGetDimension(_dm, &dimF);PYLITH_CHECK_ERROR(err);
+  err = DMGetDimension(dm,  &dim);PYLITH_CHECK_ERROR(err);
+  err = DMGetDimension(_dm, &dimF);PYLITH_CHECK_ERROR(err);
   err = DMPlexGetChart(dm,  &pStart, &pEnd);PYLITH_CHECK_ERROR(err);
   err = DMPlexGetChart(_dm, &qStart, &qEnd);PYLITH_CHECK_ERROR(err);
   err = DMPlexGetSubpointMap(dm,  &subpointMap);PYLITH_CHECK_ERROR(err);
diff --git a/libsrc/pylith/topology/Mesh.cc b/libsrc/pylith/topology/Mesh.cc
index 38d961d..a6352d9 100644
--- a/libsrc/pylith/topology/Mesh.cc
+++ b/libsrc/pylith/topology/Mesh.cc
@@ -66,7 +66,7 @@ pylith::topology::Mesh::Mesh(const int dim,
   PetscErrorCode err;
   err = DMCreate(comm, &_dmMesh);PYLITH_CHECK_ERROR(err);
   err = DMSetType(_dmMesh, DMPLEX);PYLITH_CHECK_ERROR(err);
-  err = DMPlexSetDimension(_dmMesh, dim);PYLITH_CHECK_ERROR(err);
+  err = DMSetDimension(_dmMesh, dim);PYLITH_CHECK_ERROR(err);
   err = PetscObjectSetName((PetscObject) _dmMesh, "domain");PYLITH_CHECK_ERROR(err);
 
   PYLITH_METHOD_END;
diff --git a/libsrc/pylith/topology/Mesh.icc b/libsrc/pylith/topology/Mesh.icc
index 8af2816..ffb80fc 100644
--- a/libsrc/pylith/topology/Mesh.icc
+++ b/libsrc/pylith/topology/Mesh.icc
@@ -111,7 +111,7 @@ pylith::topology::Mesh::dimension(void) const {
 
   PetscInt dim = 0;
   if (_dmMesh) {
-    PetscErrorCode err = DMPlexGetDimension(_dmMesh, &dim);PYLITH_CHECK_ERROR(err);
+    PetscErrorCode err = DMGetDimension(_dmMesh, &dim);PYLITH_CHECK_ERROR(err);
   } // if
 
   PYLITH_METHOD_RETURN(dim);
diff --git a/libsrc/pylith/topology/MeshOps.cc b/libsrc/pylith/topology/MeshOps.cc
index de80542..93d01eb 100644
--- a/libsrc/pylith/topology/MeshOps.cc
+++ b/libsrc/pylith/topology/MeshOps.cc
@@ -48,7 +48,7 @@ pylith::topology::MeshOps::createDMMesh(Mesh* const mesh,
   PetscDM dmMesh = NULL;
   err = DMCreate(comm, &dmMesh);PYLITH_CHECK_ERROR(err);
   err = DMSetType(dmMesh, DMPLEX);PYLITH_CHECK_ERROR(err);
-  err = DMPlexSetDimension(dmMesh, dim);PYLITH_CHECK_ERROR(err);
+  err = DMSetDimension(dmMesh, dim);PYLITH_CHECK_ERROR(err);
   mesh->dmMesh(dmMesh, label);
 
   PYLITH_METHOD_END;