From b43f1438f56a06f3f9bff0efe93535159bc69035 Mon Sep 17 00:00:00 2001
From: Thomas Fischer <thomas.fischer@ufz.de>
Date: Thu, 31 Jan 2019 15:21:20 +0100
Subject: [PATCH] [PL/HT] Remove thermal dispersivities.
---
ProcessLib/HT/CreateHTProcess.cpp | 37 +---------------------------
ProcessLib/HT/HTMaterialProperties.h | 11 ---------
2 files changed, 1 insertion(+), 47 deletions(-)
diff --git a/ProcessLib/HT/CreateHTProcess.cpp b/ProcessLib/HT/CreateHTProcess.cpp
index 64b03599173..2e04db78342 100644
--- a/ProcessLib/HT/CreateHTProcess.cpp
+++ b/ProcessLib/HT/CreateHTProcess.cpp
@@ -119,31 +119,7 @@ std::unique_ptr<Process> createHTProcess(
&default_thermal_dispersivity_longitudinal;
ParameterLib::Parameter<double>* thermal_dispersivity_transversal =
&default_thermal_dispersivity_transversal;
- auto const dispersion_config =
- //! \ogs_file_param{prj__processes__process__HT__thermal_dispersivity}
- config.getConfigSubtreeOptional("thermal_dispersivity");
- bool const has_fluid_thermal_dispersivity =
- static_cast<bool>(dispersion_config);
- if (dispersion_config)
- {
- thermal_dispersivity_longitudinal = &ParameterLib::findParameter<
- double>(
- *dispersion_config,
- //! \ogs_file_param_special{prj__processes__process__HT__thermal_dispersivity__longitudinal}
- "longitudinal", parameters, 1);
- DBUG("Use '%s' as thermal_dispersivity_longitudinal parameter.",
- thermal_dispersivity_longitudinal->name.c_str());
-
- // Parameter for the thermal conductivity of the solid (only one scalar
- // per
- // element, i.e., the isotropic case is handled at the moment)
- thermal_dispersivity_transversal = &ParameterLib::findParameter<double>(
- *dispersion_config,
- //! \ogs_file_param_special{prj__processes__process__HT__thermal_dispersivity__transversal}
- "transversal", parameters, 1);
- DBUG("Use '%s' as thermal_dispersivity_transversal parameter.",
- thermal_dispersivity_transversal->name.c_str());
- }
+ bool const has_fluid_thermal_dispersivity = true;
// Parameter for the thermal conductivity of the solid (only one scalar per
// element, i.e., the isotropic case is handled at the moment)
@@ -154,14 +130,6 @@ std::unique_ptr<Process> createHTProcess(
DBUG("Use '%s' as thermal_conductivity_solid parameter.",
thermal_conductivity_solid.name.c_str());
- // Parameter for the thermal conductivity of the fluid.
- auto& thermal_conductivity_fluid = ParameterLib::findParameter<double>(
- config,
- //! \ogs_file_param_special{prj__processes__process__HT__thermal_conductivity_fluid}
- "thermal_conductivity_fluid", parameters, 1);
- DBUG("Use '%s' as thermal_conductivity_fluid parameter.",
- thermal_conductivity_fluid.name.c_str());
-
// Specific body force parameter.
Eigen::VectorXd specific_body_force;
std::vector<double> const b =
@@ -228,11 +196,8 @@ std::unique_ptr<Process> createHTProcess(
std::move(fluid_properties),
std::move(media_map),
has_fluid_thermal_dispersivity,
- *thermal_dispersivity_longitudinal,
- *thermal_dispersivity_transversal,
specific_heat_capacity_solid,
thermal_conductivity_solid,
- thermal_conductivity_fluid,
has_fluid_thermal_expansion,
*solid_thermal_expansion,
*biot_constant,
diff --git a/ProcessLib/HT/HTMaterialProperties.h b/ProcessLib/HT/HTMaterialProperties.h
index fd52906b1fa..175e2ecfd5c 100644
--- a/ProcessLib/HT/HTMaterialProperties.h
+++ b/ProcessLib/HT/HTMaterialProperties.h
@@ -34,13 +34,8 @@ struct HTMaterialProperties final
std::unique_ptr<MaterialPropertyLib::MaterialSpatialDistributionMap>&&
media_map_,
bool const has_fluid_thermal_dispersivity_,
- ParameterLib::Parameter<double> const&
- thermal_dispersivity_longitudinal_,
- ParameterLib::Parameter<double> const&
- thermal_dispersivity_transversal_,
ParameterLib::Parameter<double> const& specific_heat_capacity_solid_,
ParameterLib::Parameter<double> const& thermal_conductivity_solid_,
- ParameterLib::Parameter<double> const& thermal_conductivity_fluid_,
bool const has_fluid_thermal_expansion_,
ParameterLib::Parameter<double> const& solid_thermal_expansion_,
ParameterLib::Parameter<double> const& biot_constant_,
@@ -52,10 +47,7 @@ struct HTMaterialProperties final
media_map(std::move(media_map_)),
specific_heat_capacity_solid(specific_heat_capacity_solid_),
has_fluid_thermal_dispersivity(has_fluid_thermal_dispersivity_),
- thermal_dispersivity_longitudinal(thermal_dispersivity_longitudinal_),
- thermal_dispersivity_transversal(thermal_dispersivity_transversal_),
thermal_conductivity_solid(thermal_conductivity_solid_),
- thermal_conductivity_fluid(thermal_conductivity_fluid_),
has_fluid_thermal_expansion(has_fluid_thermal_expansion_),
solid_thermal_expansion(solid_thermal_expansion_),
biot_constant(biot_constant_),
@@ -76,10 +68,7 @@ struct HTMaterialProperties final
media_map;
ParameterLib::Parameter<double> const& specific_heat_capacity_solid;
bool const has_fluid_thermal_dispersivity;
- ParameterLib::Parameter<double> const& thermal_dispersivity_longitudinal;
- ParameterLib::Parameter<double> const& thermal_dispersivity_transversal;
ParameterLib::Parameter<double> const& thermal_conductivity_solid;
- ParameterLib::Parameter<double> const& thermal_conductivity_fluid;
bool const has_fluid_thermal_expansion;
ParameterLib::Parameter<double> const& solid_thermal_expansion;
--
GitLab