Change some ASSERT to PARSE_ERROR for cyl_wedge

Better errors from input files.

Author: nilsdeppe

src/Domain/DomainHelpers.cpp

@@ -1069,15 +1069,20 @@ cyl_wedge_coord_map_surrounding_blocks(
   using Wedge2D = domain::CoordinateMaps::Wedge<2>;
   using Wedge3DPrism =
       domain::CoordinateMaps::ProductOf2Maps<Wedge2D, Interval>;
-  ASSERT(radial_distribution.size() == 1 + radial_partitioning.size(),
-         "Specify a radial distribution for every cylindrical shell. You "
-         "specified "
-             << radial_distribution.size() << " items, but the domain has "
-             << 1 + radial_partitioning.size() << " shells.");
-  ASSERT(radial_distribution.front() ==
-             domain::CoordinateMaps::Distribution::Linear,
-         "The innermost shell must have a 'Linear' radial distribution because "
-         "it changes in circularity.");
+  if (radial_distribution.size() != 1 + radial_partitioning.size()) {
+    PARSE_ERROR(
+        options_context,
+        "Specify a radial distribution for every cylindrical shell. You "
+        "specified "
+            << radial_distribution.size() << " items, but the domain has "
+            << 1 + radial_partitioning.size() << " shells.");
+  }
+  if (radial_distribution.front() !=
+      domain::CoordinateMaps::Distribution::Linear) {
+    PARSE_ERROR(options_context,
+                "The innermost shell must have a 'Linear' radial distribution "
+                "because it changes in circularity.");
+  }
   std::vector<Wedge3DPrism> maps{};
   double temp_inner_circularity{};
   double temp_inner_radius{};

tests/Unit/Domain/Creators/Test_Cylinder.cpp

@@ -1254,6 +1254,48 @@ void test_cylinder_wedge_parse_errors() {
       Catch::Matchers::ContainsSubstring(
           "The radius of the outer surface must be greater than the radius of "
           "the inner surface."));
+  {
+    const std::vector<double> radial_partitioning_more{1.5};
+    const std::vector<double> partitioning_in_z_more{};
+    const std::vector<domain::CoordinateMaps::Distribution>
+        radial_distribution_missing{
+            domain::CoordinateMaps::Distribution::Linear};
+    const std::vector<domain::CoordinateMaps::Distribution>
+        distribution_in_z_more{domain::CoordinateMaps::Distribution::Linear};
+    CHECK_THROWS_WITH(
+        [&]() {
+          auto invalid_cylinder = creators::Cylinder(
+              1.0, 2.0, lower_z_bound, upper_z_bound, false, refinement_level,
+              grid_points, false, radial_partitioning_more,
+              partitioning_in_z_more, radial_distribution_missing,
+              distribution_in_z_more, Options::Context{false, {}, 1, 1});
+          invalid_cylinder.create_domain();
+        }(),
+        Catch::Matchers::ContainsSubstring(
+            "Specify a 'RadialDistribution' for every cylindrical shell."));
+  }
+  {
+    const std::vector<double> radial_partitioning_more{1.5};
+    const std::vector<double> partitioning_in_z_more{};
+    const std::vector<domain::CoordinateMaps::Distribution>
+        radial_distribution_non_linear{
+            domain::CoordinateMaps::Distribution::Logarithmic,
+            domain::CoordinateMaps::Distribution::Linear};
+    const std::vector<domain::CoordinateMaps::Distribution>
+        distribution_in_z_more{domain::CoordinateMaps::Distribution::Linear};
+    CHECK_THROWS_WITH(
+        [&]() {
+          auto invalid_cylinder = creators::Cylinder(
+              1.0, 2.0, lower_z_bound, upper_z_bound, false, refinement_level,
+              grid_points, false, radial_partitioning_more,
+              partitioning_in_z_more, radial_distribution_non_linear,
+              distribution_in_z_more, Options::Context{false, {}, 1, 1});
+          invalid_cylinder.create_domain();
+        }(),
+        Catch::Matchers::ContainsSubstring(
+            "The 'RadialDistribution' must be 'Linear' for the innermost "
+            "shell because it changes in circularity."));
+  }
 }
 
 }  // namespace

