From b5e9337e8243344b11af231ecb9ce2b528c7bddd Mon Sep 17 00:00:00 2001 From: Daniel Arndt Date: Sun, 1 Dec 2019 10:44:10 -0500 Subject: [PATCH] Remove p4est restriction in Particles::DataOut --- include/deal.II/particles/data_out.h | 5 ----- source/particles/data_out.cc | 12 +----------- tests/particles/data_out_01.cc | 7 ++----- ...p4est=true.mpirun=1.output => data_out_01.output} | 6 +++--- 4 files changed, 6 insertions(+), 24 deletions(-) rename tests/particles/{data_out_01.with_p4est=true.mpirun=1.output => data_out_01.output} (92%) diff --git a/include/deal.II/particles/data_out.h b/include/deal.II/particles/data_out.h index e305a15e10..c760c88e1a 100644 --- 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 @@ -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 56c9868dab..6a17c1b2be 100644 --- 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 @@ -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 560f905e8b..60507d5d7a 100644 --- a/tests/particles/data_out_01.cc +++ b/tests/particles/data_out_01.cc @@ -37,7 +37,7 @@ void test() { { - parallel::distributed::Triangulation tr(MPI_COMM_WORLD); + Triangulation 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 7ba9a4d774..f58ebef385 100644 --- 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 -- 2.39.5