diff --git a/modules/thermal_hydraulics/doc/content/modules/thermal_hydraulics/component_groups/heat_structure_2d_usage.md.template b/modules/thermal_hydraulics/doc/content/modules/thermal_hydraulics/component_groups/heat_structure_2d_usage.md.template index 8e068574b5ed..ad3d5769aa4a 100644 --- a/modules/thermal_hydraulics/doc/content/modules/thermal_hydraulics/component_groups/heat_structure_2d_usage.md.template +++ b/modules/thermal_hydraulics/doc/content/modules/thermal_hydraulics/component_groups/heat_structure_2d_usage.md.template @@ -3,17 +3,21 @@ The parameters [!param](/Components/{{name}}/widths), and [!param](/Components/{{name}}/n_part_elems) are discussed in [#mesh_radial]. -The parameter [!param](/Components/{{name}}/materials) specifies the names of -[HeatStructureMaterials](HeatStructureMaterials/index.md) objects to use in -each region. Each entry in this parameter corresponds to the entries in the parameters -[!param](/Components/{{name}}/names), [!param](/Components/{{name}}/widths), -and [!param](/Components/{{name}}/n_part_elems). -Note that this parameter is optional; if omitted, the user must -create [Materials](Materials/index.md) supplying the following material properties -on all blocks (see [#mesh_blocks]) of the heat structure mesh: +There are two options for specification of the thermal properties on the heat structure: -| Material Property | Symbol | Description | -| :- | :- | :- | -| `density` | $\rho$ | Density \[kg/m$^3$\] | -| `specific_heat` | $c_p$ | Specific heat capacity \[J/(kg-K)\] | -| `thermal_conductivity` | $k$ | Thermal conductivity \[W/(m-K)\] | +- Create a [SolidProperties](syntax/SolidProperties/index.md) object for each unique heat structure material, + and then provide [!param](/Components/{{name}}/solid_properties) which corresponds + to the `SolidProperties` object to use in each transverse region (each entry corresponds + to the equally indexed entry in [!param](/Components/{{name}}/names)) + and [!param](/Components/{{name}}/solid_properties_T_ref), which provides + the temperatures at which to evaluate the densities, since a constant density + is to be used in each region, due to heat structures having a non-deformable + mesh. +- Create [Materials](Materials/index.md) object(s) supplying the following material properties + on all blocks (see [#mesh_blocks]) of the heat structure mesh: + + | Material Property | Symbol | Description | + | :- | :- | :- | + | `density` | $\rho$ | Density \[kg/m$^3$\] | + | `specific_heat` | $c_p$ | Specific heat capacity \[J/(kg-K)\] | + | `thermal_conductivity` | $k$ | Thermal conductivity \[W/(m-K)\] | diff --git a/modules/thermal_hydraulics/doc/content/modules/thermal_hydraulics/tutorials/single_phase_flow/step02.md b/modules/thermal_hydraulics/doc/content/modules/thermal_hydraulics/tutorials/single_phase_flow/step02.md index 33be5bda7936..ad00da057c9d 100644 --- a/modules/thermal_hydraulics/doc/content/modules/thermal_hydraulics/tutorials/single_phase_flow/step02.md +++ b/modules/thermal_hydraulics/doc/content/modules/thermal_hydraulics/tutorials/single_phase_flow/step02.md @@ -32,14 +32,14 @@ tot_power = 2000 # W ``` -## Heat Structure Materials +## Solid Properties To set up a heat conduction, we will need to define a solid material used in the block with heat conduction. -To do that, we put the following block into a top-level [HeatStructureMaterials](HeatStructureMaterials/index.md) block: +To do that, we put the following block into a top-level [SolidProperties](syntax/SolidProperties/index.md) block: !listing thermal_hydraulics/tutorials/single_phase_flow/02_core.i - block=HeatStructureMaterials/steel + block=SolidProperties/steel link=False where `rho`, `k`, and `cp` are density, thermal conductivity, and specific heat, respectively. diff --git a/modules/thermal_hydraulics/doc/content/modules/thermal_hydraulics/tutorials/single_phase_flow/step06.md b/modules/thermal_hydraulics/doc/content/modules/thermal_hydraulics/tutorials/single_phase_flow/step06.md index 65eac58d4da9..4d0587b44bfa 100644 --- a/modules/thermal_hydraulics/doc/content/modules/thermal_hydraulics/tutorials/single_phase_flow/step06.md +++ b/modules/thermal_hydraulics/doc/content/modules/thermal_hydraulics/tutorials/single_phase_flow/step06.md @@ -76,7 +76,7 @@ To accomplish this, we define the Prandtl number using an [ADPrandtlNumberMateri !listing thermal_hydraulics/tutorials/single_phase_flow/06_custom_closures.i start=Pr_mat - end=HeatStructureMaterials + end=SolidProperties link=False !content pagination previous=tutorials/single_phase_flow/step05.md diff --git a/modules/thermal_hydraulics/include/components/HeatStructureBase.h b/modules/thermal_hydraulics/include/components/HeatStructureBase.h index 8e66dba9f55e..8a74ff5694d9 100644 --- a/modules/thermal_hydraulics/include/components/HeatStructureBase.h +++ b/modules/thermal_hydraulics/include/components/HeatStructureBase.h @@ -55,6 +55,17 @@ class HeatStructureBase : public Component2D, public HeatStructureInterface void loadMaterial(InputParameters & pars, const std::string & par, const std::string & material_name); + /** + * Adds a ADConstantDensityThermalSolidPropertiesMaterial for a heat structure region + * + * @param[in] sp_name Solid properties object name + * @param[in] T_ref Constant density reference temperature + * @param[in] i_region Heat structure region index + */ + void addConstantDensitySolidPropertiesMaterial(const UserObjectName & sp_name, + const Real & T_ref, + unsigned int i_region) const; + /// Map from block name to block index std::map _name_index; /// Material names diff --git a/modules/thermal_hydraulics/src/components/HeatStructureBase.C b/modules/thermal_hydraulics/src/components/HeatStructureBase.C index 686757cb83da..7f35310ca49a 100644 --- a/modules/thermal_hydraulics/src/components/HeatStructureBase.C +++ b/modules/thermal_hydraulics/src/components/HeatStructureBase.C @@ -88,4 +88,30 @@ HeatStructureBase::addMooseObjects() comp->connectObject(rho_fn->parameters(), rho_fn->name(), "rho", "value"); } } + + if (isParamValid("solid_properties")) + { + const auto sp_names = getParam>("solid_properties"); + const auto T_ref = getParam>("solid_properties_T_ref"); + for (unsigned int i = 0; i < sp_names.size(); i++) + addConstantDensitySolidPropertiesMaterial(sp_names[i], T_ref[i], i); + } +} + +void +HeatStructureBase::addConstantDensitySolidPropertiesMaterial(const UserObjectName & sp_name, + const Real & T_ref, + unsigned int i_region) const +{ + const auto blocks = getSubdomainNames(); + const auto region_names = getNames(); + + const std::string class_name = "ADConstantDensityThermalSolidPropertiesMaterial"; + InputParameters params = _factory.getValidParams(class_name); + params.set>("block") = {blocks[i_region]}; + params.set>("temperature") = {HeatConductionModel::TEMPERATURE}; + params.set("sp") = sp_name; + params.set("T_ref") = T_ref; + getTHMProblem().addMaterial( + class_name, genName(name(), class_name, region_names[i_region]), params); } diff --git a/modules/thermal_hydraulics/src/components/HeatStructureCylindrical.C b/modules/thermal_hydraulics/src/components/HeatStructureCylindrical.C index 4744346f8e17..4945eb7f6aab 100644 --- a/modules/thermal_hydraulics/src/components/HeatStructureCylindrical.C +++ b/modules/thermal_hydraulics/src/components/HeatStructureCylindrical.C @@ -20,7 +20,20 @@ HeatStructureCylindrical::validParams() params.addRequiredParam>("widths", "Width of each radial region [m]"); params.addRequiredParam>("n_part_elems", "Number of elements of each radial region"); - params.addParam>("materials", "Material name for each radial region"); + params.addDeprecatedParam>( + "materials", + "Material name for each transverse region", + "HeatStructureMaterials are deprecated. Please make corresponding SolidProperties objects " + "and replace the heat structure parameter 'materials' with the parameters 'solid_properties' " + "and 'solid_properties_T_ref'. See heat structure documentation for more information."); + params.addParam>( + "solid_properties", "Solid properties object name for each radial region"); + params.addParam>( + "solid_properties_T_ref", + {}, + "Density reference temperatures for each radial region. This is required if " + "'solid_properties' is provided. The density in each region will be a constant value " + "computed by evaluating the density function at the reference temperature."); params.addParam("num_rods", 1.0, "Number of rods represented by this heat structure"); params.addParam("inner_radius", 0., "Inner radius of the heat structure [m]"); @@ -71,4 +84,10 @@ HeatStructureCylindrical::check() const checkEqualSize("names", "widths"); if (isParamValid("materials")) checkEqualSize("names", "materials"); + if (isParamValid("solid_properties")) + { + checkEqualSize("solid_properties", "names"); + checkEqualSize("solid_properties", "solid_properties_T_ref"); + } + checkMutuallyExclusiveParameters({"materials", "solid_properties"}, false); } diff --git a/modules/thermal_hydraulics/src/components/HeatStructurePlate.C b/modules/thermal_hydraulics/src/components/HeatStructurePlate.C index 314ed2b52660..5871f0b8a167 100644 --- a/modules/thermal_hydraulics/src/components/HeatStructurePlate.C +++ b/modules/thermal_hydraulics/src/components/HeatStructurePlate.C @@ -20,8 +20,20 @@ HeatStructurePlate::validParams() params.addRequiredParam>("widths", "Width of each transverse region [m]"); params.addRequiredParam>( "n_part_elems", "Number of elements of each transverse region"); - params.addParam>("materials", - "Material name for each transverse region"); + params.addDeprecatedParam>( + "materials", + "Material name for each transverse region", + "HeatStructureMaterials are deprecated. Please make corresponding SolidProperties objects " + "and replace the heat structure parameter 'materials' with the parameters 'solid_properties' " + "and 'solid_properties_T_ref'. See heat structure documentation for more information."); + params.addParam>( + "solid_properties", "Solid properties object name for each radial region"); + params.addParam>( + "solid_properties_T_ref", + {}, + "Density reference temperatures for each radial region. This is required if " + "'solid_properties' is provided. The density in each region will be a constant value " + "computed by evaluating the density function at the reference temperature."); params.addParam("num_rods", 1.0, "Number of rods represented by this heat structure"); params.addRequiredParam("depth", "Dimension of plate fuel in the third direction [m]"); @@ -66,6 +78,12 @@ HeatStructurePlate::check() const checkEqualSize("names", "widths"); if (isParamValid("materials")) checkEqualSize("names", "materials"); + if (isParamValid("solid_properties")) + { + checkEqualSize("solid_properties", "names"); + checkEqualSize("solid_properties", "solid_properties_T_ref"); + } + checkMutuallyExclusiveParameters({"materials", "solid_properties"}, false); } Real diff --git a/modules/thermal_hydraulics/src/materials/ADSolidMaterial.C b/modules/thermal_hydraulics/src/materials/ADSolidMaterial.C index 72b30e0e298d..0b8936786c90 100644 --- a/modules/thermal_hydraulics/src/materials/ADSolidMaterial.C +++ b/modules/thermal_hydraulics/src/materials/ADSolidMaterial.C @@ -10,7 +10,7 @@ #include "ADSolidMaterial.h" #include "HeatConductionModel.h" -registerMooseObject("ThermalHydraulicsApp", ADSolidMaterial); +registerMooseObjectDeprecated("ThermalHydraulicsApp", ADSolidMaterial, "04/31/2024 24:00"); InputParameters ADSolidMaterial::validParams() @@ -33,6 +33,9 @@ ADSolidMaterial::ADSolidMaterial(const InputParameters & parameters) _temp(adCoupledValue("T")), _props(getUserObject("properties")) { + mooseDeprecated( + "Heat structure materials are deprecated in favor of SolidProperties objects, so this " + "Material should no longer be used. See heat structure documentation for more information."); } void diff --git a/modules/thermal_hydraulics/src/userobjects/SolidMaterialProperties.C b/modules/thermal_hydraulics/src/userobjects/SolidMaterialProperties.C index 1301d5fa3d28..98e4cac36b20 100644 --- a/modules/thermal_hydraulics/src/userobjects/SolidMaterialProperties.C +++ b/modules/thermal_hydraulics/src/userobjects/SolidMaterialProperties.C @@ -9,7 +9,7 @@ #include "SolidMaterialProperties.h" -registerMooseObject("ThermalHydraulicsApp", SolidMaterialProperties); +registerMooseObjectDeprecated("ThermalHydraulicsApp", SolidMaterialProperties, "04/31/2024 24:00"); InputParameters SolidMaterialProperties::validParams() @@ -41,6 +41,8 @@ SolidMaterialProperties::SolidMaterialProperties(const InputParameters & paramet _cp(isParamValid("Cp") ? getFunction("Cp") : getFunction("cp")), _rho(getFunction("rho")) { + mooseDeprecated("Heat structure materials are deprecated in favor of SolidProperties objects. " + "See heat structure documentation for more information."); } void diff --git a/modules/thermal_hydraulics/test/tests/base/component_groups/test.i b/modules/thermal_hydraulics/test/tests/base/component_groups/test.i index 4b73e3b638b1..eb747aba1328 100644 --- a/modules/thermal_hydraulics/test/tests/base/component_groups/test.i +++ b/modules/thermal_hydraulics/test/tests/base/component_groups/test.i @@ -23,9 +23,9 @@ [] [] -[HeatStructureMaterials] +[SolidProperties] [hx:wall] - type = SolidMaterialProperties + type = ThermalFunctionSolidProperties k = 1 cp = 1 rho = 1 @@ -63,7 +63,8 @@ type = HeatStructurePlate position = '0 0 0' orientation = '1 0 0' - materials = hx:wall + solid_properties = 'hx:wall' + solid_properties_T_ref = '300' n_elems = ${n_elems} length = ${length} n_part_elems = 1 diff --git a/modules/thermal_hydraulics/test/tests/base/logger/test.i b/modules/thermal_hydraulics/test/tests/base/logger/test.i index e01326016974..1b1c09c448cc 100644 --- a/modules/thermal_hydraulics/test/tests/base/logger/test.i +++ b/modules/thermal_hydraulics/test/tests/base/logger/test.i @@ -1,6 +1,6 @@ -[HeatStructureMaterials] +[SolidProperties] [a] - type = SolidMaterialProperties + type = ThermalFunctionSolidProperties rho = 1 cp = 1 k = 1 @@ -19,7 +19,8 @@ length = 1 names = '0' widths = '0.1' - materials = 'a' + solid_properties = 'a' + solid_properties_T_ref = '300' n_elems = 1 n_part_elems = 1 initial_T = 300 diff --git a/modules/thermal_hydraulics/test/tests/base/simulation/loop_identification.i b/modules/thermal_hydraulics/test/tests/base/simulation/loop_identification.i index 7b1a87af38fe..b0a9c470eb0c 100644 --- a/modules/thermal_hydraulics/test/tests/base/simulation/loop_identification.i +++ b/modules/thermal_hydraulics/test/tests/base/simulation/loop_identification.i @@ -57,9 +57,9 @@ [] [] -[HeatStructureMaterials] +[SolidProperties] [hx:wall] - type = SolidMaterialProperties + type = ThermalFunctionSolidProperties k = 1 cp = 1 rho = 1 @@ -134,7 +134,8 @@ orientation = '1 0 0' length = 1 n_elems = 1 - materials = hx:wall + solid_properties = hx:wall + solid_properties_T_ref = '300' n_part_elems = 1 names = 0 widths = 1 diff --git a/modules/thermal_hydraulics/test/tests/components/deprecated/heat_generation.i b/modules/thermal_hydraulics/test/tests/components/deprecated/heat_generation.i index ae858f3a11e9..3600cf8723e8 100644 --- a/modules/thermal_hydraulics/test/tests/components/deprecated/heat_generation.i +++ b/modules/thermal_hydraulics/test/tests/components/deprecated/heat_generation.i @@ -1,6 +1,6 @@ -[HeatStructureMaterials] +[SolidProperties] [fuel-mat] - type = SolidMaterialProperties + type = ThermalFunctionSolidProperties k = 2.5 cp = 300. rho = 1.032e4 @@ -18,7 +18,8 @@ names = 'fuel' widths = '0.004096' n_part_elems = '1' - materials = 'fuel-mat' + solid_properties = 'fuel-mat' + solid_properties_T_ref = '300' initial_T = 559.15 [] diff --git a/modules/thermal_hydraulics/test/tests/components/flow_component_ns/flow_component_ns_pinc.i b/modules/thermal_hydraulics/test/tests/components/flow_component_ns/flow_component_ns_pinc.i index 8614c7cf421f..ee5e574acf10 100644 --- a/modules/thermal_hydraulics/test/tests/components/flow_component_ns/flow_component_ns_pinc.i +++ b/modules/thermal_hydraulics/test/tests/components/flow_component_ns/flow_component_ns_pinc.i @@ -72,7 +72,7 @@ p_outlet = 0 [] [] -[Materials] +[FunctorMaterials] [const_functor] type = ADGenericFunctorMaterial prop_names = 'rho mu' diff --git a/modules/thermal_hydraulics/test/tests/components/geometrical_component/err.2nd_order.i b/modules/thermal_hydraulics/test/tests/components/geometrical_component/err.2nd_order.i index 869860287a9b..b5011f79fa2a 100644 --- a/modules/thermal_hydraulics/test/tests/components/geometrical_component/err.2nd_order.i +++ b/modules/thermal_hydraulics/test/tests/components/geometrical_component/err.2nd_order.i @@ -16,9 +16,9 @@ [] [] -[HeatStructureMaterials] +[SolidProperties] [hs-mat] - type = SolidMaterialProperties + type = ThermalFunctionSolidProperties k = 1 cp = 1 rho = 1 @@ -36,7 +36,8 @@ names = 'blk' widths = '1' n_part_elems = '2' - materials = 'hs-mat' + solid_properties = 'hs-mat' + solid_properties_T_ref = '300' initial_T = 350 [] diff --git a/modules/thermal_hydraulics/test/tests/components/heat_source_from_power_density/err.base.i b/modules/thermal_hydraulics/test/tests/components/heat_source_from_power_density/err.base.i index e5361a61d409..a0a1a6138754 100644 --- a/modules/thermal_hydraulics/test/tests/components/heat_source_from_power_density/err.base.i +++ b/modules/thermal_hydraulics/test/tests/components/heat_source_from_power_density/err.base.i @@ -15,9 +15,9 @@ [] [] -[HeatStructureMaterials] +[SolidProperties] [fuel-mat] - type = SolidMaterialProperties + type = ThermalFunctionSolidProperties k = 2.5 cp = 300. rho = 1.032e4 @@ -35,7 +35,8 @@ names = 'fuel' widths = '0.004096' n_part_elems = '1' - materials = 'fuel-mat' + solid_properties = 'fuel-mat' + solid_properties_T_ref = '300' initial_T = 559.15 [] diff --git a/modules/thermal_hydraulics/test/tests/components/heat_source_from_power_density/phy.cylinder_power_shape_aux_var.i b/modules/thermal_hydraulics/test/tests/components/heat_source_from_power_density/phy.cylinder_power_shape_aux_var.i index 01793eaa9872..0844cf17f9cf 100644 --- a/modules/thermal_hydraulics/test/tests/components/heat_source_from_power_density/phy.cylinder_power_shape_aux_var.i +++ b/modules/thermal_hydraulics/test/tests/components/heat_source_from_power_density/phy.cylinder_power_shape_aux_var.i @@ -9,21 +9,21 @@ [] [] -[HeatStructureMaterials] +[SolidProperties] [fuel-mat] - type = SolidMaterialProperties + type = ThermalFunctionSolidProperties k = 16 cp = 191.67 rho = 1.4583e4 [] [gap-mat] - type = SolidMaterialProperties + type = ThermalFunctionSolidProperties k = 64 cp = 1272 rho = 865 [] [clad-mat] - type = SolidMaterialProperties + type = ThermalFunctionSolidProperties k = 26 cp = 638 rho = 7.646e3 @@ -65,7 +65,8 @@ names = 'fuel gap clad' widths = '0.003015 0.000465 0.00052' n_part_elems = '20 2 2' - materials = 'fuel-mat gap-mat clad-mat' + solid_properties = 'fuel-mat gap-mat clad-mat' + solid_properties_T_ref = '300 300 300' [] [CH1:hgen] diff --git a/modules/thermal_hydraulics/test/tests/components/heat_source_from_total_power/err.base.i b/modules/thermal_hydraulics/test/tests/components/heat_source_from_total_power/err.base.i index 4cee7b83101e..580216bc31aa 100644 --- a/modules/thermal_hydraulics/test/tests/components/heat_source_from_total_power/err.base.i +++ b/modules/thermal_hydraulics/test/tests/components/heat_source_from_total_power/err.base.i @@ -1,6 +1,6 @@ -[HeatStructureMaterials] +[SolidProperties] [fuel-mat] - type = SolidMaterialProperties + type = ThermalFunctionSolidProperties k = 2.5 cp = 300. rho = 1.032e4 @@ -23,7 +23,8 @@ names = 'fuel' widths = '0.004096' n_part_elems = '1' - materials = 'fuel-mat' + solid_properties = 'fuel-mat' + solid_properties_T_ref = '300' initial_T = 559.15 [] diff --git a/modules/thermal_hydraulics/test/tests/components/heat_source_from_total_power/phy.conservation.i b/modules/thermal_hydraulics/test/tests/components/heat_source_from_total_power/phy.conservation.i index de1f50455be4..37c4552a097e 100644 --- a/modules/thermal_hydraulics/test/tests/components/heat_source_from_total_power/phy.conservation.i +++ b/modules/thermal_hydraulics/test/tests/components/heat_source_from_total_power/phy.conservation.i @@ -18,9 +18,9 @@ energy_change = ${fparse power_fraction * power * t} [] [] -[HeatStructureMaterials] +[SolidProperties] [main-material] - type = SolidMaterialProperties + type = ThermalFunctionSolidProperties k = 1e4 cp = 500.0 rho = 100.0 @@ -38,7 +38,8 @@ energy_change = ${fparse power_fraction * power * t} n_elems = 100 names = 'rgn1 rgn2 rgn3' - materials = 'main-material main-material main-material' + solid_properties = 'main-material main-material main-material' + solid_properties_T_ref = '300 300 300' widths = '0.4 0.1 0.5' n_part_elems = '2 2 2' diff --git a/modules/thermal_hydraulics/test/tests/components/heat_source_from_total_power/phy.cylinder_power_shape_fn.i b/modules/thermal_hydraulics/test/tests/components/heat_source_from_total_power/phy.cylinder_power_shape_fn.i index 7b9640ea03be..28e3fed0c1a3 100644 --- a/modules/thermal_hydraulics/test/tests/components/heat_source_from_total_power/phy.cylinder_power_shape_fn.i +++ b/modules/thermal_hydraulics/test/tests/components/heat_source_from_total_power/phy.cylinder_power_shape_fn.i @@ -9,21 +9,21 @@ [] [] -[HeatStructureMaterials] +[SolidProperties] [fuel-mat] - type = SolidMaterialProperties + type = ThermalFunctionSolidProperties k = 16 cp = 191.67 rho = 1.4583e4 [] [gap-mat] - type = SolidMaterialProperties + type = ThermalFunctionSolidProperties k = 64 cp = 1272 rho = 865 [] [clad-mat] - type = SolidMaterialProperties + type = ThermalFunctionSolidProperties k = 26 cp = 638 rho = 7.646e3 @@ -48,7 +48,8 @@ names = 'fuel gap clad' widths = '0.003015 0.000465 0.00052' n_part_elems = '20 2 2' - materials = 'fuel-mat gap-mat clad-mat' + solid_properties = 'fuel-mat gap-mat clad-mat' + solid_properties_T_ref = '300 300 300' [] [CH1:hgen] diff --git a/modules/thermal_hydraulics/test/tests/components/heat_source_from_total_power/phy.plate.i b/modules/thermal_hydraulics/test/tests/components/heat_source_from_total_power/phy.plate.i index c3fd60790a7c..e8a1250220a0 100644 --- a/modules/thermal_hydraulics/test/tests/components/heat_source_from_total_power/phy.plate.i +++ b/modules/thermal_hydraulics/test/tests/components/heat_source_from_total_power/phy.plate.i @@ -9,21 +9,21 @@ [] [] -[HeatStructureMaterials] +[SolidProperties] [fuel-mat] - type = SolidMaterialProperties + type = ThermalFunctionSolidProperties k = 16 cp = 191.67 rho = 1.4583e4 [] [gap-mat] - type = SolidMaterialProperties + type = ThermalFunctionSolidProperties k = 64 cp = 1272 rho = 865 [] [clad-mat] - type = SolidMaterialProperties + type = ThermalFunctionSolidProperties k = 26 cp = 638 rho = 7.646e3 @@ -49,7 +49,8 @@ widths = '0.003015 0.000465 0.00052' depth = 1 n_part_elems = '20 2 2' - materials = 'fuel-mat gap-mat clad-mat' + solid_properties = 'fuel-mat gap-mat clad-mat' + solid_properties_T_ref = '300 300 300' [] [CH1:hgen] diff --git a/modules/thermal_hydraulics/test/tests/components/heat_structure_2d_coupler/heat_structure_2d_coupler.i b/modules/thermal_hydraulics/test/tests/components/heat_structure_2d_coupler/heat_structure_2d_coupler.i index 13510791e455..78f213fff56b 100644 --- a/modules/thermal_hydraulics/test/tests/components/heat_structure_2d_coupler/heat_structure_2d_coupler.i +++ b/modules/thermal_hydraulics/test/tests/components/heat_structure_2d_coupler/heat_structure_2d_coupler.i @@ -1,6 +1,6 @@ -[HeatStructureMaterials] +[SolidProperties] [hs_mat] - type = SolidMaterialProperties + type = ThermalFunctionSolidProperties k = 15 cp = 500 rho = 8000 @@ -18,7 +18,8 @@ names = 'region1' widths = '0.5' n_part_elems = '5' - materials = 'hs_mat' + solid_properties = 'hs_mat' + solid_properties_T_ref = '300' initial_T = 500 [] @@ -34,7 +35,8 @@ names = 'region1 region2' widths = '0.5 0.2' n_part_elems = '5 3' - materials = 'hs_mat hs_mat' + solid_properties = 'hs_mat hs_mat' + solid_properties_T_ref = '300 300' initial_T = 300 [] @@ -49,7 +51,8 @@ names = 'region1' widths = '0.5' n_part_elems = '5' - materials = 'hs_mat' + solid_properties = 'hs_mat' + solid_properties_T_ref = '300' initial_T = 500 [] diff --git a/modules/thermal_hydraulics/test/tests/components/heat_structure_2d_coupler/separated.i b/modules/thermal_hydraulics/test/tests/components/heat_structure_2d_coupler/separated.i index 7c87f9213896..744c19ef061d 100644 --- a/modules/thermal_hydraulics/test/tests/components/heat_structure_2d_coupler/separated.i +++ b/modules/thermal_hydraulics/test/tests/components/heat_structure_2d_coupler/separated.i @@ -22,9 +22,9 @@ power_per_K = 5.0 L_hs = 0.5 htc = ${fparse power_per_K / (L_hs * P2)} -[HeatStructureMaterials] +[SolidProperties] [hs_mat] - type = SolidMaterialProperties + type = ThermalFunctionSolidProperties k = 15 cp = 500 rho = 8000 @@ -42,7 +42,8 @@ htc = ${fparse power_per_K / (L_hs * P2)} names = 'region1' widths = '${R1}' n_part_elems = '5' - materials = 'hs_mat' + solid_properties = 'hs_mat' + solid_properties_T_ref = '300' initial_T = ${initial_T1} [] @@ -57,7 +58,8 @@ htc = ${fparse power_per_K / (L_hs * P2)} names = 'region1' widths = '${R2}' n_part_elems = '5' - materials = 'hs_mat' + solid_properties = 'hs_mat' + solid_properties_T_ref = '300' initial_T = ${initial_T2} [] diff --git a/modules/thermal_hydraulics/test/tests/components/heat_structure_2d_radiation_coupler_rz/heat_structure_2d_radiation_coupler_rz.i b/modules/thermal_hydraulics/test/tests/components/heat_structure_2d_radiation_coupler_rz/heat_structure_2d_radiation_coupler_rz.i index 640b11a9b05a..600554e6a89a 100644 --- a/modules/thermal_hydraulics/test/tests/components/heat_structure_2d_radiation_coupler_rz/heat_structure_2d_radiation_coupler_rz.i +++ b/modules/thermal_hydraulics/test/tests/components/heat_structure_2d_radiation_coupler_rz/heat_structure_2d_radiation_coupler_rz.i @@ -1,9 +1,9 @@ emissivity1 = 0.75 emissivity2 = 0.5 -[HeatStructureMaterials] +[SolidProperties] [hs_mat] - type = SolidMaterialProperties + type = ThermalFunctionSolidProperties k = 15 cp = 500 rho = 8000 @@ -22,7 +22,8 @@ emissivity2 = 0.5 names = 'region1' widths = '0.1' n_part_elems = '5' - materials = 'hs_mat' + solid_properties = 'hs_mat' + solid_properties_T_ref = '300' initial_T = 300 [] @@ -39,7 +40,8 @@ emissivity2 = 0.5 names = 'region1' widths = '0.1' n_part_elems = '5' - materials = 'hs_mat' + solid_properties = 'hs_mat' + solid_properties_T_ref = '300' initial_T = 1000 [] diff --git a/modules/thermal_hydraulics/test/tests/components/heat_structure_base/2nd_order.i b/modules/thermal_hydraulics/test/tests/components/heat_structure_base/2nd_order.i index aaeebfb157a2..66705f01c5bf 100644 --- a/modules/thermal_hydraulics/test/tests/components/heat_structure_base/2nd_order.i +++ b/modules/thermal_hydraulics/test/tests/components/heat_structure_base/2nd_order.i @@ -5,21 +5,21 @@ 2nd_order_mesh = true [] -[HeatStructureMaterials] +[SolidProperties] [fuel-mat] - type = SolidMaterialProperties + type = ThermalFunctionSolidProperties k = 3.65 cp = 288.734 rho = 1.0412e2 [] [gap-mat] - type = SolidMaterialProperties + type = ThermalFunctionSolidProperties k = 1.084498 cp = 1.0 rho = 1.0 [] [clad-mat] - type = SolidMaterialProperties + type = ThermalFunctionSolidProperties k = 16.48672 cp = 321.384 rho = 6.6e1 @@ -42,7 +42,8 @@ names = 'FUEL GAP CLAD' widths = '0.0046955 0.0000955 0.000673' n_part_elems = '1 1 1' - materials = 'fuel-mat gap-mat clad-mat' + solid_properties = 'fuel-mat gap-mat clad-mat' + solid_properties_T_ref = '300 300 300' initial_T = 564.15 [] diff --git a/modules/thermal_hydraulics/test/tests/components/heat_structure_base/axial_regions.i b/modules/thermal_hydraulics/test/tests/components/heat_structure_base/axial_regions.i index e3d053c307dd..83a8c18a65c7 100644 --- a/modules/thermal_hydraulics/test/tests/components/heat_structure_base/axial_regions.i +++ b/modules/thermal_hydraulics/test/tests/components/heat_structure_base/axial_regions.i @@ -4,9 +4,9 @@ # taken, and the output should show heat transfer only at the bottom 2 # boundaries. -[HeatStructureMaterials] +[SolidProperties] [hs_mat] - type = SolidMaterialProperties + type = ThermalFunctionSolidProperties k = 5 cp = 300 rho = 100 @@ -26,7 +26,8 @@ names = 'radialregion' widths = '0.5' n_part_elems = '3' - materials = 'hs_mat' + solid_properties = 'hs_mat' + solid_properties_T_ref = '300' initial_T = 300 [] diff --git a/modules/thermal_hydraulics/test/tests/components/heat_structure_base/err.no_2nd_order_with_trap.i b/modules/thermal_hydraulics/test/tests/components/heat_structure_base/err.no_2nd_order_with_trap.i index c20b7282ca79..7ca7dd0cdf9a 100644 --- a/modules/thermal_hydraulics/test/tests/components/heat_structure_base/err.no_2nd_order_with_trap.i +++ b/modules/thermal_hydraulics/test/tests/components/heat_structure_base/err.no_2nd_order_with_trap.i @@ -6,21 +6,21 @@ 2nd_order_mesh = true [] -[HeatStructureMaterials] +[SolidProperties] [fuel-mat] - type = SolidMaterialProperties + type = ThermalFunctionSolidProperties k = 3.65 cp = 288.734 rho = 1.0412e2 [] [gap-mat] - type = SolidMaterialProperties + type = ThermalFunctionSolidProperties k = 1.084498 cp = 1.0 rho = 1.0 [] [clad-mat] - type = SolidMaterialProperties + type = ThermalFunctionSolidProperties k = 16.48672 cp = 321.384 rho = 6.6e1 @@ -43,7 +43,8 @@ names = 'FUEL GAP CLAD' widths = '0.0046955 0.0000955 0.000673' n_part_elems = '1 1 1' - materials = 'fuel-mat gap-mat clad-mat' + solid_properties = 'fuel-mat gap-mat clad-mat' + solid_properties_T_ref = '300 300 300' initial_T = 564.15 [] diff --git a/modules/thermal_hydraulics/test/tests/components/heat_structure_base/err.no_T_ic.i b/modules/thermal_hydraulics/test/tests/components/heat_structure_base/err.no_T_ic.i index 536ce7508855..2dccc6a0dff2 100644 --- a/modules/thermal_hydraulics/test/tests/components/heat_structure_base/err.no_T_ic.i +++ b/modules/thermal_hydraulics/test/tests/components/heat_structure_base/err.no_T_ic.i @@ -4,21 +4,21 @@ [GlobalParams] [] -[HeatStructureMaterials] +[SolidProperties] [fuel-mat] - type = SolidMaterialProperties + type = ThermalFunctionSolidProperties k = 3.65 cp = 288.734 rho = 1.0412e2 [] [gap-mat] - type = SolidMaterialProperties + type = ThermalFunctionSolidProperties k = 1.084498 cp = 1.0 rho = 1.0 [] [clad-mat] - type = SolidMaterialProperties + type = ThermalFunctionSolidProperties k = 16.48672 cp = 321.384 rho = 6.6e1 @@ -41,7 +41,8 @@ names = 'FUEL GAP CLAD' widths = '0.0046955 0.0000955 0.000673' n_part_elems = '1 1 1' - materials = 'fuel-mat gap-mat clad-mat' + solid_properties = 'fuel-mat gap-mat clad-mat' + solid_properties_T_ref = '300 300 300' [] [temp_outside] diff --git a/modules/thermal_hydraulics/test/tests/components/heat_structure_base/inner_radial_boundary.i b/modules/thermal_hydraulics/test/tests/components/heat_structure_base/inner_radial_boundary.i index a0f941af8fc3..d395de05be80 100644 --- a/modules/thermal_hydraulics/test/tests/components/heat_structure_base/inner_radial_boundary.i +++ b/modules/thermal_hydraulics/test/tests/components/heat_structure_base/inner_radial_boundary.i @@ -22,9 +22,9 @@ [] [] -[HeatStructureMaterials] +[SolidProperties] [hs_mat] - type = SolidMaterialProperties + type = ThermalFunctionSolidProperties k = 1 cp = 1 rho = 1 @@ -43,7 +43,8 @@ names = 'region1 region2 region3' widths = '1.0 3.0 2.0' n_part_elems = '2 6 8' - materials = 'hs_mat hs_mat hs_mat' + solid_properties = 'hs_mat hs_mat hs_mat' + solid_properties_T_ref = '300 300 300' initial_T = initial_T_fn [] diff --git a/modules/thermal_hydraulics/test/tests/components/heat_structure_base/interior_axial_boundaries.i b/modules/thermal_hydraulics/test/tests/components/heat_structure_base/interior_axial_boundaries.i index cf4fd0343726..cf94f33f9bb1 100644 --- a/modules/thermal_hydraulics/test/tests/components/heat_structure_base/interior_axial_boundaries.i +++ b/modules/thermal_hydraulics/test/tests/components/heat_structure_base/interior_axial_boundaries.i @@ -25,9 +25,9 @@ [] [] -[HeatStructureMaterials] +[SolidProperties] [hs_mat] - type = SolidMaterialProperties + type = ThermalFunctionSolidProperties k = 1 cp = 1 rho = 1 @@ -47,7 +47,8 @@ names = 'radial1 radial2 radial3' widths = '0.5 0.5 0.5' n_part_elems = '2 2 2' - materials = 'hs_mat hs_mat hs_mat' + solid_properties = 'hs_mat hs_mat hs_mat' + solid_properties_T_ref = '300 300 300' depth = 1.0 diff --git a/modules/thermal_hydraulics/test/tests/components/heat_structure_base/phy.sub_discretization.i b/modules/thermal_hydraulics/test/tests/components/heat_structure_base/phy.sub_discretization.i index 77363fa59a55..b285f0d095fc 100644 --- a/modules/thermal_hydraulics/test/tests/components/heat_structure_base/phy.sub_discretization.i +++ b/modules/thermal_hydraulics/test/tests/components/heat_structure_base/phy.sub_discretization.i @@ -6,21 +6,21 @@ [GlobalParams] [] -[HeatStructureMaterials] +[SolidProperties] [fuel-mat] - type = SolidMaterialProperties + type = ThermalFunctionSolidProperties k = 3.65 cp = 288.734 rho = 1.0412e2 [] [gap-mat] - type = SolidMaterialProperties + type = ThermalFunctionSolidProperties k = 1.084498 cp = 1.0 rho = 1.0 [] [clad-mat] - type = SolidMaterialProperties + type = ThermalFunctionSolidProperties k = 16.48672 cp = 321.384 rho = 6.6e1 @@ -40,7 +40,8 @@ names = 'FUEL GAP CLAD' widths = '0.0046955 0.0000955 0.000673' n_part_elems = '10 3 3' - materials = 'fuel-mat gap-mat clad-mat' + solid_properties = 'fuel-mat gap-mat clad-mat' + solid_properties_T_ref = '300 300 300' initial_T = 300 [] diff --git a/modules/thermal_hydraulics/test/tests/components/heat_structure_base/phy.variable_init_t.i b/modules/thermal_hydraulics/test/tests/components/heat_structure_base/phy.variable_init_t.i index e71867d2a526..08d736ad5f06 100644 --- a/modules/thermal_hydraulics/test/tests/components/heat_structure_base/phy.variable_init_t.i +++ b/modules/thermal_hydraulics/test/tests/components/heat_structure_base/phy.variable_init_t.i @@ -12,21 +12,21 @@ [] [] -[HeatStructureMaterials] +[SolidProperties] [fuel-mat] - type = SolidMaterialProperties + type = ThermalFunctionSolidProperties k = 3.65 cp = 288.734 rho = 1.0412e2 [] [gap-mat] - type = SolidMaterialProperties + type = ThermalFunctionSolidProperties k = 0.1 cp = 1.0 rho = 1.0 [] [clad-mat] - type = SolidMaterialProperties + type = ThermalFunctionSolidProperties k = 16.48672 cp = 321.384 rho = 6.6e1 @@ -44,7 +44,8 @@ names = 'FUEL GAP CLAD' widths = '0.0046955 0.0000955 0.000673' n_part_elems = '10 3 3' - materials = 'fuel-mat gap-mat clad-mat' + solid_properties = 'fuel-mat gap-mat clad-mat' + solid_properties_T_ref = '300 300 300' initial_T = fn-initial_T [] diff --git a/modules/thermal_hydraulics/test/tests/components/heat_structure_base/tests b/modules/thermal_hydraulics/test/tests/components/heat_structure_base/tests index c360ed2058a7..724f158fc28e 100644 --- a/modules/thermal_hydraulics/test/tests/components/heat_structure_base/tests +++ b/modules/thermal_hydraulics/test/tests/components/heat_structure_base/tests @@ -94,12 +94,12 @@ detail = 'the user does not specify a matching number of names and widths for every part in a cylindrical heat structure,' [] - [err:incorrect_size_of_materials] + [err:incorrect_size_of_solid_properties] type = 'RunException' input = 'err.no_T_ic.i' - cli_args = 'Components/hs/materials=a' - expect_err = "hs: The number of entries in parameter 'names' \(3\) must equal the number of entries of parameter 'materials' \(1\)" - detail = 'the user does not specify a matching number of names and materials for every part in a cylindrical heat structure.' + cli_args = 'Components/hs/solid_properties=a' + expect_err = "hs: The number of entries in parameter 'solid_properties' \(1\) must equal the number of entries of parameter 'names' \(3\)" + detail = 'the user does not specify a matching number of names and solid properties for every part in a cylindrical heat structure.' [] [] [] diff --git a/modules/thermal_hydraulics/test/tests/components/heat_structure_cylindrical/by_hsmaterials.i b/modules/thermal_hydraulics/test/tests/components/heat_structure_cylindrical/by_hsmaterials.i new file mode 100644 index 000000000000..24bd5a198491 --- /dev/null +++ b/modules/thermal_hydraulics/test/tests/components/heat_structure_cylindrical/by_hsmaterials.i @@ -0,0 +1,30 @@ +# Tests that cylindrical heat structure geometry can be used. + +!include part_base.i + +[HeatStructureMaterials] + [fuel-mat] + type = SolidMaterialProperties + k = 3.65 + cp = 288.734 + rho = 1.0412e2 + [] + [gap-mat] + type = SolidMaterialProperties + k = 1.084498 + cp = 1.0 + rho = 1.0 + [] + [clad-mat] + type = SolidMaterialProperties + k = 16.48672 + cp = 321.384 + rho = 6.6e1 + [] +[] + +[Components] + [hs] + materials = 'fuel-mat gap-mat clad-mat' + [] +[] diff --git a/modules/thermal_hydraulics/test/tests/components/heat_structure_cylindrical/by_materials.i b/modules/thermal_hydraulics/test/tests/components/heat_structure_cylindrical/by_materials.i new file mode 100644 index 000000000000..978a1d7ec001 --- /dev/null +++ b/modules/thermal_hydraulics/test/tests/components/heat_structure_cylindrical/by_materials.i @@ -0,0 +1,36 @@ +# Tests that cylindrical heat structure thermal properties can be defined in the Materials block + +!include part_base.i + +[SolidProperties] + [function_sp] + type = ThermalFunctionSolidProperties + rho = 6.6e1 + cp = 321.384 + k = 16.48672 + [] +[] + +[Materials] + [fuel-mat] + type = ADGenericConstantMaterial + block = hs:FUEL + prop_names = 'thermal_conductivity specific_heat density' + prop_values = '3.65 288.734 1.0412e2' + [] + + [gap-mat] + type = ADGenericConstantMaterial + block = hs:GAP + prop_names = 'thermal_conductivity specific_heat density' + prop_values = '1.084498 1.0 1.0' + [] + + [clad-mat] + type = ADConstantDensityThermalSolidPropertiesMaterial + block = hs:CLAD + sp = function_sp + temperature = T_solid + T_ref = 300 + [] +[] diff --git a/modules/thermal_hydraulics/test/tests/components/heat_structure_cylindrical/by_solid_properties.i b/modules/thermal_hydraulics/test/tests/components/heat_structure_cylindrical/by_solid_properties.i new file mode 100644 index 000000000000..3124aab5eb85 --- /dev/null +++ b/modules/thermal_hydraulics/test/tests/components/heat_structure_cylindrical/by_solid_properties.i @@ -0,0 +1,31 @@ +# Tests that cylindrical heat structure thermal properties can be defined in the SolidProperties block + +!include part_base.i + +[SolidProperties] + [fuel_sp] + type = ThermalFunctionSolidProperties + rho = 1.0412e2 + cp = 288.734 + k = 3.65 + [] + [gap_sp] + type = ThermalFunctionSolidProperties + rho = 1.0 + cp = 1.0 + k = 1.084498 + [] + [clad_sp] + type = ThermalFunctionSolidProperties + rho = 6.6e1 + cp = 321.384 + k = 16.48672 + [] +[] + +[Components] + [hs] + solid_properties = 'fuel_sp gap_sp clad_sp' + solid_properties_T_ref = '300 300 300' + [] +[] diff --git a/modules/thermal_hydraulics/test/tests/components/heat_structure_cylindrical/gold/phy.rz_out.e b/modules/thermal_hydraulics/test/tests/components/heat_structure_cylindrical/gold/transient.e similarity index 100% rename from modules/thermal_hydraulics/test/tests/components/heat_structure_cylindrical/gold/phy.rz_out.e rename to modules/thermal_hydraulics/test/tests/components/heat_structure_cylindrical/gold/transient.e diff --git a/modules/thermal_hydraulics/test/tests/components/heat_structure_cylindrical/phy.rz.i b/modules/thermal_hydraulics/test/tests/components/heat_structure_cylindrical/part_base.i similarity index 70% rename from modules/thermal_hydraulics/test/tests/components/heat_structure_cylindrical/phy.rz.i rename to modules/thermal_hydraulics/test/tests/components/heat_structure_cylindrical/part_base.i index 833ab7f3969b..6a1331a02df4 100644 --- a/modules/thermal_hydraulics/test/tests/components/heat_structure_cylindrical/phy.rz.i +++ b/modules/thermal_hydraulics/test/tests/components/heat_structure_cylindrical/part_base.i @@ -1,5 +1,3 @@ -# Tests that cylindrical heat structure geometry can be used. - [Functions] [power_profile_fn] type = ParsedFunction @@ -7,27 +5,6 @@ [] [] -[HeatStructureMaterials] - [fuel-mat] - type = SolidMaterialProperties - k = 3.65 - cp = 288.734 - rho = 1.0412e2 - [] - [gap-mat] - type = SolidMaterialProperties - k = 1.084498 - cp = 1.0 - rho = 1.0 - [] - [clad-mat] - type = SolidMaterialProperties - k = 16.48672 - cp = 321.384 - rho = 6.6e1 - [] -[] - [Components] [reactor] type = TotalPower @@ -44,7 +21,6 @@ names = 'FUEL GAP CLAD' widths = '0.0046955 0.0000955 0.000673' n_part_elems = '3 1 1' - materials = 'fuel-mat gap-mat clad-mat' initial_T = 564.15 [] @@ -67,7 +43,7 @@ [] [Preconditioning] - [SMP_PJFNK] + [pc] type = SMP full = true [] @@ -91,11 +67,9 @@ l_max_its = 300 [] - [Outputs] - [out] - type = Exodus - [] + file_base = transient + exodus = true [console] type = Console execute_scalars_on = none diff --git a/modules/thermal_hydraulics/test/tests/components/heat_structure_cylindrical/phy.rz_mats.i b/modules/thermal_hydraulics/test/tests/components/heat_structure_cylindrical/phy.rz_mats.i deleted file mode 100644 index a3e7cf6d6a1c..000000000000 --- a/modules/thermal_hydraulics/test/tests/components/heat_structure_cylindrical/phy.rz_mats.i +++ /dev/null @@ -1,112 +0,0 @@ -# Tests that cylindrical heat structure thermal properties can be defined in the Materials block - -[Functions] - [power_profile_fn] - type = ParsedFunction - expression = '1.570796326794897 * sin(x / 3.6576 * pi)' - [] -[] - -[SolidProperties] - [function_sp] - type = ThermalFunctionSolidProperties - rho = 6.6e1 - cp = 321.384 - k = 16.48672 - [] -[] - -[Materials] - [fuel-mat] - type = ADGenericConstantMaterial - block = hs:FUEL - prop_names = 'thermal_conductivity specific_heat density' - prop_values = '3.65 288.734 1.0412e2' - [] - - [gap-mat] - type = ADGenericConstantMaterial - block = hs:GAP - prop_names = 'thermal_conductivity specific_heat density' - prop_values = '1.084498 1.0 1.0' - [] - - [clad-mat] - type = ADConstantDensityThermalSolidPropertiesMaterial - block = hs:CLAD - sp = function_sp - temperature = T_solid - T_ref = 300 - [] -[] - -[Components] - [reactor] - type = TotalPower - power = 296153.84615384615385 - [] - - [hs] - type = HeatStructureCylindrical - position = '0 0 1' - orientation = '1 0 0' - - length = 3.6576 - n_elems = 20 - names = 'FUEL GAP CLAD' - widths = '0.0046955 0.0000955 0.000673' - n_part_elems = '3 1 1' - - initial_T = 564.15 - [] - - [hg] - type = HeatSourceFromTotalPower - hs = hs - regions = 'FUEL' - power_fraction = 3.33672612e-1 - power = reactor - power_shape_function = power_profile_fn - [] - - [temp_outside] - type = HSBoundarySpecifiedTemperature - hs = hs - boundary = hs:outer - T = 600 - [] -[] - -[Preconditioning] - [pc] - type = SMP - full = true - [] -[] - -[Executioner] - type = Transient - scheme = 'bdf2' - - start_time = 0 - dt = 2 - num_steps = 10 - abort_on_solve_fail = true - - solve_type = 'NEWTON' - nl_rel_tol = 1e-6 - nl_abs_tol = 1e-6 - nl_max_its = 30 - - l_tol = 1e-4 - l_max_its = 300 -[] - - -[Outputs] - exodus = true - [console] - type = Console - execute_scalars_on = none - [] -[] diff --git a/modules/thermal_hydraulics/test/tests/components/heat_structure_cylindrical/steady.i b/modules/thermal_hydraulics/test/tests/components/heat_structure_cylindrical/steady.i index 3e4857b106d0..a436e0364d18 100644 --- a/modules/thermal_hydraulics/test/tests/components/heat_structure_cylindrical/steady.i +++ b/modules/thermal_hydraulics/test/tests/components/heat_structure_cylindrical/steady.i @@ -7,24 +7,24 @@ [] [] -[HeatStructureMaterials] - [fuel-mat] - type = SolidMaterialProperties - k = 3.65 - cp = 288.734 +[SolidProperties] + [fuel_sp] + type = ThermalFunctionSolidProperties rho = 1.0412e2 + cp = 288.734 + k = 3.65 [] - [gap-mat] - type = SolidMaterialProperties - k = 1.084498 - cp = 1.0 + [gap_sp] + type = ThermalFunctionSolidProperties rho = 1.0 + cp = 1.0 + k = 1.084498 [] - [clad-mat] - type = SolidMaterialProperties - k = 16.48672 - cp = 321.384 + [clad_sp] + type = ThermalFunctionSolidProperties rho = 6.6e1 + cp = 321.384 + k = 16.48672 [] [] @@ -44,7 +44,8 @@ names = 'FUEL GAP CLAD' widths = '0.0046955 0.0000955 0.000673' n_part_elems = '3 1 1' - materials = 'fuel-mat gap-mat clad-mat' + solid_properties = 'fuel_sp gap_sp clad_sp' + solid_properties_T_ref = '300 300 300' initial_T = 564.15 [] diff --git a/modules/thermal_hydraulics/test/tests/components/heat_structure_cylindrical/tests b/modules/thermal_hydraulics/test/tests/components/heat_structure_cylindrical/tests index 88a826c38501..0833fc5031ea 100644 --- a/modules/thermal_hydraulics/test/tests/components/heat_structure_cylindrical/tests +++ b/modules/thermal_hydraulics/test/tests/components/heat_structure_cylindrical/tests @@ -5,22 +5,30 @@ [physics] requirement = 'The system shall simulate a 2D cylindrical heat structure' - [transient] + [by_hsmaterials] type = Exodiff - input = 'phy.rz.i' - exodiff = 'phy.rz_out.e' - custom_cmp = 'phy.rz.exodiff' + input = 'by_hsmaterials.i' + exodiff = 'transient.e' + custom_cmp = 'transient.exodiff' + no_error_deprecated = True detail = 'in a transient problem, with properties defined by HeatStructureMaterials.' [] - [transient_mats] + [by_materials] type = Exodiff - input = 'phy.rz_mats.i' - exodiff = 'phy.rz_out.e' - custom_cmp = 'phy.rz.exodiff' - cli_args = 'Outputs/file_base=phy.rz_out' - prereq = 'physics/transient' + input = 'by_materials.i' + exodiff = 'transient.e' + custom_cmp = 'transient.exodiff' + prereq = 'physics/by_hsmaterials' detail = 'in a transient problem, with properties defined by Materials.' [] + [by_solid_properties] + type = Exodiff + input = 'by_solid_properties.i' + exodiff = 'transient.e' + custom_cmp = 'transient.exodiff' + prereq = 'physics/by_materials' + detail = 'in a transient problem, with properties defined by SolidProperties.' + [] [steady] type = Exodiff input = 'steady.i' diff --git a/modules/thermal_hydraulics/test/tests/components/heat_structure_cylindrical/phy.rz.exodiff b/modules/thermal_hydraulics/test/tests/components/heat_structure_cylindrical/transient.exodiff similarity index 100% rename from modules/thermal_hydraulics/test/tests/components/heat_structure_cylindrical/phy.rz.exodiff rename to modules/thermal_hydraulics/test/tests/components/heat_structure_cylindrical/transient.exodiff diff --git a/modules/thermal_hydraulics/test/tests/components/heat_structure_plate/by_hsmaterials.i b/modules/thermal_hydraulics/test/tests/components/heat_structure_plate/by_hsmaterials.i new file mode 100644 index 000000000000..7cac7ad0ba26 --- /dev/null +++ b/modules/thermal_hydraulics/test/tests/components/heat_structure_plate/by_hsmaterials.i @@ -0,0 +1,16 @@ +!include part_base.i + +[HeatStructureMaterials] + [hs-mat] + type = SolidMaterialProperties + k = 1 + cp = 1 + rho = 1 + [] +[] + +[Components] + [hs] + materials = 'hs-mat' + [] +[] diff --git a/modules/thermal_hydraulics/test/tests/components/heat_structure_plate/by_materials.i b/modules/thermal_hydraulics/test/tests/components/heat_structure_plate/by_materials.i new file mode 100644 index 000000000000..9f8e0f67dcf8 --- /dev/null +++ b/modules/thermal_hydraulics/test/tests/components/heat_structure_plate/by_materials.i @@ -0,0 +1,10 @@ +!include part_base.i + +[Materials] + [hs-mat] + type = ADGenericConstantMaterial + block = hs:blk + prop_names = 'thermal_conductivity specific_heat density' + prop_values = '1 1 1' + [] +[] diff --git a/modules/thermal_hydraulics/test/tests/components/heat_structure_plate/by_solid_properties.i b/modules/thermal_hydraulics/test/tests/components/heat_structure_plate/by_solid_properties.i new file mode 100644 index 000000000000..348cd1bfb7d4 --- /dev/null +++ b/modules/thermal_hydraulics/test/tests/components/heat_structure_plate/by_solid_properties.i @@ -0,0 +1,17 @@ +!include part_base.i + +[SolidProperties] + [sp] + type = ThermalFunctionSolidProperties + rho = 1 + cp = 1 + k = 1 + [] +[] + +[Components] + [hs] + solid_properties = 'sp' + solid_properties_T_ref = '300' + [] +[] diff --git a/modules/thermal_hydraulics/test/tests/components/heat_structure_plate/gold/phy.test_out.e b/modules/thermal_hydraulics/test/tests/components/heat_structure_plate/gold/transient.e similarity index 100% rename from modules/thermal_hydraulics/test/tests/components/heat_structure_plate/gold/phy.test_out.e rename to modules/thermal_hydraulics/test/tests/components/heat_structure_plate/gold/transient.e diff --git a/modules/thermal_hydraulics/test/tests/components/heat_structure_plate/phy.test.i b/modules/thermal_hydraulics/test/tests/components/heat_structure_plate/part_base.i similarity index 84% rename from modules/thermal_hydraulics/test/tests/components/heat_structure_plate/phy.test.i rename to modules/thermal_hydraulics/test/tests/components/heat_structure_plate/part_base.i index 84a7e6ed40a7..927b2076d784 100644 --- a/modules/thermal_hydraulics/test/tests/components/heat_structure_plate/phy.test.i +++ b/modules/thermal_hydraulics/test/tests/components/heat_structure_plate/part_base.i @@ -1,12 +1,3 @@ -[HeatStructureMaterials] - [hs-mat] - type = SolidMaterialProperties - k = 1 - cp = 1 - rho = 1 - [] -[] - [Components] [hs] type = HeatStructurePlate @@ -19,7 +10,6 @@ widths = '1' depth = 0.5 n_part_elems = '5' - materials = 'hs-mat' initial_T = 350 [] @@ -40,7 +30,7 @@ [] [Preconditioning] - [SMP] + [pc] type = SMP full = true [] @@ -63,5 +53,6 @@ [] [Outputs] + file_base = transient exodus = true [] diff --git a/modules/thermal_hydraulics/test/tests/components/heat_structure_plate/phy.test_mats.i b/modules/thermal_hydraulics/test/tests/components/heat_structure_plate/phy.test_mats.i deleted file mode 100644 index 038868c05b17..000000000000 --- a/modules/thermal_hydraulics/test/tests/components/heat_structure_plate/phy.test_mats.i +++ /dev/null @@ -1,66 +0,0 @@ -[Materials] - [hs-mat] - type = ADGenericConstantMaterial - block = hs:blk - prop_names = 'thermal_conductivity specific_heat density' - prop_values = '1 1 1' - [] -[] - -[Components] - [hs] - type = HeatStructurePlate - position = '0 0 0' - orientation = '1 0 0' - - length = 1 - n_elems = 5 - names = 'blk' - widths = '1' - depth = 0.5 - n_part_elems = '5' - - initial_T = 350 - [] - - [start] - type = HSBoundarySpecifiedTemperature - hs = hs - boundary = hs:start - T = 300 - [] - - [end] - type = HSBoundarySpecifiedTemperature - hs = hs - boundary = hs:end - T = 400 - [] -[] - -[Preconditioning] - [pc] - type = SMP - full = true - [] -[] - -[Executioner] - type = Transient - scheme = 'bdf2' - - start_time = 0 - dt = 1 - num_steps = 10 - abort_on_solve_fail = true - - solve_type = 'NEWTON' - nl_rel_tol = 1e-8 - nl_abs_tol = 1e-8 - petsc_options_iname = '-pc_type' - petsc_options_value = 'lu' -[] - -[Outputs] - exodus = true -[] diff --git a/modules/thermal_hydraulics/test/tests/components/heat_structure_plate/tests b/modules/thermal_hydraulics/test/tests/components/heat_structure_plate/tests index 821b70f085c9..dc537faa3382 100644 --- a/modules/thermal_hydraulics/test/tests/components/heat_structure_plate/tests +++ b/modules/thermal_hydraulics/test/tests/components/heat_structure_plate/tests @@ -1,19 +1,30 @@ [Tests] design = 'HeatStructurePlate.md' issues = '#19837' - [phy:test] - type = Exodiff - input = 'phy.test.i' - exodiff = 'phy.test_out.e' - requirement = 'The system shall be able to model heat conduction in a plate.' - [] - [phy:test_mats] - type = Exodiff - input = 'phy.test_mats.i' - exodiff = 'phy.test_out.e' - cli_args = 'Outputs/file_base=phy.test_out' - prereq = 'phy:test' - requirement = 'The system shall be able to model heat conduction in a plate using materials to define the solid properties.' + [physics] + requirement = 'The system shall be able to model heat conduction in a 2-D plate' + + [by_hsmaterials] + type = Exodiff + input = 'by_hsmaterials.i' + exodiff = 'transient.e' + no_error_deprecated = True + detail = 'with properties defined by HeatStructureMaterials.' + [] + [by_materials] + type = Exodiff + input = 'by_materials.i' + exodiff = 'transient.e' + prereq = 'physics/by_hsmaterials' + detail = 'with properties defined by Materials.' + [] + [by_solid_properties] + type = Exodiff + input = 'by_solid_properties.i' + exodiff = 'transient.e' + prereq = 'physics/by_materials' + detail = 'with properties defined by SolidProperties.' + [] [] [] diff --git a/modules/thermal_hydraulics/test/tests/components/heat_transfer_from_heat_structure_1phase/err.1phase.i b/modules/thermal_hydraulics/test/tests/components/heat_transfer_from_heat_structure_1phase/err.1phase.i index 9b2cf1ce8c8f..85d17c94aa66 100644 --- a/modules/thermal_hydraulics/test/tests/components/heat_transfer_from_heat_structure_1phase/err.1phase.i +++ b/modules/thermal_hydraulics/test/tests/components/heat_transfer_from_heat_structure_1phase/err.1phase.i @@ -18,9 +18,9 @@ [] [] -[HeatStructureMaterials] +[SolidProperties] [fuel-mat] - type = SolidMaterialProperties + type = ThermalFunctionSolidProperties k = 2.5 cp = 300. rho = 1.032e4 @@ -52,7 +52,8 @@ names = 'fuel' widths = '0.1' n_part_elems = '1' - materials = 'fuel-mat' + solid_properties = 'fuel-mat' + solid_properties_T_ref = '300' initial_T = 300 [] diff --git a/modules/thermal_hydraulics/test/tests/components/heat_transfer_from_heat_structure_1phase/jac.1phase.i b/modules/thermal_hydraulics/test/tests/components/heat_transfer_from_heat_structure_1phase/jac.1phase.i index 7d7052ab9adb..56604dd91ac8 100644 --- a/modules/thermal_hydraulics/test/tests/components/heat_transfer_from_heat_structure_1phase/jac.1phase.i +++ b/modules/thermal_hydraulics/test/tests/components/heat_transfer_from_heat_structure_1phase/jac.1phase.i @@ -21,9 +21,9 @@ [] [] -[HeatStructureMaterials] +[SolidProperties] [fuel-mat] - type = SolidMaterialProperties + type = ThermalFunctionSolidProperties k = 2.5 cp = 300. rho = 1.032e4 @@ -55,7 +55,8 @@ names = 'fuel' widths = '0.1' n_part_elems = '1' - materials = 'fuel-mat' + solid_properties = 'fuel-mat' + solid_properties_T_ref = '300' initial_T = 300 [] diff --git a/modules/thermal_hydraulics/test/tests/components/heat_transfer_from_heat_structure_1phase/phy.T_wall_transfer_3eqn_x.i b/modules/thermal_hydraulics/test/tests/components/heat_transfer_from_heat_structure_1phase/phy.T_wall_transfer_3eqn_x.i index f981d27bc124..1978794f3c62 100644 --- a/modules/thermal_hydraulics/test/tests/components/heat_transfer_from_heat_structure_1phase/phy.T_wall_transfer_3eqn_x.i +++ b/modules/thermal_hydraulics/test/tests/components/heat_transfer_from_heat_structure_1phase/phy.T_wall_transfer_3eqn_x.i @@ -28,9 +28,9 @@ [] [] -[HeatStructureMaterials] +[SolidProperties] [wall-mat] - type = SolidMaterialProperties + type = ThermalFunctionSolidProperties k = 100.0 rho = 100.0 cp = 100.0 @@ -68,7 +68,8 @@ n_elems = 50 #rotation = 90 - materials = 'wall-mat' + solid_properties = 'wall-mat' + solid_properties_T_ref = '300' n_part_elems = 3 widths = '0.1' names = 'wall' diff --git a/modules/thermal_hydraulics/test/tests/components/heat_transfer_from_heat_structure_1phase/phy.T_wall_transfer_3eqn_y.i b/modules/thermal_hydraulics/test/tests/components/heat_transfer_from_heat_structure_1phase/phy.T_wall_transfer_3eqn_y.i index 2f6e35a094f0..9b5a721d4334 100644 --- a/modules/thermal_hydraulics/test/tests/components/heat_transfer_from_heat_structure_1phase/phy.T_wall_transfer_3eqn_y.i +++ b/modules/thermal_hydraulics/test/tests/components/heat_transfer_from_heat_structure_1phase/phy.T_wall_transfer_3eqn_y.i @@ -28,9 +28,9 @@ [] [] -[HeatStructureMaterials] +[SolidProperties] [wall-mat] - type = SolidMaterialProperties + type = ThermalFunctionSolidProperties k = 100.0 rho = 100.0 cp = 100.0 @@ -67,7 +67,8 @@ length = 1 n_elems = 50 - materials = 'wall-mat' + solid_properties = 'wall-mat' + solid_properties_T_ref = '300' n_part_elems = 3 widths = '0.1' names = 'wall' diff --git a/modules/thermal_hydraulics/test/tests/components/heat_transfer_from_heat_structure_1phase/phy.T_wall_transfer_3eqn_z.i b/modules/thermal_hydraulics/test/tests/components/heat_transfer_from_heat_structure_1phase/phy.T_wall_transfer_3eqn_z.i index 2d91c168e586..472c06a7ef5b 100644 --- a/modules/thermal_hydraulics/test/tests/components/heat_transfer_from_heat_structure_1phase/phy.T_wall_transfer_3eqn_z.i +++ b/modules/thermal_hydraulics/test/tests/components/heat_transfer_from_heat_structure_1phase/phy.T_wall_transfer_3eqn_z.i @@ -28,9 +28,9 @@ [] [] -[HeatStructureMaterials] +[SolidProperties] [wall-mat] - type = SolidMaterialProperties + type = ThermalFunctionSolidProperties k = 100.0 rho = 100.0 cp = 100.0 @@ -68,7 +68,8 @@ n_elems = 50 rotation = 90 - materials = 'wall-mat' + solid_properties = 'wall-mat' + solid_properties_T_ref = '300' n_part_elems = 2 widths = '0.1' names = 'wall' diff --git a/modules/thermal_hydraulics/test/tests/components/heat_transfer_from_heat_structure_1phase/phy.conservation_1phase.i b/modules/thermal_hydraulics/test/tests/components/heat_transfer_from_heat_structure_1phase/phy.conservation_1phase.i index f4a82d2b37dd..d93c1b5061fb 100644 --- a/modules/thermal_hydraulics/test/tests/components/heat_transfer_from_heat_structure_1phase/phy.conservation_1phase.i +++ b/modules/thermal_hydraulics/test/tests/components/heat_transfer_from_heat_structure_1phase/phy.conservation_1phase.i @@ -25,9 +25,9 @@ [] [] -[HeatStructureMaterials] +[SolidProperties] [main-material] - type = SolidMaterialProperties + type = ThermalFunctionSolidProperties k = 1e4 cp = 500.0 rho = 100.0 @@ -87,7 +87,8 @@ n_elems = 5 names = 'main' - materials = 'main-material' + solid_properties = 'main-material' + solid_properties_T_ref = '300' widths = '1.0' n_part_elems = '5' diff --git a/modules/thermal_hydraulics/test/tests/components/heat_transfer_from_heat_structure_1phase/phy.energy_heatstructure_ss_1phase.i b/modules/thermal_hydraulics/test/tests/components/heat_transfer_from_heat_structure_1phase/phy.energy_heatstructure_ss_1phase.i index 1ac297765ccd..452c63af2ca4 100644 --- a/modules/thermal_hydraulics/test/tests/components/heat_transfer_from_heat_structure_1phase/phy.energy_heatstructure_ss_1phase.i +++ b/modules/thermal_hydraulics/test/tests/components/heat_transfer_from_heat_structure_1phase/phy.energy_heatstructure_ss_1phase.i @@ -31,21 +31,21 @@ [] [] -[HeatStructureMaterials] +[SolidProperties] [fuel-mat] - type = SolidMaterialProperties + type = ThermalFunctionSolidProperties k = 3.7 cp = 3.e2 rho = 10.42e3 [] [gap-mat] - type = SolidMaterialProperties + type = ThermalFunctionSolidProperties k = 0.7 cp = 5e3 rho = 1.0 [] [clad-mat] - type = SolidMaterialProperties + type = ThermalFunctionSolidProperties k = 16 cp = 356. rho = 6.551400E+03 @@ -82,7 +82,8 @@ names = 'FUEL GAP CLAD' widths = '6.057900E-03 1.524000E-04 9.398000E-04' n_part_elems = '5 1 2' - materials = 'fuel-mat gap-mat clad-mat' + solid_properties = 'fuel-mat gap-mat clad-mat' + solid_properties_T_ref = '300 300 300' initial_T = 513 [] diff --git a/modules/thermal_hydraulics/test/tests/components/heat_transfer_from_heat_structure_1phase/phy.heat_structure_multiple_3eqn.i b/modules/thermal_hydraulics/test/tests/components/heat_transfer_from_heat_structure_1phase/phy.heat_structure_multiple_3eqn.i index 9f22cbea9916..5d69fbebf6bc 100644 --- a/modules/thermal_hydraulics/test/tests/components/heat_transfer_from_heat_structure_1phase/phy.heat_structure_multiple_3eqn.i +++ b/modules/thermal_hydraulics/test/tests/components/heat_transfer_from_heat_structure_1phase/phy.heat_structure_multiple_3eqn.i @@ -88,15 +88,15 @@ cp2 = 600 [] [] -[HeatStructureMaterials] +[SolidProperties] [hs1_mat] - type = SolidMaterialProperties + type = ThermalFunctionSolidProperties k = ${k1} rho = ${rho1} cp = ${cp1} [] [hs2_mat] - type = SolidMaterialProperties + type = ThermalFunctionSolidProperties k = ${k2} rho = ${rho2} cp = ${cp2} @@ -123,7 +123,8 @@ cp2 = 600 depth = 1 n_elems = 10 - materials = 'hs1_mat' + solid_properties = 'hs1_mat' + solid_properties_T_ref = '300' n_part_elems = '5' widths = '1' names = 'solid' @@ -139,7 +140,8 @@ cp2 = 600 depth = 1 n_elems = 10 - materials = 'hs2_mat' + solid_properties = 'hs2_mat' + solid_properties_T_ref = '300' n_part_elems = '5' widths = '1' names = 'solid' diff --git a/modules/thermal_hydraulics/test/tests/components/heat_transfer_from_heat_structure_3d/err.not_a_3d_hs.i b/modules/thermal_hydraulics/test/tests/components/heat_transfer_from_heat_structure_3d/err.not_a_3d_hs.i index b2c9fbd454ae..e6b31719fd06 100644 --- a/modules/thermal_hydraulics/test/tests/components/heat_transfer_from_heat_structure_3d/err.not_a_3d_hs.i +++ b/modules/thermal_hydraulics/test/tests/components/heat_transfer_from_heat_structure_3d/err.not_a_3d_hs.i @@ -2,12 +2,12 @@ scaling_factor_1phase = '1 1 1e-3' [] -[Materials] +[SolidProperties] [mat] - type = ADGenericConstantMaterial - block = 'blk:0' - prop_names = 'density specific_heat thermal_conductivity' - prop_values = '1000 100 30' + type = ThermalFunctionSolidProperties + rho = 1000 + cp = 100 + k = 30 [] [] @@ -72,7 +72,8 @@ n_elems = 6 n_part_elems = 1 initial_T = T_init - materials = 'mat' + solid_properties = 'mat' + solid_properties_T_ref = '300' names = blk [] [ht] diff --git a/modules/thermal_hydraulics/test/tests/components/heat_transfer_from_specified_temperature_1phase/err.no_phf.i b/modules/thermal_hydraulics/test/tests/components/heat_transfer_from_specified_temperature_1phase/err.no_phf.i index 0be598dc6039..56f610439c96 100644 --- a/modules/thermal_hydraulics/test/tests/components/heat_transfer_from_specified_temperature_1phase/err.no_phf.i +++ b/modules/thermal_hydraulics/test/tests/components/heat_transfer_from_specified_temperature_1phase/err.no_phf.i @@ -10,9 +10,9 @@ [] [] -[HeatStructureMaterials] +[SolidProperties] [mat] - type = SolidMaterialProperties + type = ThermalFunctionSolidProperties k = 1 cp = 2 rho = 3 @@ -46,7 +46,8 @@ names = 'blk' widths = '0.1' n_part_elems = '1' - materials = 'mat' + solid_properties = 'mat' + solid_properties_T_ref = '300' initial_T = 300 [] diff --git a/modules/thermal_hydraulics/test/tests/components/hs_boundary_ambient_convection/cylindrical.i b/modules/thermal_hydraulics/test/tests/components/hs_boundary_ambient_convection/cylindrical.i index ab8d3d6b0723..23205604ec39 100644 --- a/modules/thermal_hydraulics/test/tests/components/hs_boundary_ambient_convection/cylindrical.i +++ b/modules/thermal_hydraulics/test/tests/components/hs_boundary_ambient_convection/cylindrical.i @@ -38,9 +38,9 @@ E_change = ${fparse power * t} [] [] -[HeatStructureMaterials] +[SolidProperties] [hs_mat] - type = SolidMaterialProperties + type = ThermalFunctionSolidProperties rho = ${density} cp = ${specific_heat_capacity} k = ${conductivity} @@ -58,7 +58,8 @@ E_change = ${fparse power * t} inner_radius = ${R_i} widths = '${thickness}' n_part_elems = '10' - materials = 'hs_mat' + solid_properties = 'hs_mat' + solid_properties_T_ref = '300' names = 'region' initial_T = ${T_hs} diff --git a/modules/thermal_hydraulics/test/tests/components/hs_boundary_ambient_convection/plate.i b/modules/thermal_hydraulics/test/tests/components/hs_boundary_ambient_convection/plate.i index e768e8827376..749d241a3b08 100644 --- a/modules/thermal_hydraulics/test/tests/components/hs_boundary_ambient_convection/plate.i +++ b/modules/thermal_hydraulics/test/tests/components/hs_boundary_ambient_convection/plate.i @@ -35,9 +35,9 @@ E_change = ${fparse scale * heat_flux_integral * t} [] [] -[HeatStructureMaterials] +[SolidProperties] [hs_mat] - type = SolidMaterialProperties + type = ThermalFunctionSolidProperties rho = ${density} cp = ${specific_heat_capacity} k = ${conductivity} @@ -55,7 +55,8 @@ E_change = ${fparse scale * heat_flux_integral * t} depth = ${depth} widths = '${thickness}' n_part_elems = '10' - materials = 'hs_mat' + solid_properties = 'hs_mat' + solid_properties_T_ref = '300' names = 'region' initial_T = ${T_hs} diff --git a/modules/thermal_hydraulics/test/tests/components/hs_boundary_external_app_convection/plate.i b/modules/thermal_hydraulics/test/tests/components/hs_boundary_external_app_convection/plate.i index 725b98d73815..64c94fbdfe32 100644 --- a/modules/thermal_hydraulics/test/tests/components/hs_boundary_external_app_convection/plate.i +++ b/modules/thermal_hydraulics/test/tests/components/hs_boundary_external_app_convection/plate.i @@ -14,9 +14,9 @@ conductivity = 20 scale = 0.8 -[HeatStructureMaterials] +[SolidProperties] [hs_mat] - type = SolidMaterialProperties + type = ThermalFunctionSolidProperties rho = ${density} cp = ${specific_heat_capacity} k = ${conductivity} @@ -34,7 +34,8 @@ scale = 0.8 depth = ${depth} widths = '${thickness}' n_part_elems = '10' - materials = 'hs_mat' + solid_properties = 'hs_mat' + solid_properties_T_ref = '300' names = 'region' initial_T = ${T_hs} diff --git a/modules/thermal_hydraulics/test/tests/components/hs_boundary_external_app_heat_flux/sub.i b/modules/thermal_hydraulics/test/tests/components/hs_boundary_external_app_heat_flux/sub.i index 15182a2dbe4e..5f5f1072df7a 100644 --- a/modules/thermal_hydraulics/test/tests/components/hs_boundary_external_app_heat_flux/sub.i +++ b/modules/thermal_hydraulics/test/tests/components/hs_boundary_external_app_heat_flux/sub.i @@ -15,9 +15,9 @@ rho = 8000.0 cp = 500.0 k = 15.0 -[HeatStructureMaterials] +[SolidProperties] [hs_mat] - type = SolidMaterialProperties + type = ThermalFunctionSolidProperties rho = ${rho} cp = ${cp} k = ${k} @@ -35,7 +35,8 @@ k = 15.0 names = 'body' widths = '${radius}' n_part_elems = '${n_elems_radial}' - materials = 'hs_mat' + solid_properties = 'hs_mat' + solid_properties_T_ref = '300' initial_T = ${T_initial} [] diff --git a/modules/thermal_hydraulics/test/tests/components/hs_boundary_external_app_temperature/phy.child.i b/modules/thermal_hydraulics/test/tests/components/hs_boundary_external_app_temperature/phy.child.i index 13765e66d2db..d2d2a1b9ada5 100644 --- a/modules/thermal_hydraulics/test/tests/components/hs_boundary_external_app_temperature/phy.child.i +++ b/modules/thermal_hydraulics/test/tests/components/hs_boundary_external_app_temperature/phy.child.i @@ -1,6 +1,6 @@ -[HeatStructureMaterials] +[SolidProperties] [ss316] - type = SolidMaterialProperties + type = ThermalFunctionSolidProperties rho = 8.0272e3 cp = 502.1 k = 16.26 @@ -18,7 +18,8 @@ inner_radius = 0.1 widths = '0.5' n_part_elems = '10' - materials = 'ss316' + solid_properties = 'ss316' + solid_properties_T_ref = '300' names = 'region' initial_T = 300 diff --git a/modules/thermal_hydraulics/test/tests/components/hs_boundary_heat_flux/cylindrical.i b/modules/thermal_hydraulics/test/tests/components/hs_boundary_heat_flux/cylindrical.i index edcf18aadb12..3fdcfcc8b70a 100644 --- a/modules/thermal_hydraulics/test/tests/components/hs_boundary_heat_flux/cylindrical.i +++ b/modules/thermal_hydraulics/test/tests/components/hs_boundary_heat_flux/cylindrical.i @@ -25,9 +25,9 @@ E_change = ${fparse power * t} [] [] -[HeatStructureMaterials] +[SolidProperties] [hs_mat] - type = SolidMaterialProperties + type = ThermalFunctionSolidProperties rho = ${density} cp = ${specific_heat_capacity} k = ${conductivity} @@ -45,7 +45,8 @@ E_change = ${fparse power * t} inner_radius = ${R_i} widths = '${thickness}' n_part_elems = '10' - materials = 'hs_mat' + solid_properties = 'hs_mat' + solid_properties_T_ref = '300' names = 'region' initial_T = ${T_hs} diff --git a/modules/thermal_hydraulics/test/tests/components/hs_boundary_heat_flux/plate.i b/modules/thermal_hydraulics/test/tests/components/hs_boundary_heat_flux/plate.i index b61197b4ae8c..1d734eac0707 100644 --- a/modules/thermal_hydraulics/test/tests/components/hs_boundary_heat_flux/plate.i +++ b/modules/thermal_hydraulics/test/tests/components/hs_boundary_heat_flux/plate.i @@ -22,9 +22,9 @@ E_change = ${fparse scale * heat_flux * A * t} [] [] -[HeatStructureMaterials] +[SolidProperties] [hs_mat] - type = SolidMaterialProperties + type = ThermalFunctionSolidProperties rho = ${density} cp = ${specific_heat_capacity} k = ${conductivity} @@ -42,7 +42,8 @@ E_change = ${fparse scale * heat_flux * A * t} depth = ${depth} widths = '${thickness}' n_part_elems = '10' - materials = 'hs_mat' + solid_properties = 'hs_mat' + solid_properties_T_ref = '300' names = 'region' initial_T = ${T_hs} diff --git a/modules/thermal_hydraulics/test/tests/components/hs_boundary_radiation/cylindrical.i b/modules/thermal_hydraulics/test/tests/components/hs_boundary_radiation/cylindrical.i index a1bd58b965df..8c22a9fd9443 100644 --- a/modules/thermal_hydraulics/test/tests/components/hs_boundary_radiation/cylindrical.i +++ b/modules/thermal_hydraulics/test/tests/components/hs_boundary_radiation/cylindrical.i @@ -22,9 +22,9 @@ scale = 0.8 power = ${fparse scale * heat_flux * A} E_change = ${fparse power * t} -[HeatStructureMaterials] +[SolidProperties] [hs_mat] - type = SolidMaterialProperties + type = ThermalFunctionSolidProperties rho = ${density} cp = ${specific_heat_capacity} k = ${conductivity} @@ -42,7 +42,8 @@ E_change = ${fparse power * t} inner_radius = ${R_i} widths = '${thickness}' n_part_elems = '10' - materials = 'hs_mat' + solid_properties = 'hs_mat' + solid_properties_T_ref = '300' names = 'region' initial_T = ${T_hs} diff --git a/modules/thermal_hydraulics/test/tests/components/hs_boundary_radiation/plate.i b/modules/thermal_hydraulics/test/tests/components/hs_boundary_radiation/plate.i index 697a1f7f7199..201d153e271e 100644 --- a/modules/thermal_hydraulics/test/tests/components/hs_boundary_radiation/plate.i +++ b/modules/thermal_hydraulics/test/tests/components/hs_boundary_radiation/plate.i @@ -19,9 +19,9 @@ heat_flux = ${fparse stefan_boltzmann * emissivity * view_factor * (T_ambient^4 scale = 0.8 E_change = ${fparse scale * heat_flux * A * t} -[HeatStructureMaterials] +[SolidProperties] [hs_mat] - type = SolidMaterialProperties + type = ThermalFunctionSolidProperties rho = ${density} cp = ${specific_heat_capacity} k = ${conductivity} @@ -39,7 +39,8 @@ E_change = ${fparse scale * heat_flux * A * t} depth = ${depth} widths = '${thickness}' n_part_elems = '10' - materials = 'hs_mat' + solid_properties = 'hs_mat' + solid_properties_T_ref = '300' names = 'region' initial_T = ${T_hs} diff --git a/modules/thermal_hydraulics/test/tests/components/hs_boundary_specified_temperature/err.no_bnd.i b/modules/thermal_hydraulics/test/tests/components/hs_boundary_specified_temperature/err.no_bnd.i index 25009c38e5d4..08d18cabf52c 100644 --- a/modules/thermal_hydraulics/test/tests/components/hs_boundary_specified_temperature/err.no_bnd.i +++ b/modules/thermal_hydraulics/test/tests/components/hs_boundary_specified_temperature/err.no_bnd.i @@ -1,6 +1,6 @@ -[HeatStructureMaterials] +[SolidProperties] [hs_mat] - type = SolidMaterialProperties + type = ThermalFunctionSolidProperties rho = 1 cp = 2 k = 3 @@ -18,7 +18,8 @@ names = 'blk' widths = '0.1' n_part_elems = '1' - materials = 'hs_mat' + solid_properties = 'hs_mat' + solid_properties_T_ref = '300' initial_T = 300 [] diff --git a/modules/thermal_hydraulics/test/tests/components/shaft_connected_motor/clg.test.i b/modules/thermal_hydraulics/test/tests/components/shaft_connected_motor/clg.test.i index 9e010773525a..0cf5e628e0bf 100644 --- a/modules/thermal_hydraulics/test/tests/components/shaft_connected_motor/clg.test.i +++ b/modules/thermal_hydraulics/test/tests/components/shaft_connected_motor/clg.test.i @@ -14,9 +14,9 @@ [] [] -[HeatStructureMaterials] +[SolidProperties] [mat] - type = SolidMaterialProperties + type = ThermalFunctionSolidProperties rho = 1 cp = 1 k = 1 @@ -46,7 +46,8 @@ names = '0' n_part_elems = 1 widths = '1' - materials = 'mat' + solid_properties = 'mat' + solid_properties_T_ref = '300' initial_T = 300 [] diff --git a/modules/thermal_hydraulics/test/tests/components/shaft_connected_motor/test.i b/modules/thermal_hydraulics/test/tests/components/shaft_connected_motor/test.i index 7d0713fe9e51..1615e3c01cde 100644 --- a/modules/thermal_hydraulics/test/tests/components/shaft_connected_motor/test.i +++ b/modules/thermal_hydraulics/test/tests/components/shaft_connected_motor/test.i @@ -1,6 +1,6 @@ -[HeatStructureMaterials] +[SolidProperties] [mat] - type = SolidMaterialProperties + type = ThermalFunctionSolidProperties rho = 1 cp = 1 k = 1 @@ -29,7 +29,8 @@ names = '0' n_part_elems = 1 widths = '1' - materials = 'mat' + solid_properties = 'mat' + solid_properties_T_ref = '300' [] [] diff --git a/modules/thermal_hydraulics/test/tests/components/total_power/clg.power.i b/modules/thermal_hydraulics/test/tests/components/total_power/clg.power.i index 8b3a4b868921..a55426d28214 100644 --- a/modules/thermal_hydraulics/test/tests/components/total_power/clg.power.i +++ b/modules/thermal_hydraulics/test/tests/components/total_power/clg.power.i @@ -14,9 +14,9 @@ [] [] -[HeatStructureMaterials] +[SolidProperties] [mat] - type = SolidMaterialProperties + type = ThermalFunctionSolidProperties k = 1 cp = 1 rho = 1 @@ -39,7 +39,8 @@ names = '0' widths = '1' n_part_elems = '1' - materials = 'mat' + solid_properties = 'mat' + solid_properties_T_ref = '300' [] [] diff --git a/modules/thermal_hydraulics/test/tests/components/total_power/phy.constant_power.i b/modules/thermal_hydraulics/test/tests/components/total_power/phy.constant_power.i index 2ae2e41342bc..1efd0d3501d7 100644 --- a/modules/thermal_hydraulics/test/tests/components/total_power/phy.constant_power.i +++ b/modules/thermal_hydraulics/test/tests/components/total_power/phy.constant_power.i @@ -1,6 +1,6 @@ -[HeatStructureMaterials] +[SolidProperties] [mat] - type = SolidMaterialProperties + type = ThermalFunctionSolidProperties k = 1 cp = 1 rho = 1 @@ -23,7 +23,8 @@ names = '0' widths = '1' n_part_elems = '1' - materials = 'mat' + solid_properties = 'mat' + solid_properties_T_ref = '300' [] [] diff --git a/modules/thermal_hydraulics/test/tests/interfaces/discrete_line_segment_interface/discrete_line_segment_interface.i b/modules/thermal_hydraulics/test/tests/interfaces/discrete_line_segment_interface/discrete_line_segment_interface.i index c06ad99e32e3..4a5e48a5da47 100644 --- a/modules/thermal_hydraulics/test/tests/interfaces/discrete_line_segment_interface/discrete_line_segment_interface.i +++ b/modules/thermal_hydraulics/test/tests/interfaces/discrete_line_segment_interface/discrete_line_segment_interface.i @@ -21,9 +21,9 @@ [] [] -[HeatStructureMaterials] +[SolidProperties] [hs_mat] - type = SolidMaterialProperties + type = ThermalFunctionSolidProperties k = 1 cp = 1 rho = 1 @@ -43,7 +43,8 @@ names = 'region1 region2 region3' widths = '1.0 3.0 2.0' n_part_elems = '2 6 8' - materials = 'hs_mat hs_mat hs_mat' + solid_properties = 'hs_mat hs_mat hs_mat' + solid_properties_T_ref = '300 300 300' initial_T = 300 [] diff --git a/modules/thermal_hydraulics/test/tests/jacobians/materials/tests b/modules/thermal_hydraulics/test/tests/jacobians/materials/tests index 321164ad5e28..315ec1bea6e3 100644 --- a/modules/thermal_hydraulics/test/tests/jacobians/materials/tests +++ b/modules/thermal_hydraulics/test/tests/jacobians/materials/tests @@ -7,6 +7,7 @@ max_threads = 1 max_parallel = 1 allow_test_objects = true + no_error_deprecated = true issues = '#20662' design = 'ADSolidMaterial.md' requirement = 'The system shall be able to use the material property system to define solid properties for a solid energy equation.' diff --git a/modules/thermal_hydraulics/test/tests/misc/initial_from_file/heat_structure/steady_state.i b/modules/thermal_hydraulics/test/tests/misc/initial_from_file/heat_structure/steady_state.i index b5325220ccad..456973ede95e 100644 --- a/modules/thermal_hydraulics/test/tests/misc/initial_from_file/heat_structure/steady_state.i +++ b/modules/thermal_hydraulics/test/tests/misc/initial_from_file/heat_structure/steady_state.i @@ -1,6 +1,6 @@ -[HeatStructureMaterials] +[SolidProperties] [mat1] - type = SolidMaterialProperties + type = ThermalFunctionSolidProperties k = 16 cp = 356. rho = 6.551400E+03 @@ -23,7 +23,8 @@ n_elems = 3 names = 'wall' n_part_elems = 1 - materials = 'mat1' + solid_properties = 'mat1' + solid_properties_T_ref = '300' widths = 0.1 initial_T = Ts_init [] diff --git a/modules/thermal_hydraulics/test/tests/misc/initial_from_file/heat_structure/test.i b/modules/thermal_hydraulics/test/tests/misc/initial_from_file/heat_structure/test.i index 3aefd0870f42..4f012f4e5ba8 100644 --- a/modules/thermal_hydraulics/test/tests/misc/initial_from_file/heat_structure/test.i +++ b/modules/thermal_hydraulics/test/tests/misc/initial_from_file/heat_structure/test.i @@ -4,9 +4,9 @@ initial_from_file = 'steady_state_out.e' [] -[HeatStructureMaterials] +[SolidProperties] [mat1] - type = SolidMaterialProperties + type = ThermalFunctionSolidProperties k = 16 cp = 356. rho = 6.551400E+03 @@ -29,7 +29,8 @@ n_elems = 3 names = 'wall' n_part_elems = 1 - materials = 'mat1' + solid_properties = 'mat1' + solid_properties_T_ref = '300' widths = 0.1 [] diff --git a/modules/thermal_hydraulics/test/tests/misc/initial_from_file/heat_transfer_from_heat_structure/steady_state.i b/modules/thermal_hydraulics/test/tests/misc/initial_from_file/heat_transfer_from_heat_structure/steady_state.i index 56b5efc47485..faf00ab325b1 100644 --- a/modules/thermal_hydraulics/test/tests/misc/initial_from_file/heat_transfer_from_heat_structure/steady_state.i +++ b/modules/thermal_hydraulics/test/tests/misc/initial_from_file/heat_transfer_from_heat_structure/steady_state.i @@ -28,9 +28,9 @@ [] [] -[HeatStructureMaterials] +[SolidProperties] [mat1] - type = SolidMaterialProperties + type = ThermalFunctionSolidProperties k = 16 cp = 356. rho = 6.551400E+03 @@ -66,7 +66,8 @@ n_elems = 3 names = 'wall' n_part_elems = 1 - materials = 'mat1' + solid_properties = 'mat1' + solid_properties_T_ref = '300' inner_radius = 0.01 widths = 0.1 initial_T = Ts_init diff --git a/modules/thermal_hydraulics/test/tests/misc/initial_from_file/heat_transfer_from_heat_structure/test.i b/modules/thermal_hydraulics/test/tests/misc/initial_from_file/heat_transfer_from_heat_structure/test.i index dcb381870a69..ac89d8fbd387 100644 --- a/modules/thermal_hydraulics/test/tests/misc/initial_from_file/heat_transfer_from_heat_structure/test.i +++ b/modules/thermal_hydraulics/test/tests/misc/initial_from_file/heat_transfer_from_heat_structure/test.i @@ -28,9 +28,9 @@ [] [] -[HeatStructureMaterials] +[SolidProperties] [mat1] - type = SolidMaterialProperties + type = ThermalFunctionSolidProperties k = 16 cp = 356. rho = 6.551400E+03 @@ -66,7 +66,8 @@ n_elems = 3 names = 'wall' n_part_elems = 1 - materials = 'mat1' + solid_properties = 'mat1' + solid_properties_T_ref = '300' inner_radius = 0.01 widths = 0.1 [] diff --git a/modules/thermal_hydraulics/test/tests/misc/initial_from_file/shaft/steady_state.i b/modules/thermal_hydraulics/test/tests/misc/initial_from_file/shaft/steady_state.i index 3ba9e8ed7e95..c4b0a53e9ab2 100644 --- a/modules/thermal_hydraulics/test/tests/misc/initial_from_file/shaft/steady_state.i +++ b/modules/thermal_hydraulics/test/tests/misc/initial_from_file/shaft/steady_state.i @@ -1,6 +1,6 @@ -[HeatStructureMaterials] +[SolidProperties] [mat] - type = SolidMaterialProperties + type = ThermalFunctionSolidProperties rho = 1 cp = 1 k = 1 @@ -30,7 +30,8 @@ names = '0' n_part_elems = 1 widths = '1' - materials = 'mat' + solid_properties = 'mat' + solid_properties_T_ref = '300' initial_T = 300 [] diff --git a/modules/thermal_hydraulics/test/tests/misc/initial_from_file/shaft/test.i b/modules/thermal_hydraulics/test/tests/misc/initial_from_file/shaft/test.i index 2e9d4f92411c..322a3c21814d 100644 --- a/modules/thermal_hydraulics/test/tests/misc/initial_from_file/shaft/test.i +++ b/modules/thermal_hydraulics/test/tests/misc/initial_from_file/shaft/test.i @@ -2,9 +2,9 @@ initial_from_file = 'steady_state_out.e' [] -[HeatStructureMaterials] +[SolidProperties] [mat] - type = SolidMaterialProperties + type = ThermalFunctionSolidProperties rho = 1 cp = 1 k = 1 @@ -33,7 +33,8 @@ names = '0' n_part_elems = 1 widths = '1' - materials = 'mat' + solid_properties = 'mat' + solid_properties_T_ref = '300' [] [] diff --git a/modules/thermal_hydraulics/test/tests/misc/mesh_only/test.i b/modules/thermal_hydraulics/test/tests/misc/mesh_only/test.i index db41062ba5d5..f73328fbe26b 100644 --- a/modules/thermal_hydraulics/test/tests/misc/mesh_only/test.i +++ b/modules/thermal_hydraulics/test/tests/misc/mesh_only/test.i @@ -28,9 +28,9 @@ [] [] -[HeatStructureMaterials] +[SolidProperties] [hs_mat] - type = SolidMaterialProperties + type = ThermalFunctionSolidProperties rho = 1 cp = 1 k = 1 @@ -59,7 +59,8 @@ length = 1 depth = 0.1 names = 'blk' - materials = 'hs_mat' + solid_properties = 'hs_mat' + solid_properties_T_ref = '300' n_part_elems = 1 widths = '0.1' [] @@ -85,7 +86,8 @@ length = 1 depth = 0.1 names = 'blk' - materials = 'hs_mat' + solid_properties = 'hs_mat' + solid_properties_T_ref = '300' n_part_elems = 1 widths = '0.1' [] @@ -111,7 +113,8 @@ length = 1 depth = 0.1 names = 'blk' - materials = 'hs_mat' + solid_properties = 'hs_mat' + solid_properties_T_ref = '300' n_part_elems = 1 widths = '0.1' [] diff --git a/modules/thermal_hydraulics/test/tests/misc/restart_1phase/test.i b/modules/thermal_hydraulics/test/tests/misc/restart_1phase/test.i index 475b0d67301a..10d4811e9ac4 100644 --- a/modules/thermal_hydraulics/test/tests/misc/restart_1phase/test.i +++ b/modules/thermal_hydraulics/test/tests/misc/restart_1phase/test.i @@ -21,9 +21,9 @@ [] [] -[HeatStructureMaterials] +[SolidProperties] [mat1] - type = SolidMaterialProperties + type = ThermalFunctionSolidProperties k = 16 cp = 356. rho = 6.551400E+03 @@ -99,7 +99,8 @@ n_elems = 5 names = '0' n_part_elems = 1 - materials = 'mat1' + solid_properties = 'mat1' + solid_properties_T_ref = '300' widths = 0.1 [] diff --git a/modules/thermal_hydraulics/test/tests/misc/surrogate_power_profile/surrogate_power_profile.i b/modules/thermal_hydraulics/test/tests/misc/surrogate_power_profile/surrogate_power_profile.i index e0d042c84bae..4412747c6861 100644 --- a/modules/thermal_hydraulics/test/tests/misc/surrogate_power_profile/surrogate_power_profile.i +++ b/modules/thermal_hydraulics/test/tests/misc/surrogate_power_profile/surrogate_power_profile.i @@ -32,21 +32,21 @@ [] [] -[HeatStructureMaterials] +[SolidProperties] [fuel-mat] - type = SolidMaterialProperties + type = ThermalFunctionSolidProperties k = 2.5 cp = 300. rho = 1.032e4 [] [gap-mat] - type = SolidMaterialProperties + type = ThermalFunctionSolidProperties k = 0.6 cp = 1. rho = 1. [] [clad-mat] - type = SolidMaterialProperties + type = ThermalFunctionSolidProperties k = 21.5 cp = 350. rho = 6.55e3 @@ -78,7 +78,8 @@ names = 'fuel gap clad' widths = '0.004096 0.0001 0.000552' n_part_elems = '5 1 2' - materials = 'fuel-mat gap-mat clad-mat' + solid_properties = 'fuel-mat gap-mat clad-mat' + solid_properties_T_ref = '300 300 300' [] [CCH1:hx] diff --git a/modules/thermal_hydraulics/test/tests/misc/uniform_refine/test.i b/modules/thermal_hydraulics/test/tests/misc/uniform_refine/test.i index 837f7c5f9664..6605894063a7 100644 --- a/modules/thermal_hydraulics/test/tests/misc/uniform_refine/test.i +++ b/modules/thermal_hydraulics/test/tests/misc/uniform_refine/test.i @@ -29,9 +29,9 @@ [] [] -[HeatStructureMaterials] +[SolidProperties] [mat1] - type = SolidMaterialProperties + type = ThermalFunctionSolidProperties rho = 10 cp = 1 k = 1 @@ -87,7 +87,8 @@ names = '0' widths = 0.5 n_part_elems = '1' - materials = 'mat1' + solid_properties = 'mat1' + solid_properties_T_ref = '300' [] [] diff --git a/modules/thermal_hydraulics/test/tests/output/paraview_component_annotation_map/test.i b/modules/thermal_hydraulics/test/tests/output/paraview_component_annotation_map/test.i index 22b01d507b4a..de6c0f80dfef 100644 --- a/modules/thermal_hydraulics/test/tests/output/paraview_component_annotation_map/test.i +++ b/modules/thermal_hydraulics/test/tests/output/paraview_component_annotation_map/test.i @@ -23,9 +23,9 @@ [] [] -[HeatStructureMaterials] +[SolidProperties] [m] - type = SolidMaterialProperties + type = ThermalFunctionSolidProperties rho = 1 cp = 1 k = 1 @@ -60,7 +60,8 @@ n_elems = 10 names = '1 2' widths = '0.2 0.3' - materials = 'm m' + solid_properties = 'm m' + solid_properties_T_ref = '300 300' n_part_elems = '1 1' rotation = 90 [] @@ -94,7 +95,8 @@ n_elems = '5 5' names = '1 2' widths = '0.2 0.3' - materials = 'm m' + solid_properties = 'm m' + solid_properties_T_ref = '300 300' n_part_elems = '1 1' rotation = 270 [] diff --git a/modules/thermal_hydraulics/test/tests/postprocessors/function_side_integral_rz/function_side_integral_rz.i b/modules/thermal_hydraulics/test/tests/postprocessors/function_side_integral_rz/function_side_integral_rz.i index 13871b3b42b5..5460752cf39e 100644 --- a/modules/thermal_hydraulics/test/tests/postprocessors/function_side_integral_rz/function_side_integral_rz.i +++ b/modules/thermal_hydraulics/test/tests/postprocessors/function_side_integral_rz/function_side_integral_rz.i @@ -10,9 +10,9 @@ S = ${fparse 2 * pi * R_o * L} Q = 5000 q = ${fparse Q / S} -[HeatStructureMaterials] +[SolidProperties] [region1-mat] - type = SolidMaterialProperties + type = ThermalFunctionSolidProperties k = 1 cp = 1 rho = 1 @@ -37,7 +37,8 @@ q = ${fparse Q / S} n_elems = 50 names = 'region1' - materials = 'region1-mat' + solid_properties = 'region1-mat' + solid_properties_T_ref = '300' widths = '${thickness}' n_part_elems = '5' diff --git a/modules/thermal_hydraulics/test/tests/postprocessors/heat_rate_convection/heat_rate_convection.i b/modules/thermal_hydraulics/test/tests/postprocessors/heat_rate_convection/heat_rate_convection.i index 55fc90bc2987..59e6fdc40678 100644 --- a/modules/thermal_hydraulics/test/tests/postprocessors/heat_rate_convection/heat_rate_convection.i +++ b/modules/thermal_hydraulics/test/tests/postprocessors/heat_rate_convection/heat_rate_convection.i @@ -10,9 +10,9 @@ T = 300 T_ambient = 350 htc = ${fparse Q / (S * (T_ambient - T))} -[HeatStructureMaterials] +[SolidProperties] [region1-mat] - type = SolidMaterialProperties + type = ThermalFunctionSolidProperties k = 1 cp = 1 rho = 1 @@ -31,7 +31,8 @@ htc = ${fparse Q / (S * (T_ambient - T))} depth = ${depth} names = 'region1' - materials = 'region1-mat' + solid_properties = 'region1-mat' + solid_properties_T_ref = '300' widths = '${thickness}' n_part_elems = '5' diff --git a/modules/thermal_hydraulics/test/tests/postprocessors/heat_rate_convection_rz/heat_rate_convection_rz.i b/modules/thermal_hydraulics/test/tests/postprocessors/heat_rate_convection_rz/heat_rate_convection_rz.i index c824891b7970..4794bbca3c21 100644 --- a/modules/thermal_hydraulics/test/tests/postprocessors/heat_rate_convection_rz/heat_rate_convection_rz.i +++ b/modules/thermal_hydraulics/test/tests/postprocessors/heat_rate_convection_rz/heat_rate_convection_rz.i @@ -12,9 +12,9 @@ T = 300 T_ambient = 350 htc = ${fparse Q / (S * (T_ambient - T))} -[HeatStructureMaterials] +[SolidProperties] [region1-mat] - type = SolidMaterialProperties + type = ThermalFunctionSolidProperties k = 1 cp = 1 rho = 1 @@ -32,7 +32,8 @@ htc = ${fparse Q / (S * (T_ambient - T))} n_elems = 50 names = 'region1' - materials = 'region1-mat' + solid_properties = 'region1-mat' + solid_properties_T_ref = '300' widths = '${thickness}' n_part_elems = '5' diff --git a/modules/thermal_hydraulics/test/tests/postprocessors/heat_rate_external_app_convection_rz/heat_rate_external_app_convection_rz.i b/modules/thermal_hydraulics/test/tests/postprocessors/heat_rate_external_app_convection_rz/heat_rate_external_app_convection_rz.i index df33d02bbdb1..a4d6415e6ea0 100644 --- a/modules/thermal_hydraulics/test/tests/postprocessors/heat_rate_external_app_convection_rz/heat_rate_external_app_convection_rz.i +++ b/modules/thermal_hydraulics/test/tests/postprocessors/heat_rate_external_app_convection_rz/heat_rate_external_app_convection_rz.i @@ -21,9 +21,9 @@ htc = ${fparse Q / (S * (T_ambient - T))} [] [] -[HeatStructureMaterials] +[SolidProperties] [region1-mat] - type = SolidMaterialProperties + type = ThermalFunctionSolidProperties k = 1 cp = 1 rho = 1 @@ -41,7 +41,8 @@ htc = ${fparse Q / (S * (T_ambient - T))} n_elems = 50 names = 'region1' - materials = 'region1-mat' + solid_properties = 'region1-mat' + solid_properties_T_ref = '300' widths = '${thickness}' n_part_elems = '5' diff --git a/modules/thermal_hydraulics/test/tests/postprocessors/heat_rate_heat_flux/heat_rate_heat_flux.i b/modules/thermal_hydraulics/test/tests/postprocessors/heat_rate_heat_flux/heat_rate_heat_flux.i index 3135cf83c265..d8bffdd89567 100644 --- a/modules/thermal_hydraulics/test/tests/postprocessors/heat_rate_heat_flux/heat_rate_heat_flux.i +++ b/modules/thermal_hydraulics/test/tests/postprocessors/heat_rate_heat_flux/heat_rate_heat_flux.i @@ -9,9 +9,9 @@ S = ${fparse depth * L} Q = 5000 q = ${fparse Q / S} -[HeatStructureMaterials] +[SolidProperties] [region1-mat] - type = SolidMaterialProperties + type = ThermalFunctionSolidProperties k = 1 cp = 1 rho = 1 @@ -28,7 +28,8 @@ q = ${fparse Q / S} n_elems = 50 names = 'region1' - materials = 'region1-mat' + solid_properties = 'region1-mat' + solid_properties_T_ref = '300' widths = '${thickness}' n_part_elems = '5' diff --git a/modules/thermal_hydraulics/test/tests/postprocessors/heat_rate_heat_flux_rz/heat_rate_heat_flux_rz.i b/modules/thermal_hydraulics/test/tests/postprocessors/heat_rate_heat_flux_rz/heat_rate_heat_flux_rz.i index 68e3ca92f538..33d8bcfa0e39 100644 --- a/modules/thermal_hydraulics/test/tests/postprocessors/heat_rate_heat_flux_rz/heat_rate_heat_flux_rz.i +++ b/modules/thermal_hydraulics/test/tests/postprocessors/heat_rate_heat_flux_rz/heat_rate_heat_flux_rz.i @@ -10,9 +10,9 @@ S = ${fparse 2 * pi * R_o * L} Q = 5000 q = ${fparse Q / S} -[HeatStructureMaterials] +[SolidProperties] [region1-mat] - type = SolidMaterialProperties + type = ThermalFunctionSolidProperties k = 1 cp = 1 rho = 1 @@ -30,7 +30,8 @@ q = ${fparse Q / S} n_elems = 50 names = 'region1' - materials = 'region1-mat' + solid_properties = 'region1-mat' + solid_properties_T_ref = '300' widths = '${thickness}' n_part_elems = '5' diff --git a/modules/thermal_hydraulics/test/tests/postprocessors/heat_rate_radiation/heat_rate_radiation.i b/modules/thermal_hydraulics/test/tests/postprocessors/heat_rate_radiation/heat_rate_radiation.i index 3184d33a6f2f..8e6ed028d67c 100644 --- a/modules/thermal_hydraulics/test/tests/postprocessors/heat_rate_radiation/heat_rate_radiation.i +++ b/modules/thermal_hydraulics/test/tests/postprocessors/heat_rate_radiation/heat_rate_radiation.i @@ -11,9 +11,9 @@ T_ambient = 350 sigma = 5.670367e-8 emissivity = ${fparse Q / (S * sigma * (T_ambient^4 - T^4))} -[HeatStructureMaterials] +[SolidProperties] [region1-mat] - type = SolidMaterialProperties + type = ThermalFunctionSolidProperties k = 1 cp = 1 rho = 1 @@ -32,7 +32,8 @@ emissivity = ${fparse Q / (S * sigma * (T_ambient^4 - T^4))} depth = ${depth} names = 'region1' - materials = 'region1-mat' + solid_properties = 'region1-mat' + solid_properties_T_ref = '300' widths = '${thickness}' n_part_elems = '5' diff --git a/modules/thermal_hydraulics/test/tests/postprocessors/heat_rate_radiation_rz/heat_rate_radiation_rz.i b/modules/thermal_hydraulics/test/tests/postprocessors/heat_rate_radiation_rz/heat_rate_radiation_rz.i index f2e6ce09b01a..32957b8e2137 100644 --- a/modules/thermal_hydraulics/test/tests/postprocessors/heat_rate_radiation_rz/heat_rate_radiation_rz.i +++ b/modules/thermal_hydraulics/test/tests/postprocessors/heat_rate_radiation_rz/heat_rate_radiation_rz.i @@ -13,9 +13,9 @@ T_ambient = 350 sigma = 5.670367e-8 emissivity = ${fparse Q / (S * sigma * (T_ambient^4 - T^4))} -[HeatStructureMaterials] +[SolidProperties] [region1-mat] - type = SolidMaterialProperties + type = ThermalFunctionSolidProperties k = 1 cp = 1 rho = 1 @@ -33,7 +33,8 @@ emissivity = ${fparse Q / (S * sigma * (T_ambient^4 - T^4))} n_elems = 50 names = 'region1' - materials = 'region1-mat' + solid_properties = 'region1-mat' + solid_properties_T_ref = '300' widths = '${thickness}' n_part_elems = '5' diff --git a/modules/thermal_hydraulics/test/tests/postprocessors/heat_structure_energy/heat_structure_energy_cylinder.i b/modules/thermal_hydraulics/test/tests/postprocessors/heat_structure_energy/heat_structure_energy_cylinder.i index 30d60f805da1..58385ae44e3e 100644 --- a/modules/thermal_hydraulics/test/tests/postprocessors/heat_structure_energy/heat_structure_energy_cylinder.i +++ b/modules/thermal_hydraulics/test/tests/postprocessors/heat_structure_energy/heat_structure_energy_cylinder.i @@ -26,15 +26,15 @@ # # Finally, n_units * 2 pi * rho2 * cp2 * int(T * y) = 7.930950653987433e+04 -[HeatStructureMaterials] +[SolidProperties] [region1-mat] - type = SolidMaterialProperties + type = ThermalFunctionSolidProperties k = 1 cp = 1 rho = 1 [] [region2-mat] - type = SolidMaterialProperties + type = ThermalFunctionSolidProperties k = 1 cp = 5 rho = 3 @@ -60,7 +60,8 @@ n_elems = 50 names = 'region1 region2' - materials = 'region1-mat region2-mat' + solid_properties = 'region1-mat region2-mat' + solid_properties_T_ref = '300 300' widths = '4.0 3.0' n_part_elems = '5 50' diff --git a/modules/thermal_hydraulics/test/tests/postprocessors/heat_structure_energy/heat_structure_energy_plate.i b/modules/thermal_hydraulics/test/tests/postprocessors/heat_structure_energy/heat_structure_energy_plate.i index 15bbf032eb26..50d4ac93ab1c 100644 --- a/modules/thermal_hydraulics/test/tests/postprocessors/heat_structure_energy/heat_structure_energy_plate.i +++ b/modules/thermal_hydraulics/test/tests/postprocessors/heat_structure_energy/heat_structure_energy_plate.i @@ -29,15 +29,15 @@ # For a test variation using a reference temperature of T_ref = 0.5, # rho2 * cp2 * int(T - T_ref) * P = 864. -[HeatStructureMaterials] +[SolidProperties] [region1-mat] - type = SolidMaterialProperties + type = ThermalFunctionSolidProperties k = 1 cp = 1 rho = 1 [] [region2-mat] - type = SolidMaterialProperties + type = ThermalFunctionSolidProperties k = 1 cp = 5 rho = 3 @@ -62,7 +62,8 @@ n_elems = 5 names = 'region1 region2' - materials = 'region1-mat region2-mat' + solid_properties = 'region1-mat region2-mat' + solid_properties_T_ref = '300 300' widths = '4.0 3.0' n_part_elems = '5 5' diff --git a/modules/thermal_hydraulics/test/tests/postprocessors/side_flux_integral_rz/side_flux_integral_rz.i b/modules/thermal_hydraulics/test/tests/postprocessors/side_flux_integral_rz/side_flux_integral_rz.i index d216c6405869..53d7f4e995ac 100644 --- a/modules/thermal_hydraulics/test/tests/postprocessors/side_flux_integral_rz/side_flux_integral_rz.i +++ b/modules/thermal_hydraulics/test/tests/postprocessors/side_flux_integral_rz/side_flux_integral_rz.i @@ -30,9 +30,9 @@ R_i = 1.0 [] [] -[HeatStructureMaterials] +[SolidProperties] [hsmat] - type = SolidMaterialProperties + type = ThermalFunctionSolidProperties k = 5 cp = 1 rho = 1 @@ -51,7 +51,8 @@ R_i = 1.0 inner_radius = ${R_i} names = 'radial1 radial2' - materials = 'hsmat hsmat' + solid_properties = 'hsmat hsmat' + solid_properties_T_ref = '300 300' widths = '0.5 0.7' n_part_elems = '2 3' diff --git a/modules/thermal_hydraulics/test/tests/problems/brayton_cycle/recuperated_brayton_cycle.i b/modules/thermal_hydraulics/test/tests/problems/brayton_cycle/recuperated_brayton_cycle.i index e956aee55c06..9919eb431edc 100644 --- a/modules/thermal_hydraulics/test/tests/problems/brayton_cycle/recuperated_brayton_cycle.i +++ b/modules/thermal_hydraulics/test/tests/problems/brayton_cycle/recuperated_brayton_cycle.i @@ -152,9 +152,9 @@ hs_power = 105750 [] [] -[HeatStructureMaterials] +[SolidProperties] [steel] - type = SolidMaterialProperties + type = ThermalFunctionSolidProperties rho = 8050 k = 45 cp = 466 @@ -472,7 +472,8 @@ hs_power = 105750 n_elems = ${fparse n_elems3/2} n_part_elems = 2 names = recuperator - materials = steel + solid_properties = steel + solid_properties_T_ref = '300' inner_radius = ${D1} [] # heat transfer from recuperator to cold leg @@ -532,7 +533,8 @@ hs_power = 105750 n_elems = ${n_elems4} n_part_elems = 2 names = core - materials = steel + solid_properties = steel + solid_properties_T_ref = '300' [] [total_power] type = TotalPower diff --git a/modules/thermal_hydraulics/test/tests/userobjects/layered_avg_rz/test.i b/modules/thermal_hydraulics/test/tests/userobjects/layered_avg_rz/test.i index ebb4e701eb50..c6d10c113e2b 100644 --- a/modules/thermal_hydraulics/test/tests/userobjects/layered_avg_rz/test.i +++ b/modules/thermal_hydraulics/test/tests/userobjects/layered_avg_rz/test.i @@ -33,21 +33,21 @@ length = 4 [] [] -[HeatStructureMaterials] +[SolidProperties] [mat1] - type = SolidMaterialProperties + type = ThermalFunctionSolidProperties k = 2.5 cp = 300. rho = 1.032e4 [] [mat2] - type = SolidMaterialProperties + type = ThermalFunctionSolidProperties k = 0.6 cp = 1. rho = 1. [] [mat3] - type = SolidMaterialProperties + type = ThermalFunctionSolidProperties k = 21.5 cp = 350. rho = 6.55e3 @@ -67,7 +67,8 @@ length = 4 names = '1 2 3' widths = '0.004 0.0001 0.0005' n_part_elems = '10 1 2' - materials = 'mat1 mat2 mat3' + solid_properties = 'mat1 mat2 mat3' + solid_properties_T_ref = '300 300 300' [] [] diff --git a/modules/thermal_hydraulics/tutorials/single_phase_flow/02_core.i b/modules/thermal_hydraulics/tutorials/single_phase_flow/02_core.i index ff688878eb2f..29b2ffaff8d1 100644 --- a/modules/thermal_hydraulics/tutorials/single_phase_flow/02_core.i +++ b/modules/thermal_hydraulics/tutorials/single_phase_flow/02_core.i @@ -41,9 +41,9 @@ tot_power = 2000 # W [] [] -[HeatStructureMaterials] +[SolidProperties] [steel] - type = SolidMaterialProperties + type = ThermalFunctionSolidProperties rho = 8050 k = 45 cp = 466 @@ -81,7 +81,8 @@ tot_power = 2000 # W n_elems = ${core_n_elems} names = 'block' widths = '${fparse core_dia / 2.}' - materials = 'steel' + solid_properties = 'steel' + solid_properties_T_ref = '300' n_part_elems = 3 [] diff --git a/modules/thermal_hydraulics/tutorials/single_phase_flow/03_upper_loop.i b/modules/thermal_hydraulics/tutorials/single_phase_flow/03_upper_loop.i index 310a7b84784f..c77ab09e1dee 100644 --- a/modules/thermal_hydraulics/tutorials/single_phase_flow/03_upper_loop.i +++ b/modules/thermal_hydraulics/tutorials/single_phase_flow/03_upper_loop.i @@ -53,9 +53,9 @@ tot_power = 2000 # W [] [] -[HeatStructureMaterials] +[SolidProperties] [steel] - type = SolidMaterialProperties + type = ThermalFunctionSolidProperties rho = 8050 k = 45 cp = 466 @@ -109,7 +109,8 @@ tot_power = 2000 # W n_elems = ${core_n_elems} names = 'block' widths = '${fparse core_dia / 2.}' - materials = 'steel' + solid_properties = 'steel' + solid_properties_T_ref = '300' n_part_elems = 3 [] diff --git a/modules/thermal_hydraulics/tutorials/single_phase_flow/04_loop.i b/modules/thermal_hydraulics/tutorials/single_phase_flow/04_loop.i index 869f87a3d734..50381762836c 100644 --- a/modules/thermal_hydraulics/tutorials/single_phase_flow/04_loop.i +++ b/modules/thermal_hydraulics/tutorials/single_phase_flow/04_loop.i @@ -53,9 +53,9 @@ tot_power = 2000 # W [] [] -[HeatStructureMaterials] +[SolidProperties] [steel] - type = SolidMaterialProperties + type = ThermalFunctionSolidProperties rho = 8050 k = 45 cp = 466 @@ -102,7 +102,8 @@ tot_power = 2000 # W n_elems = ${core_n_elems} names = 'block' widths = '${fparse core_dia / 2.}' - materials = 'steel' + solid_properties = 'steel' + solid_properties_T_ref = '300' n_part_elems = 3 [] diff --git a/modules/thermal_hydraulics/tutorials/single_phase_flow/05_secondary_side.i b/modules/thermal_hydraulics/tutorials/single_phase_flow/05_secondary_side.i index 44f02eee161a..a8bc67f51003 100644 --- a/modules/thermal_hydraulics/tutorials/single_phase_flow/05_secondary_side.i +++ b/modules/thermal_hydraulics/tutorials/single_phase_flow/05_secondary_side.i @@ -81,9 +81,9 @@ m_dot_sec_in = 1. # kg/s [] [] -[HeatStructureMaterials] +[SolidProperties] [steel] - type = SolidMaterialProperties + type = ThermalFunctionSolidProperties rho = 8050 k = 45 cp = 466 @@ -130,7 +130,8 @@ m_dot_sec_in = 1. # kg/s n_elems = ${core_n_elems} names = 'block' widths = '${fparse core_dia / 2.}' - materials = 'steel' + solid_properties = 'steel' + solid_properties_T_ref = '300' n_part_elems = 3 [] @@ -264,7 +265,8 @@ m_dot_sec_in = 1. # kg/s n_elems = ${hx_n_elems} widths = '${hx_wall_thickness}' n_part_elems = '3' - materials = 'steel' + solid_properties = 'steel' + solid_properties_T_ref = '300' names = '0' inner_radius = '${fparse hx_dia_inner / 2.}' [] diff --git a/modules/thermal_hydraulics/tutorials/single_phase_flow/06_custom_closures.i b/modules/thermal_hydraulics/tutorials/single_phase_flow/06_custom_closures.i index c8a30f431efb..bd192b5dd039 100644 --- a/modules/thermal_hydraulics/tutorials/single_phase_flow/06_custom_closures.i +++ b/modules/thermal_hydraulics/tutorials/single_phase_flow/06_custom_closures.i @@ -129,9 +129,9 @@ m_dot_sec_in = 1. # kg/s block = hx/pri [] [] -[HeatStructureMaterials] +[SolidProperties] [steel] - type = SolidMaterialProperties + type = ThermalFunctionSolidProperties rho = 8050 k = 45 cp = 466 @@ -178,7 +178,8 @@ m_dot_sec_in = 1. # kg/s n_elems = ${core_n_elems} names = 'block' widths = '${fparse core_dia / 2.}' - materials = 'steel' + solid_properties = 'steel' + solid_properties_T_ref = '300' n_part_elems = 3 [] @@ -313,7 +314,8 @@ m_dot_sec_in = 1. # kg/s n_elems = ${hx_n_elems} widths = '${hx_wall_thickness}' n_part_elems = '3' - materials = 'steel' + solid_properties = 'steel' + solid_properties_T_ref = '300' names = '0' inner_radius = '${fparse hx_dia_inner / 2.}' []