tests/Unit/Domain/Test_DomainHelpers.cpp

@@ -23,6 +23,7 @@
 #include "Domain/CoordinateMaps/ProductMaps.hpp"
 #include "Domain/CoordinateMaps/ProductMaps.tpp"
 #include "Domain/CoordinateMaps/Wedge.hpp"
+#include "Domain/CoordinateMaps/Interval.hpp"
 #include "Domain/Domain.hpp"
 #include "Domain/DomainHelpers.hpp"
 #include "Domain/Structure/BlockNeighbors.hpp"
@@ -337,6 +338,57 @@ void test_wedge_errors() {
           "ShellWedges::All."));
 }
 
+void test_cyl_wedge_surrounding_blocks_radial_distribution_size_error() {
+  INFO("cyl wedge radial distribution size parse error");
+  const Options::Context context{false, "CylWedge.CylindricalShell.DistSize"};
+  const double inner_radius = 0.4;
+  const double outer_radius = 1.2;
+  const double lower_z_bound = -0.8;
+  const double upper_z_bound = 0.8;
+  const std::vector<double> radial_partitioning{0.9};
+  const std::vector<double> partitioning_in_z{};
+  const std::vector<domain::CoordinateMaps::Distribution> radial_distribution{
+      domain::CoordinateMaps::Distribution::Linear};
+  const std::vector<domain::CoordinateMaps::Distribution> distribution_in_z{
+      domain::CoordinateMaps::Distribution::Linear};
+  CHECK_THROWS_WITH(
+      ([&]() {
+        static_cast<void>(cyl_wedge_coord_map_surrounding_blocks(
+            inner_radius, outer_radius, lower_z_bound, upper_z_bound, false,
+            context, 0.0, radial_partitioning, partitioning_in_z,
+            radial_distribution, distribution_in_z,
+            CylindricalDomainParityFlip::none));
+      }()),
+      Catch::Matchers::ContainsSubstring(
+          "Specify a radial distribution for every cylindrical shell"));
+}
+
+void test_cyl_wedge_surrounding_blocks_radial_distribution_linear_error() {
+  INFO("cyl wedge radial distribution linear parse error");
+  const Options::Context context{false, "CylWedge.CylindricalShell.Linear"};
+  const double inner_radius = 0.4;
+  const double outer_radius = 1.2;
+  const double lower_z_bound = -0.8;
+  const double upper_z_bound = 0.8;
+  const std::vector<double> radial_partitioning{0.9};
+  const std::vector<double> partitioning_in_z{};
+  const std::vector<domain::CoordinateMaps::Distribution> radial_distribution{
+      domain::CoordinateMaps::Distribution::Logarithmic,
+      domain::CoordinateMaps::Distribution::Linear};
+  const std::vector<domain::CoordinateMaps::Distribution> distribution_in_z{
+      domain::CoordinateMaps::Distribution::Linear};
+  CHECK_THROWS_WITH(
+      ([&]() {
+        static_cast<void>(cyl_wedge_coord_map_surrounding_blocks(
+            inner_radius, outer_radius, lower_z_bound, upper_z_bound, false,
+            context, 0.0, radial_partitioning, partitioning_in_z,
+            radial_distribution, distribution_in_z,
+            CylindricalDomainParityFlip::none));
+      }()),
+      Catch::Matchers::ContainsSubstring(
+          "The innermost shell must have a 'Linear' radial distribution"));
+}
+
 void test_six_wedge_directions_equiangular() {
   INFO("Default six wedge directions equiangular");
   const double inner_radius = 1.2;
@@ -1621,6 +1673,8 @@ SPECTRE_TEST_CASE("Unit.Domain.DomainHelpers", "[Domain][Unit]") {
   test_periodic_different_blocks();
   test_wedge_map_generation();
   test_wedge_errors();
+  test_cyl_wedge_surrounding_blocks_radial_distribution_size_error();
+  test_cyl_wedge_surrounding_blocks_radial_distribution_linear_error();
   test_all_frustum_directions();
   test_frustrum_errors();
   test_shell_graph();