LibmeshPartitioner fowards call to partition to wrapped Partitioner (i…

…daholab#5543)
snschune · Oct 14, 2015 · 1018c26 · 1018c26
1 parent 16908fc
commit 1018c26
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 17 deletions.
diff --git a/framework/include/partitioner/LibmeshPartitioner.h b/framework/include/partitioner/LibmeshPartitioner.h
@@ -28,8 +28,10 @@ class LibmeshPartitioner : public MoosePartitioner
   LibmeshPartitioner(const InputParameters & params);
   virtual ~LibmeshPartitioner();
 
-  virtual Partitioner * getPartitioner();
   virtual UniquePtr<Partitioner> clone() const;
+  virtual void partition(MeshBase &mesh, const unsigned int n);
+  virtual void partition(MeshBase &mesh);
+
 protected:
   virtual void _do_partition(MeshBase & mesh, const unsigned int n);
 

diff --git a/framework/include/partitioner/MoosePartitioner.h b/framework/include/partitioner/MoosePartitioner.h
@@ -42,8 +42,6 @@ class MoosePartitioner :
 public:
   MoosePartitioner(const InputParameters & params);
   virtual ~MoosePartitioner();
-
-  virtual Partitioner * getPartitioner();
 };
 
 #endif /* MOOSEPARTITIONER_H */
diff --git a/framework/src/actions/PartitionerAction.C b/framework/src/actions/PartitionerAction.C
@@ -35,5 +35,5 @@ PartitionerAction::act()
 {
   _mesh->setIsCustomPartitionerRequested(true);
   MooseSharedPointer<MoosePartitioner> mp = MooseSharedNamespace::static_pointer_cast<MoosePartitioner>(_factory.create(_type, _name, _moose_object_pars));
-  _mesh->setCustomPartitioner(mp->getPartitioner());
+  _mesh->setCustomPartitioner(mp.get());
 }
diff --git a/framework/src/partitioner/LibmeshPartitioner.C b/framework/src/partitioner/LibmeshPartitioner.C
@@ -77,12 +77,6 @@ LibmeshPartitioner::~LibmeshPartitioner()
 {
 }
 
-Partitioner *
-LibmeshPartitioner::getPartitioner()
-{
-  return _partitioner;
-}
-
 UniquePtr<Partitioner>
 LibmeshPartitioner::clone() const
 {
@@ -129,6 +123,18 @@ LibmeshPartitioner::clone() const
 }
 
 void
-LibmeshPartitioner::_do_partition(MeshBase & mesh, const unsigned int n)
+LibmeshPartitioner::partition(MeshBase &mesh, const unsigned int n)
+{
+  _partitioner->partition(mesh, n);
+}
+
+void
+LibmeshPartitioner::partition(MeshBase &mesh)
+{
+  _partitioner->partition(mesh);
+}
+
+void
+LibmeshPartitioner::_do_partition(MeshBase & /*mesh*/, const unsigned int /*n*/)
 {
 }
diff --git a/framework/src/partitioner/MoosePartitioner.C b/framework/src/partitioner/MoosePartitioner.C
@@ -34,9 +34,3 @@ MoosePartitioner::MoosePartitioner(const InputParameters & params) :
 MoosePartitioner::~MoosePartitioner()
 {
 }
-
-Partitioner *
-MoosePartitioner::getPartitioner()
-{
-  return this;
-}