From 2bad1a2af560437379ce834c45082fc8bdd6b3a1 Mon Sep 17 00:00:00 2001
From: xymiao <miaoxingyuan@live.cn>
Date: Wed, 24 May 2017 10:27:02 +0200
Subject: [PATCH] renamed solid density as reference solid density.
---
.../THERMO_MECHANICS/t_reference_solid_density.md | 1 +
.../process/THERMO_MECHANICS/t_solid_density.md | 1 -
.../CreateThermoMechanicsProcess.cpp | 13 +++++++------
ProcessLib/ThermoMechanics/ThermoMechanicsFEM.h | 3 ++-
.../ThermoMechanics/ThermoMechanicsProcessData.h | 8 ++++----
5 files changed, 14 insertions(+), 12 deletions(-)
create mode 100644 Documentation/ProjectFile/prj/processes/process/THERMO_MECHANICS/t_reference_solid_density.md
delete mode 100644 Documentation/ProjectFile/prj/processes/process/THERMO_MECHANICS/t_solid_density.md
diff --git a/Documentation/ProjectFile/prj/processes/process/THERMO_MECHANICS/t_reference_solid_density.md b/Documentation/ProjectFile/prj/processes/process/THERMO_MECHANICS/t_reference_solid_density.md
new file mode 100644
index 00000000000..bccd000cb3b
--- /dev/null
+++ b/Documentation/ProjectFile/prj/processes/process/THERMO_MECHANICS/t_reference_solid_density.md
@@ -0,0 +1 @@
+Reference solid density. The density changes from this reference value.
diff --git a/Documentation/ProjectFile/prj/processes/process/THERMO_MECHANICS/t_solid_density.md b/Documentation/ProjectFile/prj/processes/process/THERMO_MECHANICS/t_solid_density.md
deleted file mode 100644
index 3a6dd634e23..00000000000
--- a/Documentation/ProjectFile/prj/processes/process/THERMO_MECHANICS/t_solid_density.md
+++ /dev/null
@@ -1 +0,0 @@
-Reference solid density. It changes with temperature difference.
diff --git a/ProcessLib/ThermoMechanics/CreateThermoMechanicsProcess.cpp b/ProcessLib/ThermoMechanics/CreateThermoMechanicsProcess.cpp
index 4e9734cf205..63403dc4a6e 100644
--- a/ProcessLib/ThermoMechanics/CreateThermoMechanicsProcess.cpp
+++ b/ProcessLib/ThermoMechanics/CreateThermoMechanicsProcess.cpp
@@ -114,12 +114,13 @@ std::unique_ptr<Process> createThermoMechanicsProcess(
type.c_str());
}
- // Solid density
- auto& solid_density = findParameter<double>(
+ // Reference solid density
+ auto& reference_solid_density = findParameter<double>(
config,
- //! \ogs_file_param_special{prj__processes__process__THERMO_MECHANICS__solid_density}
- "solid_density", parameters, 1);
- DBUG("Use \'%s\' as solid density parameter.", solid_density.name.c_str());
+ //! \ogs_file_param_special{prj__processes__process__THERMO_MECHANICS__reference_solid_density}
+ "reference_solid_density", parameters, 1);
+ DBUG("Use \'%s\' as solid density parameter.",
+ reference_solid_density.name.c_str());
// Linear thermal expansion coefficient
auto& linear_thermal_expansion_coefficient = findParameter<double>(
@@ -166,7 +167,7 @@ std::unique_ptr<Process> createThermoMechanicsProcess(
ThermoMechanicsProcessData<DisplacementDim> process_data{
std::move(material),
- solid_density,
+ reference_solid_density,
linear_thermal_expansion_coefficient,
specific_heat_capacity,
thermal_conductivity,
diff --git a/ProcessLib/ThermoMechanics/ThermoMechanicsFEM.h b/ProcessLib/ThermoMechanics/ThermoMechanicsFEM.h
index 41f5ce49ce6..07110310127 100644
--- a/ProcessLib/ThermoMechanics/ThermoMechanicsFEM.h
+++ b/ProcessLib/ThermoMechanics/ThermoMechanicsFEM.h
@@ -338,7 +338,8 @@ public:
MaterialLib::SolidModels::Invariants<kelvin_vector_size>;
// calculate real density
- auto const rho_sr = _process_data.solid_density(t, x_position)[0];
+ auto const rho_sr =
+ _process_data.reference_solid_density(t, x_position)[0];
double const rho_s = rho_sr * (1 - 3 * linear_thermal_strain);
auto const& b = _process_data.specific_body_force;
diff --git a/ProcessLib/ThermoMechanics/ThermoMechanicsProcessData.h b/ProcessLib/ThermoMechanics/ThermoMechanicsProcessData.h
index f81d03ec944..5729a546cf5 100644
--- a/ProcessLib/ThermoMechanics/ThermoMechanicsProcessData.h
+++ b/ProcessLib/ThermoMechanics/ThermoMechanicsProcessData.h
@@ -24,14 +24,14 @@ struct ThermoMechanicsProcessData
ThermoMechanicsProcessData(
std::unique_ptr<MaterialLib::Solids::MechanicsBase<DisplacementDim>>&&
material_,
- Parameter<double> const& solid_density_,
+ Parameter<double> const& reference_solid_density_,
Parameter<double> const& linear_thermal_expansion_coefficient_,
Parameter<double> const& specific_heat_capacity_,
Parameter<double> const& thermal_conductivity_,
double const reference_temperature_,
Eigen::Matrix<double, DisplacementDim, 1> const& specific_body_force_)
: material{std::move(material_)},
- solid_density(solid_density_),
+ reference_solid_density(reference_solid_density_),
linear_thermal_expansion_coefficient(
linear_thermal_expansion_coefficient_),
specific_heat_capacity(specific_heat_capacity_),
@@ -43,7 +43,7 @@ struct ThermoMechanicsProcessData
ThermoMechanicsProcessData(ThermoMechanicsProcessData&& other)
: material{std::move(other.material)},
- solid_density(other.solid_density),
+ reference_solid_density(other.reference_solid_density),
linear_thermal_expansion_coefficient(
other.linear_thermal_expansion_coefficient),
specific_heat_capacity(other.specific_heat_capacity),
@@ -66,7 +66,7 @@ struct ThermoMechanicsProcessData
std::unique_ptr<MaterialLib::Solids::MechanicsBase<DisplacementDim>>
material;
- Parameter<double> const& solid_density;
+ Parameter<double> const& reference_solid_density;
Parameter<double> const& linear_thermal_expansion_coefficient;
Parameter<double> const& specific_heat_capacity;
Parameter<double> const&
--
GitLab