attempt removing the new legacy flag on fixed point execute_on in moo…

…se test idaholab#28930
YaqiWang · Oct 25, 2024 · 214f82f · 214f82f
1 parent 6c132b5
commit 214f82f
Show file tree

Hide file tree

Showing 85 changed files with 187 additions and 144 deletions.
diff --git a/framework/include/executioners/Executioner.h b/framework/include/executioners/Executioner.h
@@ -163,6 +163,9 @@ class Executioner : public MooseObject,
   virtual PostprocessorValue & addAttributeReporter(const std::string & name,
                                                     Real initial_value = 0);
 
+  /// Flag to indicate timestep_begin/end objects are to be executed within a fixed point iteration
+  const bool _legacy_execute_on;
+
   FEProblemBase & _fe_problem;
 
   MooseEnum _iteration_method;

diff --git a/framework/src/executioners/Eigenvalue.C b/framework/src/executioners/Eigenvalue.C
@@ -257,6 +257,14 @@ Eigenvalue::execute()
 #endif // LIBMESH_ENABLE_AMR
     _eigen_problem.timestepSetup();
 
+    if (!_legacy_execute_on)
+    {
+      _eigen_problem.execute(EXEC_TIMESTEP_BEGIN);
+      _time = _time_step;
+      _eigen_problem.outputStep(EXEC_TIMESTEP_BEGIN);
+      _time = _system_time;
+    }
+
     _last_solve_converged = _fixed_point_solve->solve();
     if (!lastSolveConverged())
     {
@@ -270,6 +278,12 @@ Eigenvalue::execute()
       _eigen_problem.computeIndicators();
       _eigen_problem.computeMarkers();
     }
+
+    if (!_legacy_execute_on)
+    {
+      _eigen_problem.onTimestepEnd();
+      _eigen_problem.execute(EXEC_TIMESTEP_END);
+    }
     // need to keep _time in sync with _time_step to get correct output
     _time = _time_step;
     _eigen_problem.outputStep(EXEC_TIMESTEP_END);

diff --git a/framework/src/executioners/Executioner.C b/framework/src/executioners/Executioner.C
@@ -58,6 +58,7 @@ Executioner::Executioner(const InputParameters & parameters)
     PostprocessorInterface(this),
     Restartable(this, "Executioners"),
     PerfGraphInterface(this),
+    _legacy_execute_on(_app.parameters().get<bool>("use_legacy_fixed_point_execute_on")),
     _fe_problem(*getCheckedPointerParam<FEProblemBase *>(
         "_fe_problem_base", "This might happen if you don't have a mesh")),
     _iteration_method(getParam<MooseEnum>("fixed_point_algorithm")),
@@ -91,6 +92,7 @@ Executioner::Executioner(const InputParameters & parameters, bool)
     PostprocessorInterface(this),
     Restartable(this, "Executioners"),
     PerfGraphInterface(this),
+    _legacy_execute_on(_app.parameters().get<bool>("use_legacy_fixed_point_execute_on")),
     _fe_problem(*getCheckedPointerParam<FEProblemBase *>(
         "_fe_problem_base", "This might happen if you don't have a mesh")),
     _iteration_method(getParam<MooseEnum>("fixed_point_algorithm")),

diff --git a/framework/src/executioners/Steady.C b/framework/src/executioners/Steady.C
@@ -80,6 +80,14 @@ Steady::execute()
 #endif // LIBMESH_ENABLE_AMR
     _problem.timestepSetup();
 
+    if (!_legacy_execute_on)
+    {
+      _problem.execute(EXEC_TIMESTEP_BEGIN);
+      _time = _time_step;
+      _problem.outputStep(EXEC_TIMESTEP_BEGIN);
+      _time = _system_time;
+    }
+
     _last_solve_converged = _fixed_point_solve->solve();
 
     if (!lastSolveConverged())
@@ -91,6 +99,11 @@ Steady::execute()
     _problem.computeIndicators();
     _problem.computeMarkers();
 
+    if (!_legacy_execute_on)
+    {
+      _problem.onTimestepEnd();
+      _problem.execute(EXEC_TIMESTEP_END);
+    }
     // need to keep _time in sync with _time_step to get correct output
     _time = _time_step;
     _problem.outputStep(EXEC_TIMESTEP_END);

