From ecfc1e4dad5a127b8a5cf3e483a885a8f1fb4ea7 Mon Sep 17 00:00:00 2001 From: Bruno Blais Date: Mon, 30 Jun 2025 09:58:26 -0400 Subject: [PATCH] rename files and generator --- include/deal.II/grid/grid_generator.h | 2 +- source/grid/grid_generator.cc | 40 +++++++++---------- source/grid/grid_generator_from_name.cc | 2 +- ...enerator_uniform_channel_with_cylinder.cc} | 4 +- ...ator_uniform_channel_with_cylinder.output} | 0 5 files changed, 24 insertions(+), 24 deletions(-) rename tests/grid/{grid_generator_custom_channel_with_cylinder.cc => grid_generator_uniform_channel_with_cylinder.cc} (93%) rename tests/grid/{grid_generator_custom_channel_with_cylinder.output => grid_generator_uniform_channel_with_cylinder.output} (100%) diff --git a/include/deal.II/grid/grid_generator.h b/include/deal.II/grid/grid_generator.h index 587563802d..156a823252 100644 --- a/include/deal.II/grid/grid_generator.h +++ b/include/deal.II/grid/grid_generator.h @@ -633,7 +633,7 @@ namespace GridGenerator */ template void - custom_channel_with_cylinder( + uniform_channel_with_cylinder( Triangulation &tria, const std::vector lengths_and_heights, const double depth = 1, diff --git a/source/grid/grid_generator.cc b/source/grid/grid_generator.cc index d412431c2a..35010cb6fb 100644 --- a/source/grid/grid_generator.cc +++ b/source/grid/grid_generator.cc @@ -3831,22 +3831,22 @@ namespace GridGenerator template <> void - custom_channel_with_cylinder(Triangulation<1> &, - const std::vector, - const double, - unsigned int, - const double, - const unsigned, - const double, - const bool, - const bool) + uniform_channel_with_cylinder(Triangulation<1> &, + const std::vector, + const double, + unsigned int, + const double, + const unsigned, + const double, + const bool, + const bool) { DEAL_II_NOT_IMPLEMENTED(); } template <> void - custom_channel_with_cylinder( + uniform_channel_with_cylinder( Triangulation<2> &tria, const std::vector lengths_and_heights, const double, @@ -4023,7 +4023,7 @@ namespace GridGenerator template <> void - custom_channel_with_cylinder( + uniform_channel_with_cylinder( Triangulation<3> &tria, const std::vector lengths_and_heights, const double depth, @@ -4035,15 +4035,15 @@ namespace GridGenerator const bool colorize) { Triangulation<2> tria_2; - custom_channel_with_cylinder(tria_2, - lengths_and_heights, - depth, - depth_division, - shell_region_radius, - n_shells, - skewness, - use_transfinite_region, - colorize); + uniform_channel_with_cylinder(tria_2, + lengths_and_heights, + depth, + depth_division, + shell_region_radius, + n_shells, + skewness, + use_transfinite_region, + colorize); // extrude to 3d extrude_triangulation(tria_2, depth_division, depth, tria, true); diff --git a/source/grid/grid_generator_from_name.cc b/source/grid/grid_generator_from_name.cc index d603fc4caa..ff43ce54a6 100644 --- a/source/grid/grid_generator_from_name.cc +++ b/source/grid/grid_generator_from_name.cc @@ -129,7 +129,7 @@ namespace GridGenerator unsigned int, double, bool, - bool>(custom_channel_with_cylinder, arguments, tria); + bool>(uniform_channel_with_cylinder, arguments, tria); else if (name == "enclosed_hyper_cube") parse_and_create( enclosed_hyper_cube, arguments, tria); diff --git a/tests/grid/grid_generator_custom_channel_with_cylinder.cc b/tests/grid/grid_generator_uniform_channel_with_cylinder.cc similarity index 93% rename from tests/grid/grid_generator_custom_channel_with_cylinder.cc rename to tests/grid/grid_generator_uniform_channel_with_cylinder.cc index 9ef899c228..68d426c903 100644 --- a/tests/grid/grid_generator_custom_channel_with_cylinder.cc +++ b/tests/grid/grid_generator_uniform_channel_with_cylinder.cc @@ -30,7 +30,7 @@ dim_2(std::ostream &os) const unsigned int d = 2; Triangulation tr; - GridGenerator::custom_channel_with_cylinder( + GridGenerator::uniform_channel_with_cylinder( tr, {3, 5, 4, 4}, 1, 2, 0.75, 4, 2, true, true); GridOut gout; @@ -42,7 +42,7 @@ dim_3(std::ostream &os) { const unsigned int d = 3; Triangulation tr; - GridGenerator::custom_channel_with_cylinder( + GridGenerator::uniform_channel_with_cylinder( tr, {3, 5, 4, 4}, 1, 2, 0.75, 4, 2, true, true); GridOut gout; gout.write_vtk(tr, os); diff --git a/tests/grid/grid_generator_custom_channel_with_cylinder.output b/tests/grid/grid_generator_uniform_channel_with_cylinder.output similarity index 100% rename from tests/grid/grid_generator_custom_channel_with_cylinder.output rename to tests/grid/grid_generator_uniform_channel_with_cylinder.output -- 2.39.5