From 91cda076e6b658074bf4f91f9c15ba39fd68a5fa Mon Sep 17 00:00:00 2001
From: Wenqing Wang <wenqing.wang@ufz.de>
Date: Fri, 5 Feb 2021 17:00:11 +0100
Subject: [PATCH] [TM/Tests] Use MPL properties
---
.../Data/ThermoMechanics/BDT/cube_1e0_bdt.prj | 60 +++--
.../CreepAfterExcavation.prj | 84 +++++--
.../SimpleAxisymmetricCreep.prj | 55 +++--
...eAxisymmetricCreepWithAnalyticSolution.prj | 55 +++--
.../Verification/m2_1D1bt/m2_1D1bt.prj | 55 +++--
.../Verification/m2_1D2bt/m2_1D2bt.prj | 55 +++--
.../Verification/m2_1Dcreep/m2_1Dcreep.prj | 55 +++--
.../m2_1Dlozenge/m2_1Dlozenge.prj | 55 +++--
.../m2_1Dlozengebt/m2_1Dlozengebt.prj | 55 +++--
.../Verification/m2_1Drelax/m2_1Drelax.prj | 55 +++--
.../Verification/m2_2Dload/m2_2Dload.prj | 55 +++--
.../Verification/m2_2Dloadbt/m2_2Dloadbt.prj | 55 +++--
.../Verification/m2_3Dload/m2_3Dload.prj | 55 +++--
.../Verification/m2_3Dloadbt/m2_3Dloadbt.prj | 55 +++--
.../InitialStates/equilibrium_restart.prj | 55 +++--
.../InitialStates/into_initial_state.prj | 55 +++--
.../non_equilibrium_initial_state.prj | 55 +++--
.../LinearMFront/cube_1e0_lin.prj | 58 ++---
.../CreepAfterExcavation.prj | 84 +++++--
.../iglu_quarter_plane_strain_quad.prj | 116 +++++-----
Tests/Data/ThermoMechanics/cube_1e3.prj | 55 +++--
.../iglu_axisymmetric_plane_strain.prj | 116 +++++-----
.../iglu_axisymmetric_plane_strain_quad.prj | 116 +++++-----
.../iglu_quarter_plane_strain.prj | 116 +++++-----
.../iglu_quarter_plane_strain_quad.prj | 116 +++++-----
.../ThermoMechanics/tm1_1Dbeam/tm1_1Dbeam.prj | 71 +++---
.../ThermoMechanics/tm1_1Dfixa/tm1_1Dfixa.prj | 71 +++---
.../ThermoMechanics/tm1_1Dfixb/tm1_1Dfixb.prj | 71 +++---
.../ThermoMechanics/tm1_2Dbeam/tm1_2Dbeam.prj | 71 +++---
.../tm1_2Dsquare/tm1_2Dsquare.prj | 71 +++---
.../ThermoMechanics/tm1_3Dcube/tm1_3Dcube.prj | 71 +++---
.../tm1_3Dgravity/tm1_3Dgravity.prj | 206 ++++++++++--------
.../tm1_3Dorigin/tm1_3Dorigin.prj | 71 +++---
.../tm1_3Dsquare/tm1_3Dsquare.prj | 71 +++---
.../ThermoMechanics/tm2_1D1bt/tm2_1D1bt.prj | 71 +++---
.../ThermoMechanics/tm2_1Dfixc/tm2_1Dfixc.prj | 71 +++---
36 files changed, 1413 insertions(+), 1249 deletions(-)
diff --git a/Tests/Data/ThermoMechanics/BDT/cube_1e0_bdt.prj b/Tests/Data/ThermoMechanics/BDT/cube_1e0_bdt.prj
index 619607cf2f2..4d5a87cc154 100644
--- a/Tests/Data/ThermoMechanics/BDT/cube_1e0_bdt.prj
+++ b/Tests/Data/ThermoMechanics/BDT/cube_1e0_bdt.prj
@@ -33,10 +33,6 @@
<material_property name="at_3" parameter="at_3"/>
</material_properties>
</constitutive_relation>
- <reference_solid_density>rho_sr</reference_solid_density>
- <linear_thermal_expansion_coefficient>alpha</linear_thermal_expansion_coefficient>
- <specific_heat_capacity>cs</specific_heat_capacity>
- <thermal_conductivity>lambda</thermal_conductivity>
<process_variables>
<displacement>displacement</displacement>
<temperature>temperature</temperature>
@@ -48,6 +44,37 @@
<specific_body_force>0 0 0</specific_body_force>
</process>
</processes>
+ <media>
+ <medium>
+ <phases>
+ <phase>
+ <type>Solid</type>
+ <properties>
+ <property>
+ <name>density</name>
+ <type>Constant</type>
+ <value>0</value>
+ </property>
+ <property>
+ <name>thermal_expansivity</name>
+ <type>Constant</type>
+ <value>1.e-5</value>
+ </property>
+ <property>
+ <name>thermal_conductivity</name>
+ <type>Constant</type>
+ <value>0</value>
+ </property>
+ <property>
+ <name>specific_heat_capacity</name>
+ <type>Constant</type>
+ <value>0</value>
+ </property>
+ </properties>
+ </phase>
+ </phases>
+ </medium>
+ </media>
<time_loop>
<processes>
<process ref="SD">
@@ -194,26 +221,6 @@
<type>Constant</type>
<value> -8.1075e-2 </value>
</parameter>
- <parameter>
- <name> rho_sr </name>
- <type>Constant</type>
- <value> 0 </value>
- </parameter>
- <parameter>
- <name> alpha </name>
- <type>Constant</type>
- <value> 1.e-5 </value>
- </parameter>
- <parameter>
- <name> cs </name>
- <type>Constant</type>
- <value> 0 </value>
- </parameter>
- <parameter>
- <name> lambda </name>
- <type>Constant</type>
- <value> 0 </value>
- </parameter>
<parameter>
<name>zero</name>
<type>Constant</type>
@@ -224,6 +231,11 @@
<type>Constant</type>
<value> 1 </value>
</parameter>
+ <parameter>
+ <name>alpha</name>
+ <type>Constant</type>
+ <value>1.e-5</value>
+ </parameter>
<parameter>
<name>displacement0</name>
<type>Constant</type>
diff --git a/Tests/Data/ThermoMechanics/CreepBGRa/CreepAfterExcavation/CreepAfterExcavation.prj b/Tests/Data/ThermoMechanics/CreepBGRa/CreepAfterExcavation/CreepAfterExcavation.prj
index 932aeff22c6..d1d407b6bba 100644
--- a/Tests/Data/ThermoMechanics/CreepBGRa/CreepAfterExcavation/CreepAfterExcavation.prj
+++ b/Tests/Data/ThermoMechanics/CreepBGRa/CreepAfterExcavation/CreepAfterExcavation.prj
@@ -30,10 +30,6 @@
<increment_tolerance>0</increment_tolerance>
</nonlinear_solver>
</constitutive_relation>
- <reference_solid_density>rho_sr</reference_solid_density>
- <linear_thermal_expansion_coefficient>alpha</linear_thermal_expansion_coefficient>
- <specific_heat_capacity>cs</specific_heat_capacity>
- <thermal_conductivity>lambda</thermal_conductivity>
<process_variables>
<displacement>displacement</displacement>
<temperature>temperature</temperature>
@@ -45,6 +41,66 @@
<specific_body_force>0 -9.81</specific_body_force>
</process>
</processes>
+ <media>
+ <medium id="0">
+ <phases>
+ <phase>
+ <type>Solid</type>
+ <properties>
+ <property>
+ <name>thermal_expansivity</name>
+ <type>Constant</type>
+ <value>4e-5</value>
+ </property>
+ <property>
+ <name>thermal_conductivity</name>
+ <type>Constant</type>
+ <value>5</value>
+ </property>
+ <property>
+ <name>density</name>
+ <type>Constant</type>
+ <value>2000</value>
+ </property>
+ <property>
+ <name>specific_heat_capacity</name>
+ <type>Constant</type>
+ <value>0.</value>
+ </property>
+ </properties>
+ </phase>
+ </phases>
+ </medium>
+ <medium id="1">
+ <phases>
+ <phase>
+ <type>Solid</type>
+ <properties>
+ <property>
+ <name>thermal_expansivity</name>
+ <type>Constant</type>
+ <value>4e-5</value>
+ </property>
+ <property>
+ <name>thermal_conductivity</name>
+ <type>Constant</type>
+ <value>5</value>
+ </property>
+ <property>
+ <name>density</name>
+ <type>Constant</type>
+ <value>2170</value>
+ </property>
+ <property>
+ <name>specific_heat_capacity</name>
+ <type>Constant</type>
+ <value>0.</value>
+ </property>
+ </properties>
+ </phase>
+ </phases>
+ </medium>
+ </media>
<time_loop>
<processes>
<process ref="ThermoMechanics">
@@ -141,26 +197,6 @@
<type>Constant</type>
<value>7e9</value>
</parameter>
- <parameter>
- <name>rho_sr</name>
- <type>MeshElement</type>
- <field_name>rho</field_name>
- </parameter>
- <parameter>
- <name>alpha</name>
- <type>Constant</type>
- <value>4e-5</value>
- </parameter>
- <parameter>
- <name>cs</name>
- <type>Constant</type>
- <value>0.</value>
- </parameter>
- <parameter>
- <name>lambda</name>
- <type>Constant</type>
- <value>5</value>
- </parameter>
<parameter>
<name>temperature_ic</name>
<type>MeshNode</type>
diff --git a/Tests/Data/ThermoMechanics/CreepBGRa/SimpleAxisymmetricCreep/SimpleAxisymmetricCreep.prj b/Tests/Data/ThermoMechanics/CreepBGRa/SimpleAxisymmetricCreep/SimpleAxisymmetricCreep.prj
index f6d5e637f42..2a0aeb81b63 100644
--- a/Tests/Data/ThermoMechanics/CreepBGRa/SimpleAxisymmetricCreep/SimpleAxisymmetricCreep.prj
+++ b/Tests/Data/ThermoMechanics/CreepBGRa/SimpleAxisymmetricCreep/SimpleAxisymmetricCreep.prj
@@ -21,10 +21,6 @@
<increment_tolerance>0</increment_tolerance>
</nonlinear_solver>
</constitutive_relation>
- <reference_solid_density>rho_sr</reference_solid_density>
- <linear_thermal_expansion_coefficient>alpha</linear_thermal_expansion_coefficient>
- <specific_heat_capacity>cs</specific_heat_capacity>
- <thermal_conductivity>lambda</thermal_conductivity>
<process_variables>
<displacement>displacement</displacement>
<temperature>temperature</temperature>
@@ -36,6 +32,37 @@
<specific_body_force>0 0</specific_body_force>
</process>
</processes>
+ <media>
+ <medium>
+ <phases>
+ <phase>
+ <type>Solid</type>
+ <properties>
+ <property>
+ <name>thermal_conductivity</name>
+ <type>Constant</type>
+ <value>100</value>
+ </property>
+ <property>
+ <name>density</name>
+ <type>Constant</type>
+ <value>0.</value>
+ </property>
+ <property>
+ <name>thermal_expansivity</name>
+ <type>Constant</type>
+ <value>4e-5</value>
+ </property>
+ <property>
+ <name>specific_heat_capacity</name>
+ <type>Constant</type>
+ <value>0</value>
+ </property>
+ </properties>
+ </phase>
+ </phases>
+ </medium>
+ </media>
<time_loop>
<processes>
<process ref="ThermoMechanics">
@@ -122,26 +149,6 @@
<type>Constant</type>
<value>0.27</value>
</parameter>
- <parameter>
- <name>rho_sr</name>
- <type>Constant</type>
- <value>0.</value>
- </parameter>
- <parameter>
- <name>alpha</name>
- <type>Constant</type>
- <value>4e-5</value>
- </parameter>
- <parameter>
- <name>cs</name>
- <type>Constant</type>
- <value>0</value>
- </parameter>
- <parameter>
- <name>lambda</name>
- <type>Constant</type>
- <value>100</value>
- </parameter>
<parameter>
<name>temperature_ic</name>
<type>Constant</type>
diff --git a/Tests/Data/ThermoMechanics/CreepBGRa/SimpleAxisymmetricCreep/SimpleAxisymmetricCreepWithAnalyticSolution.prj b/Tests/Data/ThermoMechanics/CreepBGRa/SimpleAxisymmetricCreep/SimpleAxisymmetricCreepWithAnalyticSolution.prj
index d496eeefc90..507a14a22e4 100644
--- a/Tests/Data/ThermoMechanics/CreepBGRa/SimpleAxisymmetricCreep/SimpleAxisymmetricCreepWithAnalyticSolution.prj
+++ b/Tests/Data/ThermoMechanics/CreepBGRa/SimpleAxisymmetricCreep/SimpleAxisymmetricCreepWithAnalyticSolution.prj
@@ -21,10 +21,6 @@
<increment_tolerance>0</increment_tolerance>
</nonlinear_solver>
</constitutive_relation>
- <reference_solid_density>rho_sr</reference_solid_density>
- <linear_thermal_expansion_coefficient>alpha</linear_thermal_expansion_coefficient>
- <specific_heat_capacity>cs</specific_heat_capacity>
- <thermal_conductivity>lambda</thermal_conductivity>
<process_variables>
<displacement>displacement</displacement>
<temperature>temperature</temperature>
@@ -36,6 +32,37 @@
<specific_body_force>0 0</specific_body_force>
</process>
</processes>
+ <media>
+ <medium>
+ <phases>
+ <phase>
+ <type>Solid</type>
+ <properties>
+ <property>
+ <name>density</name>
+ <type>Constant</type>
+ <value>0.</value>
+ </property>
+ <property>
+ <name>specific_heat_capacity</name>
+ <type>Constant</type>
+ <value>100</value>
+ </property>
+ <property>
+ <name>thermal_conductivity</name>
+ <type>Constant</type>
+ <value>1</value>
+ </property>
+ <property>
+ <name>thermal_expansivity</name>
+ <type>Constant</type>
+ <value>4e-5</value>
+ </property>
+ </properties>
+ </phase>
+ </phases>
+ </medium>
+ </media>
<time_loop>
<processes>
<process ref="ThermoMechanics">
@@ -110,26 +137,6 @@
<type>Constant</type>
<value>0.27</value>
</parameter>
- <parameter>
- <name>rho_sr</name>
- <type>Constant</type>
- <value>0.</value>
- </parameter>
- <parameter>
- <name>alpha</name>
- <type>Constant</type>
- <value>4e-5</value>
- </parameter>
- <parameter>
- <name>cs</name>
- <type>Constant</type>
- <value>100</value>
- </parameter>
- <parameter>
- <name>lambda</name>
- <type>Constant</type>
- <value>1</value>
- </parameter>
<parameter>
<name>temperature_ic</name>
<type>Constant</type>
diff --git a/Tests/Data/ThermoMechanics/CreepBGRa/Verification/m2_1D1bt/m2_1D1bt.prj b/Tests/Data/ThermoMechanics/CreepBGRa/Verification/m2_1D1bt/m2_1D1bt.prj
index 1a094276f11..7480885c63c 100644
--- a/Tests/Data/ThermoMechanics/CreepBGRa/Verification/m2_1D1bt/m2_1D1bt.prj
+++ b/Tests/Data/ThermoMechanics/CreepBGRa/Verification/m2_1D1bt/m2_1D1bt.prj
@@ -21,10 +21,6 @@
<increment_tolerance>0</increment_tolerance>
</nonlinear_solver>
</constitutive_relation>
- <reference_solid_density>rho_sr</reference_solid_density>
- <linear_thermal_expansion_coefficient>alpha</linear_thermal_expansion_coefficient>
- <specific_heat_capacity>cs</specific_heat_capacity>
- <thermal_conductivity>lambda</thermal_conductivity>
<process_variables>
<displacement>displacement</displacement>
<temperature>temperature</temperature>
@@ -36,6 +32,37 @@
<specific_body_force>0 0 0</specific_body_force>
</process>
</processes>
+ <media>
+ <medium>
+ <phases>
+ <phase>
+ <type>Solid</type>
+ <properties>
+ <property>
+ <name>specific_heat_capacity</name>
+ <type>Constant</type>
+ <value>0</value>
+ </property>
+ <property>
+ <name>density</name>
+ <type>Constant</type>
+ <value>0.</value>
+ </property>
+ <property>
+ <name>thermal_conductivity</name>
+ <type>Constant</type>
+ <value>100</value>
+ </property>
+ <property>
+ <name>thermal_expansivity</name>
+ <type>Constant</type>
+ <value>0</value>
+ </property>
+ </properties>
+ </phase>
+ </phases>
+ </medium>
+ </media>
<time_loop>
<processes>
<process ref="ThermoMechanics">
@@ -117,26 +144,6 @@
<type>Constant</type>
<value>0.27</value>
</parameter>
- <parameter>
- <name>rho_sr</name>
- <type>Constant</type>
- <value>0.</value>
- </parameter>
- <parameter>
- <name>alpha</name>
- <type>Constant</type>
- <value>0</value>
- </parameter>
- <parameter>
- <name>cs</name>
- <type>Constant</type>
- <value>0</value>
- </parameter>
- <parameter>
- <name>lambda</name>
- <type>Constant</type>
- <value>100</value>
- </parameter>
<parameter>
<name>temperature_ic</name>
<type>Constant</type>
diff --git a/Tests/Data/ThermoMechanics/CreepBGRa/Verification/m2_1D2bt/m2_1D2bt.prj b/Tests/Data/ThermoMechanics/CreepBGRa/Verification/m2_1D2bt/m2_1D2bt.prj
index 0385a56bdd1..7eff8198c23 100644
--- a/Tests/Data/ThermoMechanics/CreepBGRa/Verification/m2_1D2bt/m2_1D2bt.prj
+++ b/Tests/Data/ThermoMechanics/CreepBGRa/Verification/m2_1D2bt/m2_1D2bt.prj
@@ -21,10 +21,6 @@
<increment_tolerance>0</increment_tolerance>
</nonlinear_solver>
</constitutive_relation>
- <reference_solid_density>rho_sr</reference_solid_density>
- <linear_thermal_expansion_coefficient>alpha</linear_thermal_expansion_coefficient>
- <specific_heat_capacity>cs</specific_heat_capacity>
- <thermal_conductivity>lambda</thermal_conductivity>
<process_variables>
<displacement>displacement</displacement>
<temperature>temperature</temperature>
@@ -36,6 +32,37 @@
<specific_body_force>0 0 0</specific_body_force>
</process>
</processes>
+ <media>
+ <medium>
+ <phases>
+ <phase>
+ <type>Solid</type>
+ <properties>
+ <property>
+ <name>density</name>
+ <type>Constant</type>
+ <value>0.</value>
+ </property>
+ <property>
+ <name>thermal_expansivity</name>
+ <type>Constant</type>
+ <value>0</value>
+ </property>
+ <property>
+ <name>specific_heat_capacity</name>
+ <type>Constant</type>
+ <value>0</value>
+ </property>
+ <property>
+ <name>thermal_conductivity</name>
+ <type>Constant</type>
+ <value>100</value>
+ </property>
+ </properties>
+ </phase>
+ </phases>
+ </medium>
+ </media>
<time_loop>
<processes>
<process ref="ThermoMechanics">
@@ -111,26 +138,6 @@
<type>Constant</type>
<value>0.27</value>
</parameter>
- <parameter>
- <name>rho_sr</name>
- <type>Constant</type>
- <value>0.</value>
- </parameter>
- <parameter>
- <name>alpha</name>
- <type>Constant</type>
- <value>0</value>
- </parameter>
- <parameter>
- <name>cs</name>
- <type>Constant</type>
- <value>0</value>
- </parameter>
- <parameter>
- <name>lambda</name>
- <type>Constant</type>
- <value>100</value>
- </parameter>
<parameter>
<name>temperature_ic</name>
<type>Constant</type>
diff --git a/Tests/Data/ThermoMechanics/CreepBGRa/Verification/m2_1Dcreep/m2_1Dcreep.prj b/Tests/Data/ThermoMechanics/CreepBGRa/Verification/m2_1Dcreep/m2_1Dcreep.prj
index 69568e8e8f0..627ba1a6c92 100644
--- a/Tests/Data/ThermoMechanics/CreepBGRa/Verification/m2_1Dcreep/m2_1Dcreep.prj
+++ b/Tests/Data/ThermoMechanics/CreepBGRa/Verification/m2_1Dcreep/m2_1Dcreep.prj
@@ -21,10 +21,6 @@
<increment_tolerance>0</increment_tolerance>
</nonlinear_solver>
</constitutive_relation>
- <reference_solid_density>rho_sr</reference_solid_density>
- <linear_thermal_expansion_coefficient>alpha</linear_thermal_expansion_coefficient>
- <specific_heat_capacity>cs</specific_heat_capacity>
- <thermal_conductivity>lambda</thermal_conductivity>
<process_variables>
<displacement>displacement</displacement>
<temperature>temperature</temperature>
@@ -36,6 +32,37 @@
<specific_body_force>0 0 0</specific_body_force>
</process>
</processes>
+ <media>
+ <medium>
+ <phases>
+ <phase>
+ <type>Solid</type>
+ <properties>
+ <property>
+ <name>thermal_expansivity</name>
+ <type>Constant</type>
+ <value>0</value>
+ </property>
+ <property>
+ <name>thermal_conductivity</name>
+ <type>Constant</type>
+ <value>100</value>
+ </property>
+ <property>
+ <name>density</name>
+ <type>Constant</type>
+ <value>0.</value>
+ </property>
+ <property>
+ <name>specific_heat_capacity</name>
+ <type>Constant</type>
+ <value>0</value>
+ </property>
+ </properties>
+ </phase>
+ </phases>
+ </medium>
+ </media>
<time_loop>
<processes>
<process ref="ThermoMechanics">
@@ -111,26 +138,6 @@
<type>Constant</type>
<value>0.27</value>
</parameter>
- <parameter>
- <name>rho_sr</name>
- <type>Constant</type>
- <value>0.</value>
- </parameter>
- <parameter>
- <name>alpha</name>
- <type>Constant</type>
- <value>0</value>
- </parameter>
- <parameter>
- <name>cs</name>
- <type>Constant</type>
- <value>0</value>
- </parameter>
- <parameter>
- <name>lambda</name>
- <type>Constant</type>
- <value>100</value>
- </parameter>
<parameter>
<name>temperature_ic</name>
<type>Constant</type>
diff --git a/Tests/Data/ThermoMechanics/CreepBGRa/Verification/m2_1Dlozenge/m2_1Dlozenge.prj b/Tests/Data/ThermoMechanics/CreepBGRa/Verification/m2_1Dlozenge/m2_1Dlozenge.prj
index 39b6ff83b23..d12e9042f3f 100644
--- a/Tests/Data/ThermoMechanics/CreepBGRa/Verification/m2_1Dlozenge/m2_1Dlozenge.prj
+++ b/Tests/Data/ThermoMechanics/CreepBGRa/Verification/m2_1Dlozenge/m2_1Dlozenge.prj
@@ -21,10 +21,6 @@
<increment_tolerance>0</increment_tolerance>
</nonlinear_solver>
</constitutive_relation>
- <reference_solid_density>rho_sr</reference_solid_density>
- <linear_thermal_expansion_coefficient>alpha</linear_thermal_expansion_coefficient>
- <specific_heat_capacity>cs</specific_heat_capacity>
- <thermal_conductivity>lambda</thermal_conductivity>
<process_variables>
<displacement>displacement</displacement>
<temperature>temperature</temperature>
@@ -36,6 +32,37 @@
<specific_body_force>0 0 0</specific_body_force>
</process>
</processes>
+ <media>
+ <medium>
+ <phases>
+ <phase>
+ <type>Solid</type>
+ <properties>
+ <property>
+ <name>specific_heat_capacity</name>
+ <type>Constant</type>
+ <value>0</value>
+ </property>
+ <property>
+ <name>density</name>
+ <type>Constant</type>
+ <value>0.</value>
+ </property>
+ <property>
+ <name>thermal_conductivity</name>
+ <type>Constant</type>
+ <value>100</value>
+ </property>
+ <property>
+ <name>thermal_expansivity</name>
+ <type>Constant</type>
+ <value>0</value>
+ </property>
+ </properties>
+ </phase>
+ </phases>
+ </medium>
+ </media>
<time_loop>
<processes>
<process ref="ThermoMechanics">
@@ -119,26 +146,6 @@
<type>Constant</type>
<value>0.25</value>
</parameter>
- <parameter>
- <name>rho_sr</name>
- <type>Constant</type>
- <value>0.</value>
- </parameter>
- <parameter>
- <name>alpha</name>
- <type>Constant</type>
- <value>0</value>
- </parameter>
- <parameter>
- <name>cs</name>
- <type>Constant</type>
- <value>0</value>
- </parameter>
- <parameter>
- <name>lambda</name>
- <type>Constant</type>
- <value>100</value>
- </parameter>
<parameter>
<name>temperature_ic</name>
<type>Constant</type>
diff --git a/Tests/Data/ThermoMechanics/CreepBGRa/Verification/m2_1Dlozengebt/m2_1Dlozengebt.prj b/Tests/Data/ThermoMechanics/CreepBGRa/Verification/m2_1Dlozengebt/m2_1Dlozengebt.prj
index a6387e0b65e..f67f6076902 100644
--- a/Tests/Data/ThermoMechanics/CreepBGRa/Verification/m2_1Dlozengebt/m2_1Dlozengebt.prj
+++ b/Tests/Data/ThermoMechanics/CreepBGRa/Verification/m2_1Dlozengebt/m2_1Dlozengebt.prj
@@ -21,10 +21,6 @@
<increment_tolerance>0</increment_tolerance>
</nonlinear_solver>
</constitutive_relation>
- <reference_solid_density>rho_sr</reference_solid_density>
- <linear_thermal_expansion_coefficient>alpha</linear_thermal_expansion_coefficient>
- <specific_heat_capacity>cs</specific_heat_capacity>
- <thermal_conductivity>lambda</thermal_conductivity>
<process_variables>
<displacement>displacement</displacement>
<temperature>temperature</temperature>
@@ -36,6 +32,37 @@
<specific_body_force>0 0 0</specific_body_force>
</process>
</processes>
+ <media>
+ <medium>
+ <phases>
+ <phase>
+ <type>Solid</type>
+ <properties>
+ <property>
+ <name>specific_heat_capacity</name>
+ <type>Constant</type>
+ <value>0</value>
+ </property>
+ <property>
+ <name>density</name>
+ <type>Constant</type>
+ <value>0.</value>
+ </property>
+ <property>
+ <name>thermal_expansivity</name>
+ <type>Constant</type>
+ <value>0</value>
+ </property>
+ <property>
+ <name>thermal_conductivity</name>
+ <type>Constant</type>
+ <value>100</value>
+ </property>
+ </properties>
+ </phase>
+ </phases>
+ </medium>
+ </media>
<time_loop>
<processes>
<process ref="ThermoMechanics">
@@ -115,26 +142,6 @@
<type>Constant</type>
<value>0.25</value>
</parameter>
- <parameter>
- <name>rho_sr</name>
- <type>Constant</type>
- <value>0.</value>
- </parameter>
- <parameter>
- <name>alpha</name>
- <type>Constant</type>
- <value>0</value>
- </parameter>
- <parameter>
- <name>cs</name>
- <type>Constant</type>
- <value>0</value>
- </parameter>
- <parameter>
- <name>lambda</name>
- <type>Constant</type>
- <value>100</value>
- </parameter>
<parameter>
<name>temperature_ic</name>
<type>Constant</type>
diff --git a/Tests/Data/ThermoMechanics/CreepBGRa/Verification/m2_1Drelax/m2_1Drelax.prj b/Tests/Data/ThermoMechanics/CreepBGRa/Verification/m2_1Drelax/m2_1Drelax.prj
index 1e14d44c9be..d929274b860 100644
--- a/Tests/Data/ThermoMechanics/CreepBGRa/Verification/m2_1Drelax/m2_1Drelax.prj
+++ b/Tests/Data/ThermoMechanics/CreepBGRa/Verification/m2_1Drelax/m2_1Drelax.prj
@@ -21,10 +21,6 @@
<increment_tolerance>0</increment_tolerance>
</nonlinear_solver>
</constitutive_relation>
- <reference_solid_density>rho_sr</reference_solid_density>
- <linear_thermal_expansion_coefficient>alpha</linear_thermal_expansion_coefficient>
- <specific_heat_capacity>cs</specific_heat_capacity>
- <thermal_conductivity>lambda</thermal_conductivity>
<process_variables>
<displacement>displacement</displacement>
<temperature>temperature</temperature>
@@ -36,6 +32,37 @@
<specific_body_force>0 0 0</specific_body_force>
</process>
</processes>
+ <media>
+ <medium>
+ <phases>
+ <phase>
+ <type>Solid</type>
+ <properties>
+ <property>
+ <name>thermal_expansivity</name>
+ <type>Constant</type>
+ <value>0</value>
+ </property>
+ <property>
+ <name>density</name>
+ <type>Constant</type>
+ <value>0.</value>
+ </property>
+ <property>
+ <name>specific_heat_capacity</name>
+ <type>Constant</type>
+ <value>0</value>
+ </property>
+ <property>
+ <name>thermal_conductivity</name>
+ <type>Constant</type>
+ <value>100</value>
+ </property>
+ </properties>
+ </phase>
+ </phases>
+ </medium>
+ </media>
<time_loop>
<processes>
<process ref="ThermoMechanics">
@@ -115,26 +142,6 @@
<type>Constant</type>
<value>0.27</value>
</parameter>
- <parameter>
- <name>rho_sr</name>
- <type>Constant</type>
- <value>0.</value>
- </parameter>
- <parameter>
- <name>alpha</name>
- <type>Constant</type>
- <value>0</value>
- </parameter>
- <parameter>
- <name>cs</name>
- <type>Constant</type>
- <value>0</value>
- </parameter>
- <parameter>
- <name>lambda</name>
- <type>Constant</type>
- <value>100</value>
- </parameter>
<parameter>
<name>temperature_ic</name>
<type>Constant</type>
diff --git a/Tests/Data/ThermoMechanics/CreepBGRa/Verification/m2_2Dload/m2_2Dload.prj b/Tests/Data/ThermoMechanics/CreepBGRa/Verification/m2_2Dload/m2_2Dload.prj
index 1dbbe6ff920..3030b96e169 100644
--- a/Tests/Data/ThermoMechanics/CreepBGRa/Verification/m2_2Dload/m2_2Dload.prj
+++ b/Tests/Data/ThermoMechanics/CreepBGRa/Verification/m2_2Dload/m2_2Dload.prj
@@ -21,10 +21,6 @@
<increment_tolerance>0</increment_tolerance>
</nonlinear_solver>
</constitutive_relation>
- <reference_solid_density>rho_sr</reference_solid_density>
- <linear_thermal_expansion_coefficient>alpha</linear_thermal_expansion_coefficient>
- <specific_heat_capacity>cs</specific_heat_capacity>
- <thermal_conductivity>lambda</thermal_conductivity>
<process_variables>
<displacement>displacement</displacement>
<temperature>temperature</temperature>
@@ -36,6 +32,37 @@
<specific_body_force>0 0 0</specific_body_force>
</process>
</processes>
+ <media>
+ <medium>
+ <phases>
+ <phase>
+ <type>Solid</type>
+ <properties>
+ <property>
+ <name>specific_heat_capacity</name>
+ <type>Constant</type>
+ <value>0</value>
+ </property>
+ <property>
+ <name>thermal_expansivity</name>
+ <type>Constant</type>
+ <value>0</value>
+ </property>
+ <property>
+ <name>density</name>
+ <type>Constant</type>
+ <value>0.</value>
+ </property>
+ <property>
+ <name>thermal_conductivity</name>
+ <type>Constant</type>
+ <value>100</value>
+ </property>
+ </properties>
+ </phase>
+ </phases>
+ </medium>
+ </media>
<time_loop>
<processes>
<process ref="ThermoMechanics">
@@ -119,26 +146,6 @@
<type>Constant</type>
<value>0.25</value>
</parameter>
- <parameter>
- <name>rho_sr</name>
- <type>Constant</type>
- <value>0.</value>
- </parameter>
- <parameter>
- <name>alpha</name>
- <type>Constant</type>
- <value>0</value>
- </parameter>
- <parameter>
- <name>cs</name>
- <type>Constant</type>
- <value>0</value>
- </parameter>
- <parameter>
- <name>lambda</name>
- <type>Constant</type>
- <value>100</value>
- </parameter>
<parameter>
<name>temperature_ic</name>
<type>Constant</type>
diff --git a/Tests/Data/ThermoMechanics/CreepBGRa/Verification/m2_2Dloadbt/m2_2Dloadbt.prj b/Tests/Data/ThermoMechanics/CreepBGRa/Verification/m2_2Dloadbt/m2_2Dloadbt.prj
index 7404a780687..ae30c146080 100644
--- a/Tests/Data/ThermoMechanics/CreepBGRa/Verification/m2_2Dloadbt/m2_2Dloadbt.prj
+++ b/Tests/Data/ThermoMechanics/CreepBGRa/Verification/m2_2Dloadbt/m2_2Dloadbt.prj
@@ -21,10 +21,6 @@
<increment_tolerance>0</increment_tolerance>
</nonlinear_solver>
</constitutive_relation>
- <reference_solid_density>rho_sr</reference_solid_density>
- <linear_thermal_expansion_coefficient>alpha</linear_thermal_expansion_coefficient>
- <specific_heat_capacity>cs</specific_heat_capacity>
- <thermal_conductivity>lambda</thermal_conductivity>
<process_variables>
<displacement>displacement</displacement>
<temperature>temperature</temperature>
@@ -36,6 +32,37 @@
<specific_body_force>0 0 0</specific_body_force>
</process>
</processes>
+ <media>
+ <medium>
+ <phases>
+ <phase>
+ <type>Solid</type>
+ <properties>
+ <property>
+ <name>specific_heat_capacity</name>
+ <type>Constant</type>
+ <value>0</value>
+ </property>
+ <property>
+ <name>thermal_conductivity</name>
+ <type>Constant</type>
+ <value>100</value>
+ </property>
+ <property>
+ <name>thermal_expansivity</name>
+ <type>Constant</type>
+ <value>0</value>
+ </property>
+ <property>
+ <name>density</name>
+ <type>Constant</type>
+ <value>0.</value>
+ </property>
+ </properties>
+ </phase>
+ </phases>
+ </medium>
+ </media>
<time_loop>
<processes>
<process ref="ThermoMechanics">
@@ -115,26 +142,6 @@
<type>Constant</type>
<value>0.25</value>
</parameter>
- <parameter>
- <name>rho_sr</name>
- <type>Constant</type>
- <value>0.</value>
- </parameter>
- <parameter>
- <name>alpha</name>
- <type>Constant</type>
- <value>0</value>
- </parameter>
- <parameter>
- <name>cs</name>
- <type>Constant</type>
- <value>0</value>
- </parameter>
- <parameter>
- <name>lambda</name>
- <type>Constant</type>
- <value>100</value>
- </parameter>
<parameter>
<name>temperature_ic</name>
<type>Constant</type>
diff --git a/Tests/Data/ThermoMechanics/CreepBGRa/Verification/m2_3Dload/m2_3Dload.prj b/Tests/Data/ThermoMechanics/CreepBGRa/Verification/m2_3Dload/m2_3Dload.prj
index 51188d65f14..4e569f776da 100644
--- a/Tests/Data/ThermoMechanics/CreepBGRa/Verification/m2_3Dload/m2_3Dload.prj
+++ b/Tests/Data/ThermoMechanics/CreepBGRa/Verification/m2_3Dload/m2_3Dload.prj
@@ -21,10 +21,6 @@
<increment_tolerance>0</increment_tolerance>
</nonlinear_solver>
</constitutive_relation>
- <reference_solid_density>rho_sr</reference_solid_density>
- <linear_thermal_expansion_coefficient>alpha</linear_thermal_expansion_coefficient>
- <specific_heat_capacity>cs</specific_heat_capacity>
- <thermal_conductivity>lambda</thermal_conductivity>
<process_variables>
<displacement>displacement</displacement>
<temperature>temperature</temperature>
@@ -36,6 +32,37 @@
<specific_body_force>0 0 0</specific_body_force>
</process>
</processes>
+ <media>
+ <medium>
+ <phases>
+ <phase>
+ <type>Solid</type>
+ <properties>
+ <property>
+ <name>thermal_conductivity</name>
+ <type>Constant</type>
+ <value>100</value>
+ </property>
+ <property>
+ <name>specific_heat_capacity</name>
+ <type>Constant</type>
+ <value>0</value>
+ </property>
+ <property>
+ <name>thermal_expansivity</name>
+ <type>Constant</type>
+ <value>0</value>
+ </property>
+ <property>
+ <name>density</name>
+ <type>Constant</type>
+ <value>0.</value>
+ </property>
+ </properties>
+ </phase>
+ </phases>
+ </medium>
+ </media>
<time_loop>
<processes>
<process ref="ThermoMechanics">
@@ -119,26 +146,6 @@
<type>Constant</type>
<value>0.25</value>
</parameter>
- <parameter>
- <name>rho_sr</name>
- <type>Constant</type>
- <value>0.</value>
- </parameter>
- <parameter>
- <name>alpha</name>
- <type>Constant</type>
- <value>0</value>
- </parameter>
- <parameter>
- <name>cs</name>
- <type>Constant</type>
- <value>0</value>
- </parameter>
- <parameter>
- <name>lambda</name>
- <type>Constant</type>
- <value>100</value>
- </parameter>
<parameter>
<name>temperature_ic</name>
<type>Constant</type>
diff --git a/Tests/Data/ThermoMechanics/CreepBGRa/Verification/m2_3Dloadbt/m2_3Dloadbt.prj b/Tests/Data/ThermoMechanics/CreepBGRa/Verification/m2_3Dloadbt/m2_3Dloadbt.prj
index 8529dfec089..373bd7e7593 100644
--- a/Tests/Data/ThermoMechanics/CreepBGRa/Verification/m2_3Dloadbt/m2_3Dloadbt.prj
+++ b/Tests/Data/ThermoMechanics/CreepBGRa/Verification/m2_3Dloadbt/m2_3Dloadbt.prj
@@ -21,10 +21,6 @@
<increment_tolerance>0</increment_tolerance>
</nonlinear_solver>
</constitutive_relation>
- <reference_solid_density>rho_sr</reference_solid_density>
- <linear_thermal_expansion_coefficient>alpha</linear_thermal_expansion_coefficient>
- <specific_heat_capacity>cs</specific_heat_capacity>
- <thermal_conductivity>lambda</thermal_conductivity>
<process_variables>
<displacement>displacement</displacement>
<temperature>temperature</temperature>
@@ -36,6 +32,37 @@
<specific_body_force>0 0 0</specific_body_force>
</process>
</processes>
+ <media>
+ <medium>
+ <phases>
+ <phase>
+ <type>Solid</type>
+ <properties>
+ <property>
+ <name>thermal_expansivity</name>
+ <type>Constant</type>
+ <value>0</value>
+ </property>
+ <property>
+ <name>thermal_conductivity</name>
+ <type>Constant</type>
+ <value>100</value>
+ </property>
+ <property>
+ <name>specific_heat_capacity</name>
+ <type>Constant</type>
+ <value>0</value>
+ </property>
+ <property>
+ <name>density</name>
+ <type>Constant</type>
+ <value>0.</value>
+ </property>
+ </properties>
+ </phase>
+ </phases>
+ </medium>
+ </media>
<time_loop>
<processes>
<process ref="ThermoMechanics">
@@ -115,26 +142,6 @@
<type>Constant</type>
<value>0.25</value>
</parameter>
- <parameter>
- <name>rho_sr</name>
- <type>Constant</type>
- <value>0.</value>
- </parameter>
- <parameter>
- <name>alpha</name>
- <type>Constant</type>
- <value>0</value>
- </parameter>
- <parameter>
- <name>cs</name>
- <type>Constant</type>
- <value>0</value>
- </parameter>
- <parameter>
- <name>lambda</name>
- <type>Constant</type>
- <value>100</value>
- </parameter>
<parameter>
<name>temperature_ic</name>
<type>Constant</type>
diff --git a/Tests/Data/ThermoMechanics/InitialStates/equilibrium_restart.prj b/Tests/Data/ThermoMechanics/InitialStates/equilibrium_restart.prj
index 47f3837e7a2..6348a7eb876 100644
--- a/Tests/Data/ThermoMechanics/InitialStates/equilibrium_restart.prj
+++ b/Tests/Data/ThermoMechanics/InitialStates/equilibrium_restart.prj
@@ -17,10 +17,6 @@
<youngs_modulus>E</youngs_modulus>
<poissons_ratio>nu</poissons_ratio>
</constitutive_relation>
- <reference_solid_density>rho_sr</reference_solid_density>
- <linear_thermal_expansion_coefficient>alpha</linear_thermal_expansion_coefficient>
- <specific_heat_capacity>cs</specific_heat_capacity>
- <thermal_conductivity>lambda</thermal_conductivity>
<specific_body_force>0 -9.81</specific_body_force>
<process_variables>
<displacement>displacement</displacement>
@@ -75,6 +71,37 @@
<suffix>_ts_{:timestep}_t_{:time}</suffix>
</output>
</time_loop>
+ <media>
+ <medium>
+ <phases>
+ <phase>
+ <type>Solid</type>
+ <properties>
+ <property>
+ <name>thermal_conductivity</name>
+ <type>Constant</type>
+ <value>1</value>
+ </property>
+ <property>
+ <name>specific_heat_capacity</name>
+ <type>Constant</type>
+ <value>1</value>
+ </property>
+ <property>
+ <name>thermal_expansivity</name>
+ <type>Constant</type>
+ <value>6e-6</value>
+ </property>
+ <property>
+ <name>density</name>
+ <type>Constant</type>
+ <value>2200.0</value>
+ </property>
+ </properties>
+ </phase>
+ </phases>
+ </medium>
+ </media>
<parameters>
<parameter>
<name>E</name>
@@ -86,26 +113,6 @@
<type>Constant</type>
<value>.0</value>
</parameter>
- <parameter>
- <name>rho_sr</name>
- <type>Constant</type>
- <value>2200.0</value>
- </parameter>
- <parameter>
- <name>alpha</name>
- <type>Constant</type>
- <value>6e-6</value>
- </parameter>
- <parameter>
- <name>cs</name>
- <type>Constant</type>
- <value>1</value>
- </parameter>
- <parameter>
- <name>lambda</name>
- <type>Constant</type>
- <value>1</value>
- </parameter>
<parameter>
<name>temperature_ic</name>
<type>Constant</type>
diff --git a/Tests/Data/ThermoMechanics/InitialStates/into_initial_state.prj b/Tests/Data/ThermoMechanics/InitialStates/into_initial_state.prj
index 86dcb8195c3..69f1b6699cd 100644
--- a/Tests/Data/ThermoMechanics/InitialStates/into_initial_state.prj
+++ b/Tests/Data/ThermoMechanics/InitialStates/into_initial_state.prj
@@ -17,10 +17,6 @@
<youngs_modulus>E</youngs_modulus>
<poissons_ratio>nu</poissons_ratio>
</constitutive_relation>
- <reference_solid_density>rho_sr</reference_solid_density>
- <linear_thermal_expansion_coefficient>alpha</linear_thermal_expansion_coefficient>
- <specific_heat_capacity>cs</specific_heat_capacity>
- <thermal_conductivity>lambda</thermal_conductivity>
<specific_body_force>0 -9.81</specific_body_force>
<process_variables>
<displacement>displacement</displacement>
@@ -75,6 +71,37 @@
<suffix>_ts_{:timestep}_t_{:time}</suffix>
</output>
</time_loop>
+ <media>
+ <medium>
+ <phases>
+ <phase>
+ <type>Solid</type>
+ <properties>
+ <property>
+ <name>density</name>
+ <type>Constant</type>
+ <value>2200.0</value>
+ </property>
+ <property>
+ <name>thermal_conductivity</name>
+ <type>Constant</type>
+ <value>1</value>
+ </property>
+ <property>
+ <name>thermal_expansivity</name>
+ <type>Constant</type>
+ <value>6e-6</value>
+ </property>
+ <property>
+ <name>specific_heat_capacity</name>
+ <type>Constant</type>
+ <value>1</value>
+ </property>
+ </properties>
+ </phase>
+ </phases>
+ </medium>
+ </media>
<parameters>
<parameter>
<name>E</name>
@@ -86,26 +113,6 @@
<type>Constant</type>
<value>.0</value>
</parameter>
- <parameter>
- <name>rho_sr</name>
- <type>Constant</type>
- <value>2200.0</value>
- </parameter>
- <parameter>
- <name>alpha</name>
- <type>Constant</type>
- <value>6e-6</value>
- </parameter>
- <parameter>
- <name>cs</name>
- <type>Constant</type>
- <value>1</value>
- </parameter>
- <parameter>
- <name>lambda</name>
- <type>Constant</type>
- <value>1</value>
- </parameter>
<parameter>
<name>temperature_ic</name>
<type>Constant</type>
diff --git a/Tests/Data/ThermoMechanics/InitialStates/non_equilibrium_initial_state.prj b/Tests/Data/ThermoMechanics/InitialStates/non_equilibrium_initial_state.prj
index 1e7da65a2b2..ef1a76dcb01 100644
--- a/Tests/Data/ThermoMechanics/InitialStates/non_equilibrium_initial_state.prj
+++ b/Tests/Data/ThermoMechanics/InitialStates/non_equilibrium_initial_state.prj
@@ -17,10 +17,6 @@
<youngs_modulus>E</youngs_modulus>
<poissons_ratio>nu</poissons_ratio>
</constitutive_relation>
- <reference_solid_density>rho_sr</reference_solid_density>
- <linear_thermal_expansion_coefficient>alpha</linear_thermal_expansion_coefficient>
- <specific_heat_capacity>cs</specific_heat_capacity>
- <thermal_conductivity>lambda</thermal_conductivity>
<specific_body_force>0 0</specific_body_force>
<process_variables>
<displacement>displacement</displacement>
@@ -77,6 +73,37 @@
<suffix>_ts_{:timestep}_t_{:time}</suffix>
</output>
</time_loop>
+ <media>
+ <medium>
+ <phases>
+ <phase>
+ <type>Solid</type>
+ <properties>
+ <property>
+ <name>density</name>
+ <type>Constant</type>
+ <value>2200.0</value>
+ </property>
+ <property>
+ <name>specific_heat_capacity</name>
+ <type>Constant</type>
+ <value>1</value>
+ </property>
+ <property>
+ <name>thermal_expansivity</name>
+ <type>Constant</type>
+ <value>0</value>
+ </property>
+ <property>
+ <name>thermal_conductivity</name>
+ <type>Constant</type>
+ <value>1</value>
+ </property>
+ </properties>
+ </phase>
+ </phases>
+ </medium>
+ </media>
<parameters>
<parameter>
<mesh>soil_column_q8</mesh>
@@ -97,26 +124,6 @@
<type>Constant</type>
<value>.0</value>
</parameter>
- <parameter>
- <name>rho_sr</name>
- <type>Constant</type>
- <value>2200.0</value>
- </parameter>
- <parameter>
- <name>alpha</name>
- <type>Constant</type>
- <value>0</value>
- </parameter>
- <parameter>
- <name>cs</name>
- <type>Constant</type>
- <value>1</value>
- </parameter>
- <parameter>
- <name>lambda</name>
- <type>Constant</type>
- <value>1</value>
- </parameter>
<parameter>
<name>temperature_ic</name>
<type>Constant</type>
diff --git a/Tests/Data/ThermoMechanics/LinearMFront/cube_1e0_lin.prj b/Tests/Data/ThermoMechanics/LinearMFront/cube_1e0_lin.prj
index d8944a72fde..8782e3b8201 100644
--- a/Tests/Data/ThermoMechanics/LinearMFront/cube_1e0_lin.prj
+++ b/Tests/Data/ThermoMechanics/LinearMFront/cube_1e0_lin.prj
@@ -15,10 +15,6 @@
<material_property name="PoissonRatio" parameter="nu"/>
</material_properties>
</constitutive_relation>
- <reference_solid_density>rho_sr</reference_solid_density>
- <linear_thermal_expansion_coefficient>alpha</linear_thermal_expansion_coefficient>
- <specific_heat_capacity>cs</specific_heat_capacity>
- <thermal_conductivity>lambda</thermal_conductivity>
<process_variables>
<displacement>displacement</displacement>
<temperature>temperature</temperature>
@@ -30,6 +26,37 @@
<specific_body_force>0 0 0</specific_body_force>
</process>
</processes>
+ <media>
+ <medium>
+ <phases>
+ <phase>
+ <type>Solid</type>
+ <properties>
+ <property>
+ <name>thermal_expansivity</name>
+ <type>Constant</type>
+ <value>1e-5</value>
+ </property>
+ <property>
+ <name>specific_heat_capacity</name>
+ <type>Constant</type>
+ <value>0</value>
+ </property>
+ <property>
+ <name>density</name>
+ <type>Constant</type>
+ <value>2200</value>
+ </property>
+ <property>
+ <name>thermal_conductivity</name>
+ <type>Constant</type>
+ <value>0</value>
+ </property>
+ </properties>
+ </phase>
+ </phases>
+ </medium>
+ </media>
<time_loop>
<processes>
<process ref="SD">
@@ -77,33 +104,14 @@
<parameter>
<name> E </name>
<type>Constant</type>
- <value> 5e9 <!-- hard rubber --> </value>
+ <value> 5e9 <!-- hard rubber -->
+ </value>
</parameter>
<parameter>
<name> nu </name>
<type>Constant</type>
<value> 2e-1 </value>
</parameter>
- <parameter>
- <name>rho_sr</name>
- <type>Constant</type>
- <value>2200</value>
- </parameter>
- <parameter>
- <name>alpha</name>
- <type>Constant</type>
- <value>1e-5</value>
- </parameter>
- <parameter>
- <name>cs</name>
- <type>Constant</type>
- <value>0</value>
- </parameter>
- <parameter>
- <name>lambda</name>
- <type>Constant</type>
- <value>0</value>
- </parameter>
<parameter>
<name>zero</name>
<type>Constant</type>
diff --git a/Tests/Data/ThermoMechanics/StaggeredScheme/CreepAfterExcavation/CreepAfterExcavation.prj b/Tests/Data/ThermoMechanics/StaggeredScheme/CreepAfterExcavation/CreepAfterExcavation.prj
index 355030a4af5..0195b2b0c01 100644
--- a/Tests/Data/ThermoMechanics/StaggeredScheme/CreepAfterExcavation/CreepAfterExcavation.prj
+++ b/Tests/Data/ThermoMechanics/StaggeredScheme/CreepAfterExcavation/CreepAfterExcavation.prj
@@ -31,10 +31,6 @@
<increment_tolerance>0</increment_tolerance>
</nonlinear_solver>
</constitutive_relation>
- <reference_solid_density>rho_sr</reference_solid_density>
- <linear_thermal_expansion_coefficient>alpha</linear_thermal_expansion_coefficient>
- <specific_heat_capacity>cs</specific_heat_capacity>
- <thermal_conductivity>lambda</thermal_conductivity>
<process_variables>
<displacement>displacement</displacement>
<temperature>temperature</temperature>
@@ -46,6 +42,66 @@
<specific_body_force>0 -9.81</specific_body_force>
</process>
</processes>
+ <media>
+ <medium id="0">
+ <phases>
+ <phase>
+ <type>Solid</type>
+ <properties>
+ <property>
+ <name>thermal_expansivity</name>
+ <type>Constant</type>
+ <value>4e-5</value>
+ </property>
+ <property>
+ <name>thermal_conductivity</name>
+ <type>Constant</type>
+ <value>5</value>
+ </property>
+ <property>
+ <name>density</name>
+ <type>Constant</type>
+ <value>2000</value>
+ </property>
+ <property>
+ <name>specific_heat_capacity</name>
+ <type>Constant</type>
+ <value>0.</value>
+ </property>
+ </properties>
+ </phase>
+ </phases>
+ </medium>
+ <medium id="1">
+ <phases>
+ <phase>
+ <type>Solid</type>
+ <properties>
+ <property>
+ <name>thermal_expansivity</name>
+ <type>Constant</type>
+ <value>4e-5</value>
+ </property>
+ <property>
+ <name>thermal_conductivity</name>
+ <type>Constant</type>
+ <value>5</value>
+ </property>
+ <property>
+ <name>density</name>
+ <type>Constant</type>
+ <value>2170</value>
+ </property>
+ <property>
+ <name>specific_heat_capacity</name>
+ <type>Constant</type>
+ <value>0.</value>
+ </property>
+ </properties>
+ </phase>
+ </phases>
+ </medium>
+ </media>
<time_loop>
<global_process_coupling>
<max_iter> 6 </max_iter>
@@ -189,26 +245,6 @@
<type>Constant</type>
<value>7e9</value>
</parameter>
- <parameter>
- <name>rho_sr</name>
- <type>MeshElement</type>
- <field_name>rho</field_name>
- </parameter>
- <parameter>
- <name>alpha</name>
- <type>Constant</type>
- <value>4e-5</value>
- </parameter>
- <parameter>
- <name>cs</name>
- <type>Constant</type>
- <value>0.</value>
- </parameter>
- <parameter>
- <name>lambda</name>
- <type>Constant</type>
- <value>5</value>
- </parameter>
<parameter>
<name>temperature_ic</name>
<type>MeshNode</type>
diff --git a/Tests/Data/ThermoMechanics/StaggeredScheme/TM_Quad/iglu_quarter_plane_strain_quad.prj b/Tests/Data/ThermoMechanics/StaggeredScheme/TM_Quad/iglu_quarter_plane_strain_quad.prj
index 10cc4a1f194..f2816f56188 100644
--- a/Tests/Data/ThermoMechanics/StaggeredScheme/TM_Quad/iglu_quarter_plane_strain_quad.prj
+++ b/Tests/Data/ThermoMechanics/StaggeredScheme/TM_Quad/iglu_quarter_plane_strain_quad.prj
@@ -17,10 +17,6 @@
<youngs_modulus>E</youngs_modulus>
<poissons_ratio>nu</poissons_ratio>
</constitutive_relation>
- <reference_solid_density>rho_sr</reference_solid_density>
- <linear_thermal_expansion_coefficient>alpha</linear_thermal_expansion_coefficient>
- <specific_heat_capacity>cs</specific_heat_capacity>
- <thermal_conductivity>lambda</thermal_conductivity>
<process_variables>
<displacement>displacement</displacement>
<temperature>temperature</temperature>
@@ -32,6 +28,66 @@
<specific_body_force>0 0</specific_body_force>
</process>
</processes>
+ <media>
+ <medium id="0">
+ <phases>
+ <phase>
+ <type>Solid</type>
+ <properties>
+ <property>
+ <name>density</name>
+ <type>Constant</type>
+ <value>1.583e-6</value>
+ </property>
+ <property>
+ <name>thermal_expansivity</name>
+ <type>Constant</type>
+ <value>1.069e-5</value>
+ </property>
+ <property>
+ <name>thermal_conductivity</name>
+ <type>Constant</type>
+ <value>0.96e-3</value>
+ </property>
+ <property>
+ <name>specific_heat_capacity</name>
+ <type>Constant</type>
+ <value>2083.4</value>
+ </property>
+ </properties>
+ </phase>
+ </phases>
+ </medium>
+ <medium id="1">
+ <phases>
+ <phase>
+ <type>Solid</type>
+ <properties>
+ <property>
+ <name>density</name>
+ <type>Constant</type>
+ <value>1.825e-6</value>
+ </property>
+ <property>
+ <name>thermal_expansivity</name>
+ <type>Constant</type>
+ <value>3e-5</value>
+ </property>
+ <property>
+ <name>thermal_conductivity</name>
+ <type>Constant</type>
+ <value>0.4e-3</value>
+ </property>
+ <property>
+ <name>specific_heat_capacity</name>
+ <type>Constant</type>
+ <value>2200</value>
+ </property>
+ </properties>
+ </phase>
+ </phases>
+ </medium>
+ </media>
<time_loop>
<global_process_coupling>
<max_iter> 6 </max_iter>
@@ -141,58 +197,6 @@
<value>0.4</value>
</index_values>
</parameter>
- <parameter>
- <name>rho_sr</name>
- <type>Group</type>
- <group_id_property>MaterialIDs</group_id_property>
- <index_values>
- <index>0</index>
- <value>1.583e-6</value>
- </index_values>
- <index_values>
- <index>1</index>
- <value>1.825e-6</value>
- </index_values>
- </parameter>
- <parameter>
- <name>alpha</name>
- <type>Group</type>
- <group_id_property>MaterialIDs</group_id_property>
- <index_values>
- <index>0</index>
- <value>1.069e-5</value>
- </index_values>
- <index_values>
- <index>1</index>
- <value>3e-5</value>
- </index_values>
- </parameter>
- <parameter>
- <name>cs</name>
- <type>Group</type>
- <group_id_property>MaterialIDs</group_id_property>
- <index_values>
- <index>0</index>
- <value>2083.4</value>
- </index_values>
- <index_values>
- <index>1</index>
- <value>2200</value>
- </index_values>
- </parameter>
- <parameter>
- <name>lambda</name>
- <type>Group</type>
- <group_id_property>MaterialIDs</group_id_property>
- <index_values>
- <index>0</index>
- <value>0.96e-3</value>
- </index_values>
- <index_values>
- <index>1</index>
- <value>0.4e-3</value>
- </index_values>
- </parameter>
<parameter>
<name>temperature_ic</name>
<type>Constant</type>
diff --git a/Tests/Data/ThermoMechanics/cube_1e3.prj b/Tests/Data/ThermoMechanics/cube_1e3.prj
index 112fce530e1..2e1ec5e27c5 100644
--- a/Tests/Data/ThermoMechanics/cube_1e3.prj
+++ b/Tests/Data/ThermoMechanics/cube_1e3.prj
@@ -12,10 +12,6 @@
<youngs_modulus>E</youngs_modulus>
<poissons_ratio>nu</poissons_ratio>
</constitutive_relation>
- <reference_solid_density>rho_sr</reference_solid_density>
- <linear_thermal_expansion_coefficient>alpha</linear_thermal_expansion_coefficient>
- <specific_heat_capacity>cs</specific_heat_capacity>
- <thermal_conductivity>lambda</thermal_conductivity>
<process_variables>
<displacement>displacement</displacement>
<temperature>temperature</temperature>
@@ -27,6 +23,37 @@
<specific_body_force>0 0 0</specific_body_force>
</process>
</processes>
+ <media>
+ <medium>
+ <phases>
+ <phase>
+ <type>Solid</type>
+ <properties>
+ <property>
+ <name>thermal_conductivity</name>
+ <type>Constant</type>
+ <value>1</value>
+ </property>
+ <property>
+ <name>thermal_expansivity</name>
+ <type>Constant</type>
+ <value>6e-6</value>
+ </property>
+ <property>
+ <name>specific_heat_capacity</name>
+ <type>Constant</type>
+ <value>1</value>
+ </property>
+ <property>
+ <name>density</name>
+ <type>Constant</type>
+ <value>2200</value>
+ </property>
+ </properties>
+ </phase>
+ </phases>
+ </medium>
+ </media>
<time_loop>
<processes>
<process ref="ThermoMechanics">
@@ -85,26 +112,6 @@
<type>Constant</type>
<value>0.27</value>
</parameter>
- <parameter>
- <name>rho_sr</name>
- <type>Constant</type>
- <value>2200</value>
- </parameter>
- <parameter>
- <name>alpha</name>
- <type>Constant</type>
- <value>6e-6</value>
- </parameter>
- <parameter>
- <name>cs</name>
- <type>Constant</type>
- <value>1</value>
- </parameter>
- <parameter>
- <name>lambda</name>
- <type>Constant</type>
- <value>1</value>
- </parameter>
<parameter>
<name>temperature_ic</name>
<type>Constant</type>
diff --git a/Tests/Data/ThermoMechanics/iglu_axisymmetric_plane_strain.prj b/Tests/Data/ThermoMechanics/iglu_axisymmetric_plane_strain.prj
index 470522e152b..790faa51e81 100644
--- a/Tests/Data/ThermoMechanics/iglu_axisymmetric_plane_strain.prj
+++ b/Tests/Data/ThermoMechanics/iglu_axisymmetric_plane_strain.prj
@@ -12,10 +12,6 @@
<youngs_modulus>E</youngs_modulus>
<poissons_ratio>nu</poissons_ratio>
</constitutive_relation>
- <reference_solid_density>rho_sr</reference_solid_density>
- <linear_thermal_expansion_coefficient>alpha</linear_thermal_expansion_coefficient>
- <specific_heat_capacity>cs</specific_heat_capacity>
- <thermal_conductivity>lambda</thermal_conductivity>
<process_variables>
<displacement>displacement</displacement>
<temperature>temperature</temperature>
@@ -27,6 +23,66 @@
<specific_body_force>0 0</specific_body_force>
</process>
</processes>
+ <media>
+ <medium id="0">
+ <phases>
+ <phase>
+ <type>Solid</type>
+ <properties>
+ <property>
+ <name>density</name>
+ <type>Constant</type>
+ <value>1.583e-6</value>
+ </property>
+ <property>
+ <name>thermal_expansivity</name>
+ <type>Constant</type>
+ <value>1.069e-5</value>
+ </property>
+ <property>
+ <name>thermal_conductivity</name>
+ <type>Constant</type>
+ <value>0.96e-3</value>
+ </property>
+ <property>
+ <name>specific_heat_capacity</name>
+ <type>Constant</type>
+ <value>2083.4</value>
+ </property>
+ </properties>
+ </phase>
+ </phases>
+ </medium>
+ <medium id="1">
+ <phases>
+ <phase>
+ <type>Solid</type>
+ <properties>
+ <property>
+ <name>density</name>
+ <type>Constant</type>
+ <value>1.825e-6</value>
+ </property>
+ <property>
+ <name>thermal_expansivity</name>
+ <type>Constant</type>
+ <value>3e-5</value>
+ </property>
+ <property>
+ <name>thermal_conductivity</name>
+ <type>Constant</type>
+ <value>0.4e-3</value>
+ </property>
+ <property>
+ <name>specific_heat_capacity</name>
+ <type>Constant</type>
+ <value>2200</value>
+ </property>
+ </properties>
+ </phase>
+ </phases>
+ </medium>
+ </media>
<time_loop>
<processes>
<process ref="ThermoMechanics">
@@ -97,58 +153,6 @@
<value>0.4</value>
</index_values>
</parameter>
- <parameter>
- <name>rho_sr</name>
- <type>Group</type>
- <group_id_property>MaterialIDs</group_id_property>
- <index_values>
- <index>0</index>
- <value>1.583e-6</value>
- </index_values>
- <index_values>
- <index>1</index>
- <value>1.825e-6</value>
- </index_values>
- </parameter>
- <parameter>
- <name>alpha</name>
- <type>Group</type>
- <group_id_property>MaterialIDs</group_id_property>
- <index_values>
- <index>0</index>
- <value>1.069e-5</value>
- </index_values>
- <index_values>
- <index>1</index>
- <value>3e-5</value>
- </index_values>
- </parameter>
- <parameter>
- <name>cs</name>
- <type>Group</type>
- <group_id_property>MaterialIDs</group_id_property>
- <index_values>
- <index>0</index>
- <value>2083.4</value>
- </index_values>
- <index_values>
- <index>1</index>
- <value>2200</value>
- </index_values>
- </parameter>
- <parameter>
- <name>lambda</name>
- <type>Group</type>
- <group_id_property>MaterialIDs</group_id_property>
- <index_values>
- <index>0</index>
- <value>0.96e-3</value>
- </index_values>
- <index_values>
- <index>1</index>
- <value>0.4e-3</value>
- </index_values>
- </parameter>
<parameter>
<name>temperature_ic</name>
<type>Constant</type>
diff --git a/Tests/Data/ThermoMechanics/iglu_axisymmetric_plane_strain_quad.prj b/Tests/Data/ThermoMechanics/iglu_axisymmetric_plane_strain_quad.prj
index c98cc4907e7..0434e5b8894 100644
--- a/Tests/Data/ThermoMechanics/iglu_axisymmetric_plane_strain_quad.prj
+++ b/Tests/Data/ThermoMechanics/iglu_axisymmetric_plane_strain_quad.prj
@@ -12,10 +12,6 @@
<youngs_modulus>E</youngs_modulus>
<poissons_ratio>nu</poissons_ratio>
</constitutive_relation>
- <reference_solid_density>rho_sr</reference_solid_density>
- <linear_thermal_expansion_coefficient>alpha</linear_thermal_expansion_coefficient>
- <specific_heat_capacity>cs</specific_heat_capacity>
- <thermal_conductivity>lambda</thermal_conductivity>
<process_variables>
<displacement>displacement</displacement>
<temperature>temperature</temperature>
@@ -27,6 +23,66 @@
<specific_body_force>0 0</specific_body_force>
</process>
</processes>
+ <media>
+ <medium id="0">
+ <phases>
+ <phase>
+ <type>Solid</type>
+ <properties>
+ <property>
+ <name>density</name>
+ <type>Constant</type>
+ <value>1.583e-6</value>
+ </property>
+ <property>
+ <name>thermal_expansivity</name>
+ <type>Constant</type>
+ <value>1.069e-5</value>
+ </property>
+ <property>
+ <name>thermal_conductivity</name>
+ <type>Constant</type>
+ <value>0.96e-3</value>
+ </property>
+ <property>
+ <name>specific_heat_capacity</name>
+ <type>Constant</type>
+ <value>2083.4</value>
+ </property>
+ </properties>
+ </phase>
+ </phases>
+ </medium>
+ <medium id="1">
+ <phases>
+ <phase>
+ <type>Solid</type>
+ <properties>
+ <property>
+ <name>density</name>
+ <type>Constant</type>
+ <value>1.825e-6</value>
+ </property>
+ <property>
+ <name>thermal_expansivity</name>
+ <type>Constant</type>
+ <value>3e-5</value>
+ </property>
+ <property>
+ <name>thermal_conductivity</name>
+ <type>Constant</type>
+ <value>0.4e-3</value>
+ </property>
+ <property>
+ <name>specific_heat_capacity</name>
+ <type>Constant</type>
+ <value>2200</value>
+ </property>
+ </properties>
+ </phase>
+ </phases>
+ </medium>
+ </media>
<time_loop>
<processes>
<process ref="ThermoMechanics">
@@ -97,58 +153,6 @@
<value>0.4</value>
</index_values>
</parameter>
- <parameter>
- <name>rho_sr</name>
- <type>Group</type>
- <group_id_property>MaterialIDs</group_id_property>
- <index_values>
- <index>0</index>
- <value>1.583e-6</value>
- </index_values>
- <index_values>
- <index>1</index>
- <value>1.825e-6</value>
- </index_values>
- </parameter>
- <parameter>
- <name>alpha</name>
- <type>Group</type>
- <group_id_property>MaterialIDs</group_id_property>
- <index_values>
- <index>0</index>
- <value>1.069e-5</value>
- </index_values>
- <index_values>
- <index>1</index>
- <value>3e-5</value>
- </index_values>
- </parameter>
- <parameter>
- <name>cs</name>
- <type>Group</type>
- <group_id_property>MaterialIDs</group_id_property>
- <index_values>
- <index>0</index>
- <value>2083.4</value>
- </index_values>
- <index_values>
- <index>1</index>
- <value>2200</value>
- </index_values>
- </parameter>
- <parameter>
- <name>lambda</name>
- <type>Group</type>
- <group_id_property>MaterialIDs</group_id_property>
- <index_values>
- <index>0</index>
- <value>0.96e-3</value>
- </index_values>
- <index_values>
- <index>1</index>
- <value>0.4e-3</value>
- </index_values>
- </parameter>
<parameter>
<name>temperature_ic</name>
<type>Constant</type>
diff --git a/Tests/Data/ThermoMechanics/iglu_quarter_plane_strain.prj b/Tests/Data/ThermoMechanics/iglu_quarter_plane_strain.prj
index 44421ababac..3dec2519276 100644
--- a/Tests/Data/ThermoMechanics/iglu_quarter_plane_strain.prj
+++ b/Tests/Data/ThermoMechanics/iglu_quarter_plane_strain.prj
@@ -16,10 +16,6 @@
<youngs_modulus>E</youngs_modulus>
<poissons_ratio>nu</poissons_ratio>
</constitutive_relation>
- <reference_solid_density>rho_sr</reference_solid_density>
- <linear_thermal_expansion_coefficient>alpha</linear_thermal_expansion_coefficient>
- <specific_heat_capacity>cs</specific_heat_capacity>
- <thermal_conductivity>lambda</thermal_conductivity>
<process_variables>
<displacement>displacement</displacement>
<temperature>temperature</temperature>
@@ -31,6 +27,66 @@
<specific_body_force>0 0</specific_body_force>
</process>
</processes>
+ <media>
+ <medium id="0">
+ <phases>
+ <phase>
+ <type>Solid</type>
+ <properties>
+ <property>
+ <name>density</name>
+ <type>Constant</type>
+ <value>1.583e-6</value>
+ </property>
+ <property>
+ <name>thermal_expansivity</name>
+ <type>Constant</type>
+ <value>1.069e-5</value>
+ </property>
+ <property>
+ <name>thermal_conductivity</name>
+ <type>Constant</type>
+ <value>0.96e-3</value>
+ </property>
+ <property>
+ <name>specific_heat_capacity</name>
+ <type>Constant</type>
+ <value>2083.4</value>
+ </property>
+ </properties>
+ </phase>
+ </phases>
+ </medium>
+ <medium id="1">
+ <phases>
+ <phase>
+ <type>Solid</type>
+ <properties>
+ <property>
+ <name>density</name>
+ <type>Constant</type>
+ <value>1.825e-6</value>
+ </property>
+ <property>
+ <name>thermal_expansivity</name>
+ <type>Constant</type>
+ <value>3e-5</value>
+ </property>
+ <property>
+ <name>thermal_conductivity</name>
+ <type>Constant</type>
+ <value>0.4e-3</value>
+ </property>
+ <property>
+ <name>specific_heat_capacity</name>
+ <type>Constant</type>
+ <value>2200</value>
+ </property>
+ </properties>
+ </phase>
+ </phases>
+ </medium>
+ </media>
<time_loop>
<processes>
<process ref="ThermoMechanics">
@@ -101,58 +157,6 @@
<value>0.4</value>
</index_values>
</parameter>
- <parameter>
- <name>rho_sr</name>
- <type>Group</type>
- <group_id_property>MaterialIDs</group_id_property>
- <index_values>
- <index>0</index>
- <value>1.583e-6</value>
- </index_values>
- <index_values>
- <index>1</index>
- <value>1.825e-6</value>
- </index_values>
- </parameter>
- <parameter>
- <name>alpha</name>
- <type>Group</type>
- <group_id_property>MaterialIDs</group_id_property>
- <index_values>
- <index>0</index>
- <value>1.069e-5</value>
- </index_values>
- <index_values>
- <index>1</index>
- <value>3e-5</value>
- </index_values>
- </parameter>
- <parameter>
- <name>cs</name>
- <type>Group</type>
- <group_id_property>MaterialIDs</group_id_property>
- <index_values>
- <index>0</index>
- <value>2083.4</value>
- </index_values>
- <index_values>
- <index>1</index>
- <value>2200</value>
- </index_values>
- </parameter>
- <parameter>
- <name>lambda</name>
- <type>Group</type>
- <group_id_property>MaterialIDs</group_id_property>
- <index_values>
- <index>0</index>
- <value>0.96e-3</value>
- </index_values>
- <index_values>
- <index>1</index>
- <value>0.4e-3</value>
- </index_values>
- </parameter>
<parameter>
<name>temperature_ic</name>
<type>Constant</type>
diff --git a/Tests/Data/ThermoMechanics/iglu_quarter_plane_strain_quad.prj b/Tests/Data/ThermoMechanics/iglu_quarter_plane_strain_quad.prj
index 41665b427b2..365d2323a81 100644
--- a/Tests/Data/ThermoMechanics/iglu_quarter_plane_strain_quad.prj
+++ b/Tests/Data/ThermoMechanics/iglu_quarter_plane_strain_quad.prj
@@ -16,10 +16,6 @@
<youngs_modulus>E</youngs_modulus>
<poissons_ratio>nu</poissons_ratio>
</constitutive_relation>
- <reference_solid_density>rho_sr</reference_solid_density>
- <linear_thermal_expansion_coefficient>alpha</linear_thermal_expansion_coefficient>
- <specific_heat_capacity>cs</specific_heat_capacity>
- <thermal_conductivity>lambda</thermal_conductivity>
<process_variables>
<displacement>displacement</displacement>
<temperature>temperature</temperature>
@@ -31,6 +27,66 @@
<specific_body_force>0 0</specific_body_force>
</process>
</processes>
+ <media>
+ <medium id="0">
+ <phases>
+ <phase>
+ <type>Solid</type>
+ <properties>
+ <property>
+ <name>density</name>
+ <type>Constant</type>
+ <value>1.583e-6</value>
+ </property>
+ <property>
+ <name>thermal_expansivity</name>
+ <type>Constant</type>
+ <value>1.069e-5</value>
+ </property>
+ <property>
+ <name>thermal_conductivity</name>
+ <type>Constant</type>
+ <value>0.96e-3</value>
+ </property>
+ <property>
+ <name>specific_heat_capacity</name>
+ <type>Constant</type>
+ <value>2083.4</value>
+ </property>
+ </properties>
+ </phase>
+ </phases>
+ </medium>
+ <medium id="1">
+ <phases>
+ <phase>
+ <type>Solid</type>
+ <properties>
+ <property>
+ <name>density</name>
+ <type>Constant</type>
+ <value>1.825e-6</value>
+ </property>
+ <property>
+ <name>thermal_expansivity</name>
+ <type>Constant</type>
+ <value>3e-5</value>
+ </property>
+ <property>
+ <name>thermal_conductivity</name>
+ <type>Constant</type>
+ <value>0.4e-3</value>
+ </property>
+ <property>
+ <name>specific_heat_capacity</name>
+ <type>Constant</type>
+ <value>2200</value>
+ </property>
+ </properties>
+ </phase>
+ </phases>
+ </medium>
+ </media>
<time_loop>
<processes>
<process ref="ThermoMechanics">
@@ -101,58 +157,6 @@
<value>0.4</value>
</index_values>
</parameter>
- <parameter>
- <name>rho_sr</name>
- <type>Group</type>
- <group_id_property>MaterialIDs</group_id_property>
- <index_values>
- <index>0</index>
- <value>1.583e-6</value>
- </index_values>
- <index_values>
- <index>1</index>
- <value>1.825e-6</value>
- </index_values>
- </parameter>
- <parameter>
- <name>alpha</name>
- <type>Group</type>
- <group_id_property>MaterialIDs</group_id_property>
- <index_values>
- <index>0</index>
- <value>1.069e-5</value>
- </index_values>
- <index_values>
- <index>1</index>
- <value>3e-5</value>
- </index_values>
- </parameter>
- <parameter>
- <name>cs</name>
- <type>Group</type>
- <group_id_property>MaterialIDs</group_id_property>
- <index_values>
- <index>0</index>
- <value>2083.4</value>
- </index_values>
- <index_values>
- <index>1</index>
- <value>2200</value>
- </index_values>
- </parameter>
- <parameter>
- <name>lambda</name>
- <type>Group</type>
- <group_id_property>MaterialIDs</group_id_property>
- <index_values>
- <index>0</index>
- <value>0.96e-3</value>
- </index_values>
- <index_values>
- <index>1</index>
- <value>0.4e-3</value>
- </index_values>
- </parameter>
<parameter>
<name>temperature_ic</name>
<type>Constant</type>
diff --git a/Tests/Data/ThermoMechanics/tm1_1Dbeam/tm1_1Dbeam.prj b/Tests/Data/ThermoMechanics/tm1_1Dbeam/tm1_1Dbeam.prj
index 65a3b2a3b00..007e46ec8c2 100644
--- a/Tests/Data/ThermoMechanics/tm1_1Dbeam/tm1_1Dbeam.prj
+++ b/Tests/Data/ThermoMechanics/tm1_1Dbeam/tm1_1Dbeam.prj
@@ -12,10 +12,6 @@
<youngs_modulus>E</youngs_modulus>
<poissons_ratio>nu</poissons_ratio>
</constitutive_relation>
- <reference_solid_density>rho</reference_solid_density>
- <linear_thermal_expansion_coefficient>alpha</linear_thermal_expansion_coefficient>
- <specific_heat_capacity>c</specific_heat_capacity>
- <thermal_conductivity>lambda</thermal_conductivity>
<specific_body_force>0 0 -9.81</specific_body_force>
<process_variables>
<temperature>temperature</temperature>
@@ -27,6 +23,37 @@
</secondary_variables>
</process>
</processes>
+ <media>
+ <medium>
+ <phases>
+ <phase>
+ <type>Solid</type>
+ <properties>
+ <property>
+ <name>density</name>
+ <type>Constant</type>
+ <value>0.</value>
+ </property>
+ <property>
+ <name>thermal_expansivity</name>
+ <type>Constant</type>
+ <value>3e-5</value>
+ </property>
+ <property>
+ <name>thermal_conductivity</name>
+ <type>Constant</type>
+ <value>1</value>
+ </property>
+ <property>
+ <name>specific_heat_capacity</name>
+ <type>Constant</type>
+ <value>0</value>
+ </property>
+ </properties>
+ </phase>
+ </phases>
+ </medium>
+ </media>
<time_loop>
<processes>
<process ref="ThermoMechanics">
@@ -91,42 +118,6 @@
<value>0.25</value>
</index_values>
</parameter>
- <parameter>
- <name>rho</name>
- <type>Group</type>
- <group_id_property>MaterialIDs</group_id_property>
- <index_values>
- <index>0</index>
- <value>0</value>
- </index_values>
- </parameter>
- <parameter>
- <name>alpha</name>
- <type>Group</type>
- <group_id_property>MaterialIDs</group_id_property>
- <index_values>
- <index>0</index>
- <value>3e-5</value>
- </index_values>
- </parameter>
- <parameter>
- <name>c</name>
- <type>Group</type>
- <group_id_property>MaterialIDs</group_id_property>
- <index_values>
- <index>0</index>
- <value>0</value>
- </index_values>
- </parameter>
- <parameter>
- <name>lambda</name>
- <type>Group</type>
- <group_id_property>MaterialIDs</group_id_property>
- <index_values>
- <index>0</index>
- <value>1.0</value>
- </index_values>
- </parameter>
<parameter>
<name>zero</name>
<type>Constant</type>
diff --git a/Tests/Data/ThermoMechanics/tm1_1Dfixa/tm1_1Dfixa.prj b/Tests/Data/ThermoMechanics/tm1_1Dfixa/tm1_1Dfixa.prj
index 71f8f032efd..0219fc81f72 100644
--- a/Tests/Data/ThermoMechanics/tm1_1Dfixa/tm1_1Dfixa.prj
+++ b/Tests/Data/ThermoMechanics/tm1_1Dfixa/tm1_1Dfixa.prj
@@ -12,10 +12,6 @@
<youngs_modulus>E</youngs_modulus>
<poissons_ratio>nu</poissons_ratio>
</constitutive_relation>
- <reference_solid_density>rho</reference_solid_density>
- <linear_thermal_expansion_coefficient>alpha</linear_thermal_expansion_coefficient>
- <specific_heat_capacity>c</specific_heat_capacity>
- <thermal_conductivity>lambda</thermal_conductivity>
<specific_body_force>0 0 -9.81</specific_body_force>
<process_variables>
<temperature>temperature</temperature>
@@ -27,6 +23,37 @@
</secondary_variables>
</process>
</processes>
+ <media>
+ <medium>
+ <phases>
+ <phase>
+ <type>Solid</type>
+ <properties>
+ <property>
+ <name>density</name>
+ <type>Constant</type>
+ <value>0.</value>
+ </property>
+ <property>
+ <name>thermal_expansivity</name>
+ <type>Constant</type>
+ <value>3e-5</value>
+ </property>
+ <property>
+ <name>thermal_conductivity</name>
+ <type>Constant</type>
+ <value>1</value>
+ </property>
+ <property>
+ <name>specific_heat_capacity</name>
+ <type>Constant</type>
+ <value>0</value>
+ </property>
+ </properties>
+ </phase>
+ </phases>
+ </medium>
+ </media>
<time_loop>
<processes>
<process ref="ThermoMechanics">
@@ -91,42 +118,6 @@
<value>0.25</value>
</index_values>
</parameter>
- <parameter>
- <name>rho</name>
- <type>Group</type>
- <group_id_property>MaterialIDs</group_id_property>
- <index_values>
- <index>0</index>
- <value>0</value>
- </index_values>
- </parameter>
- <parameter>
- <name>alpha</name>
- <type>Group</type>
- <group_id_property>MaterialIDs</group_id_property>
- <index_values>
- <index>0</index>
- <value>3e-5</value>
- </index_values>
- </parameter>
- <parameter>
- <name>c</name>
- <type>Group</type>
- <group_id_property>MaterialIDs</group_id_property>
- <index_values>
- <index>0</index>
- <value>0</value>
- </index_values>
- </parameter>
- <parameter>
- <name>lambda</name>
- <type>Group</type>
- <group_id_property>MaterialIDs</group_id_property>
- <index_values>
- <index>0</index>
- <value>1.0</value>
- </index_values>
- </parameter>
<parameter>
<name>zero</name>
<type>Constant</type>
diff --git a/Tests/Data/ThermoMechanics/tm1_1Dfixb/tm1_1Dfixb.prj b/Tests/Data/ThermoMechanics/tm1_1Dfixb/tm1_1Dfixb.prj
index 15f590633ae..def794bd0d8 100644
--- a/Tests/Data/ThermoMechanics/tm1_1Dfixb/tm1_1Dfixb.prj
+++ b/Tests/Data/ThermoMechanics/tm1_1Dfixb/tm1_1Dfixb.prj
@@ -12,10 +12,6 @@
<youngs_modulus>E</youngs_modulus>
<poissons_ratio>nu</poissons_ratio>
</constitutive_relation>
- <reference_solid_density>rho</reference_solid_density>
- <linear_thermal_expansion_coefficient>alpha</linear_thermal_expansion_coefficient>
- <specific_heat_capacity>c</specific_heat_capacity>
- <thermal_conductivity>lambda</thermal_conductivity>
<specific_body_force>0 0 -9.81</specific_body_force>
<process_variables>
<temperature>temperature</temperature>
@@ -27,6 +23,37 @@
</secondary_variables>
</process>
</processes>
+ <media>
+ <medium>
+ <phases>
+ <phase>
+ <type>Solid</type>
+ <properties>
+ <property>
+ <name>density</name>
+ <type>Constant</type>
+ <value>0.</value>
+ </property>
+ <property>
+ <name>thermal_expansivity</name>
+ <type>Constant</type>
+ <value>3e-5</value>
+ </property>
+ <property>
+ <name>thermal_conductivity</name>
+ <type>Constant</type>
+ <value>1</value>
+ </property>
+ <property>
+ <name>specific_heat_capacity</name>
+ <type>Constant</type>
+ <value>0</value>
+ </property>
+ </properties>
+ </phase>
+ </phases>
+ </medium>
+ </media>
<time_loop>
<processes>
<process ref="ThermoMechanics">
@@ -91,42 +118,6 @@
<value>0.25</value>
</index_values>
</parameter>
- <parameter>
- <name>rho</name>
- <type>Group</type>
- <group_id_property>MaterialIDs</group_id_property>
- <index_values>
- <index>0</index>
- <value>0</value>
- </index_values>
- </parameter>
- <parameter>
- <name>alpha</name>
- <type>Group</type>
- <group_id_property>MaterialIDs</group_id_property>
- <index_values>
- <index>0</index>
- <value>3e-5</value>
- </index_values>
- </parameter>
- <parameter>
- <name>c</name>
- <type>Group</type>
- <group_id_property>MaterialIDs</group_id_property>
- <index_values>
- <index>0</index>
- <value>0</value>
- </index_values>
- </parameter>
- <parameter>
- <name>lambda</name>
- <type>Group</type>
- <group_id_property>MaterialIDs</group_id_property>
- <index_values>
- <index>0</index>
- <value>1.0</value>
- </index_values>
- </parameter>
<parameter>
<name>zero</name>
<type>Constant</type>
diff --git a/Tests/Data/ThermoMechanics/tm1_2Dbeam/tm1_2Dbeam.prj b/Tests/Data/ThermoMechanics/tm1_2Dbeam/tm1_2Dbeam.prj
index 9b552fe4e73..ae7dcd7ebda 100644
--- a/Tests/Data/ThermoMechanics/tm1_2Dbeam/tm1_2Dbeam.prj
+++ b/Tests/Data/ThermoMechanics/tm1_2Dbeam/tm1_2Dbeam.prj
@@ -12,10 +12,6 @@
<youngs_modulus>E</youngs_modulus>
<poissons_ratio>nu</poissons_ratio>
</constitutive_relation>
- <reference_solid_density>rho</reference_solid_density>
- <linear_thermal_expansion_coefficient>alpha</linear_thermal_expansion_coefficient>
- <specific_heat_capacity>c</specific_heat_capacity>
- <thermal_conductivity>lambda</thermal_conductivity>
<specific_body_force>0 0 -9.81</specific_body_force>
<process_variables>
<temperature>temperature</temperature>
@@ -27,6 +23,37 @@
</secondary_variables>
</process>
</processes>
+ <media>
+ <medium>
+ <phases>
+ <phase>
+ <type>Solid</type>
+ <properties>
+ <property>
+ <name>density</name>
+ <type>Constant</type>
+ <value>0.</value>
+ </property>
+ <property>
+ <name>thermal_expansivity</name>
+ <type>Constant</type>
+ <value>1e-3</value>
+ </property>
+ <property>
+ <name>thermal_conductivity</name>
+ <type>Constant</type>
+ <value>1</value>
+ </property>
+ <property>
+ <name>specific_heat_capacity</name>
+ <type>Constant</type>
+ <value>0</value>
+ </property>
+ </properties>
+ </phase>
+ </phases>
+ </medium>
+ </media>
<time_loop>
<processes>
<process ref="ThermoMechanics">
@@ -91,42 +118,6 @@
<value>0.2</value>
</index_values>
</parameter>
- <parameter>
- <name>rho</name>
- <type>Group</type>
- <group_id_property>MaterialIDs</group_id_property>
- <index_values>
- <index>0</index>
- <value>0</value>
- </index_values>
- </parameter>
- <parameter>
- <name>alpha</name>
- <type>Group</type>
- <group_id_property>MaterialIDs</group_id_property>
- <index_values>
- <index>0</index>
- <value>1e-3</value>
- </index_values>
- </parameter>
- <parameter>
- <name>c</name>
- <type>Group</type>
- <group_id_property>MaterialIDs</group_id_property>
- <index_values>
- <index>0</index>
- <value>0</value>
- </index_values>
- </parameter>
- <parameter>
- <name>lambda</name>
- <type>Group</type>
- <group_id_property>MaterialIDs</group_id_property>
- <index_values>
- <index>0</index>
- <value>1.0</value>
- </index_values>
- </parameter>
<parameter>
<name>zero</name>
<type>Constant</type>
diff --git a/Tests/Data/ThermoMechanics/tm1_2Dsquare/tm1_2Dsquare.prj b/Tests/Data/ThermoMechanics/tm1_2Dsquare/tm1_2Dsquare.prj
index a48adc3c519..f037cae3535 100644
--- a/Tests/Data/ThermoMechanics/tm1_2Dsquare/tm1_2Dsquare.prj
+++ b/Tests/Data/ThermoMechanics/tm1_2Dsquare/tm1_2Dsquare.prj
@@ -12,10 +12,6 @@
<youngs_modulus>E</youngs_modulus>
<poissons_ratio>nu</poissons_ratio>
</constitutive_relation>
- <reference_solid_density>rho</reference_solid_density>
- <linear_thermal_expansion_coefficient>alpha</linear_thermal_expansion_coefficient>
- <specific_heat_capacity>c</specific_heat_capacity>
- <thermal_conductivity>lambda</thermal_conductivity>
<specific_body_force>0 0 -9.81</specific_body_force>
<process_variables>
<temperature>temperature</temperature>
@@ -27,6 +23,37 @@
</secondary_variables>
</process>
</processes>
+ <media>
+ <medium>
+ <phases>
+ <phase>
+ <type>Solid</type>
+ <properties>
+ <property>
+ <name>density</name>
+ <type>Constant</type>
+ <value>0.</value>
+ </property>
+ <property>
+ <name>thermal_expansivity</name>
+ <type>Constant</type>
+ <value>4e-5</value>
+ </property>
+ <property>
+ <name>thermal_conductivity</name>
+ <type>Constant</type>
+ <value>1</value>
+ </property>
+ <property>
+ <name>specific_heat_capacity</name>
+ <type>Constant</type>
+ <value>0</value>
+ </property>
+ </properties>
+ </phase>
+ </phases>
+ </medium>
+ </media>
<time_loop>
<processes>
<process ref="ThermoMechanics">
@@ -91,42 +118,6 @@
<value>0.25</value>
</index_values>
</parameter>
- <parameter>
- <name>rho</name>
- <type>Group</type>
- <group_id_property>MaterialIDs</group_id_property>
- <index_values>
- <index>0</index>
- <value>0</value>
- </index_values>
- </parameter>
- <parameter>
- <name>alpha</name>
- <type>Group</type>
- <group_id_property>MaterialIDs</group_id_property>
- <index_values>
- <index>0</index>
- <value>4e-5</value>
- </index_values>
- </parameter>
- <parameter>
- <name>c</name>
- <type>Group</type>
- <group_id_property>MaterialIDs</group_id_property>
- <index_values>
- <index>0</index>
- <value>0</value>
- </index_values>
- </parameter>
- <parameter>
- <name>lambda</name>
- <type>Group</type>
- <group_id_property>MaterialIDs</group_id_property>
- <index_values>
- <index>0</index>
- <value>1.0</value>
- </index_values>
- </parameter>
<parameter>
<name>zero</name>
<type>Constant</type>
diff --git a/Tests/Data/ThermoMechanics/tm1_3Dcube/tm1_3Dcube.prj b/Tests/Data/ThermoMechanics/tm1_3Dcube/tm1_3Dcube.prj
index aa383f45dfc..535517008d4 100644
--- a/Tests/Data/ThermoMechanics/tm1_3Dcube/tm1_3Dcube.prj
+++ b/Tests/Data/ThermoMechanics/tm1_3Dcube/tm1_3Dcube.prj
@@ -12,10 +12,6 @@
<youngs_modulus>E</youngs_modulus>
<poissons_ratio>nu</poissons_ratio>
</constitutive_relation>
- <reference_solid_density>rho</reference_solid_density>
- <linear_thermal_expansion_coefficient>alpha</linear_thermal_expansion_coefficient>
- <specific_heat_capacity>c</specific_heat_capacity>
- <thermal_conductivity>lambda</thermal_conductivity>
<specific_body_force>0 0 -9.81</specific_body_force>
<process_variables>
<temperature>temperature</temperature>
@@ -27,6 +23,37 @@
</secondary_variables>
</process>
</processes>
+ <media>
+ <medium>
+ <phases>
+ <phase>
+ <type>Solid</type>
+ <properties>
+ <property>
+ <name>density</name>
+ <type>Constant</type>
+ <value>0.</value>
+ </property>
+ <property>
+ <name>thermal_expansivity</name>
+ <type>Constant</type>
+ <value>5e-5</value>
+ </property>
+ <property>
+ <name>thermal_conductivity</name>
+ <type>Constant</type>
+ <value>1</value>
+ </property>
+ <property>
+ <name>specific_heat_capacity</name>
+ <type>Constant</type>
+ <value>0</value>
+ </property>
+ </properties>
+ </phase>
+ </phases>
+ </medium>
+ </media>
<time_loop>
<processes>
<process ref="ThermoMechanics">
@@ -91,42 +118,6 @@
<value>0.25</value>
</index_values>
</parameter>
- <parameter>
- <name>rho</name>
- <type>Group</type>
- <group_id_property>MaterialIDs</group_id_property>
- <index_values>
- <index>0</index>
- <value>0</value>
- </index_values>
- </parameter>
- <parameter>
- <name>alpha</name>
- <type>Group</type>
- <group_id_property>MaterialIDs</group_id_property>
- <index_values>
- <index>0</index>
- <value>5e-5</value>
- </index_values>
- </parameter>
- <parameter>
- <name>c</name>
- <type>Group</type>
- <group_id_property>MaterialIDs</group_id_property>
- <index_values>
- <index>0</index>
- <value>0</value>
- </index_values>
- </parameter>
- <parameter>
- <name>lambda</name>
- <type>Group</type>
- <group_id_property>MaterialIDs</group_id_property>
- <index_values>
- <index>0</index>
- <value>1.0</value>
- </index_values>
- </parameter>
<parameter>
<name>zero</name>
<type>Constant</type>
diff --git a/Tests/Data/ThermoMechanics/tm1_3Dgravity/tm1_3Dgravity.prj b/Tests/Data/ThermoMechanics/tm1_3Dgravity/tm1_3Dgravity.prj
index b835ae37972..e38b96ad7ff 100644
--- a/Tests/Data/ThermoMechanics/tm1_3Dgravity/tm1_3Dgravity.prj
+++ b/Tests/Data/ThermoMechanics/tm1_3Dgravity/tm1_3Dgravity.prj
@@ -12,10 +12,6 @@
<youngs_modulus>E</youngs_modulus>
<poissons_ratio>nu</poissons_ratio>
</constitutive_relation>
- <reference_solid_density>rho</reference_solid_density>
- <linear_thermal_expansion_coefficient>alpha</linear_thermal_expansion_coefficient>
- <specific_heat_capacity>c</specific_heat_capacity>
- <thermal_conductivity>lambda</thermal_conductivity>
<specific_body_force>0 0 -9.81</specific_body_force>
<process_variables>
<temperature>temperature</temperature>
@@ -27,6 +23,124 @@
</secondary_variables>
</process>
</processes>
+ <media>
+ <medium id="0">
+ <phases>
+ <phase>
+ <type>Solid</type>
+ <properties>
+ <property>
+ <name>density</name>
+ <type>Constant</type>
+ <value>2038.736</value>
+ </property>
+ <property>
+ <name>thermal_expansivity</name>
+ <type>Constant</type>
+ <value>5e-6</value>
+ </property>
+ <property>
+ <name>thermal_conductivity</name>
+ <type>Constant</type>
+ <value>1.</value>
+ </property>
+ <property>
+ <name>specific_heat_capacity</name>
+ <type>Constant</type>
+ <value>0</value>
+ </property>
+ </properties>
+ </phase>
+ </phases>
+ </medium>
+ <medium id="1">
+ <phases>
+ <phase>
+ <type>Solid</type>
+ <properties>
+ <property>
+ <name>density</name>
+ <type>Constant</type>
+ <value>2038.736</value>
+ </property>
+ <property>
+ <name>thermal_expansivity</name>
+ <type>Constant</type>
+ <value>5e-6</value>
+ </property>
+ <property>
+ <name>thermal_conductivity</name>
+ <type>Constant</type>
+ <value>1.</value>
+ </property>
+ <property>
+ <name>specific_heat_capacity</name>
+ <type>Constant</type>
+ <value>0.</value>
+ </property>
+ </properties>
+ </phase>
+ </phases>
+ </medium>
+ <medium id="2">
+ <phases>
+ <phase>
+ <type>Solid</type>
+ <properties>
+ <property>
+ <name>density</name>
+ <type>Constant</type>
+ <value>2038.736</value>
+ </property>
+ <property>
+ <name>thermal_expansivity</name>
+ <type>Constant</type>
+ <value>5e-6</value>
+ </property>
+ <property>
+ <name>thermal_conductivity</name>
+ <type>Constant</type>
+ <value>1.</value>
+ </property>
+ <property>
+ <name>specific_heat_capacity</name>
+ <type>Constant</type>
+ <value>0.</value>
+ </property>
+ </properties>
+ </phase>
+ </phases>
+ </medium>
+ <medium id="3">
+ <phases>
+ <phase>
+ <type>Solid</type>
+ <properties>
+ <property>
+ <name>density</name>
+ <type>Constant</type>
+ <value>2038.736</value>
+ </property>
+ <property>
+ <name>thermal_expansivity</name>
+ <type>Constant</type>
+ <value>5e-6</value>
+ </property>
+ <property>
+ <name>thermal_conductivity</name>
+ <type>Constant</type>
+ <value>1.</value>
+ </property>
+ <property>
+ <name>specific_heat_capacity</name>
+ <type>Constant</type>
+ <value>0.</value>
+ </property>
+ </properties>
+ </phase>
+ </phases>
+ </medium>
+ </media>
<time_loop>
<processes>
<process ref="ThermoMechanics">
@@ -115,90 +229,6 @@
<value>0.25</value>
</index_values>
</parameter>
- <parameter>
- <name>rho</name>
- <type>Group</type>
- <group_id_property>MaterialIDs</group_id_property>
- <index_values>
- <index>0</index>
- <value>2038.736</value>
- </index_values>
- <index_values>
- <index>1</index>
- <value>2038.736</value>
- </index_values>
- <index_values>
- <index>2</index>
- <value>2038.736</value>
- </index_values>
- <index_values>
- <index>3</index>
- <value>2038.736</value>
- </index_values>
- </parameter>
- <parameter>
- <name>alpha</name>
- <type>Group</type>
- <group_id_property>MaterialIDs</group_id_property>
- <index_values>
- <index>0</index>
- <value>5e-6</value>
- </index_values>
- <index_values>
- <index>1</index>
- <value>5e-6</value>
- </index_values>
- <index_values>
- <index>2</index>
- <value>5e-6</value>
- </index_values>
- <index_values>
- <index>3</index>
- <value>5e-6</value>
- </index_values>
- </parameter>
- <parameter>
- <name>c</name>
- <type>Group</type>
- <group_id_property>MaterialIDs</group_id_property>
- <index_values>
- <index>0</index>
- <value>0</value>
- </index_values>
- <index_values>
- <index>1</index>
- <value>0</value>
- </index_values>
- <index_values>
- <index>2</index>
- <value>0</value>
- </index_values>
- <index_values>
- <index>3</index>
- <value>0</value>
- </index_values>
- </parameter>
- <parameter>
- <name>lambda</name>
- <type>Group</type>
- <group_id_property>MaterialIDs</group_id_property>
- <index_values>
- <index>0</index>
- <value>1.0</value>
- </index_values>
- <index_values>
- <index>1</index>
- <value>1.0</value>
- </index_values>
- <index_values>
- <index>2</index>
- <value>1.0</value>
- </index_values>
- <index_values>
- <index>3</index>
- <value>1.0</value>
- </index_values>
- </parameter>
<parameter>
<name>zero</name>
<type>Constant</type>
diff --git a/Tests/Data/ThermoMechanics/tm1_3Dorigin/tm1_3Dorigin.prj b/Tests/Data/ThermoMechanics/tm1_3Dorigin/tm1_3Dorigin.prj
index b325ee64a90..07849fa6665 100644
--- a/Tests/Data/ThermoMechanics/tm1_3Dorigin/tm1_3Dorigin.prj
+++ b/Tests/Data/ThermoMechanics/tm1_3Dorigin/tm1_3Dorigin.prj
@@ -12,10 +12,6 @@
<youngs_modulus>E</youngs_modulus>
<poissons_ratio>nu</poissons_ratio>
</constitutive_relation>
- <reference_solid_density>rho</reference_solid_density>
- <linear_thermal_expansion_coefficient>alpha</linear_thermal_expansion_coefficient>
- <specific_heat_capacity>c</specific_heat_capacity>
- <thermal_conductivity>lambda</thermal_conductivity>
<specific_body_force>0 0 -9.81</specific_body_force>
<process_variables>
<temperature>temperature</temperature>
@@ -27,6 +23,37 @@
</secondary_variables>
</process>
</processes>
+ <media>
+ <medium>
+ <phases>
+ <phase>
+ <type>Solid</type>
+ <properties>
+ <property>
+ <name>density</name>
+ <type>Constant</type>
+ <value>0.</value>
+ </property>
+ <property>
+ <name>thermal_expansivity</name>
+ <type>Constant</type>
+ <value>1e-3</value>
+ </property>
+ <property>
+ <name>thermal_conductivity</name>
+ <type>Constant</type>
+ <value>1</value>
+ </property>
+ <property>
+ <name>specific_heat_capacity</name>
+ <type>Constant</type>
+ <value>0</value>
+ </property>
+ </properties>
+ </phase>
+ </phases>
+ </medium>
+ </media>
<time_loop>
<processes>
<process ref="ThermoMechanics">
@@ -91,42 +118,6 @@
<value>0.2</value>
</index_values>
</parameter>
- <parameter>
- <name>rho</name>
- <type>Group</type>
- <group_id_property>MaterialIDs</group_id_property>
- <index_values>
- <index>0</index>
- <value>0</value>
- </index_values>
- </parameter>
- <parameter>
- <name>alpha</name>
- <type>Group</type>
- <group_id_property>MaterialIDs</group_id_property>
- <index_values>
- <index>0</index>
- <value>1e-3</value>
- </index_values>
- </parameter>
- <parameter>
- <name>c</name>
- <type>Group</type>
- <group_id_property>MaterialIDs</group_id_property>
- <index_values>
- <index>0</index>
- <value>0</value>
- </index_values>
- </parameter>
- <parameter>
- <name>lambda</name>
- <type>Group</type>
- <group_id_property>MaterialIDs</group_id_property>
- <index_values>
- <index>0</index>
- <value>1.0</value>
- </index_values>
- </parameter>
<parameter>
<name>zero</name>
<type>Constant</type>
diff --git a/Tests/Data/ThermoMechanics/tm1_3Dsquare/tm1_3Dsquare.prj b/Tests/Data/ThermoMechanics/tm1_3Dsquare/tm1_3Dsquare.prj
index bbce72ce7ba..121827d1687 100644
--- a/Tests/Data/ThermoMechanics/tm1_3Dsquare/tm1_3Dsquare.prj
+++ b/Tests/Data/ThermoMechanics/tm1_3Dsquare/tm1_3Dsquare.prj
@@ -12,10 +12,6 @@
<youngs_modulus>E</youngs_modulus>
<poissons_ratio>nu</poissons_ratio>
</constitutive_relation>
- <reference_solid_density>rho</reference_solid_density>
- <linear_thermal_expansion_coefficient>alpha</linear_thermal_expansion_coefficient>
- <specific_heat_capacity>c</specific_heat_capacity>
- <thermal_conductivity>lambda</thermal_conductivity>
<specific_body_force>0 0 -9.81</specific_body_force>
<process_variables>
<temperature>temperature</temperature>
@@ -27,6 +23,37 @@
</secondary_variables>
</process>
</processes>
+ <media>
+ <medium>
+ <phases>
+ <phase>
+ <type>Solid</type>
+ <properties>
+ <property>
+ <name>density</name>
+ <type>Constant</type>
+ <value>0.</value>
+ </property>
+ <property>
+ <name>thermal_expansivity</name>
+ <type>Constant</type>
+ <value>1e-3</value>
+ </property>
+ <property>
+ <name>thermal_conductivity</name>
+ <type>Constant</type>
+ <value>1</value>
+ </property>
+ <property>
+ <name>specific_heat_capacity</name>
+ <type>Constant</type>
+ <value>0</value>
+ </property>
+ </properties>
+ </phase>
+ </phases>
+ </medium>
+ </media>
<time_loop>
<processes>
<process ref="ThermoMechanics">
@@ -91,42 +118,6 @@
<value>0.2</value>
</index_values>
</parameter>
- <parameter>
- <name>rho</name>
- <type>Group</type>
- <group_id_property>MaterialIDs</group_id_property>
- <index_values>
- <index>0</index>
- <value>0</value>
- </index_values>
- </parameter>
- <parameter>
- <name>alpha</name>
- <type>Group</type>
- <group_id_property>MaterialIDs</group_id_property>
- <index_values>
- <index>0</index>
- <value>1e-3</value>
- </index_values>
- </parameter>
- <parameter>
- <name>c</name>
- <type>Group</type>
- <group_id_property>MaterialIDs</group_id_property>
- <index_values>
- <index>0</index>
- <value>0</value>
- </index_values>
- </parameter>
- <parameter>
- <name>lambda</name>
- <type>Group</type>
- <group_id_property>MaterialIDs</group_id_property>
- <index_values>
- <index>0</index>
- <value>1.0</value>
- </index_values>
- </parameter>
<parameter>
<name>zero</name>
<type>Constant</type>
diff --git a/Tests/Data/ThermoMechanics/tm2_1D1bt/tm2_1D1bt.prj b/Tests/Data/ThermoMechanics/tm2_1D1bt/tm2_1D1bt.prj
index 5ee94e9eb7a..81ab335b8cb 100644
--- a/Tests/Data/ThermoMechanics/tm2_1D1bt/tm2_1D1bt.prj
+++ b/Tests/Data/ThermoMechanics/tm2_1D1bt/tm2_1D1bt.prj
@@ -12,10 +12,6 @@
<youngs_modulus>E</youngs_modulus>
<poissons_ratio>nu</poissons_ratio>
</constitutive_relation>
- <reference_solid_density>rho</reference_solid_density>
- <linear_thermal_expansion_coefficient>alpha</linear_thermal_expansion_coefficient>
- <specific_heat_capacity>c</specific_heat_capacity>
- <thermal_conductivity>lambda</thermal_conductivity>
<specific_body_force>0 0 0</specific_body_force>
<process_variables>
<temperature>temperature</temperature>
@@ -27,6 +23,37 @@
</secondary_variables>
</process>
</processes>
+ <media>
+ <medium>
+ <phases>
+ <phase>
+ <type>Solid</type>
+ <properties>
+ <property>
+ <name>density</name>
+ <type>Constant</type>
+ <value>2000.</value>
+ </property>
+ <property>
+ <name>thermal_expansivity</name>
+ <type>Constant</type>
+ <value>3e-4</value>
+ </property>
+ <property>
+ <name>thermal_conductivity</name>
+ <type>Constant</type>
+ <value>2.7</value>
+ </property>
+ <property>
+ <name>specific_heat_capacity</name>
+ <type>Constant</type>
+ <value>0.45</value>
+ </property>
+ </properties>
+ </phase>
+ </phases>
+ </medium>
+ </media>
<time_loop>
<processes>
<process ref="ThermoMechanics">
@@ -91,42 +118,6 @@
<value>0.25</value>
</index_values>
</parameter>
- <parameter>
- <name>rho</name>
- <type>Group</type>
- <group_id_property>MaterialIDs</group_id_property>
- <index_values>
- <index>0</index>
- <value>2000</value>
- </index_values>
- </parameter>
- <parameter>
- <name>alpha</name>
- <type>Group</type>
- <group_id_property>MaterialIDs</group_id_property>
- <index_values>
- <index>0</index>
- <value>3e-4</value>
- </index_values>
- </parameter>
- <parameter>
- <name>c</name>
- <type>Group</type>
- <group_id_property>MaterialIDs</group_id_property>
- <index_values>
- <index>0</index>
- <value>0.45</value>
- </index_values>
- </parameter>
- <parameter>
- <name>lambda</name>
- <type>Group</type>
- <group_id_property>MaterialIDs</group_id_property>
- <index_values>
- <index>0</index>
- <value>2.7</value>
- </index_values>
- </parameter>
<parameter>
<name>zero</name>
<type>Constant</type>
diff --git a/Tests/Data/ThermoMechanics/tm2_1Dfixc/tm2_1Dfixc.prj b/Tests/Data/ThermoMechanics/tm2_1Dfixc/tm2_1Dfixc.prj
index c9a0f0cda62..13da01a265c 100644
--- a/Tests/Data/ThermoMechanics/tm2_1Dfixc/tm2_1Dfixc.prj
+++ b/Tests/Data/ThermoMechanics/tm2_1Dfixc/tm2_1Dfixc.prj
@@ -12,10 +12,6 @@
<youngs_modulus>E</youngs_modulus>
<poissons_ratio>nu</poissons_ratio>
</constitutive_relation>
- <reference_solid_density>rho</reference_solid_density>
- <linear_thermal_expansion_coefficient>alpha</linear_thermal_expansion_coefficient>
- <specific_heat_capacity>c</specific_heat_capacity>
- <thermal_conductivity>lambda</thermal_conductivity>
<specific_body_force>0 0 0</specific_body_force>
<process_variables>
<temperature>temperature</temperature>
@@ -27,6 +23,37 @@
</secondary_variables>
</process>
</processes>
+ <media>
+ <medium>
+ <phases>
+ <phase>
+ <type>Solid</type>
+ <properties>
+ <property>
+ <name>density</name>
+ <type>Constant</type>
+ <value>2000.</value>
+ </property>
+ <property>
+ <name>thermal_expansivity</name>
+ <type>Constant</type>
+ <value>3e-4</value>
+ </property>
+ <property>
+ <name>thermal_conductivity</name>
+ <type>Constant</type>
+ <value>2.7</value>
+ </property>
+ <property>
+ <name>specific_heat_capacity</name>
+ <type>Constant</type>
+ <value>0.45</value>
+ </property>
+ </properties>
+ </phase>
+ </phases>
+ </medium>
+ </media>
<time_loop>
<processes>
<process ref="ThermoMechanics">
@@ -91,42 +118,6 @@
<value>0.25</value>
</index_values>
</parameter>
- <parameter>
- <name>rho</name>
- <type>Group</type>
- <group_id_property>MaterialIDs</group_id_property>
- <index_values>
- <index>0</index>
- <value>2000</value>
- </index_values>
- </parameter>
- <parameter>
- <name>alpha</name>
- <type>Group</type>
- <group_id_property>MaterialIDs</group_id_property>
- <index_values>
- <index>0</index>
- <value>3e-4</value>
- </index_values>
- </parameter>
- <parameter>
- <name>c</name>
- <type>Group</type>
- <group_id_property>MaterialIDs</group_id_property>
- <index_values>
- <index>0</index>
- <value>0.45</value>
- </index_values>
- </parameter>
- <parameter>
- <name>lambda</name>
- <type>Group</type>
- <group_id_property>MaterialIDs</group_id_property>
- <index_values>
- <index>0</index>
- <value>2.7</value>
- </index_values>
- </parameter>
<parameter>
<name>zero</name>
<type>Constant</type>
--
GitLab