From aa87c3a75f9f1f24604cfc864000c6c7fbd8d15d Mon Sep 17 00:00:00 2001 From: Daniel Arndt Date: Thu, 29 Jun 2023 11:53:49 -0400 Subject: [PATCH] Remove deprecated LevelSet namespace --- .../incompatibilities/202306230DanielArndt | 4 ++ include/deal.II/base/function_level_set.h | 40 ------------------- tests/base/function_signed_distance_01.cc | 2 +- tests/base/function_signed_distance_04.cc | 2 +- .../discrete_quadrature_generator.cc | 4 +- .../non_matching/face_quadrature_generator.cc | 12 +++--- tests/non_matching/fe_values.cc | 4 +- tests/non_matching/mesh_classifier.cc | 4 +- tests/non_matching/quadrature_generator.cc | 10 ++--- .../quadrature_generator_sphere.cc | 4 +- tests/non_matching/root_finder.cc | 7 ++-- .../up_through_dimension_creator.cc | 12 +++--- 12 files changed, 36 insertions(+), 69 deletions(-) create mode 100644 doc/news/changes/incompatibilities/202306230DanielArndt delete mode 100644 include/deal.II/base/function_level_set.h diff --git a/doc/news/changes/incompatibilities/202306230DanielArndt b/doc/news/changes/incompatibilities/202306230DanielArndt new file mode 100644 index 0000000000..343c79f983 --- /dev/null +++ b/doc/news/changes/incompatibilities/202306230DanielArndt @@ -0,0 +1,4 @@ +Removed: The deprecated Functions::LevelSet namespace +has been removed +
+(Daniel Arndt, 2023/06/30) diff --git a/include/deal.II/base/function_level_set.h b/include/deal.II/base/function_level_set.h deleted file mode 100644 index bbe096e9de..0000000000 --- a/include/deal.II/base/function_level_set.h +++ /dev/null @@ -1,40 +0,0 @@ -// --------------------------------------------------------------------- -// -// Copyright (C) 2019 - 2021 by the deal.II authors -// -// This file is part of the deal.II library. -// -// The deal.II library is free software; you can use it, redistribute -// it, and/or modify it under the terms of the GNU Lesser General -// Public License as published by the Free Software Foundation; either -// version 2.1 of the License, or (at your option) any later version. -// The full text of the license can be found in the file LICENSE.md at -// the top level directory of deal.II. -// -// --------------------------------------------------------------------- - -#ifndef dealii_function_level_set_h -#define dealii_function_level_set_h - -#include - -#include - -DEAL_II_NAMESPACE_OPEN - -namespace Functions -{ - namespace LevelSet - { - template - using Sphere DEAL_II_DEPRECATED = SignedDistance::Sphere; - - template - using Plane DEAL_II_DEPRECATED = SignedDistance::Plane; - - } // namespace LevelSet -} // namespace Functions - -DEAL_II_NAMESPACE_CLOSE - -#endif diff --git a/tests/base/function_signed_distance_01.cc b/tests/base/function_signed_distance_01.cc index 9bba700df6..3c78773704 100644 --- a/tests/base/function_signed_distance_01.cc +++ b/tests/base/function_signed_distance_01.cc @@ -20,7 +20,7 @@ * what the function values should be. */ -#include +#include #include "../tests.h" diff --git a/tests/base/function_signed_distance_04.cc b/tests/base/function_signed_distance_04.cc index b71ca257cd..87abdb3648 100644 --- a/tests/base/function_signed_distance_04.cc +++ b/tests/base/function_signed_distance_04.cc @@ -19,7 +19,7 @@ * what the function values should be. */ -#include +#include #include "../tests.h" diff --git a/tests/non_matching/discrete_quadrature_generator.cc b/tests/non_matching/discrete_quadrature_generator.cc index a9e25dbcdb..87d1be03ce 100644 --- a/tests/non_matching/discrete_quadrature_generator.cc +++ b/tests/non_matching/discrete_quadrature_generator.cc @@ -14,7 +14,7 @@ // --------------------------------------------------------------------- #include -#include +#include #include #include @@ -114,7 +114,7 @@ Test::setup_discrete_level_set() { Point point_on_zero_contour; point_on_zero_contour[0] = 1.5; - const Functions::LevelSet::Plane analytical_levelset( + const Functions::SignedDistance::Plane analytical_levelset( point_on_zero_contour, Point::unit_vector(0)); level_set.reinit(dof_handler.n_dofs()); diff --git a/tests/non_matching/face_quadrature_generator.cc b/tests/non_matching/face_quadrature_generator.cc index c5eaf604ec..dd1db31cda 100644 --- a/tests/non_matching/face_quadrature_generator.cc +++ b/tests/non_matching/face_quadrature_generator.cc @@ -23,7 +23,7 @@ * quadratures. */ -#include +#include #include #include @@ -85,7 +85,7 @@ test_plane_cuts_through_center() for (int plane_direction = 0; plane_direction < dim; ++plane_direction) { const Tensor<1, dim> normal = Point::unit_vector(plane_direction); - const Functions::LevelSet::Plane levelset(center, normal); + const Functions::SignedDistance::Plane levelset(center, normal); // Test all faces that are intersected by the plane. for (unsigned int f = 0; f < GeometryInfo::faces_per_cell; ++f) @@ -118,10 +118,10 @@ test_1D() { deallog << "test_1D" << std::endl; - const int dim = 1; - Point center(.5); - const Tensor<1, dim> normal = Point::unit_vector(0); - const Functions::LevelSet::Plane levelset(center, normal); + const int dim = 1; + Point center(.5); + const Tensor<1, dim> normal = Point::unit_vector(0); + const Functions::SignedDistance::Plane levelset(center, normal); for (unsigned int f = 0; f < GeometryInfo::faces_per_cell; ++f) { diff --git a/tests/non_matching/fe_values.cc b/tests/non_matching/fe_values.cc index 3e0e4b9dc4..06a1c15b44 100644 --- a/tests/non_matching/fe_values.cc +++ b/tests/non_matching/fe_values.cc @@ -14,7 +14,7 @@ // --------------------------------------------------------------------- #include -#include +#include #include #include @@ -188,7 +188,7 @@ Test::setup_discrete_level_set() { Point point_on_zero_contour; point_on_zero_contour[0] = 1.5; - const Functions::LevelSet::Plane analytical_levelset( + const Functions::SignedDistance::Plane analytical_levelset( point_on_zero_contour, Point::unit_vector(0)); level_set.reinit(dof_handler.n_dofs()); diff --git a/tests/non_matching/mesh_classifier.cc b/tests/non_matching/mesh_classifier.cc index cc6d72721b..ddf595da56 100644 --- a/tests/non_matching/mesh_classifier.cc +++ b/tests/non_matching/mesh_classifier.cc @@ -18,7 +18,7 @@ #include #include -#include +#include #include #include @@ -202,7 +202,7 @@ test_intersection_x_eq_0_plane() plane_normal[0] = 1; const Point origo; - const Functions::LevelSet::Plane level_set(origo, plane_normal); + const Functions::SignedDistance::Plane level_set(origo, plane_normal); classify_with_discrete_and_analytic_level_set(level_set); } diff --git a/tests/non_matching/quadrature_generator.cc b/tests/non_matching/quadrature_generator.cc index 75cc606cc6..8e418410e3 100644 --- a/tests/non_matching/quadrature_generator.cc +++ b/tests/non_matching/quadrature_generator.cc @@ -23,7 +23,7 @@ */ #include -#include +#include #include #include #include @@ -98,7 +98,7 @@ test_vertical_cuts_through_center() { deallog << "direction=" << direction << std::endl; const Tensor<1, dim> normal = Point::unit_vector(direction); - const Functions::LevelSet::Plane level_set(center, normal); + const Functions::SignedDistance::Plane level_set(center, normal); create_and_print_quadratures(level_set); } } @@ -152,7 +152,7 @@ test_simplex_cut() Point point_in_plane; point_in_plane[0] = edge_length; - const Functions::LevelSet::Plane level_set(point_in_plane, normal); + const Functions::SignedDistance::Plane level_set(point_in_plane, normal); create_and_print_quadratures(level_set); } @@ -176,7 +176,7 @@ test_epsilon_cut_at_bottom_corner() normal[i] = 1; center(i) += epsilon; } - const Functions::LevelSet::Plane level_set(center, normal); + const Functions::SignedDistance::Plane level_set(center, normal); create_and_print_quadratures(level_set); } @@ -204,7 +204,7 @@ test_sphere_cutting_corner_exactly() const double radius = 4; Point center; center[dim - 1] = radius; - const Functions::LevelSet::Sphere level_set(center, radius); + const Functions::SignedDistance::Sphere level_set(center, radius); typename QuadratureGenerator::AdditionalData data; data.split_in_half = false; diff --git a/tests/non_matching/quadrature_generator_sphere.cc b/tests/non_matching/quadrature_generator_sphere.cc index 4ed0361cbe..c60612d086 100644 --- a/tests/non_matching/quadrature_generator_sphere.cc +++ b/tests/non_matching/quadrature_generator_sphere.cc @@ -13,7 +13,7 @@ // // --------------------------------------------------------------------- -#include +#include #include #include @@ -48,7 +48,7 @@ calculate_volume_and_surface_area() // Description of the immersed domain. - const Functions::LevelSet::Sphere level_set; + const Functions::SignedDistance::Sphere level_set; // Create a quadrature generator. const hp::QCollection<1> q_collection1D(QGauss<1>(2)); diff --git a/tests/non_matching/root_finder.cc b/tests/non_matching/root_finder.cc index f77027204d..de9ea41a60 100644 --- a/tests/non_matching/root_finder.cc +++ b/tests/non_matching/root_finder.cc @@ -18,8 +18,8 @@ */ #include -#include #include +#include #include #include #include @@ -66,7 +66,7 @@ test_roots_sorted_not_duplicated() { deallog << "test_roots_sorted_not_duplicated" << std::endl; - std::vector> linear_functions; + std::vector> linear_functions; const std::vector roots = {.75, .25, .25}; for (unsigned int i = 0; i < roots.size(); ++i) @@ -74,7 +74,8 @@ test_roots_sorted_not_duplicated() Tensor<1, 1> normal; normal[0] = 1; const Point<1> point(roots.at(i)); - linear_functions.push_back(Functions::LevelSet::Plane<1>(point, normal)); + linear_functions.push_back( + Functions::SignedDistance::Plane<1>(point, normal)); } const std::vector>> functions( diff --git a/tests/non_matching/up_through_dimension_creator.cc b/tests/non_matching/up_through_dimension_creator.cc index 653be417bb..20f711d4b9 100644 --- a/tests/non_matching/up_through_dimension_creator.cc +++ b/tests/non_matching/up_through_dimension_creator.cc @@ -18,7 +18,7 @@ * in NonMatching::internal::QuadratureGeneratorImplementation. */ -#include +#include #include #include @@ -96,8 +96,8 @@ test_cut_through_center() Point point_through_plane = .5 * Point::unit_vector(dim - 1); Tensor<1, dim> plane_normal = Point::unit_vector(dim - 1); - const Functions::LevelSet::Plane level_set(point_through_plane, - plane_normal); + const Functions::SignedDistance::Plane level_set(point_through_plane, + plane_normal); create_and_print_partitioning(level_set); } @@ -121,7 +121,8 @@ test_missed_roots_on_bottom_face() const Tensor<1, dim> plane_normal = Point::unit_vector(dim - 1); Point point_in_plane; point_in_plane[dim - 1] = -.1; - const Functions::LevelSet::Plane level_set(point_in_plane, plane_normal); + const Functions::SignedDistance::Plane level_set(point_in_plane, + plane_normal); create_and_print_partitioning(level_set); } @@ -141,7 +142,8 @@ test_missed_roots_on_top_face() const Tensor<1, dim> plane_normal = Point::unit_vector(dim - 1); Point point_in_plane; point_in_plane[dim - 1] = 1.1; - const Functions::LevelSet::Plane level_set(point_in_plane, plane_normal); + const Functions::SignedDistance::Plane level_set(point_in_plane, + plane_normal); create_and_print_partitioning(level_set); } -- 2.39.5