]> https://gitweb.dealii.org/ - dealii.git/commitdiff
make constructor of p::d::Tria<1> consistent to that of dim>1
authorDenis Davydov <davydden@gmail.com>
Wed, 28 Feb 2018 14:27:14 +0000 (15:27 +0100)
committerDenis Davydov <davydden@gmail.com>
Thu, 1 Mar 2018 00:20:46 +0000 (01:20 +0100)
include/deal.II/distributed/tria.h
source/distributed/tria.cc

index 6d2ee6c4cf45ae8b7ee83c180c8d7a83df5efe5a..8affbe831a8dc8b53e8e669da510ea4d8e902cc2 100644 (file)
@@ -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<types::global_dof_index> coarse_cell_to_p4est_tree_permutation;
       std::vector<types::global_dof_index> 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 ...
       /**
index 4195b3673b4bba1f199cf53606f4d794da16c9eb..3803f876319d10c40c4e1fe87b387179e97035fa 100644 (file)
@@ -3733,10 +3733,12 @@ namespace parallel
 
 
     template <int spacedim>
-    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());

In the beginning the Universe was created. This has made a lot of people very angry and has been widely regarded as a bad move.

Douglas Adams


Typeset in Trocchi and Trocchi Bold Sans Serif.