Clean up following reversion to temporal_id for interpolation

sxs-collaboration · Aug 12, 2021 · cb92120 · cb92120
1 parent f29ecf6
commit cb92120
Show file tree

Hide file tree

Showing 10 changed files with 23 additions and 10 deletions.
diff --git a/src/Evolution/Executables/GeneralizedHarmonic/EvolveGeneralizedHarmonicWithHorizon.hpp b/src/Evolution/Executables/GeneralizedHarmonic/EvolveGeneralizedHarmonicWithHorizon.hpp
@@ -17,7 +17,6 @@
 #include "Evolution/Systems/GeneralizedHarmonic/BoundaryConditions/RegisterDerivedWithCharm.hpp"
 #include "Evolution/Systems/GeneralizedHarmonic/BoundaryCorrections/RegisterDerived.hpp"
 #include "Evolution/Systems/GeneralizedHarmonic/ConstraintDamping/RegisterDerivedWithCharm.hpp"
-#include "NumericalAlgorithms/Interpolation/AddTemporalIdsToInterpolationTarget.hpp"
 #include "NumericalAlgorithms/Interpolation/Callbacks/ErrorOnFailedApparentHorizon.hpp"
 #include "NumericalAlgorithms/Interpolation/Callbacks/FindApparentHorizon.hpp"
 #include "NumericalAlgorithms/Interpolation/Callbacks/ObserveTimeSeriesOnSurface.hpp"

diff --git a/src/Evolution/Executables/GeneralizedHarmonic/GeneralizedHarmonicBase.hpp b/src/Evolution/Executables/GeneralizedHarmonic/GeneralizedHarmonicBase.hpp
@@ -50,7 +50,6 @@
 #include "IO/Observer/ObserverComponent.hpp"
 #include "IO/Observer/Tags.hpp"
 #include "NumericalAlgorithms/DiscontinuousGalerkin/Tags.hpp"
-#include "NumericalAlgorithms/Interpolation/AddTemporalIdsToInterpolationTarget.hpp"
 #include "NumericalAlgorithms/Interpolation/Callbacks/FindApparentHorizon.hpp"
 #include "NumericalAlgorithms/Interpolation/Callbacks/ObserveTimeSeriesOnSurface.hpp"
 #include "NumericalAlgorithms/Interpolation/CleanUpInterpolator.hpp"

diff --git a/src/Evolution/Executables/GrMhd/GhValenciaDivClean/EvolveGhValenciaDivCleanWithHorizon.hpp b/src/Evolution/Executables/GrMhd/GhValenciaDivClean/EvolveGhValenciaDivCleanWithHorizon.hpp
@@ -22,7 +22,6 @@
 #include "Evolution/Systems/GrMhd/GhValenciaDivClean/BoundaryCorrections/RegisterDerived.hpp"
 #include "Evolution/Systems/GrMhd/ValenciaDivClean/Tags.hpp"
 #include "Evolution/VariableFixing/Tags.hpp"
-#include "NumericalAlgorithms/Interpolation/AddTemporalIdsToInterpolationTarget.hpp"
 #include "NumericalAlgorithms/Interpolation/Callbacks/ErrorOnFailedApparentHorizon.hpp"
 #include "NumericalAlgorithms/Interpolation/Callbacks/FindApparentHorizon.hpp"
 #include "NumericalAlgorithms/Interpolation/Callbacks/ObserveTimeSeriesOnSurface.hpp"

diff --git a/src/Evolution/Executables/GrMhd/GhValenciaDivClean/GhValenciaDivCleanBase.hpp b/src/Evolution/Executables/GrMhd/GhValenciaDivClean/GhValenciaDivCleanBase.hpp
@@ -75,7 +75,6 @@
 #include "NumericalAlgorithms/DiscontinuousGalerkin/Formulation.hpp"
 #include "NumericalAlgorithms/DiscontinuousGalerkin/Tags.hpp"
 #include "NumericalAlgorithms/Interpolation/Actions/ElementInitInterpPoints.hpp"
-#include "NumericalAlgorithms/Interpolation/AddTemporalIdsToInterpolationTarget.hpp"
 #include "NumericalAlgorithms/Interpolation/Callbacks/FindApparentHorizon.hpp"
 #include "NumericalAlgorithms/Interpolation/Callbacks/ObserveTimeSeriesOnSurface.hpp"
 #include "NumericalAlgorithms/Interpolation/CleanUpInterpolator.hpp"

diff --git a/src/Evolution/Executables/GrMhd/ValenciaDivClean/EvolveValenciaDivClean.hpp b/src/Evolution/Executables/GrMhd/ValenciaDivClean/EvolveValenciaDivClean.hpp
@@ -53,7 +53,6 @@
 #include "NumericalAlgorithms/DiscontinuousGalerkin/Formulation.hpp"
 #include "NumericalAlgorithms/DiscontinuousGalerkin/Tags.hpp"
 #include "NumericalAlgorithms/Interpolation/Actions/ElementInitInterpPoints.hpp"
