From c4f83d6828f39af7ee62a57cf43a4ccc7a4b646e Mon Sep 17 00:00:00 2001
From: Dmitri Naumov <dmitri.naumov@ufz.de>
Date: Mon, 26 Aug 2019 15:33:42 +0200
Subject: [PATCH] Revert "[PL] TM; Added nonequilibrium_stress."
This reverts commit 85f493c81bbf11cdc82ffe96ab84044c3fd97898.
---
.../i_nonequilibrium_state_variables.md | 3 ---
.../t_stress.md | 1 -
.../CreateThermoMechanicsProcess.cpp | 24 ++++---------------
.../ThermoMechanics/ThermoMechanicsFEM.h | 6 -----
.../ThermoMechanicsProcessData.h | 1 -
5 files changed, 5 insertions(+), 30 deletions(-)
delete mode 100644 Documentation/ProjectFile/prj/processes/process/THERMO_MECHANICS/nonequilibrium_state_variables/i_nonequilibrium_state_variables.md
delete mode 100644 Documentation/ProjectFile/prj/processes/process/THERMO_MECHANICS/nonequilibrium_state_variables/t_stress.md
diff --git a/Documentation/ProjectFile/prj/processes/process/THERMO_MECHANICS/nonequilibrium_state_variables/i_nonequilibrium_state_variables.md b/Documentation/ProjectFile/prj/processes/process/THERMO_MECHANICS/nonequilibrium_state_variables/i_nonequilibrium_state_variables.md
deleted file mode 100644
index 23309741b0f..00000000000
--- a/Documentation/ProjectFile/prj/processes/process/THERMO_MECHANICS/nonequilibrium_state_variables/i_nonequilibrium_state_variables.md
+++ /dev/null
@@ -1,3 +0,0 @@
-Non-equilibrium initial state variables which are not explicitly in equilibrium
-with any boundary conditions. They are not considered in the weak form but
-affect the constitutive behaviour of the materials.
diff --git a/Documentation/ProjectFile/prj/processes/process/THERMO_MECHANICS/nonequilibrium_state_variables/t_stress.md b/Documentation/ProjectFile/prj/processes/process/THERMO_MECHANICS/nonequilibrium_state_variables/t_stress.md
deleted file mode 100644
index ff6539590e8..00000000000
--- a/Documentation/ProjectFile/prj/processes/process/THERMO_MECHANICS/nonequilibrium_state_variables/t_stress.md
+++ /dev/null
@@ -1 +0,0 @@
-Non-equilibrium stress.
diff --git a/ProcessLib/ThermoMechanics/CreateThermoMechanicsProcess.cpp b/ProcessLib/ThermoMechanics/CreateThermoMechanicsProcess.cpp
index a46fad8bee6..7b30e5574a9 100644
--- a/ProcessLib/ThermoMechanics/CreateThermoMechanicsProcess.cpp
+++ b/ProcessLib/ThermoMechanics/CreateThermoMechanicsProcess.cpp
@@ -166,27 +166,13 @@ std::unique_ptr<Process> createThermoMechanicsProcess(
std::copy_n(b.data(), b.size(), specific_body_force.data());
}
- // Non-equilibrium variables
- ParameterLib::Parameter<double> const* nonequilibrium_stress = nullptr;
- const auto& nonequilibrium_state_variables_config =
- //! \ogs_file_param{prj__processes__process__THERMO_MECHANICS__nonequilibrium_state_variables}
- config.getConfigSubtreeOptional("nonequilibrium_state_variables");
- if (nonequilibrium_state_variables_config)
- {
- nonequilibrium_stress = &ParameterLib::findParameter<double>(
- *nonequilibrium_state_variables_config,
- //! \ogs_file_param_special{prj__processes__process__THERMO_MECHANICS__nonequilibrium_state_variables__stress}
- "stress", parameters,
- MathLib::KelvinVector::KelvinVectorDimensions<
- DisplacementDim>::value);
- }
ThermoMechanicsProcessData<DisplacementDim> process_data{
- materialIDs(mesh), std::move(solid_constitutive_relations),
- reference_solid_density, linear_thermal_expansion_coefficient,
- specific_heat_capacity, thermal_conductivity,
- specific_body_force, nonequilibrium_stress,
- mechanics_process_id, heat_conduction_process_id};
+ materialIDs(mesh), std::move(solid_constitutive_relations),
+ reference_solid_density, linear_thermal_expansion_coefficient,
+ specific_heat_capacity, thermal_conductivity,
+ specific_body_force, mechanics_process_id,
+ heat_conduction_process_id};
SecondaryVariableCollection secondary_variables;
diff --git a/ProcessLib/ThermoMechanics/ThermoMechanicsFEM.h b/ProcessLib/ThermoMechanics/ThermoMechanicsFEM.h
index 4c45008c62f..3bfa7c764fe 100644
--- a/ProcessLib/ThermoMechanics/ThermoMechanicsFEM.h
+++ b/ProcessLib/ThermoMechanics/ThermoMechanicsFEM.h
@@ -52,12 +52,6 @@ struct IntegrationPointData final
// mechanical strain
typename BMatricesType::KelvinVectorType eps_m, eps_m_prev;
- // Non-equilibrium initial stress.
- typename BMatricesType::KelvinVectorType sigma_neq =
- BMatricesType::KelvinVectorType::Zero(
- MathLib::KelvinVector::KelvinVectorDimensions<
- DisplacementDim>::value);
-
MaterialLib::Solids::MechanicsBase<DisplacementDim> const& solid_material;
std::unique_ptr<typename MaterialLib::Solids::MechanicsBase<
DisplacementDim>::MaterialStateVariables>
diff --git a/ProcessLib/ThermoMechanics/ThermoMechanicsProcessData.h b/ProcessLib/ThermoMechanics/ThermoMechanicsProcessData.h
index 8b948848155..eee568d37a9 100644
--- a/ProcessLib/ThermoMechanics/ThermoMechanicsProcessData.h
+++ b/ProcessLib/ThermoMechanics/ThermoMechanicsProcessData.h
@@ -44,7 +44,6 @@ struct ThermoMechanicsProcessData
ParameterLib::Parameter<double> const&
thermal_conductivity; // TODO To be changed as a matrix type variable.
Eigen::Matrix<double, DisplacementDim, 1> const specific_body_force;
- ParameterLib::Parameter<double> const* const nonequilibrium_stress;
/// ID of the mechanical process.
int const mechanics_process_id;
--
GitLab