From 7d69e1afaab8a699d07f192f14e9959404c6af7e Mon Sep 17 00:00:00 2001 From: Denis Davydov Date: Wed, 28 Feb 2018 15:27:14 +0100 Subject: [PATCH] make constructor of p::d::Tria<1> consistent to that of dim>1 --- include/deal.II/distributed/tria.h | 26 +++++++++++++++----------- source/distributed/tria.cc | 8 +++++--- 2 files changed, 20 insertions(+), 14 deletions(-) diff --git a/include/deal.II/distributed/tria.h b/include/deal.II/distributed/tria.h index 6d2ee6c4cf..8affbe831a 100644 --- a/include/deal.II/distributed/tria.h +++ b/include/deal.II/distributed/tria.h @@ -878,11 +878,25 @@ namespace parallel class Triangulation<1,spacedim> : public dealii::parallel::Triangulation<1,spacedim> { public: + + /** + * dummy settings + */ + enum Settings + { + default_setting = 0x0, + mesh_reconstruction_after_repartitioning = 0x1, + construct_multigrid_hierarchy = 0x2 + }; + /** * Constructor. The argument denotes the MPI communicator to be used for * the triangulation. */ - Triangulation (MPI_Comm mpi_communicator); + Triangulation (MPI_Comm mpi_communicator, + const typename dealii::Triangulation<1,spacedim>::MeshSmoothing + smooth_grid = (dealii::Triangulation<1,spacedim>::none), + const Settings settings = default_setting); /** * Destructor. @@ -959,16 +973,6 @@ namespace parallel std::vector coarse_cell_to_p4est_tree_permutation; std::vector p4est_tree_to_coarse_cell_permutation; - /** - * dummy settings - */ - enum Settings - { - default_setting = 0x0, - mesh_reconstruction_after_repartitioning = 0x1, - construct_multigrid_hierarchy = 0x2 - }; - //TODO: The following variable should really be private, but it is used in dof_handler_policy.cc ... /** diff --git a/source/distributed/tria.cc b/source/distributed/tria.cc index 4195b3673b..3803f87631 100644 --- a/source/distributed/tria.cc +++ b/source/distributed/tria.cc @@ -3733,10 +3733,12 @@ namespace parallel template - Triangulation<1,spacedim>::Triangulation (MPI_Comm) + Triangulation<1,spacedim>::Triangulation (MPI_Comm mpi_communicator, + const typename dealii::Triangulation<1,spacedim>::MeshSmoothing smooth_grid, + const Settings /*settings*/) : - dealii::parallel::Triangulation<1,spacedim>(MPI_COMM_WORLD, - typename dealii::Triangulation<1,spacedim>::MeshSmoothing(), + dealii::parallel::Triangulation<1,spacedim>(mpi_communicator, + smooth_grid, false) { Assert (false, ExcNotImplemented()); -- 2.39.5