diff --git a/framework/include/partitioner/LibmeshPartitioner.h b/framework/include/partitioner/LibmeshPartitioner.h index dee62db3ec93..dae215ee3a61 100644 --- 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 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 index b166e3112c8b..441195d79423 100644 --- 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 index fc92697108a8..fd2ef490bbbc 100644 --- a/framework/src/actions/PartitionerAction.C +++ b/framework/src/actions/PartitionerAction.C @@ -35,5 +35,5 @@ PartitionerAction::act() { _mesh->setIsCustomPartitionerRequested(true); MooseSharedPointer mp = MooseSharedNamespace::static_pointer_cast(_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 index 10860e92a0bd..39484a27fad0 100644 --- a/framework/src/partitioner/LibmeshPartitioner.C +++ b/framework/src/partitioner/LibmeshPartitioner.C @@ -77,12 +77,6 @@ LibmeshPartitioner::~LibmeshPartitioner() { } -Partitioner * -LibmeshPartitioner::getPartitioner() -{ - return _partitioner; -} - UniquePtr 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 index 76d180dfaf84..6073a4b8c38f 100644 --- 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; -}