From f1d837341d7defcfefcb39eeb2775aec6960fd11 Mon Sep 17 00:00:00 2001
From: Guillaume Giudicelli <guillaume.giudicelli@inl.gov>
Date: Mon, 2 Oct 2023 20:16:10 -0600
Subject: [PATCH 01/12] Apply parameter is useless if it does not override the
 default

---
 framework/include/utils/InputParameters.h | 4 +++-
 framework/src/utils/InputParameters.C     | 5 +++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/framework/include/utils/InputParameters.h b/framework/include/utils/InputParameters.h
index af3ccf3a103c..a550bde0b44b 100644
--- a/framework/include/utils/InputParameters.h
+++ b/framework/include/utils/InputParameters.h
@@ -830,11 +830,13 @@ class InputParameters : public Parameters
    *   (1) A local parameter must exist with the same name as common parameter
    *   (2) Common parameter must valid
    *   (3) Local parameter must be invalid OR not have been set from its default
+   *   (except if override_default is set)
    *   (4) Both cannot be private
    */
   void applyParameter(const InputParameters & common,
                       const std::string & common_name,
-                      bool allow_private = false);
+                      bool allow_private = false,
+                      bool override_default = false);
   // END APPLY PARAMETER METHODS
 
   /**
diff --git a/framework/src/utils/InputParameters.C b/framework/src/utils/InputParameters.C
index 1707468fc3b3..a9b747d49a4c 100644
--- a/framework/src/utils/InputParameters.C
+++ b/framework/src/utils/InputParameters.C
@@ -1019,7 +1019,8 @@ InputParameters::applyCoupledVar(const InputParameters & common, const std::stri
 void
 InputParameters::applyParameter(const InputParameters & common,
                                 const std::string & common_name,
-                                bool allow_private)
+                                bool allow_private,
+                                bool override_default)
 {
   // Disable the display of deprecated message when applying common parameters, this avoids a dump
   // of messages
@@ -1036,7 +1037,7 @@ InputParameters::applyParameter(const InputParameters & common,
   // Extract the properties from the common parameter
   const bool common_exist = common._values.find(common_name) != common._values.end();
   const bool common_priv = allow_private ? false : common.isPrivate(common_name);
-  const bool common_valid = common.isParamValid(common_name);
+  const bool common_valid = common.isParamValid(common_name) || override_default;
 
   /* In order to apply a common parameter 4 statements must be satisfied
    * (1) A local parameter must exist with the same name as the common parameter

From a644e39b668d0e58a53de397075dc529e615f21d Mon Sep 17 00:00:00 2001
From: Guillaume Giudicelli <guillaume.giudicelli@inl.gov>
Date: Tue, 10 Oct 2023 09:37:31 -0600
Subject: [PATCH 02/12] Add a component to handle a physics definition

---
 .../components/FileMeshPhysicsComponent.h     | 59 +++++++++++++++++++
 .../src/components/FileMeshPhysicsComponent.C | 52 ++++++++++++++++
 .../thermal_hydraulics/src/parser/THMSyntax.C |  3 +-
 3 files changed, 112 insertions(+), 2 deletions(-)
 create mode 100644 modules/thermal_hydraulics/include/components/FileMeshPhysicsComponent.h
 create mode 100644 modules/thermal_hydraulics/src/components/FileMeshPhysicsComponent.C

diff --git a/modules/thermal_hydraulics/include/components/FileMeshPhysicsComponent.h b/modules/thermal_hydraulics/include/components/FileMeshPhysicsComponent.h
new file mode 100644
index 000000000000..6266e44160ee
--- /dev/null
+++ b/modules/thermal_hydraulics/include/components/FileMeshPhysicsComponent.h
@@ -0,0 +1,59 @@
+//* This file is part of the MOOSE framework
+//* https://www.mooseframework.org
+//*
+//* All rights reserved, see COPYRIGHT for full restrictions
+//* https://github.com/idaholab/moose/blob/master/COPYRIGHT
+//*
+//* Licensed under LGPL 2.1, please see LICENSE for details
+//* https://www.gnu.org/licenses/lgpl-2.1.html
+
+#pragma once
+
+#include "FileMeshComponent.h"
+
+/**
+ * Create a component with a single Physics object active on it
+ */
+class FileMeshPhysicsComponent : public FileMeshComponent
+{
+public:
+  static InputParameters validParams();
+
+  FileMeshPhysicsComponent(const InputParameters & parameters);
+
+  virtual void addRelationshipManagers(Moose::RelationshipManagerType input_rm_type) override;
+  // These objects are added by the Physics already
+  virtual void addVariables() override{};
+  virtual void addMooseObjects() override{};
+
+protected:
+  virtual void init() override;
+
+  virtual std::vector<SubdomainName> getBlocks() const { return getSubdomainNames(); }
+  virtual Factory & getFactory() { return getMooseApp().getFactory(); }
+  virtual FEProblemBase & getProblem() { return getMooseApp().feProblem(); }
+  virtual const MooseMesh & getMesh() const { return constMesh(); }
+  // virtual void addNSNonlinearVariable(const std::string & var_type,
+  //                                     const std::string & var_name,
+  //                                     InputParameters & params)
+  // {
+  //   getTHMProblem().addSimVariable(true, var_type, var_name, params);
+  // }
+  // virtual void addNSAuxVariable(const std::string & var_type,
+  //                               const std::string & var_name,
+  //                               InputParameters & params)
+  // {
+  //   getTHMProblem().addSimVariable(false, var_type, var_name, params);
+  // }
+  // virtual void addNSInitialCondition(const std::string & type,
+  //                                    const std::string & name,
+  //                                    InputParameters & params)
+  // {
+  //   getTHMProblem().addSimInitialCondition(type, name, params);
+  // }
+  virtual std::string prefix() const { return name() + ":"; }
+
+private:
+  /// Physics object that creates the equations on this component
+  std::vector<PhysicsBase *> _physics;
+};
diff --git a/modules/thermal_hydraulics/src/components/FileMeshPhysicsComponent.C b/modules/thermal_hydraulics/src/components/FileMeshPhysicsComponent.C
new file mode 100644
index 000000000000..05c96749c778
--- /dev/null
+++ b/modules/thermal_hydraulics/src/components/FileMeshPhysicsComponent.C
@@ -0,0 +1,52 @@
+//* This file is part of the MOOSE framework
+//* https://www.mooseframework.org
+//*
+//* All rights reserved, see COPYRIGHT for full restrictions
+//* https://github.com/idaholab/moose/blob/master/COPYRIGHT
+//*
+//* Licensed under LGPL 2.1, please see LICENSE for details
+//* https://www.gnu.org/licenses/lgpl-2.1.html
+
+#include "FileMeshPhysicsComponent.h"
+#include "PhysicsBase.h"
+
+registerMooseObject("ThermalHydraulicsApp", FileMeshPhysicsComponent);
+
+InputParameters
+FileMeshPhysicsComponent::validParams()
+{
+  InputParameters params = FileMeshComponent::validParams();
+
+  params.addClassDescription("Component with a single physics active on it.");
+  params.addParam<std::vector<PhysicsName>>("physics", "Physics object(s) active on the Component");
+  return params;
+}
+
+FileMeshPhysicsComponent::FileMeshPhysicsComponent(const InputParameters & parameters)
+  : FileMeshComponent(parameters)
+{
+}
+
+void FileMeshPhysicsComponent::addRelationshipManagers(
+    Moose::RelationshipManagerType /*input_rm_type*/)
+{
+  // TODO: We ll just add late relationship managers
+  // At this point in the setup, we do not have a problem, so we cannot retrieve a Physics. We can
+  // send the default ghosting for the physics, but that's it.
+  addRelationshipManagersFromParameters(PhysicsBase::validParams());
+}
+
+void
+FileMeshPhysicsComponent::init()
+{
+  FileMeshComponent::init();
+
+  // Before this point, we did not have a problem, so we could not retrieve the physics
+  for (const auto & physics_name : getParam<std::vector<PhysicsName>>("physics"))
+    _physics.push_back(getProblem().getPhysics(physics_name));
+
+  for (auto physics : _physics)
+  {
+    physics->addBlocks(getSubdomainNames());
+  }
+}
diff --git a/modules/thermal_hydraulics/src/parser/THMSyntax.C b/modules/thermal_hydraulics/src/parser/THMSyntax.C
index ffc902a2cba8..b589c8999828 100644
--- a/modules/thermal_hydraulics/src/parser/THMSyntax.C
+++ b/modules/thermal_hydraulics/src/parser/THMSyntax.C
@@ -66,7 +66,6 @@ registerActions(Syntax & syntax)
 
   try
   {
-    syntax.addDependency("THM:add_heat_structure_material", "add_function");
     syntax.addDependency("THM:output_vector_velocity", "setup_mesh");
     syntax.addDependency("THM:add_closures", "setup_mesh");
     syntax.addDependency("THM:init_components", "THM:output_vector_velocity");
@@ -87,7 +86,7 @@ registerActions(Syntax & syntax)
     syntax.addDependency("add_variable", "add_fluid_properties");
     syntax.addDependency("THM:init_components", "THM:add_heat_structure_material");
     syntax.addDependency("THM:init_components", "THM:add_closures");
-    syntax.addDependency("THM:add_variables", "THM:init_components");
+    syntax.addDependency("add_variable", "THM:init_components");
     syntax.addDependency("THM:setup_output", "add_output");
     syntax.addDependency("THM:add_component_moose_objects", "add_material");
     syntax.addDependency("check_output", "THM:add_component_moose_objects");

From 2156ecbeb99f0bb897833dc5a1a32f32ce0d180e Mon Sep 17 00:00:00 2001
From: Guillaume Giudicelli <guillaume.giudicelli@inl.gov>
Date: Tue, 10 Oct 2023 09:43:26 -0600
Subject: [PATCH 03/12] Add a test for adding a single physics to a single
 component

---
 .../gold/single_physics_out.e                 | Bin 0 -> 63628 bytes
 .../components/physics_component/rectangle.i  |   1 +
 .../physics_component/single_physics.i        | 109 ++++++++++++++++++
 .../tests/components/physics_component/tests  |  24 ++++
 4 files changed, 134 insertions(+)
 create mode 100644 modules/thermal_hydraulics/test/tests/components/physics_component/gold/single_physics_out.e
 create mode 120000 modules/thermal_hydraulics/test/tests/components/physics_component/rectangle.i
 create mode 100644 modules/thermal_hydraulics/test/tests/components/physics_component/single_physics.i
 create mode 100644 modules/thermal_hydraulics/test/tests/components/physics_component/tests

diff --git a/modules/thermal_hydraulics/test/tests/components/physics_component/gold/single_physics_out.e b/modules/thermal_hydraulics/test/tests/components/physics_component/gold/single_physics_out.e
new file mode 100644
index 0000000000000000000000000000000000000000..10d3414dfae4b824bc1b3c855001303449daead8
GIT binary patch
literal 63628
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

literal 0
HcmV?d00001

diff --git a/modules/thermal_hydraulics/test/tests/components/physics_component/rectangle.i b/modules/thermal_hydraulics/test/tests/components/physics_component/rectangle.i
new file mode 120000
index 000000000000..6291681463ae
--- /dev/null
+++ b/modules/thermal_hydraulics/test/tests/components/physics_component/rectangle.i
@@ -0,0 +1 @@
+../flow_component_ns/rectangle.i
\ No newline at end of file
diff --git a/modules/thermal_hydraulics/test/tests/components/physics_component/single_physics.i b/modules/thermal_hydraulics/test/tests/components/physics_component/single_physics.i
new file mode 100644
index 000000000000..ef9bc7e2da97
--- /dev/null
+++ b/modules/thermal_hydraulics/test/tests/components/physics_component/single_physics.i
@@ -0,0 +1,109 @@
+# Operating conditions
+u_inlet = 1
+p_outlet = 0
+
+[AuxVariables]
+  [porosity]
+    type = MooseVariableFVReal
+    initial_condition = 0.5
+  []
+  [velocity_norm]
+    type = MooseVariableFVReal
+  []
+[]
+
+[Physics]
+  [flow]
+    type = WCNSFVFlowPhysics
+    compressibility = 'incompressible'
+    porous_medium_treatment = true
+
+    density = 'rho'
+    dynamic_viscosity = 'mu'
+
+    initial_velocity = '${u_inlet} 0 0'
+    initial_pressure = '${p_outlet}'
+
+    mass_advection_interpolation = 'upwind'
+    momentum_advection_interpolation = 'upwind'
+
+    inlet_boundaries = 'comp1:left'
+    momentum_inlet_types = 'fixed-velocity'
+    momentum_inlet_function = 'f1 f1'
+
+    wall_boundaries = 'comp1:top comp1:bottom'
+    momentum_wall_types = 'noslip symmetry'
+
+    outlet_boundaries = 'comp1:right'
+    momentum_outlet_types = 'fixed-pressure'
+    pressure_function = 'f1'
+  []
+[]
+
+[Functions]
+  [f1]
+    type = ConstantFunction
+    value = 1
+  []
+[]
+
+[Components]
+  [comp1]
+    type = FileMeshPhysicsComponent
+    file = rectangle.e
+    position = '0 0 0'
+    physics = 'flow'
+  []
+[]
+
+[Materials]
+  [const_functor]
+    type = ADGenericFunctorMaterial
+    prop_names = 'rho mu'
+    prop_values = '1  1'
+  []
+[]
+
+[AuxKernels]
+  [speed]
+    type = ParsedAux
+    variable = 'velocity_norm'
+    coupled_variables = 'superficial_vel_x superficial_vel_y porosity'
+    expression = 'sqrt(superficial_vel_x*superficial_vel_x + superficial_vel_y*superficial_vel_y) / porosity'
+  []
+[]
+
+[Executioner]
+  type = Steady
+  solve_type = 'NEWTON'
+  petsc_options_iname = '-pc_type -pc_factor_shift_type -pc_factor_mat_solver_type'
+  petsc_options_value = 'lu       NONZERO               mumps'
+  line_search = 'none'
+  nl_rel_tol = 1e-12
+  automatic_scaling = true
+  off_diagonals_in_auto_scaling = true
+  verbose = true
+  scaling_group_variables = 'superficial_vel_x superficial_vel_y'
+[]
+
+[Debug]
+  show_var_residual_norms = true
+[]
+
+# Some basic Postprocessors to examine the solution
+[Postprocessors]
+  [inlet-p]
+    type = SideAverageValue
+    variable = pressure
+    boundary = 'comp1:left'
+  []
+  [outlet-u]
+    type = SideAverageValue
+    variable = superficial_vel_x
+    boundary = 'comp1:right'
+  []
+[]
+
+[Outputs]
+  exodus = true
+[]
diff --git a/modules/thermal_hydraulics/test/tests/components/physics_component/tests b/modules/thermal_hydraulics/test/tests/components/physics_component/tests
new file mode 100644
index 000000000000..3a393d82c9ef
--- /dev/null
+++ b/modules/thermal_hydraulics/test/tests/components/physics_component/tests
@@ -0,0 +1,24 @@
+[Tests]
+  design = 'FlowComponentNS.md'
+  issues = '#23794'
+
+  [generate_mesh]
+    type = RunApp
+    input = rectangle.i
+    recover = false # No transient, just mesh generation
+    cli_args = "--mesh-only rectangle.e"
+    requirement = 'The system shall be able to generate a simple rectangular mesh for the physics component tests.'
+  []
+  [single_physics]
+    type = Exodiff
+    input = single_physics.i
+    exodiff = single_physics_out.e
+    abs_zero = 5e-6
+    prereq = 'generate_mesh'
+    method = "!dbg"
+    installation_type = in_tree
+    max_parallel = 4 # https://github.com/idaholab/moose/issues/24503
+    valgrind = HEAVY
+    requirement = 'The system shall model the porous, incompressible Navier-Stokes equations with a finite volume discretization, using a component, abstracting the flow equation definitions using the Physics system.'
+  []
+[]

From 47ecf494dffd5466395e49885140ca84ffb2d014 Mon Sep 17 00:00:00 2001
From: Guillaume Giudicelli <guillaume.giudicelli@inl.gov>
Date: Wed, 18 Oct 2023 15:43:11 -0600
Subject: [PATCH 04/12] Add ability for components to query AD functors

---
 modules/thermal_hydraulics/include/components/Component.h | 6 +++++-
 modules/thermal_hydraulics/src/components/Component.C     | 2 ++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/modules/thermal_hydraulics/include/components/Component.h b/modules/thermal_hydraulics/include/components/Component.h
index 82e2fa959367..bf1489dd7c67 100644
--- a/modules/thermal_hydraulics/include/components/Component.h
+++ b/modules/thermal_hydraulics/include/components/Component.h
@@ -15,6 +15,7 @@
 #include "InputParameterWarehouse.h"
 #include "LoggingInterface.h"
 #include "NamingInterface.h"
+#include "ADFunctorInterface.h"
 
 class THMProblem;
 class THMMesh;
@@ -23,7 +24,10 @@ class ThermalHydraulicsApp;
 /**
  * Base class for THM components
  */
-class Component : public THMObject, public LoggingInterface, public NamingInterface
+class Component : public THMObject,
+                  public LoggingInterface,
+                  public NamingInterface,
+                  public ADFunctorInterface
 {
 public:
   Component(const InputParameters & parameters);
diff --git a/modules/thermal_hydraulics/src/components/Component.C b/modules/thermal_hydraulics/src/components/Component.C
index bdba1d31d033..7e2cc6fb3eb6 100644
--- a/modules/thermal_hydraulics/src/components/Component.C
+++ b/modules/thermal_hydraulics/src/components/Component.C
@@ -18,6 +18,7 @@ InputParameters
 Component::validParams()
 {
   InputParameters params = THMObject::validParams();
+  params += ADFunctorInterface::validParams();
   params.addPrivateParam<THMProblem *>("_thm_problem");
   params.addPrivateParam<Component *>("_parent", nullptr);
   params.addPrivateParam<std::string>("built_by_action", "add_component");
@@ -35,6 +36,7 @@ Component::Component(const InputParameters & parameters)
   : THMObject(parameters),
     LoggingInterface(getCheckedPointerParam<THMProblem *>("_thm_problem")->log()),
     NamingInterface(),
+    ADFunctorInterface(this),
 
     _parent(getParam<Component *>("_parent")),
     _sim(*getCheckedPointerParam<THMProblem *>("_thm_problem")),

From 11762960e131a55175cd85a89210dc9e98ab76f8 Mon Sep 17 00:00:00 2001
From: Guillaume Giudicelli <guillaume.giudicelli@inl.gov>
Date: Mon, 23 Oct 2023 13:39:56 -0600
Subject: [PATCH 05/12] Update to new syntax for physics component tests Enable
 valgrind

---
 .../physics_component/single_physics.i        | 39 ++++++++++---------
 .../tests/components/physics_component/tests  |  1 -
 2 files changed, 21 insertions(+), 19 deletions(-)

diff --git a/modules/thermal_hydraulics/test/tests/components/physics_component/single_physics.i b/modules/thermal_hydraulics/test/tests/components/physics_component/single_physics.i
index ef9bc7e2da97..80453aa5f2e4 100644
--- a/modules/thermal_hydraulics/test/tests/components/physics_component/single_physics.i
+++ b/modules/thermal_hydraulics/test/tests/components/physics_component/single_physics.i
@@ -13,30 +13,33 @@ p_outlet = 0
 []
 
 [Physics]
-  [flow]
-    type = WCNSFVFlowPhysics
-    compressibility = 'incompressible'
-    porous_medium_treatment = true
+  [NavierStokes]
+    [WCNSFVFlowPhysics]
+      [flow]
+        compressibility = 'incompressible'
+        porous_medium_treatment = true
 
-    density = 'rho'
-    dynamic_viscosity = 'mu'
+        density = 'rho'
+        dynamic_viscosity = 'mu'
 
-    initial_velocity = '${u_inlet} 0 0'
-    initial_pressure = '${p_outlet}'
+        initial_velocity = '${u_inlet} 0 0'
+        initial_pressure = '${p_outlet}'
 
-    mass_advection_interpolation = 'upwind'
-    momentum_advection_interpolation = 'upwind'
+        mass_advection_interpolation = 'upwind'
+        momentum_advection_interpolation = 'upwind'
 
-    inlet_boundaries = 'comp1:left'
-    momentum_inlet_types = 'fixed-velocity'
-    momentum_inlet_function = 'f1 f1'
+        inlet_boundaries = 'comp1:left'
+        momentum_inlet_types = 'fixed-velocity'
+        momentum_inlet_function = 'f1 f1'
 
-    wall_boundaries = 'comp1:top comp1:bottom'
-    momentum_wall_types = 'noslip symmetry'
+        wall_boundaries = 'comp1:top comp1:bottom'
+        momentum_wall_types = 'noslip symmetry'
 
-    outlet_boundaries = 'comp1:right'
-    momentum_outlet_types = 'fixed-pressure'
-    pressure_function = 'f1'
+        outlet_boundaries = 'comp1:right'
+        momentum_outlet_types = 'fixed-pressure'
+        pressure_function = 'f1'
+      []
+    []
   []
 []
 
diff --git a/modules/thermal_hydraulics/test/tests/components/physics_component/tests b/modules/thermal_hydraulics/test/tests/components/physics_component/tests
index 3a393d82c9ef..5bfa2ce8f47d 100644
--- a/modules/thermal_hydraulics/test/tests/components/physics_component/tests
+++ b/modules/thermal_hydraulics/test/tests/components/physics_component/tests
@@ -18,7 +18,6 @@
     method = "!dbg"
     installation_type = in_tree
     max_parallel = 4 # https://github.com/idaholab/moose/issues/24503
-    valgrind = HEAVY
     requirement = 'The system shall model the porous, incompressible Navier-Stokes equations with a finite volume discretization, using a component, abstracting the flow equation definitions using the Physics system.'
   []
 []

From cc572d9a4430bce5691cdc8beb885ce5bf47f522 Mon Sep 17 00:00:00 2001
From: Guillaume Giudicelli <guillaume.giudicelli@inl.gov>
Date: Tue, 24 Oct 2023 15:19:05 -0600
Subject: [PATCH 06/12] Adapting input file for merging Physics and new syntax

---
 .../test/tests/components/physics_component/single_physics.i  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/thermal_hydraulics/test/tests/components/physics_component/single_physics.i b/modules/thermal_hydraulics/test/tests/components/physics_component/single_physics.i
index 80453aa5f2e4..211fb65c1257 100644
--- a/modules/thermal_hydraulics/test/tests/components/physics_component/single_physics.i
+++ b/modules/thermal_hydraulics/test/tests/components/physics_component/single_physics.i
@@ -30,14 +30,14 @@ p_outlet = 0
 
         inlet_boundaries = 'comp1:left'
         momentum_inlet_types = 'fixed-velocity'
-        momentum_inlet_function = 'f1 f1'
+        momentum_inlet_functors = 'f1 f1'
 
         wall_boundaries = 'comp1:top comp1:bottom'
         momentum_wall_types = 'noslip symmetry'
 
         outlet_boundaries = 'comp1:right'
         momentum_outlet_types = 'fixed-pressure'
-        pressure_function = 'f1'
+        pressure_functors = 'f1'
       []
     []
   []

From dad8777df7e42b5311205330796a0f9fed71cb5c Mon Sep 17 00:00:00 2001
From: Guillaume Giudicelli <guillaume.giudicelli@inl.gov>
Date: Wed, 29 May 2024 12:26:10 +0900
Subject: [PATCH 07/12] Update syntax Fix test definition Add documentation to
 new component refs #23794 #24103

---
 .../components/FileMeshPhysicsComponent.md    | 22 ++++++++++++++++
 .../components/FileMeshPhysicsComponent.h     | 25 ++++---------------
 .../src/components/FileMeshPhysicsComponent.C |  7 +++---
 .../physics_component/single_physics.i        |  2 +-
 .../tests/components/physics_component/tests  |  6 ++---
 5 files changed, 34 insertions(+), 28 deletions(-)
 create mode 100644 modules/thermal_hydraulics/doc/content/source/components/FileMeshPhysicsComponent.md

diff --git a/modules/thermal_hydraulics/doc/content/source/components/FileMeshPhysicsComponent.md b/modules/thermal_hydraulics/doc/content/source/components/FileMeshPhysicsComponent.md
new file mode 100644
index 000000000000..dd9fdf81c323
--- /dev/null
+++ b/modules/thermal_hydraulics/doc/content/source/components/FileMeshPhysicsComponent.md
@@ -0,0 +1,22 @@
+# FileMeshPhysicsComponent
+
+This component first loads a mesh from an ExodusII file. It is equivalent to the [FileMeshGenerator.md]
+but can be used within a simulation with the geometry described with [Components](Components/index.md) instead of a [Mesh](Mesh/index.md)
+block.
+
+This component then adds its block to the domain of definition of [Physics](Physics/index.md) actions.
+The `Physics` must have implemented the `::addBlocks` routine.
+
+## Loading the mesh file
+
+See the [FileMeshComponent.md] for explanations on how to load the mesh.
+
+## Defining Physics
+
+The `Physics` active on the mesh loaded by this component are specified with the [!param](/Components/FileMeshPhysicsComponent/physics) parameter.
+
+!syntax parameters /Components/FileMeshPhysicsComponent
+
+!syntax inputs /Components/FileMeshPhysicsComponent
+
+!syntax children /Components/FileMeshPhysicsComponent
diff --git a/modules/thermal_hydraulics/include/components/FileMeshPhysicsComponent.h b/modules/thermal_hydraulics/include/components/FileMeshPhysicsComponent.h
index 6266e44160ee..d63747ad0bea 100644
--- a/modules/thermal_hydraulics/include/components/FileMeshPhysicsComponent.h
+++ b/modules/thermal_hydraulics/include/components/FileMeshPhysicsComponent.h
@@ -12,7 +12,7 @@
 #include "FileMeshComponent.h"
 
 /**
- * Create a component with a single Physics object active on it
+ * Create a component with user-selected Physics active on it
  */
 class FileMeshPhysicsComponent : public FileMeshComponent
 {
@@ -29,31 +29,16 @@ class FileMeshPhysicsComponent : public FileMeshComponent
 protected:
   virtual void init() override;
 
+  /// Return the blocks this component defines (assuming the ids do not overlap with other components)
   virtual std::vector<SubdomainName> getBlocks() const { return getSubdomainNames(); }
   virtual Factory & getFactory() { return getMooseApp().getFactory(); }
   virtual FEProblemBase & getProblem() { return getMooseApp().feProblem(); }
+  /// Returns the mesh, which also contains other components
   virtual const MooseMesh & getMesh() const { return constMesh(); }
-  // virtual void addNSNonlinearVariable(const std::string & var_type,
-  //                                     const std::string & var_name,
-  //                                     InputParameters & params)
-  // {
-  //   getTHMProblem().addSimVariable(true, var_type, var_name, params);
-  // }
-  // virtual void addNSAuxVariable(const std::string & var_type,
-  //                               const std::string & var_name,
-  //                               InputParameters & params)
-  // {
-  //   getTHMProblem().addSimVariable(false, var_type, var_name, params);
-  // }
-  // virtual void addNSInitialCondition(const std::string & type,
-  //                                    const std::string & name,
-  //                                    InputParameters & params)
-  // {
-  //   getTHMProblem().addSimInitialCondition(type, name, params);
-  // }
+  /// Returns a useful prefix for logs
   virtual std::string prefix() const { return name() + ":"; }
 
 private:
-  /// Physics object that creates the equations on this component
+  /// Physics that creates the equations on this component
   std::vector<PhysicsBase *> _physics;
 };
diff --git a/modules/thermal_hydraulics/src/components/FileMeshPhysicsComponent.C b/modules/thermal_hydraulics/src/components/FileMeshPhysicsComponent.C
index 05c96749c778..56f2008a085b 100644
--- a/modules/thermal_hydraulics/src/components/FileMeshPhysicsComponent.C
+++ b/modules/thermal_hydraulics/src/components/FileMeshPhysicsComponent.C
@@ -17,7 +17,8 @@ FileMeshPhysicsComponent::validParams()
 {
   InputParameters params = FileMeshComponent::validParams();
 
-  params.addClassDescription("Component with a single physics active on it.");
+  params.addClassDescription(
+      "Component using a mesh from a file with one or more Physics active on it.");
   params.addParam<std::vector<PhysicsName>>("physics", "Physics object(s) active on the Component");
   return params;
 }
@@ -43,10 +44,8 @@ FileMeshPhysicsComponent::init()
 
   // Before this point, we did not have a problem, so we could not retrieve the physics
   for (const auto & physics_name : getParam<std::vector<PhysicsName>>("physics"))
-    _physics.push_back(getProblem().getPhysics(physics_name));
+    _physics.push_back(_app.actionWarehouse().getPhysics<PhysicsBase>(physics_name));
 
   for (auto physics : _physics)
-  {
     physics->addBlocks(getSubdomainNames());
-  }
 }
diff --git a/modules/thermal_hydraulics/test/tests/components/physics_component/single_physics.i b/modules/thermal_hydraulics/test/tests/components/physics_component/single_physics.i
index 211fb65c1257..26bfb11b2218 100644
--- a/modules/thermal_hydraulics/test/tests/components/physics_component/single_physics.i
+++ b/modules/thermal_hydraulics/test/tests/components/physics_component/single_physics.i
@@ -14,7 +14,7 @@ p_outlet = 0
 
 [Physics]
   [NavierStokes]
-    [WCNSFVFlowPhysics]
+    [Flow]
       [flow]
         compressibility = 'incompressible'
         porous_medium_treatment = true
diff --git a/modules/thermal_hydraulics/test/tests/components/physics_component/tests b/modules/thermal_hydraulics/test/tests/components/physics_component/tests
index 5bfa2ce8f47d..b468377d8a57 100644
--- a/modules/thermal_hydraulics/test/tests/components/physics_component/tests
+++ b/modules/thermal_hydraulics/test/tests/components/physics_component/tests
@@ -1,6 +1,6 @@
 [Tests]
-  design = 'FlowComponentNS.md'
-  issues = '#23794'
+  design = 'FileMeshPhysicsComponent.md'
+  issues = '#23794 #24103'
 
   [generate_mesh]
     type = RunApp
@@ -18,6 +18,6 @@
     method = "!dbg"
     installation_type = in_tree
     max_parallel = 4 # https://github.com/idaholab/moose/issues/24503
-    requirement = 'The system shall model the porous, incompressible Navier-Stokes equations with a finite volume discretization, using a component, abstracting the flow equation definitions using the Physics system.'
+    requirement = 'The system shall be able to create a component leveraging the Physics syntax to define equations.'
   []
 []

From 0ed277bb45cfe921986c293838c55d5683d5ca7d Mon Sep 17 00:00:00 2001
From: Guillaume Giudicelli <guillaume.giudicelli@inl.gov>
Date: Sat, 1 Jun 2024 15:55:28 +0900
Subject: [PATCH 08/12] Default physics to being defined everywhere

---
 framework/src/physics/PhysicsBase.C                  | 12 ++++++++++++
 .../src/physics/NavierStokesPhysicsBase.C            | 11 -----------
 .../src/components/FileMeshPhysicsComponent.C        |  4 ++--
 modules/thermal_hydraulics/src/parser/THMSyntax.C    |  2 ++
 .../components/physics_component/single_physics.i    |  2 +-
 5 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/framework/src/physics/PhysicsBase.C b/framework/src/physics/PhysicsBase.C
index 8f91fb9f1199..d958a43fa761 100644
--- a/framework/src/physics/PhysicsBase.C
+++ b/framework/src/physics/PhysicsBase.C
@@ -195,6 +195,18 @@ PhysicsBase::addRelationshipManagers(Moose::RelationshipManagerType input_rm_typ
 void
 PhysicsBase::initializePhysics()
 {
+  // Annoying edge case. We cannot use ANY_BLOCK_ID for kernels and variables since errors got added
+  // downstream for using it, we cannot leave it empty as that sets all objects to not live on any
+  // block
+  if (isParamSetByUser("block") && _blocks.empty())
+    paramError("block",
+               "Empty block restriction is not supported. Comment out the Physics if you are "
+               "trying to disable it.");
+
+  // Components should have added their blocks already.
+  if (_blocks.empty())
+    _blocks.push_back("ANY_BLOCK_ID");
+
   mooseAssert(_mesh, "We should have a mesh to find the dimension");
   if (_blocks.size())
     _dim = _mesh->getBlocksMaxDimension(_blocks);
diff --git a/modules/navier_stokes/src/physics/NavierStokesPhysicsBase.C b/modules/navier_stokes/src/physics/NavierStokesPhysicsBase.C
index 4b5c87fcdaf0..46efc60c6203 100644
--- a/modules/navier_stokes/src/physics/NavierStokesPhysicsBase.C
+++ b/modules/navier_stokes/src/physics/NavierStokesPhysicsBase.C
@@ -34,17 +34,6 @@ NavierStokesPhysicsBase::validParams()
 NavierStokesPhysicsBase::NavierStokesPhysicsBase(const InputParameters & parameters)
   : PhysicsBase(parameters), _define_variables(getParam<bool>("define_variables"))
 {
-  // Annoying edge case. We cannot use ANY_BLOCK_ID for kernels and variables since errors got added
-  // downstream for using it, we cannot leave it empty as that sets all objects to not live on any
-  // block
-  if (isParamSetByUser("block") && _blocks.empty())
-    paramError("block",
-               "Empty block restriction is not supported. Comment out the Physics if you are "
-               "trying to disable it.");
-
-  // Placeholder before work with components
-  if (_blocks.empty())
-    _blocks.push_back("ANY_BLOCK_ID");
 }
 
 InputParameters
diff --git a/modules/thermal_hydraulics/src/components/FileMeshPhysicsComponent.C b/modules/thermal_hydraulics/src/components/FileMeshPhysicsComponent.C
index 56f2008a085b..6aea711c5e4c 100644
--- a/modules/thermal_hydraulics/src/components/FileMeshPhysicsComponent.C
+++ b/modules/thermal_hydraulics/src/components/FileMeshPhysicsComponent.C
@@ -28,8 +28,8 @@ FileMeshPhysicsComponent::FileMeshPhysicsComponent(const InputParameters & param
 {
 }
 
-void FileMeshPhysicsComponent::addRelationshipManagers(
-    Moose::RelationshipManagerType /*input_rm_type*/)
+void
+FileMeshPhysicsComponent::addRelationshipManagers(Moose::RelationshipManagerType /*input_rm_type*/)
 {
   // TODO: We ll just add late relationship managers
   // At this point in the setup, we do not have a problem, so we cannot retrieve a Physics. We can
diff --git a/modules/thermal_hydraulics/src/parser/THMSyntax.C b/modules/thermal_hydraulics/src/parser/THMSyntax.C
index b589c8999828..dc60eadde2ad 100644
--- a/modules/thermal_hydraulics/src/parser/THMSyntax.C
+++ b/modules/thermal_hydraulics/src/parser/THMSyntax.C
@@ -73,6 +73,8 @@ registerActions(Syntax & syntax)
     syntax.addDependency("THM:init_simulation", "THM:add_component");
     syntax.addDependency("add_mesh_generator", "THM:add_component");
     syntax.addDependency("THM:identify_loops", "THM:add_component");
+    // Components must specify their blocks to the Physics before it gets initialized
+    syntax.addDependency("init_physics", "THM:init_components");
     syntax.addDependency("THM:identify_loops", "add_fluid_properties");
     syntax.addDependency("THM:integrity_check", "THM:init_components");
     syntax.addDependency("THM:integrity_check", "THM:identify_loops");
diff --git a/modules/thermal_hydraulics/test/tests/components/physics_component/single_physics.i b/modules/thermal_hydraulics/test/tests/components/physics_component/single_physics.i
index 26bfb11b2218..5a05eeb60736 100644
--- a/modules/thermal_hydraulics/test/tests/components/physics_component/single_physics.i
+++ b/modules/thermal_hydraulics/test/tests/components/physics_component/single_physics.i
@@ -59,7 +59,7 @@ p_outlet = 0
   []
 []
 
-[Materials]
+[FunctorMaterials]
   [const_functor]
     type = ADGenericFunctorMaterial
     prop_names = 'rho mu'

From 24b6730e765f4032882f46d407e1080953f07fb7 Mon Sep 17 00:00:00 2001
From: Guillaume Giudicelli <guillaume.giudicelli@inl.gov>
Date: Mon, 3 Jun 2024 19:38:33 +0900
Subject: [PATCH 09/12] Relax dependency on problem for NSFVAction processMesh
 by moving a call to addNSVariables Re-organize task dependencies to allow
 physics being initialized after componentse

---
 framework/src/base/Moose.C                                   | 5 +++--
 modules/fluid_properties/src/base/FluidPropertiesApp.C       | 2 +-
 modules/navier_stokes/include/base/NSFVBase.h                | 5 +++--
 .../include/components/FileMeshPhysicsComponent.h            | 1 +
 .../src/components/FileMeshPhysicsComponent.C                | 2 +-
 modules/thermal_hydraulics/src/parser/THMSyntax.C            | 4 ++++
 6 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/framework/src/base/Moose.C b/framework/src/base/Moose.C
index 24a02d35313b..e55f38edcc75 100644
--- a/framework/src/base/Moose.C
+++ b/framework/src/base/Moose.C
@@ -306,7 +306,9 @@ addActionTypes(Syntax & syntax)
                            "(create_problem_custom)"
                            "(create_problem_default)"
                            "(create_problem_complete)"
-                           "(init_physics)"
+                           "(add_function)"  // Functions can depend on scalar variables, but this dependence can be
+                                             // added on initialSetup() rather than construction
+                           "(init_physics)"  // Components add their blocks to Physics, and components need functions at initialization
                            "(setup_postprocessor_data)"
                            "(setup_time_integrator)"
                            "(setup_executioner)"
@@ -322,7 +324,6 @@ addActionTypes(Syntax & syntax)
                            "(add_mortar_variable)"
                            "(setup_variable_complete)"
                            "(setup_quadrature)"
-                           "(add_function)"
                            "(add_periodic_bc)"
                            "(add_user_object)"
                            "(add_distribution)"
diff --git a/modules/fluid_properties/src/base/FluidPropertiesApp.C b/modules/fluid_properties/src/base/FluidPropertiesApp.C
index 50c9107b8fd6..e0ba164b0c03 100644
--- a/modules/fluid_properties/src/base/FluidPropertiesApp.C
+++ b/modules/fluid_properties/src/base/FluidPropertiesApp.C
@@ -45,7 +45,7 @@ associateSyntaxInner(Syntax & syntax, ActionFactory & /*action_factory*/)
   registerMooseObjectTask("add_fluid_properties", FluidProperties, false);
   registerMooseObjectTask("add_fp_output", Output, false);
 
-  syntax.addDependency("add_fluid_properties", "init_displaced_problem");
+  // Fluid properties depend on variables
   syntax.addDependency("add_aux_variable", "add_fluid_properties");
   syntax.addDependency("add_variable", "add_fluid_properties");
   syntax.addDependency("add_elemental_field_variable", "add_fluid_properties");
diff --git a/modules/navier_stokes/include/base/NSFVBase.h b/modules/navier_stokes/include/base/NSFVBase.h
index 290f5705d97b..de128fc0bdcb 100644
--- a/modules/navier_stokes/include/base/NSFVBase.h
+++ b/modules/navier_stokes/include/base/NSFVBase.h
@@ -1171,6 +1171,9 @@ template <class BaseType>
 void
 NSFVBase<BaseType>::addNSVariables()
 {
+  // We use finite volume variables
+  getProblem().needFV();
+
   // Determine which variables to add
   processVariables();
 
@@ -3051,8 +3054,6 @@ template <class BaseType>
 void
 NSFVBase<BaseType>::processMesh()
 {
-  getProblem().needFV();
-
   _blocks = getBlocks();
 
   // If the user doesn't define a block name we go with the default
diff --git a/modules/thermal_hydraulics/include/components/FileMeshPhysicsComponent.h b/modules/thermal_hydraulics/include/components/FileMeshPhysicsComponent.h
index d63747ad0bea..d51358713db4 100644
--- a/modules/thermal_hydraulics/include/components/FileMeshPhysicsComponent.h
+++ b/modules/thermal_hydraulics/include/components/FileMeshPhysicsComponent.h
@@ -10,6 +10,7 @@
 #pragma once
 
 #include "FileMeshComponent.h"
+#include "THMMesh.h"
 
 /**
  * Create a component with user-selected Physics active on it
diff --git a/modules/thermal_hydraulics/src/components/FileMeshPhysicsComponent.C b/modules/thermal_hydraulics/src/components/FileMeshPhysicsComponent.C
index 6aea711c5e4c..561f5463fe1e 100644
--- a/modules/thermal_hydraulics/src/components/FileMeshPhysicsComponent.C
+++ b/modules/thermal_hydraulics/src/components/FileMeshPhysicsComponent.C
@@ -29,7 +29,7 @@ FileMeshPhysicsComponent::FileMeshPhysicsComponent(const InputParameters & param
 }
 
 void
-FileMeshPhysicsComponent::addRelationshipManagers(Moose::RelationshipManagerType /*input_rm_type*/)
+FileMeshPhysicsComponent::addRelationshipManagers(Moose::RelationshipManagerType /*in_rm_type*/)
 {
   // TODO: We ll just add late relationship managers
   // At this point in the setup, we do not have a problem, so we cannot retrieve a Physics. We can
diff --git a/modules/thermal_hydraulics/src/parser/THMSyntax.C b/modules/thermal_hydraulics/src/parser/THMSyntax.C
index dc60eadde2ad..b6276c2c4f45 100644
--- a/modules/thermal_hydraulics/src/parser/THMSyntax.C
+++ b/modules/thermal_hydraulics/src/parser/THMSyntax.C
@@ -75,6 +75,10 @@ registerActions(Syntax & syntax)
     syntax.addDependency("THM:identify_loops", "THM:add_component");
     // Components must specify their blocks to the Physics before it gets initialized
     syntax.addDependency("init_physics", "THM:init_components");
+    // Fluid properties are retrieved during component initialization
+    syntax.addDependency("THM:init_components", "add_fluid_properties");
+    // Solid material property used in a component needs a function
+    syntax.addDependency("THM:init_components", "add_function");
     syntax.addDependency("THM:identify_loops", "add_fluid_properties");
     syntax.addDependency("THM:integrity_check", "THM:init_components");
     syntax.addDependency("THM:integrity_check", "THM:identify_loops");

From 034c3cec09bec6d36faa01be64f4d6cd3e568738 Mon Sep 17 00:00:00 2001
From: Guillaume Giudicelli <guillaume.giudicelli@inl.gov>
Date: Wed, 12 Jun 2024 18:40:58 -0600
Subject: [PATCH 10/12] Remove retrieval of FPs at construction in fluid
 property functions - lets us construct functions much earlier. As FPs depend
 on variables

---
 .../functions/SaturationDensityFunction.h       |  9 ++++++---
 .../functions/SaturationPressureFunction.h      |  5 ++++-
 .../functions/SaturationTemperatureFunction.h   |  5 ++++-
 .../src/functions/SaturationDensityFunction.C   | 17 +++++++++++------
 .../src/functions/SaturationPressureFunction.C  | 13 +++++++++----
 .../functions/SaturationTemperatureFunction.C   | 13 +++++++++----
 6 files changed, 43 insertions(+), 19 deletions(-)

diff --git a/modules/fluid_properties/include/functions/SaturationDensityFunction.h b/modules/fluid_properties/include/functions/SaturationDensityFunction.h
index ed8b1dab0563..da7c7d37a4d3 100644
--- a/modules/fluid_properties/include/functions/SaturationDensityFunction.h
+++ b/modules/fluid_properties/include/functions/SaturationDensityFunction.h
@@ -25,6 +25,9 @@ class SaturationDensityFunction : public Function, public FunctionInterface
 
   SaturationDensityFunction(const InputParameters & parameters);
 
+  // To retrieve the fluid properties
+  virtual void initialSetup() override;
+
   using Function::value;
   virtual Real value(Real t, const Point & p) const override;
 
@@ -32,11 +35,11 @@ class SaturationDensityFunction : public Function, public FunctionInterface
   /// Temperature function
   const Function & _T_fn;
   /// 2-phase fluid properties object
-  const TwoPhaseFluidProperties & _fp_2phase;
+  const TwoPhaseFluidProperties * _fp_2phase;
   /// Single-phase liquid properties
-  const SinglePhaseFluidProperties & _fp_liquid;
+  const SinglePhaseFluidProperties * _fp_liquid;
   /// Single-phase vapor properties
-  const SinglePhaseFluidProperties & _fp_vapor;
+  const SinglePhaseFluidProperties * _fp_vapor;
   /// Set true to use liquid phase; else vapor phase
   const bool _use_liquid;
 };
diff --git a/modules/fluid_properties/include/functions/SaturationPressureFunction.h b/modules/fluid_properties/include/functions/SaturationPressureFunction.h
index 9f624be68bd7..2ec7818ebbb9 100644
--- a/modules/fluid_properties/include/functions/SaturationPressureFunction.h
+++ b/modules/fluid_properties/include/functions/SaturationPressureFunction.h
@@ -24,6 +24,9 @@ class SaturationPressureFunction : public Function, public FunctionInterface
 
   SaturationPressureFunction(const InputParameters & parameters);
 
+  // To retrieve the fluid properties
+  virtual void initialSetup() override;
+
   using Function::value;
   virtual Real value(Real t, const Point & p) const override;
   virtual RealVectorValue gradient(Real t, const Point & p) const override;
@@ -32,5 +35,5 @@ class SaturationPressureFunction : public Function, public FunctionInterface
   /// Temperature function
   const Function & _T_fn;
   /// 2-phase fluid properties object
-  const TwoPhaseFluidProperties & _fp_2phase;
+  const TwoPhaseFluidProperties * _fp_2phase;
 };
diff --git a/modules/fluid_properties/include/functions/SaturationTemperatureFunction.h b/modules/fluid_properties/include/functions/SaturationTemperatureFunction.h
index 651f213db496..e584ca573cb1 100644
--- a/modules/fluid_properties/include/functions/SaturationTemperatureFunction.h
+++ b/modules/fluid_properties/include/functions/SaturationTemperatureFunction.h
@@ -24,6 +24,9 @@ class SaturationTemperatureFunction : public Function, public FunctionInterface
 
   SaturationTemperatureFunction(const InputParameters & parameters);
 
+  // To retrieve the fluid properties
+  virtual void initialSetup() override;
+
   using Function::value;
   virtual Real value(Real t, const Point & p) const override;
   virtual RealVectorValue gradient(Real t, const Point & p) const override;
@@ -32,5 +35,5 @@ class SaturationTemperatureFunction : public Function, public FunctionInterface
   /// Pressure function
   const Function & _p_fn;
   /// 2-phase fluid properties object
-  const TwoPhaseFluidProperties & _fp_2phase;
+  const TwoPhaseFluidProperties * _fp_2phase;
 };
diff --git a/modules/fluid_properties/src/functions/SaturationDensityFunction.C b/modules/fluid_properties/src/functions/SaturationDensityFunction.C
index 9ee4b1736d53..469ef2c7278b 100644
--- a/modules/fluid_properties/src/functions/SaturationDensityFunction.C
+++ b/modules/fluid_properties/src/functions/SaturationDensityFunction.C
@@ -32,21 +32,26 @@ SaturationDensityFunction::SaturationDensityFunction(const InputParameters & par
     FunctionInterface(this),
 
     _T_fn(getFunction("T")),
-    _fp_2phase(getUserObject<TwoPhaseFluidProperties>("fp_2phase")),
-    _fp_liquid(getUserObjectByName<SinglePhaseFluidProperties>(_fp_2phase.getLiquidName())),
-    _fp_vapor(getUserObjectByName<SinglePhaseFluidProperties>(_fp_2phase.getVaporName())),
     _use_liquid(getParam<bool>("use_liquid"))
 {
 }
 
+void
+SaturationDensityFunction::initialSetup()
+{
+  _fp_2phase = &getUserObject<TwoPhaseFluidProperties>("fp_2phase");
+  _fp_liquid = &getUserObjectByName<SinglePhaseFluidProperties>(_fp_2phase->getLiquidName());
+  _fp_vapor = &getUserObjectByName<SinglePhaseFluidProperties>(_fp_2phase->getVaporName());
+}
+
 Real
 SaturationDensityFunction::value(Real t, const Point & point) const
 {
   const Real T = _T_fn.value(t, point);
-  const Real p = _fp_2phase.p_sat(T);
+  const Real p = _fp_2phase->p_sat(T);
 
   if (_use_liquid)
-    return _fp_liquid.rho_from_p_T(p, T);
+    return _fp_liquid->rho_from_p_T(p, T);
   else
-    return _fp_vapor.rho_from_p_T(p, T);
+    return _fp_vapor->rho_from_p_T(p, T);
 }
diff --git a/modules/fluid_properties/src/functions/SaturationPressureFunction.C b/modules/fluid_properties/src/functions/SaturationPressureFunction.C
index a72ef8772cf7..91d89d08db84 100644
--- a/modules/fluid_properties/src/functions/SaturationPressureFunction.C
+++ b/modules/fluid_properties/src/functions/SaturationPressureFunction.C
@@ -30,19 +30,24 @@ SaturationPressureFunction::SaturationPressureFunction(const InputParameters & p
   : Function(parameters),
     FunctionInterface(this),
 
-    _T_fn(getFunction("T")),
-    _fp_2phase(getUserObject<TwoPhaseFluidProperties>("fp_2phase"))
+    _T_fn(getFunction("T"))
 {
 }
 
+void
+SaturationPressureFunction::initialSetup()
+{
+  _fp_2phase = &getUserObject<TwoPhaseFluidProperties>("fp_2phase");
+}
+
 Real
 SaturationPressureFunction::value(Real t, const Point & point) const
 {
-  return _fp_2phase.p_sat(_T_fn.value(t, point));
+  return _fp_2phase->p_sat(_T_fn.value(t, point));
 }
 
 RealVectorValue
 SaturationPressureFunction::gradient(Real t, const Point & point) const
 {
-  return _T_fn.gradient(t, point) / _fp_2phase.dT_sat_dp(value(t, point));
+  return _T_fn.gradient(t, point) / _fp_2phase->dT_sat_dp(value(t, point));
 }
diff --git a/modules/fluid_properties/src/functions/SaturationTemperatureFunction.C b/modules/fluid_properties/src/functions/SaturationTemperatureFunction.C
index 7eba10caac8e..0900248cf554 100644
--- a/modules/fluid_properties/src/functions/SaturationTemperatureFunction.C
+++ b/modules/fluid_properties/src/functions/SaturationTemperatureFunction.C
@@ -30,19 +30,24 @@ SaturationTemperatureFunction::SaturationTemperatureFunction(const InputParamete
   : Function(parameters),
     FunctionInterface(this),
 
-    _p_fn(getFunction("p")),
-    _fp_2phase(getUserObject<TwoPhaseFluidProperties>("fp_2phase"))
+    _p_fn(getFunction("p"))
 {
 }
 
+void
+SaturationTemperatureFunction::initialSetup()
+{
+  _fp_2phase = &getUserObject<TwoPhaseFluidProperties>("fp_2phase");
+}
+
 Real
 SaturationTemperatureFunction::value(Real t, const Point & point) const
 {
-  return _fp_2phase.T_sat(_p_fn.value(t, point));
+  return _fp_2phase->T_sat(_p_fn.value(t, point));
 }
 
 RealVectorValue
 SaturationTemperatureFunction::gradient(Real t, const Point & point) const
 {
-  return _fp_2phase.dT_sat_dp(_p_fn.value(t, point)) * _p_fn.gradient(t, point);
+  return _fp_2phase->dT_sat_dp(_p_fn.value(t, point)) * _p_fn.gradient(t, point);
 }

From 2ba13fc6d8c52e3cd869c5ab06e27bcd18cbfcee Mon Sep 17 00:00:00 2001
From: Guillaume Giudicelli <guillaume.giudicelli@inl.gov>
Date: Thu, 13 Jun 2024 14:37:15 -0600
Subject: [PATCH 11/12] Move displaced problem init earlier to have functions
 functors Add TI to displaced problem later as it is not ready when problem is
 created

---
 framework/include/problems/DisplacedProblem.h     |  3 +++
 .../src/actions/CreateDisplacedProblemAction.C    |  4 ++--
 framework/src/base/Moose.C                        |  4 ++--
 framework/src/problems/DisplacedProblem.C         | 13 +++++++++----
 framework/src/problems/FEProblemBase.C            |  4 ++++
 framework/src/variables/MooseVariableFE.C         | 15 ++++++++++++---
 6 files changed, 32 insertions(+), 11 deletions(-)

diff --git a/framework/include/problems/DisplacedProblem.h b/framework/include/problems/DisplacedProblem.h
index c96b39857590..699d9573f952 100644
--- a/framework/include/problems/DisplacedProblem.h
+++ b/framework/include/problems/DisplacedProblem.h
@@ -84,6 +84,9 @@ class DisplacedProblem : public SubProblem
   virtual unsigned int linearSysNum(const LinearSystemName & sys_name) const override;
   virtual unsigned int solverSysNum(const SolverSystemName & sys_name) const override;
 
+  /// Get the time integrators from the problem
+  void addTimeIntegrator();
+
   /**
    * Allocate vectors and save old solutions into them.
    */
diff --git a/framework/src/actions/CreateDisplacedProblemAction.C b/framework/src/actions/CreateDisplacedProblemAction.C
index 88cbf6094016..b16063145956 100644
--- a/framework/src/actions/CreateDisplacedProblemAction.C
+++ b/framework/src/actions/CreateDisplacedProblemAction.C
@@ -131,7 +131,7 @@ CreateDisplacedProblemAction::act()
             "We should be adding geometric rms so early that we haven't set our MeshBase yet");
 
       _mesh->allowRemoteElementRemoval(false);
-      // Displaced mesh should not exist yet
+      mooseAssert(!_displaced_mesh, "Displaced mesh should not exist yet");
     }
 
     if (_current_task == "add_algebraic_rm")
@@ -163,7 +163,7 @@ CreateDisplacedProblemAction::act()
       addProxyAlgebraicRelationshipManagers(undisplaced_aux, displaced_aux);
       addProxyAlgebraicRelationshipManagers(displaced_aux, undisplaced_aux);
 
-      // Add geoemtric ghosting (which only acts through the mesh) through the single auxiliary
+      // Add geometric ghosting (which only acts through the mesh) through the single auxiliary
       // system as opposed to duplicating the effort through potentially multiple nonlinear systems
       addProxyGeometricRelationshipManagers(undisplaced_aux, displaced_aux);
       addProxyGeometricRelationshipManagers(displaced_aux, undisplaced_aux);
diff --git a/framework/src/base/Moose.C b/framework/src/base/Moose.C
index e55f38edcc75..04cbb69fab77 100644
--- a/framework/src/base/Moose.C
+++ b/framework/src/base/Moose.C
@@ -306,7 +306,8 @@ addActionTypes(Syntax & syntax)
                            "(create_problem_custom)"
                            "(create_problem_default)"
                            "(create_problem_complete)"
-                           "(add_function)"  // Functions can depend on scalar variables, but this dependence can be
+                           "(init_displaced_problem)" // Problem must be init-ed before we start adding functors
+                           "(add_function)"  // Functions can depend on scalar variables & PPs, but this dependence can be
                                              // added on initialSetup() rather than construction
                            "(init_physics)"  // Components add their blocks to Physics, and components need functions at initialization
                            "(setup_postprocessor_data)"
@@ -318,7 +319,6 @@ addActionTypes(Syntax & syntax)
                            "(check_integrity_early)"
                            "(check_integrity_early_physics)"
                            "(setup_predictor)"
-                           "(init_displaced_problem)"
                            "(add_aux_variable, add_variable, add_elemental_field_variable,"
                            " add_external_aux_variables)"
                            "(add_mortar_variable)"
diff --git a/framework/src/problems/DisplacedProblem.C b/framework/src/problems/DisplacedProblem.C
index 4ef88d937133..84d9796d61c6 100644
--- a/framework/src/problems/DisplacedProblem.C
+++ b/framework/src/problems/DisplacedProblem.C
@@ -67,9 +67,6 @@ DisplacedProblem::DisplacedProblem(const InputParameters & parameters)
 
     for (unsigned int i = 0; i < n_threads; ++i)
       _assembly[i].emplace_back(std::make_unique<Assembly>(*displaced_nl, i));
-
-    displaced_nl->addTimeIntegrator(
-        _mproblem.getNonlinearSystemBase(nl_sys_num).getSharedTimeIntegrator());
   }
 
   _nl_solution.resize(_displaced_solver_systems.size(), nullptr);
@@ -80,7 +77,6 @@ DisplacedProblem::DisplacedProblem(const InputParameters & parameters)
                                         _mproblem.getAuxiliarySystem(),
                                         "displaced_" + _mproblem.getAuxiliarySystem().name(),
                                         Moose::VAR_AUXILIARY);
-  _displaced_aux->addTimeIntegrator(_mproblem.getAuxiliarySystem().getSharedTimeIntegrator());
 
   // // Generally speaking, the mesh is prepared for use, and consequently remote elements are deleted
   // // well before our Problem(s) are constructed. Historically, in MooseMesh we have a bunch of
@@ -195,6 +191,15 @@ DisplacedProblem::initAdaptivity()
 {
 }
 
+void
+DisplacedProblem::addTimeIntegrator()
+{
+  for (const auto nl_sys_num : make_range(_mproblem.numNonlinearSystems()))
+    _displaced_solver_systems[nl_sys_num]->addTimeIntegrator(
+        _mproblem.getNonlinearSystemBase(nl_sys_num).getSharedTimeIntegrator());
+  _displaced_aux->addTimeIntegrator(_mproblem.getAuxiliarySystem().getSharedTimeIntegrator());
+}
+
 void
 DisplacedProblem::saveOldSolutions()
 {
diff --git a/framework/src/problems/FEProblemBase.C b/framework/src/problems/FEProblemBase.C
index 843d73c24848..ad317ac4fa77 100644
--- a/framework/src/problems/FEProblemBase.C
+++ b/framework/src/problems/FEProblemBase.C
@@ -6335,6 +6335,10 @@ FEProblemBase::addTimeIntegrator(const std::string & type,
     if (!nl->hasVector(tag_udotdot) && uDotDotRequested())
       nl->associateVectorToTag(*nl->solutionUDotDot(), tag_udotdot);
   }
+
+  if (_displaced_problem)
+    // Time integrator does not exist when displaced problem is created.
+    _displaced_problem->addTimeIntegrator();
 }
 
 void
diff --git a/framework/src/variables/MooseVariableFE.C b/framework/src/variables/MooseVariableFE.C
index bb506bb9685d..9258fddd6e32 100644
--- a/framework/src/variables/MooseVariableFE.C
+++ b/framework/src/variables/MooseVariableFE.C
@@ -1144,9 +1144,12 @@ template <typename OutputType>
 typename MooseVariableFE<OutputType>::DotType
 MooseVariableFE<OutputType>::evaluateDot(const ElemQpArg & elem_qp, const StateArg & state) const
 {
-  mooseAssert(_time_integrator && _time_integrator->dt(),
+  mooseAssert(_time_integrator,
               "A time derivative is being requested but we do not have a time integrator so we'll "
               "have no idea how to compute it");
+  mooseAssert(_time_integrator->dt(),
+              "A time derivative is being requested but the time integrator wants to perform a 0s "
+              "time step");
   evaluateOnElement(elem_qp, state, /*query_cache=*/true);
   const auto qp = elem_qp.qp;
   mooseAssert(qp < _current_elem_qp_functor_dot.size(),
@@ -1158,9 +1161,12 @@ template <typename OutputType>
 typename MooseVariableFE<OutputType>::DotType
 MooseVariableFE<OutputType>::evaluateDot(const ElemArg & elem_arg, const StateArg & state) const
 {
-  mooseAssert(_time_integrator && _time_integrator->dt(),
+  mooseAssert(_time_integrator,
               "A time derivative is being requested but we do not have a time integrator so we'll "
               "have no idea how to compute it");
+  mooseAssert(_time_integrator->dt(),
+              "A time derivative is being requested but the time integrator wants to perform a 0s "
+              "time step");
   const QMonomial qrule(elem_arg.elem->dim(), CONSTANT);
   // We can use whatever we want for the point argument since it won't be used
   const ElemQpArg elem_qp_arg{elem_arg.elem, /*qp=*/0, &qrule, Point(0, 0, 0)};
@@ -1172,9 +1178,12 @@ template <typename OutputType>
 typename MooseVariableFE<OutputType>::GradientType
 MooseVariableFE<OutputType>::evaluateGradDot(const ElemArg & elem_arg, const StateArg & state) const
 {
-  mooseAssert(_time_integrator && _time_integrator->dt(),
+  mooseAssert(_time_integrator,
               "A time derivative is being requested but we do not have a time integrator so we'll "
               "have no idea how to compute it");
+  mooseAssert(_time_integrator->dt(),
+              "A time derivative is being requested but the time integrator wants to perform a 0s "
+              "time step");
   const QMonomial qrule(elem_arg.elem->dim(), CONSTANT);
   // We can use whatever we want for the point argument since it won't be used
   const ElemQpArg elem_qp_arg{elem_arg.elem, /*qp=*/0, &qrule, Point(0, 0, 0)};

From a333d030aa4baec111d085d8e37a829e325c1f7d Mon Sep 17 00:00:00 2001
From: Guillaume Giudicelli <guillaume.giudicelli@inl.gov>
Date: Sun, 16 Jun 2024 15:49:53 -0600
Subject: [PATCH 12/12] Make sure displaced problem gets destructed earlier

---
 framework/include/executioners/SolveObject.h | 2 +-
 framework/src/executioners/SolveObject.C     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/framework/include/executioners/SolveObject.h b/framework/include/executioners/SolveObject.h
index 503859a01207..dca615fda792 100644
--- a/framework/include/executioners/SolveObject.h
+++ b/framework/include/executioners/SolveObject.h
@@ -41,7 +41,7 @@ class SolveObject : public MooseObject, public PerfGraphInterface, public Postpr
   /// Reference to FEProblem
   FEProblemBase & _problem;
   /// Displaced problem
-  std::shared_ptr<DisplacedProblem> _displaced_problem;
+  DisplacedProblem * _displaced_problem;
   /// Mesh
   MooseMesh & _mesh;
   /// Displaced mesh
diff --git a/framework/src/executioners/SolveObject.C b/framework/src/executioners/SolveObject.C
index 5d45673552db..7445739e967b 100644
--- a/framework/src/executioners/SolveObject.C
+++ b/framework/src/executioners/SolveObject.C
@@ -22,7 +22,7 @@ SolveObject::SolveObject(Executioner & ex)
     _executioner(ex),
     _problem(*getCheckedPointerParam<FEProblemBase *>(
         "_fe_problem_base", "This might happen if you don't have a mesh")),
-    _displaced_problem(_problem.getDisplacedProblem()),
+    _displaced_problem(_problem.getDisplacedProblem().get()),
     _mesh(_problem.mesh()),
     _displaced_mesh(_displaced_problem ? &_displaced_problem->mesh() : nullptr),
     _solver_sys(_problem.numNonlinearSystems()