Fix framework tests. (idaholab#28819)

grmnptr · Oct 22, 2024 · 7a347dc · 7a347dc
1 parent bda4ab9
commit 7a347dc
Show file tree

Hide file tree

Showing 21 changed files with 76 additions and 42 deletions.
diff --git a/framework/src/executioners/LinearFixedPointSteady.C b/framework/src/executioners/LinearFixedPointSteady.C
@@ -18,20 +18,22 @@
 
 #include "libmesh/equation_systems.h"
 
-registerMooseObject("MooseTestApp", LinearFixedPointSteady);
+registerMooseObject("MooseApp", LinearFixedPointSteady);
 
 InputParameters
 LinearFixedPointSteady::validParams()
 {
  InputParameters params = LinearFixedPointSolve::validParams();
  params += Executioner::validParams();
+ params.addParam<Real>("time", 0.0, "System time");
 
  return params;
 }
 
 LinearFixedPointSteady::LinearFixedPointSteady(const InputParameters & parameters)
  : Executioner(parameters),
  _solve(*this),
+ _system_time(getParam<Real>("time")),
  _time_step(_fe_problem.timeStep()),
  _time(_fe_problem.time())
 {
@@ -62,6 +64,8 @@ LinearFixedPointSteady::execute()
 
  preExecute();
 
+ _fe_problem.advanceState();
+
  // first step in any steady state solve is always 1 (preserving backwards compatibility)
  _time_step = 1;
 
@@ -92,9 +96,7 @@ LinearFixedPointSteady::execute()
 
 #ifdef LIBMESH_ENABLE_AMR
  if (r_step != steps)
- {
  _fe_problem.adaptMesh();
- }
 
  _time_step++;
  }

diff --git a/modules/navier_stokes/src/executioners/SIMPLE.C b/modules/navier_stokes/src/executioners/SIMPLE.C
@@ -60,12 +60,6 @@ SIMPLE::execute()
  return;
  }
 
