From bbbfc919c108c4b296d416430bbfb65a4c2645be Mon Sep 17 00:00:00 2001
From: Dmitri Naumov <dmitri.naumov@ufz.de>
Date: Sat, 21 Oct 2017 10:50:22 +0200
Subject: [PATCH] [PL] LIE: Update parsing of fracture model config.
---
.../CreateHydroMechanicsProcess.cpp | 24 ++++++++++---------
.../CreateSmallDeformationProcess.cpp | 19 ++++++++-------
2 files changed, 23 insertions(+), 20 deletions(-)
diff --git a/ProcessLib/LIE/HydroMechanics/CreateHydroMechanicsProcess.cpp b/ProcessLib/LIE/HydroMechanics/CreateHydroMechanicsProcess.cpp
index 76213f3603c..9c6852aa7c3 100644
--- a/ProcessLib/LIE/HydroMechanics/CreateHydroMechanicsProcess.cpp
+++ b/ProcessLib/LIE/HydroMechanics/CreateHydroMechanicsProcess.cpp
@@ -198,26 +198,28 @@ std::unique_ptr<Process> createHydroMechanicsProcess(
// Fracture constitutive relation.
std::unique_ptr<MaterialLib::Fracture::FractureModelBase<GlobalDim>> fracture_model = nullptr;
- auto const opt_fracture_constitutive_relation_config =
- //! \ogs_file_param{prj__processes__process__HYDRO_MECHANICS_WITH_LIE__fracture_constitutive_relation}
- config.getConfigSubtreeOptional("fracture_constitutive_relation");
- if (opt_fracture_constitutive_relation_config)
+ auto const opt_fracture_model_config =
+ //! \ogs_file_param{prj__processes__process__HYDRO_MECHANICS_WITH_LIE__fracture_model}
+ config.getConfigSubtreeOptional("fracture_model");
+ if (opt_fracture_model_config)
{
- auto& fracture_constitutive_relation_config = *opt_fracture_constitutive_relation_config;
+ auto& fracture_model_config = *opt_fracture_model_config;
auto const frac_type =
- //! \ogs_file_param{prj__processes__process__HYDRO_MECHANICS_WITH_LIE__fracture_constitutive_relation__type}
- fracture_constitutive_relation_config.peekConfigParameter<std::string>("type");
+ //! \ogs_file_param{prj__processes__process__HYDRO_MECHANICS_WITH_LIE__fracture_model__type}
+ fracture_model_config.peekConfigParameter<std::string>("type");
if (frac_type == "LinearElasticIsotropic")
{
- fracture_model = MaterialLib::Fracture::createLinearElasticIsotropic<GlobalDim>(
- parameters, fracture_constitutive_relation_config);
+ fracture_model =
+ MaterialLib::Fracture::createLinearElasticIsotropic<GlobalDim>(
+ parameters, fracture_model_config);
}
else if (frac_type == "MohrCoulomb")
{
- fracture_model = MaterialLib::Fracture::createMohrCoulomb<GlobalDim>(
- parameters, fracture_constitutive_relation_config);
+ fracture_model =
+ MaterialLib::Fracture::createMohrCoulomb<GlobalDim>(
+ parameters, fracture_model_config);
}
else
{
diff --git a/ProcessLib/LIE/SmallDeformation/CreateSmallDeformationProcess.cpp b/ProcessLib/LIE/SmallDeformation/CreateSmallDeformationProcess.cpp
index 40460278b19..60631403c52 100644
--- a/ProcessLib/LIE/SmallDeformation/CreateSmallDeformationProcess.cpp
+++ b/ProcessLib/LIE/SmallDeformation/CreateSmallDeformationProcess.cpp
@@ -119,24 +119,25 @@ createSmallDeformationProcess(
// Fracture constitutive relation.
// read type;
- auto const fracture_constitutive_relation_config =
- //! \ogs_file_param{prj__processes__process__SMALL_DEFORMATION_WITH_LIE__fracture_constitutive_relation}
- config.getConfigSubtree("fracture_constitutive_relation");
+ auto const fracture_model_config =
+ //! \ogs_file_param{prj__processes__process__SMALL_DEFORMATION_WITH_LIE__fracture_model}
+ config.getConfigSubtree("fracture_model");
auto const frac_type =
- //! \ogs_file_param{prj__processes__process__SMALL_DEFORMATION_WITH_LIE__fracture_constitutive_relation__type}
- fracture_constitutive_relation_config.peekConfigParameter<std::string>("type");
+ //! \ogs_file_param{prj__processes__process__SMALL_DEFORMATION_WITH_LIE__fracture_model__type}
+ fracture_model_config.peekConfigParameter<std::string>("type");
std::unique_ptr<MaterialLib::Fracture::FractureModelBase<DisplacementDim>> fracture_model = nullptr;
if (frac_type == "LinearElasticIsotropic")
{
- fracture_model = MaterialLib::Fracture::createLinearElasticIsotropic<DisplacementDim>(
- parameters, fracture_constitutive_relation_config);
+ fracture_model = MaterialLib::Fracture::createLinearElasticIsotropic<
+ DisplacementDim>(parameters, fracture_model_config);
}
else if (frac_type == "MohrCoulomb")
{
- fracture_model = MaterialLib::Fracture::createMohrCoulomb<DisplacementDim>(
- parameters, fracture_constitutive_relation_config);
+ fracture_model =
+ MaterialLib::Fracture::createMohrCoulomb<DisplacementDim>(
+ parameters, fracture_model_config);
}
else
{
--
GitLab