From 0136204386b73c5d3dbdb0e449b000fe98cd94dc Mon Sep 17 00:00:00 2001 From: Thomas Fischer <thomas.fischer@ufz.de> Date: Fri, 24 Jul 2020 08:10:50 +0200 Subject: [PATCH] [T] Use MPL in HeatConduction tests. --- .../Parabolic/T/1D_dirichlet/line_60_heat.prj | 45 +++++++++------ .../line_1_line_1e2_source_term.prj | 45 +++++++++------ .../line_source_term.prj | 45 +++++++++------ .../moving_source_term.prj | 45 +++++++++------ Tests/Data/Parabolic/T/1D_neumann/newton.prj | 45 +++++++++------ .../T/1D_neumann/newton_masslumping.prj | 45 +++++++++------ .../Parabolic/T/1D_neumann/petsc_newtonls.prj | 45 +++++++++------ Tests/Data/Parabolic/T/1D_neumann/picard.prj | 45 +++++++++------ .../T/1D_neumann/picard_masslumping.prj | 45 +++++++++------ Tests/Data/Parabolic/T/2D_BHE_array/bhe2d.prj | 45 +++++++++------ .../T/2D_axially_symmetric/square_1e2_axi.prj | 45 +++++++++------ .../wedge_1e2_axi_ang_0.02.prj | 45 +++++++++------ .../source_term_left.prj | 45 +++++++++------ .../line_source_term_x_0.5.prj | 45 +++++++++------ .../line_source_term_x_0.5.prj | 45 +++++++++------ .../line_source_term_x=5.prj | 45 +++++++++------ .../line_source_term_in_cylinder.prj | 45 +++++++++------ .../line_source_term_in_cylinder.prj | 45 +++++++++------ .../line_source_term_in_cylinder.prj | 45 +++++++++------ .../line_source_term_x_0.5_y_0.5.prj | 45 +++++++++------ ...ine_source_term_x_0.5_y_0.5_restricted.prj | 45 +++++++++------ .../Parabolic/T/t1_1Dsource/t1_1Dsource.prj | 55 ++++++++++++++++++- .../Parabolic/T/t1_1Dsteady/t1_1Dsteady.prj | 30 +++++++++- Tests/Data/Parabolic/T/t2_1D1bt/t2_1D1bt.prj | 30 +++++++++- Tests/Data/Parabolic/T/t2_1D2bt/t2_1D2bt.prj | 55 ++++++++++++++++++- 25 files changed, 725 insertions(+), 390 deletions(-) mode change 100755 => 100644 Tests/Data/Parabolic/T/t1_1Dsource/t1_1Dsource.prj mode change 100755 => 100644 Tests/Data/Parabolic/T/t1_1Dsteady/t1_1Dsteady.prj mode change 100755 => 100644 Tests/Data/Parabolic/T/t2_1D1bt/t2_1D1bt.prj mode change 100755 => 100644 Tests/Data/Parabolic/T/t2_1D2bt/t2_1D2bt.prj diff --git a/Tests/Data/Parabolic/T/1D_dirichlet/line_60_heat.prj b/Tests/Data/Parabolic/T/1D_dirichlet/line_60_heat.prj index c983e792679..67cab616d6c 100644 --- a/Tests/Data/Parabolic/T/1D_dirichlet/line_60_heat.prj +++ b/Tests/Data/Parabolic/T/1D_dirichlet/line_60_heat.prj @@ -7,9 +7,6 @@ <name>HeatConduction</name> <type>HEAT_CONDUCTION</type> <integration_order>2</integration_order> - <thermal_conductivity>K</thermal_conductivity> - <heat_capacity>Cp</heat_capacity> - <density>rho</density> <process_variables> <process_variable>temperature</process_variable> </process_variables> @@ -18,6 +15,33 @@ </secondary_variables> </process> </processes> + <media> + <medium id="0"> + <phases/> + <properties> + <property> + <name>thermal_conductivity</name> + <type>Constant</type> + <value>3.2</value> + </property> + <property> + <name>density</name> + <type>Constant</type> + <value>2500</value> + </property> + <property> + <name>heat_capacity</name> + <type>Constant</type> + <value>1000</value> + </property> + <property> + <name>reference_temperature</name> + <type>Constant</type> + <value>293.15</value> + </property> + </properties> + </medium> + </media> <time_loop> <processes> <process ref="HeatConduction"> @@ -64,21 +88,6 @@ </output> </time_loop> <parameters> - <parameter> - <name>K</name> - <type>Constant</type> - <value>3.2</value> - </parameter> - <parameter> - <name>Cp</name> - <type>Constant</type> - <value>1000</value> - </parameter> - <parameter> - <name>rho</name> - <type>Constant</type> - <value>2500</value> - </parameter> <parameter> <name>T0</name> <type>Constant</type> diff --git a/Tests/Data/Parabolic/T/1D_dirichlet_source-term/line_1_line_1e2_source_term.prj b/Tests/Data/Parabolic/T/1D_dirichlet_source-term/line_1_line_1e2_source_term.prj index cc66e2b45dc..e0883984a73 100644 --- a/Tests/Data/Parabolic/T/1D_dirichlet_source-term/line_1_line_1e2_source_term.prj +++ b/Tests/Data/Parabolic/T/1D_dirichlet_source-term/line_1_line_1e2_source_term.prj @@ -11,9 +11,6 @@ <name>HeatConduction</name> <type>HEAT_CONDUCTION</type> <integration_order>2</integration_order> - <thermal_conductivity>K</thermal_conductivity> - <heat_capacity>Cp</heat_capacity> - <density>rho</density> <process_variables> <process_variable>temperature</process_variable> </process_variables> @@ -63,22 +60,34 @@ <suffix>_ts_{:timestep}_t_{:time}</suffix> </output> </time_loop> + <media> + <medium id="0"> + <phases/> + <properties> + <property> + <name>thermal_conductivity</name> + <type>Constant</type> + <value>5</value> + </property> + <property> + <name>heat_capacity</name> + <type>Constant</type> + <value>1000</value> + </property> + <property> + <name>density</name> + <type>Constant</type> + <value>2500</value> + </property> + <property> + <name>reference_temperature</name> + <type>Constant</type> + <value>293.15</value> + </property> + </properties> + </medium> + </media> <parameters> - <parameter> - <name>K</name> - <type>Constant</type> - <value>5</value> - </parameter> - <parameter> - <name>Cp</name> - <type>Constant</type> - <value>1000</value> - </parameter> - <parameter> - <name>rho</name> - <type>Constant</type> - <value>2500</value> - </parameter> <parameter> <name>T0</name> <type>Constant</type> diff --git a/Tests/Data/Parabolic/T/1D_line_source_term_tests/line_source_term.prj b/Tests/Data/Parabolic/T/1D_line_source_term_tests/line_source_term.prj index ce056b23d91..ad0a1f0f012 100644 --- a/Tests/Data/Parabolic/T/1D_line_source_term_tests/line_source_term.prj +++ b/Tests/Data/Parabolic/T/1D_line_source_term_tests/line_source_term.prj @@ -11,9 +11,6 @@ <name>HeatConduction</name> <type>HEAT_CONDUCTION</type> <integration_order>2</integration_order> - <thermal_conductivity>lambda</thermal_conductivity> - <heat_capacity>c_p</heat_capacity> - <density>rho</density> <process_variables> <process_variable>temperature</process_variable> </process_variables> @@ -63,22 +60,34 @@ <suffix>_ts_{:timestep}_t_{:time}</suffix> </output> </time_loop> + <media> + <medium id="0"> + <phases/> + <properties> + <property> + <name>density</name> + <type>Constant</type> + <value>0</value> + </property> + <property> + <name>thermal_conductivity</name> + <type>Constant</type> + <value>1</value> + </property> + <property> + <name>heat_capacity</name> + <type>Constant</type> + <value>0</value> + </property> + <property> + <name>reference_temperature</name> + <type>Constant</type> + <value>293.15</value> + </property> + </properties> + </medium> + </media> <parameters> - <parameter> - <name>lambda</name> - <type>Constant</type> - <value>1</value> - </parameter> - <parameter> - <name>c_p</name> - <type>Constant</type> - <value>0</value> - </parameter> - <parameter> - <name>rho</name> - <type>Constant</type> - <value>0</value> - </parameter> <parameter> <name>T0</name> <type>Constant</type> diff --git a/Tests/Data/Parabolic/T/1D_line_source_term_tests/moving_source_term.prj b/Tests/Data/Parabolic/T/1D_line_source_term_tests/moving_source_term.prj index c86c24e0b21..49abebe13de 100644 --- a/Tests/Data/Parabolic/T/1D_line_source_term_tests/moving_source_term.prj +++ b/Tests/Data/Parabolic/T/1D_line_source_term_tests/moving_source_term.prj @@ -11,9 +11,6 @@ <name>HeatConduction</name> <type>HEAT_CONDUCTION</type> <integration_order>2</integration_order> - <thermal_conductivity>lambda</thermal_conductivity> - <heat_capacity>c_p</heat_capacity> - <density>rho</density> <process_variables> <process_variable>temperature</process_variable> </process_variables> @@ -63,22 +60,34 @@ </variables> </output> </time_loop> + <media> + <medium id="0"> + <phases/> + <properties> + <property> + <name>density</name> + <type>Constant</type> + <value>1</value> + </property> + <property> + <name>heat_capacity</name> + <type>Constant</type> + <value>1</value> + </property> + <property> + <name>thermal_conductivity</name> + <type>Constant</type> + <value>.0001</value> + </property> + <property> + <name>reference_temperature</name> + <type>Constant</type> + <value>293.15</value> + </property> + </properties> + </medium> + </media> <parameters> - <parameter> - <name>lambda</name> - <type>Constant</type> - <value>.0001</value> - </parameter> - <parameter> - <name>c_p</name> - <type>Constant</type> - <value>1</value> - </parameter> - <parameter> - <name>rho</name> - <type>Constant</type> - <value>1</value> - </parameter> <parameter> <name>T0</name> <type>Constant</type> diff --git a/Tests/Data/Parabolic/T/1D_neumann/newton.prj b/Tests/Data/Parabolic/T/1D_neumann/newton.prj index 70c0fae98af..f819b776942 100644 --- a/Tests/Data/Parabolic/T/1D_neumann/newton.prj +++ b/Tests/Data/Parabolic/T/1D_neumann/newton.prj @@ -7,9 +7,6 @@ <name>HeatConduction</name> <type>HEAT_CONDUCTION</type> <integration_order>2</integration_order> - <thermal_conductivity>K</thermal_conductivity> - <heat_capacity>Cp</heat_capacity> - <density>rho</density> <process_variables> <process_variable>temperature</process_variable> </process_variables> @@ -18,6 +15,33 @@ </secondary_variables> </process> </processes> + <media> + <medium id="0"> + <phases/> + <properties> + <property> + <name>density</name> + <type>Constant</type> + <value>2500</value> + </property> + <property> + <name>thermal_conductivity</name> + <type>Constant</type> + <value>3.2</value> + </property> + <property> + <name>heat_capacity</name> + <type>Constant</type> + <value>1000</value> + </property> + <property> + <name>reference_temperature</name> + <type>Constant</type> + <value>293.15</value> + </property> + </properties> + </medium> + </media> <time_loop> <processes> <process ref="HeatConduction"> @@ -72,21 +96,6 @@ </output> </time_loop> <parameters> - <parameter> - <name>K</name> - <type>Constant</type> - <value>3.2</value> - </parameter> - <parameter> - <name>Cp</name> - <type>Constant</type> - <value>1000</value> - </parameter> - <parameter> - <name>rho</name> - <type>Constant</type> - <value>2500</value> - </parameter> <parameter> <name>T0</name> <type>Constant</type> diff --git a/Tests/Data/Parabolic/T/1D_neumann/newton_masslumping.prj b/Tests/Data/Parabolic/T/1D_neumann/newton_masslumping.prj index 083f8a4c91a..589bdd9dc6e 100644 --- a/Tests/Data/Parabolic/T/1D_neumann/newton_masslumping.prj +++ b/Tests/Data/Parabolic/T/1D_neumann/newton_masslumping.prj @@ -7,9 +7,6 @@ <name>HeatConduction</name> <type>HEAT_CONDUCTION</type> <integration_order>2</integration_order> - <thermal_conductivity>K</thermal_conductivity> - <heat_capacity>Cp</heat_capacity> - <density>rho</density> <process_variables> <process_variable>temperature</process_variable> </process_variables> @@ -19,6 +16,33 @@ <mass_lumping>true</mass_lumping> </process> </processes> + <media> + <medium id="0"> + <phases/> + <properties> + <property> + <name>thermal_conductivity</name> + <type>Constant</type> + <value>3.2</value> + </property> + <property> + <name>heat_capacity</name> + <type>Constant</type> + <value>1000</value> + </property> + <property> + <name>density</name> + <type>Constant</type> + <value>2500</value> + </property> + <property> + <name>reference_temperature</name> + <type>Constant</type> + <value>293.15</value> + </property> + </properties> + </medium> + </media> <time_loop> <processes> <process ref="HeatConduction"> @@ -73,21 +97,6 @@ </output> </time_loop> <parameters> - <parameter> - <name>K</name> - <type>Constant</type> - <value>3.2</value> - </parameter> - <parameter> - <name>Cp</name> - <type>Constant</type> - <value>1000</value> - </parameter> - <parameter> - <name>rho</name> - <type>Constant</type> - <value>2500</value> - </parameter> <parameter> <name>T0</name> <type>Constant</type> diff --git a/Tests/Data/Parabolic/T/1D_neumann/petsc_newtonls.prj b/Tests/Data/Parabolic/T/1D_neumann/petsc_newtonls.prj index 8c6a40df946..da07d658b3f 100644 --- a/Tests/Data/Parabolic/T/1D_neumann/petsc_newtonls.prj +++ b/Tests/Data/Parabolic/T/1D_neumann/petsc_newtonls.prj @@ -7,9 +7,6 @@ <name>HeatConduction</name> <type>HEAT_CONDUCTION</type> <integration_order>2</integration_order> - <thermal_conductivity>K</thermal_conductivity> - <heat_capacity>Cp</heat_capacity> - <density>rho</density> <process_variables> <process_variable>temperature</process_variable> </process_variables> @@ -18,6 +15,33 @@ </secondary_variables> </process> </processes> + <media> + <medium id="0"> + <phases/> + <properties> + <property> + <name>density</name> + <type>Constant</type> + <value>2500</value> + </property> + <property> + <name>heat_capacity</name> + <type>Constant</type> + <value>1000</value> + </property> + <property> + <name>thermal_conductivity</name> + <type>Constant</type> + <value>3.2</value> + </property> + <property> + <name>reference_temperature</name> + <type>Constant</type> + <value>293.15</value> + </property> + </properties> + </medium> + </media> <time_loop> <processes> <process ref="HeatConduction"> @@ -72,21 +96,6 @@ </output> </time_loop> <parameters> - <parameter> - <name>K</name> - <type>Constant</type> - <value>3.2</value> - </parameter> - <parameter> - <name>Cp</name> - <type>Constant</type> - <value>1000</value> - </parameter> - <parameter> - <name>rho</name> - <type>Constant</type> - <value>2500</value> - </parameter> <parameter> <name>T0</name> <type>Constant</type> diff --git a/Tests/Data/Parabolic/T/1D_neumann/picard.prj b/Tests/Data/Parabolic/T/1D_neumann/picard.prj index 90573ce6534..17b0eff7da6 100644 --- a/Tests/Data/Parabolic/T/1D_neumann/picard.prj +++ b/Tests/Data/Parabolic/T/1D_neumann/picard.prj @@ -7,9 +7,6 @@ <name>HeatConduction</name> <type>HEAT_CONDUCTION</type> <integration_order>2</integration_order> - <thermal_conductivity>K</thermal_conductivity> - <heat_capacity>Cp</heat_capacity> - <density>rho</density> <process_variables> <process_variable>temperature</process_variable> </process_variables> @@ -18,6 +15,33 @@ </secondary_variables> </process> </processes> + <media> + <medium id="0"> + <phases/> + <properties> + <property> + <name>thermal_conductivity</name> + <type>Constant</type> + <value>3.2</value> + </property> + <property> + <name>density</name> + <type>Constant</type> + <value>2500</value> + </property> + <property> + <name>heat_capacity</name> + <type>Constant</type> + <value>1000</value> + </property> + <property> + <name>reference_temperature</name> + <type>Constant</type> + <value>293.15</value> + </property> + </properties> + </medium> + </media> <time_loop> <processes> <process ref="HeatConduction"> @@ -72,21 +96,6 @@ </output> </time_loop> <parameters> - <parameter> - <name>K</name> - <type>Constant</type> - <value>3.2</value> - </parameter> - <parameter> - <name>Cp</name> - <type>Constant</type> - <value>1000</value> - </parameter> - <parameter> - <name>rho</name> - <type>Constant</type> - <value>2500</value> - </parameter> <parameter> <name>T0</name> <type>Constant</type> diff --git a/Tests/Data/Parabolic/T/1D_neumann/picard_masslumping.prj b/Tests/Data/Parabolic/T/1D_neumann/picard_masslumping.prj index 1b6275d6ddf..c00a6c20ec7 100644 --- a/Tests/Data/Parabolic/T/1D_neumann/picard_masslumping.prj +++ b/Tests/Data/Parabolic/T/1D_neumann/picard_masslumping.prj @@ -7,9 +7,6 @@ <name>HeatConduction</name> <type>HEAT_CONDUCTION</type> <integration_order>2</integration_order> - <thermal_conductivity>K</thermal_conductivity> - <heat_capacity>Cp</heat_capacity> - <density>rho</density> <process_variables> <process_variable>temperature</process_variable> </process_variables> @@ -19,6 +16,33 @@ <mass_lumping>true</mass_lumping> </process> </processes> + <media> + <medium id="0"> + <phases/> + <properties> + <property> + <name>thermal_conductivity</name> + <type>Constant</type> + <value>3.2</value> + </property> + <property> + <name>heat_capacity</name> + <type>Constant</type> + <value>1000</value> + </property> + <property> + <name>density</name> + <type>Constant</type> + <value>2500</value> + </property> + <property> + <name>reference_temperature</name> + <type>Constant</type> + <value>293.15</value> + </property> + </properties> + </medium> + </media> <time_loop> <processes> <process ref="HeatConduction"> @@ -73,21 +97,6 @@ </output> </time_loop> <parameters> - <parameter> - <name>K</name> - <type>Constant</type> - <value>3.2</value> - </parameter> - <parameter> - <name>Cp</name> - <type>Constant</type> - <value>1000</value> - </parameter> - <parameter> - <name>rho</name> - <type>Constant</type> - <value>2500</value> - </parameter> <parameter> <name>T0</name> <type>Constant</type> diff --git a/Tests/Data/Parabolic/T/2D_BHE_array/bhe2d.prj b/Tests/Data/Parabolic/T/2D_BHE_array/bhe2d.prj index 733b81a8fa0..73b7490b42b 100644 --- a/Tests/Data/Parabolic/T/2D_BHE_array/bhe2d.prj +++ b/Tests/Data/Parabolic/T/2D_BHE_array/bhe2d.prj @@ -7,9 +7,6 @@ <name>HeatConduction</name> <type>HEAT_CONDUCTION</type> <integration_order>2</integration_order> - <thermal_conductivity>lambda</thermal_conductivity> - <heat_capacity>c_p</heat_capacity> - <density>rho</density> <process_variables> <process_variable>temperature</process_variable> </process_variables> @@ -18,6 +15,33 @@ </secondary_variables> </process> </processes> + <media> + <medium id="0"> + <phases/> + <properties> + <property> + <name>heat_capacity</name> + <type>Constant</type> + <value>1500</value> + </property> + <property> + <name>density</name> + <type>Constant</type> + <value>1950.0</value> + </property> + <property> + <name>thermal_conductivity</name> + <type>Constant</type> + <value>2.0</value> + </property> + <property> + <name>reference_temperature</name> + <type>Constant</type> + <value>293.15</value> + </property> + </properties> + </medium> + </media> <time_loop> <processes> <process ref="HeatConduction"> @@ -60,21 +84,6 @@ </output> </time_loop> <parameters> - <parameter> - <name>lambda</name> - <type>Constant</type> - <value>2.0</value> - </parameter> - <parameter> - <name>c_p</name> - <type>Constant</type> - <value>1500</value> - </parameter> - <parameter> - <name>rho</name> - <type>Constant</type> - <value>1950.0</value> - </parameter> <parameter> <name>T0</name> <type>Constant</type> diff --git a/Tests/Data/Parabolic/T/2D_axially_symmetric/square_1e2_axi.prj b/Tests/Data/Parabolic/T/2D_axially_symmetric/square_1e2_axi.prj index ced9c676fc5..d075cf0af4d 100644 --- a/Tests/Data/Parabolic/T/2D_axially_symmetric/square_1e2_axi.prj +++ b/Tests/Data/Parabolic/T/2D_axially_symmetric/square_1e2_axi.prj @@ -7,9 +7,6 @@ <name>HeatConduction</name> <type>HEAT_CONDUCTION</type> <integration_order>2</integration_order> - <thermal_conductivity>lambda</thermal_conductivity> - <heat_capacity>c_p</heat_capacity> - <density>rho</density> <process_variables> <process_variable>temperature</process_variable> </process_variables> @@ -18,6 +15,33 @@ </secondary_variables> </process> </processes> + <media> + <medium id="0"> + <phases/> + <properties> + <property> + <name>thermal_conductivity</name> + <type>Constant</type> + <value>1</value> + </property> + <property> + <name>heat_capacity</name> + <type>Constant</type> + <value>1</value> + </property> + <property> + <name>density</name> + <type>Constant</type> + <value>2.0</value> + </property> + <property> + <name>reference_temperature</name> + <type>Constant</type> + <value>293.15</value> + </property> + </properties> + </medium> + </media> <time_loop> <processes> <process ref="HeatConduction"> @@ -60,21 +84,6 @@ </output> </time_loop> <parameters> - <parameter> - <name>lambda</name> - <type>Constant</type> - <value>1</value> - </parameter> - <parameter> - <name>c_p</name> - <type>Constant</type> - <value>1</value> - </parameter> - <parameter> - <name>rho</name> - <type>Constant</type> - <value>2.0</value> - </parameter> <parameter> <name>T0</name> <type>Constant</type> diff --git a/Tests/Data/Parabolic/T/2D_axially_symmetric/wedge_1e2_axi_ang_0.02.prj b/Tests/Data/Parabolic/T/2D_axially_symmetric/wedge_1e2_axi_ang_0.02.prj index 75412a419a7..2db8205a60a 100644 --- a/Tests/Data/Parabolic/T/2D_axially_symmetric/wedge_1e2_axi_ang_0.02.prj +++ b/Tests/Data/Parabolic/T/2D_axially_symmetric/wedge_1e2_axi_ang_0.02.prj @@ -7,9 +7,6 @@ <name>HeatConduction</name> <type>HEAT_CONDUCTION</type> <integration_order>2</integration_order> - <thermal_conductivity>lambda</thermal_conductivity> - <heat_capacity>c_p</heat_capacity> - <density>rho</density> <process_variables> <process_variable>temperature</process_variable> </process_variables> @@ -18,6 +15,33 @@ </secondary_variables> </process> </processes> + <media> + <medium id="0"> + <phases/> + <properties> + <property> + <name>density</name> + <type>Constant</type> + <value>2.0</value> + </property> + <property> + <name>thermal_conductivity</name> + <type>Constant</type> + <value>1</value> + </property> + <property> + <name>heat_capacity</name> + <type>Constant</type> + <value>1</value> + </property> + <property> + <name>reference_temperature</name> + <type>Constant</type> + <value>293.15</value> + </property> + </properties> + </medium> + </media> <time_loop> <processes> <process ref="HeatConduction"> @@ -60,21 +84,6 @@ </output> </time_loop> <parameters> - <parameter> - <name>lambda</name> - <type>Constant</type> - <value>1</value> - </parameter> - <parameter> - <name>c_p</name> - <type>Constant</type> - <value>1</value> - </parameter> - <parameter> - <name>rho</name> - <type>Constant</type> - <value>2.0</value> - </parameter> <parameter> <name>T0</name> <type>Constant</type> diff --git a/Tests/Data/Parabolic/T/2D_source_term_tests/line_source_term_left/source_term_left.prj b/Tests/Data/Parabolic/T/2D_source_term_tests/line_source_term_left/source_term_left.prj index c257a57c629..015d8340993 100644 --- a/Tests/Data/Parabolic/T/2D_source_term_tests/line_source_term_left/source_term_left.prj +++ b/Tests/Data/Parabolic/T/2D_source_term_tests/line_source_term_left/source_term_left.prj @@ -10,9 +10,6 @@ <name>HeatConduction</name> <type>HEAT_CONDUCTION</type> <integration_order>2</integration_order> - <thermal_conductivity>lambda</thermal_conductivity> - <heat_capacity>c_p</heat_capacity> - <density>rho</density> <process_variables> <process_variable>temperature</process_variable> </process_variables> @@ -62,22 +59,34 @@ <suffix>_ts_{:timestep}_t_{:time}</suffix> </output> </time_loop> + <media> + <medium id="0"> + <phases/> + <properties> + <property> + <name>thermal_conductivity</name> + <type>Constant</type> + <value>1</value> + </property> + <property> + <name>heat_capacity</name> + <type>Constant</type> + <value>1</value> + </property> + <property> + <name>density</name> + <type>Constant</type> + <value>1</value> + </property> + <property> + <name>reference_temperature</name> + <type>Constant</type> + <value>293.15</value> + </property> + </properties> + </medium> + </media> <parameters> - <parameter> - <name>lambda</name> - <type>Constant</type> - <value>1</value> - </parameter> - <parameter> - <name>c_p</name> - <type>Constant</type> - <value>1</value> - </parameter> - <parameter> - <name>rho</name> - <type>Constant</type> - <value>1</value> - </parameter> <parameter> <name>T0</name> <type>Constant</type> diff --git a/Tests/Data/Parabolic/T/2D_source_term_tests/line_source_term_x_0.5/line_source_term_x_0.5.prj b/Tests/Data/Parabolic/T/2D_source_term_tests/line_source_term_x_0.5/line_source_term_x_0.5.prj index c0c2f3bcf3e..c4015ce707c 100644 --- a/Tests/Data/Parabolic/T/2D_source_term_tests/line_source_term_x_0.5/line_source_term_x_0.5.prj +++ b/Tests/Data/Parabolic/T/2D_source_term_tests/line_source_term_x_0.5/line_source_term_x_0.5.prj @@ -11,9 +11,6 @@ <name>HeatConduction</name> <type>HEAT_CONDUCTION</type> <integration_order>2</integration_order> - <thermal_conductivity>lambda</thermal_conductivity> - <heat_capacity>c_p</heat_capacity> - <density>rho</density> <process_variables> <process_variable>temperature</process_variable> </process_variables> @@ -63,22 +60,34 @@ <suffix>_ts_{:timestep}_t_{:time}</suffix> </output> </time_loop> + <media> + <medium id="0"> + <phases/> + <properties> + <property> + <name>density</name> + <type>Constant</type> + <value>0</value> + </property> + <property> + <name>heat_capacity</name> + <type>Constant</type> + <value>0</value> + </property> + <property> + <name>thermal_conductivity</name> + <type>Constant</type> + <value>1</value> + </property> + <property> + <name>reference_temperature</name> + <type>Constant</type> + <value>293.15</value> + </property> + </properties> + </medium> + </media> <parameters> - <parameter> - <name>lambda</name> - <type>Constant</type> - <value>1</value> - </parameter> - <parameter> - <name>c_p</name> - <type>Constant</type> - <value>0</value> - </parameter> - <parameter> - <name>rho</name> - <type>Constant</type> - <value>0</value> - </parameter> <parameter> <name>T0</name> <type>Constant</type> diff --git a/Tests/Data/Parabolic/T/2D_source_term_tests/line_source_term_x_0.5_restricted_to_middle/line_source_term_x_0.5.prj b/Tests/Data/Parabolic/T/2D_source_term_tests/line_source_term_x_0.5_restricted_to_middle/line_source_term_x_0.5.prj index fbda6088b73..ad6608de34a 100644 --- a/Tests/Data/Parabolic/T/2D_source_term_tests/line_source_term_x_0.5_restricted_to_middle/line_source_term_x_0.5.prj +++ b/Tests/Data/Parabolic/T/2D_source_term_tests/line_source_term_x_0.5_restricted_to_middle/line_source_term_x_0.5.prj @@ -10,9 +10,6 @@ <name>HeatConduction</name> <type>HEAT_CONDUCTION</type> <integration_order>2</integration_order> - <thermal_conductivity>lambda</thermal_conductivity> - <heat_capacity>c_p</heat_capacity> - <density>rho</density> <process_variables> <process_variable>temperature</process_variable> </process_variables> @@ -62,22 +59,34 @@ <suffix>_ts_{:timestep}_t_{:time}</suffix> </output> </time_loop> + <media> + <medium id="0"> + <phases/> + <properties> + <property> + <name>heat_capacity</name> + <type>Constant</type> + <value>1</value> + </property> + <property> + <name>thermal_conductivity</name> + <type>Constant</type> + <value>1</value> + </property> + <property> + <name>density</name> + <type>Constant</type> + <value>1</value> + </property> + <property> + <name>reference_temperature</name> + <type>Constant</type> + <value>293.15</value> + </property> + </properties> + </medium> + </media> <parameters> - <parameter> - <name>lambda</name> - <type>Constant</type> - <value>1</value> - </parameter> - <parameter> - <name>c_p</name> - <type>Constant</type> - <value>1</value> - </parameter> - <parameter> - <name>rho</name> - <type>Constant</type> - <value>1</value> - </parameter> <parameter> <name>T0</name> <type>Constant</type> diff --git a/Tests/Data/Parabolic/T/2D_source_term_tests/line_source_term_x_5/line_source_term_x=5.prj b/Tests/Data/Parabolic/T/2D_source_term_tests/line_source_term_x_5/line_source_term_x=5.prj index 0d069735f8f..54d528701c4 100644 --- a/Tests/Data/Parabolic/T/2D_source_term_tests/line_source_term_x_5/line_source_term_x=5.prj +++ b/Tests/Data/Parabolic/T/2D_source_term_tests/line_source_term_x_5/line_source_term_x=5.prj @@ -10,9 +10,6 @@ <name>HeatConduction</name> <type>HEAT_CONDUCTION</type> <integration_order>2</integration_order> - <thermal_conductivity>lambda</thermal_conductivity> - <heat_capacity>c_p</heat_capacity> - <density>rho</density> <process_variables> <process_variable>temperature</process_variable> </process_variables> @@ -62,22 +59,34 @@ <suffix>_ts_{:timestep}_t_{:time}</suffix> </output> </time_loop> + <media> + <medium id="0"> + <phases/> + <properties> + <property> + <name>heat_capacity</name> + <type>Constant</type> + <value>1</value> + </property> + <property> + <name>thermal_conductivity</name> + <type>Constant</type> + <value>1</value> + </property> + <property> + <name>density</name> + <type>Constant</type> + <value>1</value> + </property> + <property> + <name>reference_temperature</name> + <type>Constant</type> + <value>293.15</value> + </property> + </properties> + </medium> + </media> <parameters> - <parameter> - <name>lambda</name> - <type>Constant</type> - <value>1</value> - </parameter> - <parameter> - <name>c_p</name> - <type>Constant</type> - <value>1</value> - </parameter> - <parameter> - <name>rho</name> - <type>Constant</type> - <value>1</value> - </parameter> <parameter> <name>T0</name> <type>Constant</type> diff --git a/Tests/Data/Parabolic/T/3D_line_source_term_tests/3D_line_source_term_in_cylinder/286k_prisms/line_source_term_in_cylinder.prj b/Tests/Data/Parabolic/T/3D_line_source_term_tests/3D_line_source_term_in_cylinder/286k_prisms/line_source_term_in_cylinder.prj index 221b4f626b2..8e0c40c035c 100644 --- a/Tests/Data/Parabolic/T/3D_line_source_term_tests/3D_line_source_term_in_cylinder/286k_prisms/line_source_term_in_cylinder.prj +++ b/Tests/Data/Parabolic/T/3D_line_source_term_tests/3D_line_source_term_in_cylinder/286k_prisms/line_source_term_in_cylinder.prj @@ -10,9 +10,6 @@ <name>HeatConduction</name> <type>HEAT_CONDUCTION</type> <integration_order>2</integration_order> - <thermal_conductivity>lambda</thermal_conductivity> - <heat_capacity>c_p</heat_capacity> - <density>rho</density> <process_variables> <process_variable>temperature</process_variable> </process_variables> @@ -62,22 +59,34 @@ <suffix>_ts_{:timestep}_t_{:time}</suffix> </output> </time_loop> + <media> + <medium id="0"> + <phases/> + <properties> + <property> + <name>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>1</value> + </property> + <property> + <name>reference_temperature</name> + <type>Constant</type> + <value>293.15</value> + </property> + </properties> + </medium> + </media> <parameters> - <parameter> - <name>lambda</name> - <type>Constant</type> - <value>1</value> - </parameter> - <parameter> - <name>c_p</name> - <type>Constant</type> - <value>0</value> - </parameter> - <parameter> - <name>rho</name> - <type>Constant</type> - <value>0</value> - </parameter> <parameter> <name>T0</name> <type>Constant</type> diff --git a/Tests/Data/Parabolic/T/3D_line_source_term_tests/3D_line_source_term_in_cylinder/49k_prisms/line_source_term_in_cylinder.prj b/Tests/Data/Parabolic/T/3D_line_source_term_tests/3D_line_source_term_in_cylinder/49k_prisms/line_source_term_in_cylinder.prj index 85111e97763..303efe69ae6 100644 --- a/Tests/Data/Parabolic/T/3D_line_source_term_tests/3D_line_source_term_in_cylinder/49k_prisms/line_source_term_in_cylinder.prj +++ b/Tests/Data/Parabolic/T/3D_line_source_term_tests/3D_line_source_term_in_cylinder/49k_prisms/line_source_term_in_cylinder.prj @@ -10,9 +10,6 @@ <name>HeatConduction</name> <type>HEAT_CONDUCTION</type> <integration_order>2</integration_order> - <thermal_conductivity>lambda</thermal_conductivity> - <heat_capacity>c_p</heat_capacity> - <density>rho</density> <process_variables> <process_variable>temperature</process_variable> </process_variables> @@ -62,22 +59,34 @@ <suffix>_ts_{:timestep}_t_{:time}</suffix> </output> </time_loop> + <media> + <medium id="0"> + <phases/> + <properties> + <property> + <name>heat_capacity</name> + <type>Constant</type> + <value>0</value> + </property> + <property> + <name>thermal_conductivity</name> + <type>Constant</type> + <value>1</value> + </property> + <property> + <name>density</name> + <type>Constant</type> + <value>0</value> + </property> + <property> + <name>reference_temperature</name> + <type>Constant</type> + <value>293.15</value> + </property> + </properties> + </medium> + </media> <parameters> - <parameter> - <name>lambda</name> - <type>Constant</type> - <value>1</value> - </parameter> - <parameter> - <name>c_p</name> - <type>Constant</type> - <value>0</value> - </parameter> - <parameter> - <name>rho</name> - <type>Constant</type> - <value>0</value> - </parameter> <parameter> <name>T0</name> <type>Constant</type> diff --git a/Tests/Data/Parabolic/T/3D_line_source_term_tests/3D_line_source_term_in_cylinder_axisymmetric/line_source_term_in_cylinder.prj b/Tests/Data/Parabolic/T/3D_line_source_term_tests/3D_line_source_term_in_cylinder_axisymmetric/line_source_term_in_cylinder.prj index 7886babaaa6..ffdcbfbb148 100644 --- a/Tests/Data/Parabolic/T/3D_line_source_term_tests/3D_line_source_term_in_cylinder_axisymmetric/line_source_term_in_cylinder.prj +++ b/Tests/Data/Parabolic/T/3D_line_source_term_tests/3D_line_source_term_in_cylinder_axisymmetric/line_source_term_in_cylinder.prj @@ -10,9 +10,6 @@ <name>HeatConduction</name> <type>HEAT_CONDUCTION</type> <integration_order>2</integration_order> - <thermal_conductivity>lambda</thermal_conductivity> - <heat_capacity>c_p</heat_capacity> - <density>rho</density> <process_variables> <process_variable>temperature</process_variable> </process_variables> @@ -62,22 +59,34 @@ <suffix>_ts_{:timestep}_t_{:time}</suffix> </output> </time_loop> + <media> + <medium id="0"> + <phases/> + <properties> + <property> + <name>heat_capacity</name> + <type>Constant</type> + <value>0</value> + </property> + <property> + <name>thermal_conductivity</name> + <type>Constant</type> + <value>1</value> + </property> + <property> + <name>density</name> + <type>Constant</type> + <value>0</value> + </property> + <property> + <name>reference_temperature</name> + <type>Constant</type> + <value>293.15</value> + </property> + </properties> + </medium> + </media> <parameters> - <parameter> - <name>lambda</name> - <type>Constant</type> - <value>1</value> - </parameter> - <parameter> - <name>c_p</name> - <type>Constant</type> - <value>0</value> - </parameter> - <parameter> - <name>rho</name> - <type>Constant</type> - <value>0</value> - </parameter> <parameter> <name>T0</name> <type>Constant</type> diff --git a/Tests/Data/Parabolic/T/3D_line_source_term_tests/3D_line_source_term_middle/line_source_term_x_0.5_y_0.5.prj b/Tests/Data/Parabolic/T/3D_line_source_term_tests/3D_line_source_term_middle/line_source_term_x_0.5_y_0.5.prj index ee9e4dea6bc..be42f4aa4a1 100644 --- a/Tests/Data/Parabolic/T/3D_line_source_term_tests/3D_line_source_term_middle/line_source_term_x_0.5_y_0.5.prj +++ b/Tests/Data/Parabolic/T/3D_line_source_term_tests/3D_line_source_term_middle/line_source_term_x_0.5_y_0.5.prj @@ -10,9 +10,6 @@ <name>HeatConduction</name> <type>HEAT_CONDUCTION</type> <integration_order>2</integration_order> - <thermal_conductivity>lambda</thermal_conductivity> - <heat_capacity>c_p</heat_capacity> - <density>rho</density> <process_variables> <process_variable>temperature</process_variable> </process_variables> @@ -62,22 +59,34 @@ <suffix>_ts_{:timestep}_t_{:time}</suffix> </output> </time_loop> + <media> + <medium id="0"> + <phases/> + <properties> + <property> + <name>thermal_conductivity</name> + <type>Constant</type> + <value>1</value> + </property> + <property> + <name>density</name> + <type>Constant</type> + <value>1</value> + </property> + <property> + <name>heat_capacity</name> + <type>Constant</type> + <value>1</value> + </property> + <property> + <name>reference_temperature</name> + <type>Constant</type> + <value>293.15</value> + </property> + </properties> + </medium> + </media> <parameters> - <parameter> - <name>lambda</name> - <type>Constant</type> - <value>1</value> - </parameter> - <parameter> - <name>c_p</name> - <type>Constant</type> - <value>1</value> - </parameter> - <parameter> - <name>rho</name> - <type>Constant</type> - <value>1</value> - </parameter> <parameter> <name>T0</name> <type>Constant</type> diff --git a/Tests/Data/Parabolic/T/3D_line_source_term_tests/3D_line_source_term_middle_restricted/line_source_term_x_0.5_y_0.5_restricted.prj b/Tests/Data/Parabolic/T/3D_line_source_term_tests/3D_line_source_term_middle_restricted/line_source_term_x_0.5_y_0.5_restricted.prj index a1acceb0b19..ffb5e596004 100644 --- a/Tests/Data/Parabolic/T/3D_line_source_term_tests/3D_line_source_term_middle_restricted/line_source_term_x_0.5_y_0.5_restricted.prj +++ b/Tests/Data/Parabolic/T/3D_line_source_term_tests/3D_line_source_term_middle_restricted/line_source_term_x_0.5_y_0.5_restricted.prj @@ -10,9 +10,6 @@ <name>HeatConduction</name> <type>HEAT_CONDUCTION</type> <integration_order>2</integration_order> - <thermal_conductivity>lambda</thermal_conductivity> - <heat_capacity>c_p</heat_capacity> - <density>rho</density> <process_variables> <process_variable>temperature</process_variable> </process_variables> @@ -62,22 +59,34 @@ <suffix>_ts_{:timestep}_t_{:time}</suffix> </output> </time_loop> + <media> + <medium id="0"> + <phases/> + <properties> + <property> + <name>thermal_conductivity</name> + <type>Constant</type> + <value>1</value> + </property> + <property> + <name>density</name> + <type>Constant</type> + <value>1</value> + </property> + <property> + <name>heat_capacity</name> + <type>Constant</type> + <value>1</value> + </property> + <property> + <name>reference_temperature</name> + <type>Constant</type> + <value>293.15</value> + </property> + </properties> + </medium> + </media> <parameters> - <parameter> - <name>lambda</name> - <type>Constant</type> - <value>1</value> - </parameter> - <parameter> - <name>c_p</name> - <type>Constant</type> - <value>1</value> - </parameter> - <parameter> - <name>rho</name> - <type>Constant</type> - <value>1</value> - </parameter> <parameter> <name>T0</name> <type>Constant</type> diff --git a/Tests/Data/Parabolic/T/t1_1Dsource/t1_1Dsource.prj b/Tests/Data/Parabolic/T/t1_1Dsource/t1_1Dsource.prj old mode 100755 new mode 100644 index 884c75cf335..84cf61892aa --- a/Tests/Data/Parabolic/T/t1_1Dsource/t1_1Dsource.prj +++ b/Tests/Data/Parabolic/T/t1_1Dsource/t1_1Dsource.prj @@ -7,9 +7,6 @@ <name>HeatConduction</name> <type>HEAT_CONDUCTION</type> <integration_order>2</integration_order> - <thermal_conductivity>lambda</thermal_conductivity> - <heat_capacity>c</heat_capacity> - <density>rho</density> <process_variables> <process_variable>temperature</process_variable> </process_variables> @@ -17,6 +14,58 @@ </secondary_variables> </process> </processes> + <media> + <medium id="0"> + <phases/> + <properties> + <property> + <name>density</name> + <type>Parameter</type> + <parameter_name>rho</parameter_name> + </property> + <property> + <name>heat_capacity</name> + <type>Parameter</type> + <parameter_name>c</parameter_name> + </property> + <property> + <name>thermal_conductivity</name> + <type>Parameter</type> + <parameter_name>lambda</parameter_name> + </property> + <property> + <name>reference_temperature</name> + <type>Constant</type> + <value>293.15</value> + </property> + </properties> + </medium> + <medium id="1"> + <phases/> + <properties> + <property> + <name>density</name> + <type>Parameter</type> + <parameter_name>rho</parameter_name> + </property> + <property> + <name>heat_capacity</name> + <type>Parameter</type> + <parameter_name>c</parameter_name> + </property> + <property> + <name>thermal_conductivity</name> + <type>Parameter</type> + <parameter_name>lambda</parameter_name> + </property> + <property> + <name>reference_temperature</name> + <type>Constant</type> + <value>293.15</value> + </property> + </properties> + </medium> + </media> <time_loop> <processes> <process ref="HeatConduction"> diff --git a/Tests/Data/Parabolic/T/t1_1Dsteady/t1_1Dsteady.prj b/Tests/Data/Parabolic/T/t1_1Dsteady/t1_1Dsteady.prj old mode 100755 new mode 100644 index 212946c0eb7..e1eb9123861 --- a/Tests/Data/Parabolic/T/t1_1Dsteady/t1_1Dsteady.prj +++ b/Tests/Data/Parabolic/T/t1_1Dsteady/t1_1Dsteady.prj @@ -7,9 +7,6 @@ <name>HeatConduction</name> <type>HEAT_CONDUCTION</type> <integration_order>2</integration_order> - <thermal_conductivity>lambda</thermal_conductivity> - <heat_capacity>c</heat_capacity> - <density>rho</density> <process_variables> <process_variable>temperature</process_variable> </process_variables> @@ -17,6 +14,33 @@ </secondary_variables> </process> </processes> + <media> + <medium id="0"> + <phases/> + <properties> + <property> + <name>thermal_conductivity</name> + <type>Parameter</type> + <parameter_name>lambda</parameter_name> + </property> + <property> + <name>density</name> + <type>Parameter</type> + <parameter_name>rho</parameter_name> + </property> + <property> + <name>heat_capacity</name> + <type>Parameter</type> + <parameter_name>c</parameter_name> + </property> + <property> + <name>reference_temperature</name> + <type>Constant</type> + <value>293.15</value> + </property> + </properties> + </medium> + </media> <time_loop> <processes> <process ref="HeatConduction"> diff --git a/Tests/Data/Parabolic/T/t2_1D1bt/t2_1D1bt.prj b/Tests/Data/Parabolic/T/t2_1D1bt/t2_1D1bt.prj old mode 100755 new mode 100644 index 598e0c44c14..6183e854e65 --- a/Tests/Data/Parabolic/T/t2_1D1bt/t2_1D1bt.prj +++ b/Tests/Data/Parabolic/T/t2_1D1bt/t2_1D1bt.prj @@ -7,9 +7,6 @@ <name>HeatConduction</name> <type>HEAT_CONDUCTION</type> <integration_order>2</integration_order> - <thermal_conductivity>lambda</thermal_conductivity> - <heat_capacity>c</heat_capacity> - <density>rho</density> <process_variables> <process_variable>temperature</process_variable> </process_variables> @@ -18,6 +15,33 @@ </secondary_variables> </process> </processes> + <media> + <medium id="0"> + <phases/> + <properties> + <property> + <name>density</name> + <type>Parameter</type> + <parameter_name>rho</parameter_name> + </property> + <property> + <name>heat_capacity</name> + <type>Parameter</type> + <parameter_name>c</parameter_name> + </property> + <property> + <name>thermal_conductivity</name> + <type>Parameter</type> + <parameter_name>lambda</parameter_name> + </property> + <property> + <name>reference_temperature</name> + <type>Constant</type> + <value>293.15</value> + </property> + </properties> + </medium> + </media> <time_loop> <processes> <process ref="HeatConduction"> diff --git a/Tests/Data/Parabolic/T/t2_1D2bt/t2_1D2bt.prj b/Tests/Data/Parabolic/T/t2_1D2bt/t2_1D2bt.prj old mode 100755 new mode 100644 index 401a73d2e09..3a3617bda01 --- a/Tests/Data/Parabolic/T/t2_1D2bt/t2_1D2bt.prj +++ b/Tests/Data/Parabolic/T/t2_1D2bt/t2_1D2bt.prj @@ -7,9 +7,6 @@ <name>HeatConduction</name> <type>HEAT_CONDUCTION</type> <integration_order>2</integration_order> - <thermal_conductivity>lambda</thermal_conductivity> - <heat_capacity>c</heat_capacity> - <density>rho</density> <process_variables> <process_variable>temperature</process_variable> </process_variables> @@ -18,6 +15,58 @@ </secondary_variables> </process> </processes> + <media> + <medium id="0"> + <phases/> + <properties> + <property> + <name>density</name> + <type>Parameter</type> + <parameter_name>rho</parameter_name> + </property> + <property> + <name>thermal_conductivity</name> + <type>Parameter</type> + <parameter_name>lambda</parameter_name> + </property> + <property> + <name>heat_capacity</name> + <type>Parameter</type> + <parameter_name>c</parameter_name> + </property> + <property> + <name>reference_temperature</name> + <type>Constant</type> + <value>293.15</value> + </property> + </properties> + </medium> + <medium id="1"> + <phases/> + <properties> + <property> + <name>density</name> + <type>Parameter</type> + <parameter_name>rho</parameter_name> + </property> + <property> + <name>thermal_conductivity</name> + <type>Parameter</type> + <parameter_name>lambda</parameter_name> + </property> + <property> + <name>heat_capacity</name> + <type>Parameter</type> + <parameter_name>c</parameter_name> + </property> + <property> + <name>reference_temperature</name> + <type>Constant</type> + <value>293.15</value> + </property> + </properties> + </medium> + </media> <time_loop> <processes> <process ref="HeatConduction"> -- GitLab