sxs-collaboration · nilsdeppe · Jun 12, 2024 · Mar 28, 2024 · Apr 3, 2024 · Apr 3, 2024
diff --git a/.clang-tidy b/.clang-tidy
@@ -96,6 +96,9 @@ CheckOptions:
     value: true
   - key: performance-move-const-arg.CheckTriviallyCopyableMove
     value: false
+  # The fix for this is not supported by GCC 9.
+  - key: modernize-loop-convert.UseCxx20ReverseRanges
+    value: false
 WarningsAsErrors: '*'
 # It is unclear if the header filter actually works or how to use it so
 # just include all headers

diff --git a/src/Evolution/Executables/GeneralizedHarmonic/EvolveGhBinaryBlackHole.hpp b/src/Evolution/Executables/GeneralizedHarmonic/EvolveGhBinaryBlackHole.hpp
@@ -488,7 +488,9 @@ struct EvolutionMetavars {
         tmpl::pair<
             gh::gauges::GaugeCondition,
             tmpl::list<gh::gauges::DampedHarmonic, gh::gauges::Harmonic>>,
-        tmpl::pair<LtsTimeStepper, TimeSteppers::lts_time_steppers>,
+        // Restrict to monotonic time steppers in LTS to avoid control
+        // systems deadlocking.
+        tmpl::pair<LtsTimeStepper, TimeSteppers::monotonic_lts_time_steppers>,
         tmpl::pair<PhaseChange, PhaseControl::factory_creatable_classes>,
         tmpl::pair<StepChooser<StepChooserUse::LtsStep>,
                    StepChoosers::standard_step_choosers<system>>,

diff --git a/src/Evolution/Executables/GeneralizedHarmonic/EvolveGhSingleBlackHole.hpp b/src/Evolution/Executables/GeneralizedHarmonic/EvolveGhSingleBlackHole.hpp
@@ -177,7 +177,13 @@ struct EvolutionMetavars : public GeneralizedHarmonicTemplateBase<3, UseLts> {
   struct factory_creation
       : tt::ConformsTo<Options::protocols::FactoryCreation> {
     using factory_classes = Options::add_factory_classes<
-        typename gh_base::factory_creation::factory_classes,
+        // Restrict to monotonic time steppers in LTS to avoid control
+        // systems deadlocking.
+        tmpl::insert<
+            tmpl::erase<typename gh_base::factory_creation::factory_classes,
+                        LtsTimeStepper>,
+            tmpl::pair<LtsTimeStepper,
+                       TimeSteppers::monotonic_lts_time_steppers>>,
         tmpl::pair<Event,
                    tmpl::flatten<tmpl::list<
                        intrp::Events::Interpolate<3, ApparentHorizon,

diff --git a/src/Evolution/Executables/GrMhd/GhValenciaDivClean/GhValenciaDivCleanBase.hpp b/src/Evolution/Executables/GrMhd/GhValenciaDivClean/GhValenciaDivCleanBase.hpp
@@ -616,7 +616,13 @@ struct GhValenciaDivCleanTemplateBase<
             boundary_conditions>,
         tmpl::pair<gh::gauges::GaugeCondition, gh::gauges::all_gauges>,
         tmpl::pair<evolution::initial_data::InitialData, initial_data_list>,
-        tmpl::pair<LtsTimeStepper, TimeSteppers::lts_time_steppers>,
+        // Restrict to monotonic time steppers in LTS to avoid control
+        // systems deadlocking.
+        tmpl::pair<
+            LtsTimeStepper,
+            tmpl::conditional_t<use_control_systems,
+                                TimeSteppers::monotonic_lts_time_steppers,
+                                TimeSteppers::lts_time_steppers>>,
         tmpl::pair<PhaseChange, PhaseControl::factory_creatable_classes>,
         tmpl::pair<StepChooser<StepChooserUse::LtsStep>,
                    StepChoosers::standard_step_choosers<system>>,

diff --git a/src/Evolution/Executables/ScalarTensor/EvolveScalarTensorSingleBlackHole.hpp b/src/Evolution/Executables/ScalarTensor/EvolveScalarTensorSingleBlackHole.hpp
@@ -154,7 +154,13 @@ struct EvolutionMetavars : public ScalarTensorTemplateBase<EvolutionMetavars> {
   struct factory_creation
       : tt::ConformsTo<Options::protocols::FactoryCreation> {
     using factory_classes = Options::add_factory_classes<
-        typename st_base::factory_creation::factory_classes,
+        // Restrict to monotonic time steppers in LTS to avoid control
+        // systems deadlocking.
+        tmpl::insert<
+            tmpl::erase<typename st_base::factory_creation::factory_classes,
+                        LtsTimeStepper>,
+            tmpl::pair<LtsTimeStepper,
+                       TimeSteppers::monotonic_lts_time_steppers>>,
         tmpl::pair<Event,
                    tmpl::flatten<tmpl::list<
                        intrp::Events::Interpolate<volume_dim, AhA,

diff --git a/src/Time/Actions/ChangeStepSize.hpp b/src/Time/Actions/ChangeStepSize.hpp
@@ -114,9 +114,8 @@ bool change_step_size(const gsl::not_null<db::DataBox<DbTags>*> box) {
         << time_step_id.substep_time() << ".");
   }
 
-  const auto& next_time_id = db::get<Tags::Next<Tags::TimeStepId>>(*box);
-  const auto new_step =
-      choose_lts_step_size(next_time_id.step_time(), desired_step);
+  const auto new_step = choose_lts_step_size(
+      time_step_id.step_time() + current_step, desired_step);
   db::mutate<Tags::Next<Tags::TimeStep>>(
       [&new_step](const gsl::not_null<TimeDelta*> next_step) {
         *next_step = new_step;

diff --git a/src/Time/BoundaryHistory.hpp b/src/Time/BoundaryHistory.hpp
@@ -15,7 +15,6 @@
 
 #include "DataStructures/CircularDeque.hpp"
 #include "DataStructures/MathWrapper.hpp"
-#include "DataStructures/StaticDeque.hpp"
 #include "Time/History.hpp"
 #include "Time/TimeStepId.hpp"
 #include "Utilities/Algorithm.hpp"
@@ -342,20 +341,16 @@ class BoundaryHistory {
   void clear_substeps_local(size_t n);
   void clear_substeps_remote(size_t n);
 
-  StaticDeque<StepData<LocalData>, history_max_past_steps + 2> local_data_{};
+  CircularDeque<StepData<LocalData>> local_data_{};
   CircularDeque<StepData<RemoteData>> remote_data_{};
 
   template <typename Data>
   using CouplingSubsteps =
       boost::container::static_vector<Data, history_max_substeps + 1>;
 
-  // Putting the CircularDeque outermost means that we are inserting
-  // and removing containers that do not allocate, so we don't have to
-  // worry about that.
   // NOLINTNEXTLINE(spectre-mutable)
   mutable CircularDeque<CouplingSubsteps<
-      StaticDeque<CouplingSubsteps<std::optional<CouplingResult>>,
-                  decltype(local_data_)::max_size()>>>
+      CircularDeque<CouplingSubsteps<std::optional<CouplingResult>>>>>
       couplings_;
 };