Remove p4est restriction in Particles::DataOut

diff --git a/include/deal.II/particles/data_out.h b/include/deal.II/particles/data_out.h
index e305a15e1079026a4ff9d8ec8fa23942fe42fd4e..c760c88e1a75cc1bfedcad0ace24be13afe9c759 100644 (file)
--- a/include/deal.II/particles/data_out.h
+++ b/include/deal.II/particles/data_out.h
@@ -24,9 +24,6 @@
 
 DEAL_II_NAMESPACE_OPEN
 
-#ifdef DEAL_II_WITH_P4EST
-
-
 namespace Particles
 {
   template <int dim, int spacedim>
@@ -102,8 +99,6 @@ namespace Particles
 
 } // namespace Particles
 
-#endif // DEAL_II_WITH_P4EST
-
 DEAL_II_NAMESPACE_CLOSE
 
 #endif

diff --git a/source/particles/data_out.cc b/source/particles/data_out.cc
index 56c9868dab519221d3e7a5e1d57ba847d33ff6ba..6a17c1b2be0f25b6767a27076b3d37d78f844dc8 100644 (file)
--- a/source/particles/data_out.cc
+++ b/source/particles/data_out.cc
@@ -18,9 +18,6 @@
 
 DEAL_II_NAMESPACE_OPEN
 
-#ifdef DEAL_II_WITH_P4EST
-
-
 namespace Particles
 {
   template <int dim, int spacedim>
@@ -63,14 +60,7 @@ namespace Particles
   }
 
 } // namespace Particles
-#endif
-
-DEAL_II_NAMESPACE_CLOSE
-
-DEAL_II_NAMESPACE_OPEN
 
-#ifdef DEAL_II_WITH_P4EST
-#  include "data_out.inst"
-#endif
+#include "data_out.inst"
 
 DEAL_II_NAMESPACE_CLOSE

diff --git a/tests/particles/data_out_01.cc b/tests/particles/data_out_01.cc
index 560f905e8b5196c725c9e3c49e97594fc3ba93d4..60507d5d7a5ad596386cfcb762c06dabec7e82cd 100644 (file)
--- a/tests/particles/data_out_01.cc
+++ b/tests/particles/data_out_01.cc
@@ -37,7 +37,7 @@ void
 test()
 {
   {
-    parallel::distributed::Triangulation<dim, spacedim> tr(MPI_COMM_WORLD);
+    Triangulation<dim, spacedim> tr;
 
     GridGenerator::hyper_cube(tr);
     tr.refine_global(2);
@@ -84,10 +84,7 @@ test()
 int
 main(int argc, char *argv[])
 {
-  Utilities::MPI::MPI_InitFinalize mpi_initialization(argc, argv, 1);
-
-  MPILogInitAll all;
-
+  initlog();
   deallog.push("2d/2d");
   test<2, 2>();
   deallog.pop();

diff --git a/tests/particles/data_out_01.with_p4est=true.mpirun=1.output b/tests/particles/data_out_01.output
similarity index 92%
rename from tests/particles/data_out_01.with_p4est=true.mpirun=1.output
rename to tests/particles/data_out_01.output
index 7ba9a4d774196092cd215ca92d55ab909975c6c7..f58ebef385b38b862cf24514ff76c555d19d1843 100644 (file)
--- a/tests/particles/data_out_01.with_p4est=true.mpirun=1.output
+++ b/tests/particles/data_out_01.output
@@ -10,7 +10,7 @@
 
 0.525000 0.525000 1.00000 
 
-DEAL:0:2d/2d::OK
+DEAL:2d/2d::OK
 # This file was generated by the deal.II library.
 
 
@@ -22,7 +22,7 @@ DEAL:0:2d/2d::OK
 
 0.525000 0.525000 0.00000 1.00000 
 
-DEAL:0:2d/3d::OK
+DEAL:2d/3d::OK
 # This file was generated by the deal.II library.
 
 
@@ -34,4 +34,4 @@ DEAL:0:2d/3d::OK
 
 0.525000 0.525000 0.525000 1.00000 
 
-DEAL:0:3d/3d::OK
+DEAL:3d/3d::OK