[cig-commits] [commit] knepley/upgrade-petsc-master: Distribution: Fixed interface to DMPlexDistribute() (892ada1)

[cig_noreply at geodynamics.org]

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

On branch  : knepley/upgrade-petsc-master
Link       : https://github.com/geodynamics/pylith/compare/0000000000000000000000000000000000000000...892ada1768d84260fa6d939de239cf8ba531913b

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

commit 892ada1768d84260fa6d939de239cf8ba531913b
Author: Matthew G. Knepley <knepley at gmail.com>
Date:   Tue Oct 14 11:02:16 2014 -0500

    Distribution: Fixed interface to DMPlexDistribute()


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

892ada1768d84260fa6d939de239cf8ba531913b
 libsrc/pylith/topology/Distributor.cc | 5 ++---
 libsrc/pylith/topology/Distributor.hh | 4 +---
 modulesrc/topology/Distributor.i      | 3 +--
 3 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/libsrc/pylith/topology/Distributor.cc b/libsrc/pylith/topology/Distributor.cc
index e217c14..c5df8b8 100644
--- a/libsrc/pylith/topology/Distributor.cc
+++ b/libsrc/pylith/topology/Distributor.cc
@@ -50,8 +50,7 @@ pylith::topology::Distributor::~Distributor(void)
 // Distribute mesh among processors.
 void
 pylith::topology::Distributor::distribute(topology::Mesh* const newMesh,
-					  const topology::Mesh& origMesh,
-					  const char* partitioner)
+					  const topology::Mesh& origMesh)
 { // distribute
   PYLITH_METHOD_BEGIN;
   
@@ -60,7 +59,7 @@ pylith::topology::Distributor::distribute(topology::Mesh* const newMesh,
   journal::info_t info("distributor");
 
   PetscDM newDM = NULL;
-  PetscErrorCode err = DMPlexDistribute(origMesh.dmMesh(), partitioner, 0, NULL, &newDM);PYLITH_CHECK_ERROR(err);
+  PetscErrorCode err = DMPlexDistribute(origMesh.dmMesh(), 0, NULL, &newDM);PYLITH_CHECK_ERROR(err);
   newMesh->dmMesh(newDM);
 
   PYLITH_METHOD_END;
diff --git a/libsrc/pylith/topology/Distributor.hh b/libsrc/pylith/topology/Distributor.hh
index 851d0f7..3d656df 100644
--- a/libsrc/pylith/topology/Distributor.hh
+++ b/libsrc/pylith/topology/Distributor.hh
@@ -49,12 +49,10 @@ public :
    *
    * @param newMesh Distributed mesh (result).
    * @param origMesh Mesh to distribute.
-   * @param partitioner Name of partitioner to use in distributing mesh.
    */
   static
   void distribute(topology::Mesh* const newMesh,
-		  const topology::Mesh& origMesh,
-		  const char* partitioner);
+		  const topology::Mesh& origMesh);
 
   /** Write partitioning info for distributed mesh.
    *
diff --git a/modulesrc/topology/Distributor.i b/modulesrc/topology/Distributor.i
index b8008e9..12c2345 100644
--- a/modulesrc/topology/Distributor.i
+++ b/modulesrc/topology/Distributor.i
@@ -45,8 +45,7 @@ namespace pylith {
        */
       static
       void distribute(pylith::topology::Mesh* const newMesh,
-		      const pylith::topology::Mesh& origMesh,
-		      const char* partitioner);
+		      const pylith::topology::Mesh& origMesh);
 
       /** Write partitioning info for distributed mesh.
        *