From 992e322d69ea831054bc73a48db8eccb86fa8061 Mon Sep 17 00:00:00 2001 From: Wenqing Wang <wenqing.wang@ufz.de> Date: Thu, 19 Jul 2018 17:30:39 +0200 Subject: [PATCH] [Mechanics] Changed the way to read reference_temperature --- ProcessLib/HydroMechanics/CreateHydroMechanicsProcess.cpp | 5 +++-- .../LIE/HydroMechanics/CreateHydroMechanicsProcess.cpp | 5 +++-- .../LIE/SmallDeformation/CreateSmallDeformationProcess.cpp | 5 +++-- .../SmallDeformation/CreateSmallDeformationProcess.cpp | 5 +++-- 4 files changed, 12 insertions(+), 8 deletions(-) diff --git a/ProcessLib/HydroMechanics/CreateHydroMechanicsProcess.cpp b/ProcessLib/HydroMechanics/CreateHydroMechanicsProcess.cpp index b3b09939772..a3d8e4a949a 100644 --- a/ProcessLib/HydroMechanics/CreateHydroMechanicsProcess.cpp +++ b/ProcessLib/HydroMechanics/CreateHydroMechanicsProcess.cpp @@ -183,7 +183,8 @@ std::unique_ptr<Process> createHydroMechanicsProcess( // Reference temperature const auto& reference_temperature = //! \ogs_file_param{prj__processes__process__HYDRO_MECHANICS__reference_temperature} - config.getConfigParameterOptional<double>("reference_temperature"); + config.getConfigParameter<double>( + "reference_temperature", std::numeric_limits<double>::quiet_NaN()); HydroMechanicsProcessData<DisplacementDim> process_data{ std::move(material), @@ -195,7 +196,7 @@ std::unique_ptr<Process> createHydroMechanicsProcess( porosity, solid_density, specific_body_force, - *reference_temperature}; + reference_temperature}; SecondaryVariableCollection secondary_variables; diff --git a/ProcessLib/LIE/HydroMechanics/CreateHydroMechanicsProcess.cpp b/ProcessLib/LIE/HydroMechanics/CreateHydroMechanicsProcess.cpp index 5c8ffbddd28..bac9e707380 100644 --- a/ProcessLib/LIE/HydroMechanics/CreateHydroMechanicsProcess.cpp +++ b/ProcessLib/LIE/HydroMechanics/CreateHydroMechanicsProcess.cpp @@ -305,7 +305,8 @@ std::unique_ptr<Process> createHydroMechanicsProcess( // Reference temperature const auto& reference_temperature = //! \ogs_file_param{prj__processes__process__HYDRO_MECHANICS_WITH_LIE__reference_temperature} - config.getConfigParameterOptional<double>("reference_temperature"); + config.getConfigParameter<double>( + "reference_temperature", std::numeric_limits<double>::quiet_NaN()); HydroMechanicsProcessData<GlobalDim> process_data{ std::move(material), @@ -322,7 +323,7 @@ std::unique_ptr<Process> createHydroMechanicsProcess( initial_effective_stress, initial_fracture_effective_stress, deactivate_matrix_in_flow, - *reference_temperature}; + reference_temperature}; SecondaryVariableCollection secondary_variables; diff --git a/ProcessLib/LIE/SmallDeformation/CreateSmallDeformationProcess.cpp b/ProcessLib/LIE/SmallDeformation/CreateSmallDeformationProcess.cpp index 33513e74088..edcac74b40a 100644 --- a/ProcessLib/LIE/SmallDeformation/CreateSmallDeformationProcess.cpp +++ b/ProcessLib/LIE/SmallDeformation/CreateSmallDeformationProcess.cpp @@ -170,11 +170,12 @@ std::unique_ptr<Process> createSmallDeformationProcess( // Reference temperature const auto& reference_temperature = //! \ogs_file_param{prj__processes__process__SMALL_DEFORMATION_WITH_LIE__reference_temperature} - config.getConfigParameterOptional<double>("reference_temperature"); + config.getConfigParameter<double>( + "reference_temperature", std::numeric_limits<double>::quiet_NaN()); SmallDeformationProcessData<DisplacementDim> process_data( std::move(material), std::move(fracture_model), - std::move(vec_fracture_property), *reference_temperature); + std::move(vec_fracture_property), reference_temperature); SecondaryVariableCollection secondary_variables; diff --git a/ProcessLib/SmallDeformation/CreateSmallDeformationProcess.cpp b/ProcessLib/SmallDeformation/CreateSmallDeformationProcess.cpp index 44af30c5410..15dee6ba84e 100644 --- a/ProcessLib/SmallDeformation/CreateSmallDeformationProcess.cpp +++ b/ProcessLib/SmallDeformation/CreateSmallDeformationProcess.cpp @@ -96,11 +96,12 @@ createSmallDeformationProcess( // Reference temperature const auto& reference_temperature = //! \ogs_file_param{prj__processes__process__SMALL_DEFORMATION__reference_temperature} - config.getConfigParameterOptional<double>("reference_temperature"); + config.getConfigParameter<double>( + "reference_temperature", std::numeric_limits<double>::quiet_NaN()); SmallDeformationProcessData<DisplacementDim> process_data{ std::move(material), solid_density, specific_body_force, - *reference_temperature}; + reference_temperature}; SecondaryVariableCollection secondary_variables; -- GitLab