diff --git a/framework/src/executioners/Transient.C b/framework/src/executioners/Transient.C
@@ -412,6 +412,11 @@ Transient::takeStep(Real input_dt)
   _problem.timestepSetup();
 
   _problem.onTimestepBegin();
+  if (!_legacy_execute_on)
+  {
+    _problem.execute(EXEC_TIMESTEP_BEGIN);
+    _problem.outputStep(EXEC_TIMESTEP_BEGIN);
+  }
 
   _time_stepper->step();
   _xfem_repeat_step = _fixed_point_solve->XFEMRepeatStep();
@@ -424,6 +429,12 @@ Transient::takeStep(Real input_dt)
     return;
   }
 
+  if (!_legacy_execute_on)
+  {
+    _problem.onTimestepEnd();
+    _problem.execute(EXEC_TIMESTEP_END);
+  }
+
   if (!(_problem.haveXFEM() && _fixed_point_solve->XFEMRepeatStep()))
   {
     if (lastSolveConverged())

diff --git a/framework/src/multiapps/MultiApp.C b/framework/src/multiapps/MultiApp.C
@@ -125,7 +125,7 @@ MultiApp::validParams()
   params.addPrivateParam<MPI_Comm>("_mpi_comm");
 
   // Set the default execution time
-  params.set<ExecFlagEnum>("execute_on", true) = EXEC_TIMESTEP_BEGIN; //FixedPointSolve::EXEC_FIXEDPOINT_BEGIN;
+  params.set<ExecFlagEnum>("execute_on", true) = FixedPointSolve::EXEC_FIXEDPOINT_BEGIN;
 
   params.addParam<processor_id_type>("max_procs_per_app",
                                      std::numeric_limits<processor_id_type>::max(),

diff --git a/test/tests/multiapps/application_block_multiapps/application_block_parent.i b/test/tests/multiapps/application_block_multiapps/application_block_parent.i
@@ -55,7 +55,7 @@
   [sub]
     type = TransientMultiApp
     app_type = MooseTestApp
-    execute_on = timestep_end
+    execute_on = fixedpoint_end
     positions = '1 1 0'
     input_files = application_block_sub.i
     output_in_position = true

diff --git a/test/tests/multiapps/catch_up/parent.i b/test/tests/multiapps/catch_up/parent.i
@@ -62,7 +62,7 @@
     positions = '0 0 0  0.5 0.5 0'
     input_files = 'sub.i failing_sub.i'
     app_type = MooseTestApp
-    execute_on = 'timestep_end'
+    execute_on = 'fixedpoint_end'
     max_catch_up_steps = 100
     max_failures = 100
     catch_up = true

diff --git a/test/tests/multiapps/grid-sequencing/fine.i b/test/tests/multiapps/grid-sequencing/fine.i
@@ -58,7 +58,7 @@
   [coarse]
     type = TransientMultiApp
     app_type = MooseTestApp
-    execute_on = timestep_begin
+    execute_on = fixedpoint_begin
     positions = '0 0 0'
     input_files = coarse.i
   []
@@ -70,6 +70,6 @@
     from_multi_app = coarse
     source_variable = u
     variable = u
-    execute_on = timestep_begin
+    execute_on = fixedpoint_begin
   []
 []
diff --git a/test/tests/multiapps/grid-sequencing/vi-coarse.i b/test/tests/multiapps/grid-sequencing/vi-coarse.i
@@ -96,7 +96,7 @@ num_steps = 2
   exodus = true
   [csv]
     type = CSV
-    execute_on = 'nonlinear timestep_end'
+    execute_on = 'nonlinear fixedpoint_end'
   []
   [dof]
     type = DOFMap
@@ -113,14 +113,14 @@ num_steps = 2
   [upper_violations]
     type = GreaterThanLessThanPostprocessor
     variable = u
-    execute_on = 'nonlinear timestep_end'
+    execute_on = 'nonlinear fixedpoint_end'
     value = '${fparse 10+1e-8}'
     comparator = 'greater'
   []
   [lower_violations]
     type = GreaterThanLessThanPostprocessor
     variable = u
-    execute_on = 'nonlinear timestep_end'
+    execute_on = 'nonlinear fixedpoint_end'
     value = -1e-8
     comparator = 'less'
   []
@@ -137,7 +137,7 @@ num_steps = 2
   [coarser]
     type = TransientMultiApp
     app_type = MooseTestApp
-    execute_on = timestep_begin
+    execute_on = fixedpoint_begin
     positions = '0 0 0'
     input_files = vi-coarser.i
   []
@@ -149,6 +149,6 @@ num_steps = 2
     from_multi_app = coarser
     source_variable = u
     variable = u
-    execute_on = timestep_begin
+    execute_on = fixedpoint_begin
   []
 []
diff --git a/test/tests/multiapps/grid-sequencing/vi-coarser.i b/test/tests/multiapps/grid-sequencing/vi-coarser.i
@@ -95,7 +95,7 @@ num_steps=2
   exodus = true
   [csv]
     type = CSV
-    execute_on = 'nonlinear timestep_end'
+    execute_on = 'nonlinear fixedpoint_end'
   []
   [dof]
     type = DOFMap
@@ -112,14 +112,14 @@ num_steps=2
   [upper_violations]
     type = GreaterThanLessThanPostprocessor
     variable = u
-    execute_on = 'nonlinear timestep_end'
+    execute_on = 'nonlinear fixedpoint_end'
     value = ${fparse 10+1e-8}
     comparator = 'greater'
   []
   [lower_violations]
     type = GreaterThanLessThanPostprocessor
     variable = u
-    execute_on = 'nonlinear timestep_end'
+    execute_on = 'nonlinear fixedpoint_end'
     value = -1e-8
     comparator = 'less'
   []

diff --git a/test/tests/multiapps/grid-sequencing/vi-fine-alone.i b/test/tests/multiapps/grid-sequencing/vi-fine-alone.i
@@ -95,7 +95,7 @@ num_steps=2
   exodus = true
   [csv]
     type = CSV
-    execute_on = 'nonlinear timestep_end'
+    execute_on = 'nonlinear fixedpoint_end'
   []
   [dof]
     type = DOFMap
@@ -112,14 +112,14 @@ num_steps=2
   [upper_violations]
     type = GreaterThanLessThanPostprocessor
     variable = u
-    execute_on = 'nonlinear timestep_end'
+    execute_on = 'nonlinear fixedpoint_end'
     value = ${fparse 10+1e-8}
     comparator = 'greater'
   []
   [lower_violations]
     type = GreaterThanLessThanPostprocessor
     variable = u
-    execute_on = 'nonlinear timestep_end'
+    execute_on = 'nonlinear fixedpoint_end'
     value = -1e-8
     comparator = 'less'
   []

diff --git a/test/tests/multiapps/grid-sequencing/vi-fine.i b/test/tests/multiapps/grid-sequencing/vi-fine.i
@@ -96,7 +96,7 @@ num_steps = 2
   exodus = true
   [csv]
     type = CSV
-    execute_on = 'nonlinear timestep_end'
+    execute_on = 'nonlinear fixedpoint_end'
   []
   [dof]
     type = DOFMap
@@ -113,14 +113,14 @@ num_steps = 2
   [upper_violations]
     type = GreaterThanLessThanPostprocessor
     variable = u
-    execute_on = 'nonlinear timestep_end'
+    execute_on = 'nonlinear fixedpoint_end'
     value = '${fparse 10+1e-8}'
     comparator = 'greater'
   []
   [lower_violations]
     type = GreaterThanLessThanPostprocessor
     variable = u
-    execute_on = 'nonlinear timestep_end'
+    execute_on = 'nonlinear fixedpoint_end'
     value = -1e-8
     comparator = 'less'
   []
@@ -137,7 +137,7 @@ num_steps = 2
   [coarse]
     type = TransientMultiApp
     app_type = MooseTestApp
-    execute_on = timestep_begin
+    execute_on = fixedpoint_begin
     positions = '0 0 0'
     input_files = vi-coarse.i
   []
@@ -149,6 +149,6 @@ num_steps = 2
     from_multi_app = coarse
     source_variable = u
     variable = u
-    execute_on = timestep_begin
+    execute_on = fixedpoint_begin
   []
 []
diff --git a/test/tests/multiapps/initial_intactive/parent.i b/test/tests/multiapps/initial_intactive/parent.i
@@ -68,7 +68,7 @@
     disable_objects = 'MultiApps::sub'
     start_time = 0
     end_time = 1.3
-    execute_on = 'timestep_begin'
+    execute_on = 'fixedpoint_begin'
     reverse_on_false = true
   [../]
 []
diff --git a/test/tests/multiapps/initial_transfer/sub.i b/test/tests/multiapps/initial_transfer/sub.i
@@ -21,7 +21,7 @@
     value = receiver
     scaling_factor = 2
     # Note: during subapp initial setup, parent postprocessor has not been transferred
-    execute_on = 'initial timestep_end'
+    execute_on = 'initial fixedpoint_end'
   []
   [receiver]
     type = Receiver

diff --git a/test/tests/multiapps/loose_couple_time_adapt/begin.i b/test/tests/multiapps/loose_couple_time_adapt/begin.i
@@ -41,7 +41,7 @@
   [./dummy]
     type = TransientMultiApp
     input_files = adaptiveDT.i
-    execute_on = timestep_begin
+    execute_on = fixedpoint_begin
   [../]
 []
 

diff --git a/test/tests/multiapps/loose_couple_time_adapt/end.i b/test/tests/multiapps/loose_couple_time_adapt/end.i
@@ -41,7 +41,7 @@
   [./dummy]
     type = TransientMultiApp
     input_files = adaptiveDT.i
-    execute_on = timestep_end
+    execute_on = fixedpoint_end
   [../]
 []
 

diff --git a/test/tests/multiapps/max_procs_per_app/parent.i b/test/tests/multiapps/max_procs_per_app/parent.i
@@ -55,7 +55,7 @@
   [./sub]
     type = TransientMultiApp
     app_type = MooseTestApp
-    execute_on = timestep_end
+    execute_on = fixedpoint_end
     positions = '0 0 0'
     input_files = sub.i
     max_procs_per_app = 1

diff --git a/test/tests/multiapps/move/multilevel_parent.i b/test/tests/multiapps/move/multilevel_parent.i
@@ -55,7 +55,7 @@
   [./sub]
     type = TransientMultiApp
     app_type = MooseTestApp
-    execute_on = timestep_end
+    execute_on = fixedpoint_end
     positions = '1 1 0'
     input_files = multilevel_sub.i
     output_in_position = true

diff --git a/test/tests/multiapps/move/multilevel_sub.i b/test/tests/multiapps/move/multilevel_sub.i
@@ -55,7 +55,7 @@
   [./sub]
     type = TransientMultiApp
     app_type = MooseTestApp
-    execute_on = timestep_end
+    execute_on = fixedpoint_end
     positions = '1 1 0'
     input_files = sub.i
     output_in_position = true

diff --git a/test/tests/multiapps/move/parent.i b/test/tests/multiapps/move/parent.i
@@ -55,7 +55,7 @@
   [./sub]
     type = TransientMultiApp
     app_type = MooseTestApp
-    execute_on = timestep_end
+    execute_on = fixedpoint_end
     positions = '1 1 0'
     input_files = sub.i
     output_in_position = true

diff --git a/test/tests/multiapps/move_and_reset/multilevel_parent.i b/test/tests/multiapps/move_and_reset/multilevel_parent.i
@@ -55,7 +55,7 @@
   [./sub]
     type = TransientMultiApp
     app_type = MooseTestApp
-    execute_on = timestep_end
+    execute_on = fixedpoint_end
     positions = '1 1 0'
     input_files = multilevel_sub.i
     output_in_position = true

diff --git a/test/tests/multiapps/move_and_reset/multilevel_sub.i b/test/tests/multiapps/move_and_reset/multilevel_sub.i
@@ -55,7 +55,7 @@
   [./sub]
     type = TransientMultiApp
     app_type = MooseTestApp
-    execute_on = timestep_end
+    execute_on = fixedpoint_end
     positions = '1 1 0'
     input_files = multilevel_sub_sub.i
     output_in_position = true

diff --git a/test/tests/multiapps/move_and_reset/multilevel_sub_sub.i b/test/tests/multiapps/move_and_reset/multilevel_sub_sub.i
@@ -46,6 +46,6 @@
 []
 
 [Outputs]
-  execute_on = 'timestep_end'
+  execute_on = 'fixedpoint_end'
   exodus = true
 []
diff --git a/test/tests/multiapps/move_and_reset/parent.i b/test/tests/multiapps/move_and_reset/parent.i
@@ -55,7 +55,7 @@
   [./sub]
     type = TransientMultiApp
     app_type = MooseTestApp
-    execute_on = timestep_end
+    execute_on = fixedpoint_end
     positions = '1 1 0'
     input_files = sub.i
     reset_apps = 0