-#include "NumericalAlgorithms/Interpolation/AddTemporalIdsToInterpolationTarget.hpp"
 #include "NumericalAlgorithms/Interpolation/Callbacks/ObserveTimeSeriesOnSurface.hpp"
 #include "NumericalAlgorithms/Interpolation/CleanUpInterpolator.hpp"
 #include "NumericalAlgorithms/Interpolation/InitializeInterpolationTarget.hpp"

diff --git a/src/NumericalAlgorithms/Interpolation/AddTemporalIdsToInterpolationTarget.hpp b/src/NumericalAlgorithms/Interpolation/AddTemporalIdsToInterpolationTarget.hpp
@@ -30,7 +30,7 @@ namespace Actions {
 /// - If the InterpolationTarget is sequential
 ///   - If TemporalIds and PendingTemporalIds were both initially empty,
 ///     invokes Actions::VerifyTemporalIdsAndSendPoints. (Otherwise there
-///     (is an interpolation in progress and nothing needs to be done.)
+///     is an interpolation in progress and nothing needs to be done.)
 /// - If the InterpolationTarget is not sequential
 ///   - Invokes Actions::SendPointsToInterpolator on all TemporalIds
 ///   - Invokes Actions::VerifyTemporalIdsAndSendPoints if PendingTemporalIds

diff --git a/src/NumericalAlgorithms/Interpolation/Callbacks/FindApparentHorizon.hpp b/src/NumericalAlgorithms/Interpolation/Callbacks/FindApparentHorizon.hpp
@@ -13,6 +13,7 @@
 #include "DataStructures/VariablesTag.hpp"
 #include "IO/Logging/Tags.hpp"
 #include "IO/Logging/Verbosity.hpp"
+#include "NumericalAlgorithms/Interpolation/Actions/SendPointsToInterpolator.hpp"
 #include "Parallel/GlobalCache.hpp"
 #include "Parallel/Invoke.hpp"
 #include "Parallel/Printf.hpp"

diff --git a/src/NumericalAlgorithms/Interpolation/Interpolate.hpp b/src/NumericalAlgorithms/Interpolation/Interpolate.hpp
@@ -27,7 +27,8 @@ namespace Tags {
 template <typename TagsList>
 struct Variables;
 }  // namespace Tags
-template <size_t Dim> class Mesh;
+template <size_t Dim>
+class Mesh;
 template <size_t VolumeDim>
 class ElementId;
 namespace intrp {

diff --git a/src/NumericalAlgorithms/Interpolation/Tags.hpp b/src/NumericalAlgorithms/Interpolation/Tags.hpp
@@ -25,7 +25,6 @@ class ElementId;
 
 namespace intrp {
 
-
 namespace OptionTags {
 /*!
  * \ingroup OptionGroupsGroup

diff --git a/tests/Unit/ApparentHorizons/Test_ApparentHorizonFinder.cpp b/tests/Unit/ApparentHorizons/Test_ApparentHorizonFinder.cpp
@@ -259,7 +259,8 @@ void test_apparent_horizon(const gsl::not_null<size_t*> test_horizon_called,
                            const size_t l_max,
                            const size_t grid_points_each_dimension,
                            const double mass,
-                           const std::array<double, 3>& dimensionless_spin) {
+                           const std::array<double, 3>& dimensionless_spin,
+                           const size_t max_its = 100_st) {
   using metavars =
       MockMetavariables<PostHorizonFindCallback, IsTimeDependent, Frame>;
   using interp_component = mock_interpolator<metavars>;
@@ -269,7 +270,9 @@ void test_apparent_horizon(const gsl::not_null<size_t*> test_horizon_called,
   // Options for all InterpolationTargets.
   // The initial guess for the horizon search is a sphere of radius 2.8M.
   intrp::OptionHolders::ApparentHorizon<Frame> apparent_horizon_opts(
-      Strahlkorper<Frame>{l_max, 2.8, {{0.0, 0.0, 0.0}}}, FastFlow{},
+      Strahlkorper<Frame>{l_max, 2.8, {{0.0, 0.0, 0.0}}},
+      FastFlow{FastFlow::FlowType::Fast, 1.0, 0.5, 1.e-12, 1.e-2, 1.2, 5,
+               max_its},
       Verbosity::Verbose);
 
   std::unique_ptr<DomainCreator<3>> domain_creator;
@@ -729,4 +732,18 @@ SPECTRE_TEST_CASE(
                         std::true_type, Frame::Inertial, true>(
       &test_schwarzschild_horizon_called, 3, 4, 1.0, {{0.0, 0.0, 0.0}});
 }
+
+// [[OutputRegex, Cannot interpolate onto surface]]
+SPECTRE_TEST_CASE("Unit.Interpolator.ApparentHorizonFinder.NotConvergedError",
+                  "[Unit]") {
+  ERROR_TEST();
+  domain::creators::register_derived_with_charm();
+  domain::creators::time_dependence::register_derived_with_charm();
+  domain::FunctionsOfTime::register_derived_with_charm();
+
+  test_schwarzschild_horizon_called = 0;
+  test_apparent_horizon<TestSchwarzschildHorizon<Frame::Inertial>,
+                        std::true_type, Frame::Inertial, true>(
+      &test_schwarzschild_horizon_called, 3, 4, 1.0, {{0.0, 0.0, 0.0}}, 1);
+}
 }  // namespace