From 12be080e8597b339f2673c2ba84caa64c9ea9516 Mon Sep 17 00:00:00 2001 From: Peter Munch Date: Wed, 20 Jan 2021 18:39:52 +0100 Subject: [PATCH] Compile subdivided_hyper_rectangle_with_simplices even without DEAL_II_WITH_SIMPLEX_SUPPORT enabled --- include/deal.II/simplex/grid_generator.h | 4 ---- source/simplex/grid_generator.cc | 7 +++---- source/simplex/grid_generator.inst.in | 4 ---- 3 files changed, 3 insertions(+), 12 deletions(-) diff --git a/include/deal.II/simplex/grid_generator.h b/include/deal.II/simplex/grid_generator.h index 2e68f9e1bd..3eaba788c9 100644 --- a/include/deal.II/simplex/grid_generator.h +++ b/include/deal.II/simplex/grid_generator.h @@ -27,8 +27,6 @@ DEAL_II_NAMESPACE_OPEN -#ifdef DEAL_II_WITH_SIMPLEX_SUPPORT - namespace GridGenerator { /** @@ -77,8 +75,6 @@ namespace GridGenerator } // namespace GridGenerator -#endif - DEAL_II_NAMESPACE_CLOSE #endif diff --git a/source/simplex/grid_generator.cc b/source/simplex/grid_generator.cc index e17e69e39d..aaed0379d3 100644 --- a/source/simplex/grid_generator.cc +++ b/source/simplex/grid_generator.cc @@ -19,8 +19,6 @@ DEAL_II_NAMESPACE_OPEN -#ifdef DEAL_II_WITH_SIMPLEX_SUPPORT - namespace GridGenerator { template @@ -32,6 +30,9 @@ namespace GridGenerator const Point & p2, const bool colorize) { +#ifndef DEAL_II_WITH_SIMPLEX_SUPPORT + Assert(false, ExcNeedsSimplexSupport()); +#endif AssertDimension(dim, spacedim); AssertThrow(colorize == false, ExcNotImplemented()); @@ -207,8 +208,6 @@ namespace GridGenerator } } // namespace GridGenerator -#endif - // explicit instantiations #include "grid_generator.inst" diff --git a/source/simplex/grid_generator.inst.in b/source/simplex/grid_generator.inst.in index 3c855b64ae..b65ed758bb 100644 --- a/source/simplex/grid_generator.inst.in +++ b/source/simplex/grid_generator.inst.in @@ -15,8 +15,6 @@ -#ifdef DEAL_II_WITH_SIMPLEX_SUPPORT - for (deal_II_dimension : DIMENSIONS) { template void GridGenerator::subdivided_hyper_rectangle_with_simplices( @@ -33,5 +31,3 @@ for (deal_II_dimension : DIMENSIONS) const double p2, const bool colorize); } - -#endif -- 2.39.5