- if (_problem.adaptivity().isOn())
- {
- _console << "\nCannot use SIMPLE solves with mesh adaptivity!\nExiting...\n" << std::endl;
- return;
- }
-
  ExecFlagEnum disabled_flags;
  disabled_flags.addAvailableFlags(EXEC_TIMESTEP_BEGIN,
  EXEC_TIMESTEP_END,

diff --git a/test/tests/linearfvkernels/advection/advection-1d.i b/test/tests/linearfvkernels/advection/advection-1d.i
@@ -72,9 +72,11 @@
 []
 
 [Executioner]
- type = LinearPicardSteady
+ type = LinearFixedPointSteady
  linear_systems_to_solve = u_sys
  number_of_iterations = 1
+ continue_on_max_its = true
+ absolute_tolerance = 1e-10
 []
 
 [Outputs]

diff --git a/test/tests/linearfvkernels/advection/advection-2d-rz.i b/test/tests/linearfvkernels/advection/advection-2d-rz.i
@@ -76,11 +76,13 @@
 []
 
 [Executioner]
- type = LinearPicardSteady
+ type = LinearFixedPointSteady
  linear_systems_to_solve = u_sys
  number_of_iterations = 2
  petsc_options_iname = '-pc_type -pc_factor_shift_type -pc_factor_shift_amount'
  petsc_options_value = 'lu NONZERO 1e-10'
+ continue_on_max_its = true
+ absolute_tolerance = 1e-10
 []
 
 [Outputs]

diff --git a/test/tests/linearfvkernels/advection/advection-2d.i b/test/tests/linearfvkernels/advection/advection-2d.i
@@ -74,11 +74,13 @@
 []
 
 [Executioner]
- type = LinearPicardSteady
+ type = LinearFixedPointSteady
  linear_systems_to_solve = u_sys
  number_of_iterations = 1
  petsc_options_iname = '-pc_type -pc_factor_shift_type -pc_factor_shift_amount'
  petsc_options_value = 'lu NONZERO 1e-10'
+ continue_on_max_its = true
+ absolute_tolerance = 1e-10
 []
 
 [Outputs]

diff --git a/test/tests/linearfvkernels/anisotropic-diffusion/anisotropic-diffusion-2d.i b/test/tests/linearfvkernels/anisotropic-diffusion/anisotropic-diffusion-2d.i
@@ -84,11 +84,13 @@
 []
 
 [Executioner]
- type = LinearPicardSteady
+ type = LinearFixedPointSteady
  linear_systems_to_solve = u_sys
  petsc_options_iname = '-pc_type -pc_hypre_type'
  petsc_options_value = 'hypre boomeramg'
  number_of_iterations = 1
+ continue_on_max_its = true
+ absolute_tolerance = 1e-10
 []
 
 [Outputs]

diff --git a/test/tests/linearfvkernels/block-restriction/block-restricted-adr.i b/test/tests/linearfvkernels/block-restriction/block-restricted-adr.i
@@ -119,10 +119,12 @@
 []
 
 [Executioner]
- type = LinearPicardSteady
+ type = LinearFixedPointSteady
  linear_systems_to_solve = u_sys
  petsc_options_iname = '-pc_type -pc_hypre_type'
  petsc_options_value = 'hypre boomeramg'
+ continue_on_max_its = true
+ absolute_tolerance = 1e-10
 []
 
 [Outputs]

diff --git a/test/tests/linearfvkernels/block-restriction/block-restricted-diffusion-react.i b/test/tests/linearfvkernels/block-restriction/block-restricted-diffusion-react.i
@@ -66,28 +66,30 @@ reac_coeff=3
 [Postprocessors]
  [h]
  type = AverageElementSize
- execute_on = FINAL
+ execute_on = TIMESTEP_END
  block = 2
  []
  [error]
  type = ElementL2FunctorError
  approximate = u
  exact = analytic_solution
- execute_on = FINAL
+ execute_on = TIMESTEP_END
  block = 2
  []
 []
 
 [Executioner]
- type = LinearPicardSteady
+ type = LinearFixedPointSteady
  linear_systems_to_solve = u_sys
  petsc_options_iname = '-pc_type -pc_hypre_type'
  petsc_options_value = 'hypre boomeramg'
+ continue_on_max_its = true
+ absolute_tolerance = 1e-10
 []
 
 [Outputs]
  [csv]
  type = CSV
- execute_on = FINAL
+ execute_on = TIMESTEP_END
  []
 []
diff --git a/test/tests/linearfvkernels/block-restriction/block-restricted-diffusion.i b/test/tests/linearfvkernels/block-restriction/block-restricted-diffusion.i
@@ -97,10 +97,12 @@
 []
 
 [Executioner]
- type = LinearPicardSteady
+ type = LinearFixedPointSteady
  linear_systems_to_solve = u_sys
  petsc_options_iname = '-pc_type -pc_hypre_type'
  petsc_options_value = 'hypre boomeramg'
+ continue_on_max_its = true
+ absolute_tolerance = 1e-10
 []
 
 [Outputs]

diff --git a/test/tests/linearfvkernels/diffusion-reaction-advection/advection-diffusion-reaction-1d.i b/test/tests/linearfvkernels/diffusion-reaction-advection/advection-diffusion-reaction-1d.i
@@ -92,10 +92,12 @@
 []
 
 [Executioner]
- type = LinearPicardSteady
+ type = LinearFixedPointSteady
  linear_systems_to_solve = u_sys
  petsc_options_iname = '-pc_type -pc_hypre_type'
  petsc_options_value = 'hypre boomeramg'
+ continue_on_max_its = true
+ absolute_tolerance = 1e-10
 []
 
 [Outputs]

diff --git a/test/tests/linearfvkernels/diffusion-reaction-advection/advection-diffusion-reaction-2d.i b/test/tests/linearfvkernels/diffusion-reaction-advection/advection-diffusion-reaction-2d.i
@@ -94,10 +94,12 @@
 []
 
 [Executioner]
- type = LinearPicardSteady
+ type = LinearFixedPointSteady
  linear_systems_to_solve = u_sys
  petsc_options_iname = '-pc_type -pc_hypre_type'
  petsc_options_value = 'hypre boomeramg'
+ continue_on_max_its = true
+ absolute_tolerance = 1e-10
 []
 
 [Outputs]

diff --git a/test/tests/linearfvkernels/diffusion/diffusion-1d.i b/test/tests/linearfvkernels/diffusion/diffusion-1d.i
@@ -69,10 +69,12 @@
 []
 
 [Executioner]
- type = LinearPicardSteady
+ type = LinearFixedPointSteady
  linear_systems_to_solve = u_sys
  petsc_options_iname = '-pc_type -pc_hypre_type'
  petsc_options_value = 'hypre boomeramg'
+ continue_on_max_its = true
+ absolute_tolerance = 1e-10
 []
 
 [Outputs]

diff --git a/test/tests/linearfvkernels/diffusion/diffusion-2d-rz.i b/test/tests/linearfvkernels/diffusion/diffusion-2d-rz.i
@@ -74,10 +74,12 @@
 []
 
 [Executioner]
- type = LinearPicardSteady
+ type = LinearFixedPointSteady
  linear_systems_to_solve = u_sys
  petsc_options_iname = '-pc_type -pc_hypre_type'
  petsc_options_value = 'hypre boomeramg'
+ continue_on_max_its = true
+ absolute_tolerance = 1e-10
 []
 
 [Outputs]

diff --git a/test/tests/linearfvkernels/diffusion/diffusion-2d.i b/test/tests/linearfvkernels/diffusion/diffusion-2d.i
@@ -72,10 +72,12 @@
 []
 
 [Executioner]
- type = LinearPicardSteady
+ type = LinearFixedPointSteady
  linear_systems_to_solve = u_sys
  petsc_options_iname = '-pc_type -pc_hypre_type'
  petsc_options_value = 'hypre boomeramg'
+ continue_on_max_its = true
+ absolute_tolerance = 1e-10
 []
 
 [Outputs]

diff --git a/test/tests/linearfvkernels/reaction/reaction-1d.i b/test/tests/linearfvkernels/reaction/reaction-1d.i
@@ -51,18 +51,20 @@
  type = ElementL2FunctorError
  approximate = u
  exact = analytic_solution
- execute_on = FINAL
+ execute_on = TIMESTEP_END
  []
 []
 
 [Executioner]
- type = LinearPicardSteady
+ type = LinearFixedPointSteady
  linear_systems_to_solve = u_sys
+ continue_on_max_its = true
+ absolute_tolerance = 1e-10
 []
 
 [Outputs]
  [exodus]
  type = Exodus
- execute_on = FINAL
+ execute_on = TIMESTEP_END
  []
 []
diff --git a/test/tests/outputs/debug/show_execution_linear_fv_elemental.i b/test/tests/outputs/debug/show_execution_linear_fv_elemental.i
@@ -53,8 +53,10 @@
 []
 
 [Executioner]
- type = LinearPicardSteady
+ type = LinearFixedPointSteady
  linear_systems_to_solve = u_sys
+ continue_on_max_its = true
+ absolute_tolerance = 1e-10
 []
 
 [Debug]

diff --git a/test/tests/outputs/debug/show_execution_linear_fv_flux.i b/test/tests/outputs/debug/show_execution_linear_fv_flux.i
@@ -62,8 +62,10 @@
 []
 
 [Executioner]
- type = LinearPicardSteady
+ type = LinearFixedPointSteady
  linear_systems_to_solve = u_sys
+ continue_on_max_its = true
+ absolute_tolerance = 1e-10
 []
 
 [Debug]

diff --git a/...ests/postprocessors/side_diffusive_flux_integral/side_diffusive_flux_integral_linear_fv.i b/...ests/postprocessors/side_diffusive_flux_integral/side_diffusive_flux_integral_linear_fv.i
@@ -88,10 +88,12 @@
 []
 
 [Executioner]
- type = LinearPicardSteady
+ type = LinearFixedPointSteady
  linear_systems_to_solve = u_sys
  petsc_options_iname = '-pc_type -pc_hypre_type'
  petsc_options_value = 'hypre boomeramg'
+ continue_on_max_its = true
+ absolute_tolerance = 1e-10
 []
 
 [Outputs]

diff --git a/test/tests/transfers/multiapp_copy_transfer/linear_sys_to_aux/linear_sub.i b/test/tests/transfers/multiapp_copy_transfer/linear_sys_to_aux/linear_sub.i
@@ -56,10 +56,12 @@
 []
 
 [Executioner]
- type = LinearPicardSteady
+ type = LinearFixedPointSteady
  linear_systems_to_solve = u_sys
  petsc_options_iname = '-pc_type -pc_hypre_type'
  petsc_options_value = 'hypre boomeramg'
+ continue_on_max_its = true
+ absolute_tolerance = 1e-10
 []
 
 [Outputs]

diff --git a/test/tests/variables/linearfv/diffusion-1d-aux.i b/test/tests/variables/linearfv/diffusion-1d-aux.i
@@ -89,10 +89,12 @@
 []
 
 [Executioner]
- type = LinearPicardSteady
+ type = LinearFixedPointSteady
  linear_systems_to_solve = u_sys
  petsc_options_iname = '-pc_type -pc_hypre_type'
  petsc_options_value = 'hypre boomeramg'
+ continue_on_max_its = true
+ absolute_tolerance = 1e-10
 []
 
 [Outputs]