Skip to content

Commit

Permalink
Merge commit '10455f8e4cf14236b32e21161ac77b87c4d65432'
Browse files Browse the repository at this point in the history
  • Loading branch information
moosetest committed Jun 20, 2024
2 parents 5c3a051 + 10455f8 commit 62015ba
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion moose
Submodule moose updated 63 files
+1 −1 conda/moose-dev/conda_build_config.yaml
+1 −1 conda/moose-dev/meta.yaml
+1 −1 conda/moose/conda_build_config.yaml
+2 −1 conda/tools/meta.yaml
+2 −2 framework/doc/packages_config.yml
+1 −1 framework/include/executioners/SolveObject.h
+13 −0 framework/include/materials/ParsedMaterialHelper.h
+14 −2 framework/include/physics/PhysicsBase.h
+3 −0 framework/include/problems/DisplacedProblem.h
+7 −4 framework/include/utils/FunctionParserUtils.h
+3 −1 framework/include/utils/InputParameters.h
+2 −0 framework/include/utils_nonunity/VectorTag.h
+2 −2 framework/src/actions/CreateDisplacedProblemAction.C
+4 −3 framework/src/base/Moose.C
+1 −1 framework/src/executioners/SolveObject.C
+21 −1 framework/src/materials/ParsedMaterialHelper.C
+36 −1 framework/src/mesh/MooseMesh.C
+21 −3 framework/src/physics/PhysicsBase.C
+9 −4 framework/src/problems/DisplacedProblem.C
+4 −0 framework/src/problems/FEProblemBase.C
+10 −2 framework/src/utils/FunctionParserUtils.C
+3 −2 framework/src/utils/InputParameters.C
+12 −3 framework/src/variables/MooseVariableFE.C
+7 −8 modules/contact/src/constraints/ExplicitDynamicsContactConstraint.C
+51 −0 modules/contact/test/tests/explicit_dynamics/gold/highvel_out.csv
+499 −499 modules/contact/test/tests/explicit_dynamics/gold/settlement_out.csv
+ − modules/contact/test/tests/explicit_dynamics/gold/test_balance_out.e
+5 −5 modules/contact/test/tests/explicit_dynamics/gold/test_balance_overwrite_out.csv
+2 −2 modules/contact/test/tests/explicit_dynamics/gold/test_balance_overwrite_short_out.csv
+ − modules/contact/test/tests/explicit_dynamics/gold/test_balance_short_out.e
+400 −0 modules/contact/test/tests/explicit_dynamics/highvel.i
+11 −0 modules/contact/test/tests/explicit_dynamics/tests
+6 −3 modules/fluid_properties/include/functions/SaturationDensityFunction.h
+4 −1 modules/fluid_properties/include/functions/SaturationPressureFunction.h
+4 −1 modules/fluid_properties/include/functions/SaturationTemperatureFunction.h
+1 −1 modules/fluid_properties/src/base/FluidPropertiesApp.C
+11 −6 modules/fluid_properties/src/functions/SaturationDensityFunction.C
+9 −4 modules/fluid_properties/src/functions/SaturationPressureFunction.C
+9 −4 modules/fluid_properties/src/functions/SaturationTemperatureFunction.C
+1 −0 modules/navier_stokes/doc/content/bib/navier_stokes.bib
+3 −2 modules/navier_stokes/include/base/NSFVBase.h
+0 −11 modules/navier_stokes/src/physics/NavierStokesPhysicsBase.C
+0 −5 modules/phase_field/include/materials/KKSPhaseConcentrationMultiPhaseMaterial.h
+3 −3 modules/phase_field/src/kernels/NestedKKSMultiACBulkC.C
+2 −2 modules/phase_field/src/kernels/NestedKKSMultiACBulkF.C
+3 −4 modules/phase_field/src/kernels/NestedKKSMultiSplitCHCRes.C
+3 −4 modules/phase_field/src/kernels/NestedKKSSplitCHCRes.C
+0 −49 modules/phase_field/src/materials/KKSPhaseConcentrationMultiPhaseMaterial.C
+22 −0 modules/thermal_hydraulics/doc/content/source/components/FileMeshPhysicsComponent.md
+5 −1 modules/thermal_hydraulics/include/components/Component.h
+45 −0 modules/thermal_hydraulics/include/components/FileMeshPhysicsComponent.h
+2 −0 modules/thermal_hydraulics/src/components/Component.C
+51 −0 modules/thermal_hydraulics/src/components/FileMeshPhysicsComponent.C
+7 −2 modules/thermal_hydraulics/src/parser/THMSyntax.C
+ − modules/thermal_hydraulics/test/tests/components/physics_component/gold/single_physics_out.e
+1 −0 modules/thermal_hydraulics/test/tests/components/physics_component/rectangle.i
+112 −0 modules/thermal_hydraulics/test/tests/components/physics_component/single_physics.i
+23 −0 modules/thermal_hydraulics/test/tests/components/physics_component/tests
+6 −0 scripts/tests/versioner_hashes.yaml
+71 −0 test/tests/mesh/add_sideset_ids/add_sideset_ids.i
+3 −0 test/tests/mesh/add_sideset_ids/gold/add_sideset_ids_out.csv
+20 −0 test/tests/mesh/add_sideset_ids/tests
+1 −0 unit/src/MooseServerTest.C

0 comments on commit 62015ba

Please sign in to comment.