From 63193a5909f9634c9192fc4546e5549eb44506d0 Mon Sep 17 00:00:00 2001
From: Thomas Fischer <thomas.fischer@ufz.de>
Date: Tue, 4 Feb 2020 15:39:42 +0100
Subject: [PATCH] [T] Use density and viscosity from MPL in prj file.
---
.../LiquidFlow/AxiSymTheis/axisym_theis.prj | 32 +++++--
.../LiquidFlow/BuildupTest/buildup_test.prj | 32 +++++--
.../LiquidFlow/Dupuit/BC_BC/TestSet_01.prj | 32 +++++--
.../Dupuit/BC_BC_RECHARGE/TestSet_01.prj | 32 +++++--
.../Dupuit/BC_BC_RECHARGE2/TestSet_01.prj | 32 +++++--
.../Dupuit/BC_BC_STORAGE/TestSet_01.prj | 32 +++++--
.../2D/square_1e1_calculatesurfaceflux.prj | 32 +++++--
.../Flux/cube_1e3_calculatesurfaceflux.prj | 32 +++++--
.../GravityDriven/gravity_driven.prj | 32 +++++--
.../anisotropic_gravity_driven3D.prj | 32 +++++--
.../isotropic_gravity_driven3D.prj | 32 +++++--
.../line_dirichlet_neumannBC.prj | 32 +++++--
...sureBC_at_corner_of_anisotropic_square.prj | 32 +++++--
...pendentHeterogeneousBoundaryConditions.prj | 32 +++++--
.../TimeDependentHeterogeneousSourceTerm.prj | 32 +++++--
.../TimeIntervalDirichletBC.prj | 32 +++++--
.../Verification/h1_1Dsource/h1_1Dsource.prj | 52 +++++++++--
.../Verification/h1_1Dsteady/h1_1Dsteady.prj | 32 +++++--
.../h1_3Dhydstat/h1_3Dhydstat.prj | 92 +++++++++++++++++--
.../Verification/h2_1D1bt/h2_1D1bt.prj | 32 +++++--
.../Verification/h2_1D2bt/h2_1D2bt.prj | 52 +++++++++--
21 files changed, 562 insertions(+), 210 deletions(-)
diff --git a/Tests/Data/Parabolic/LiquidFlow/AxiSymTheis/axisym_theis.prj b/Tests/Data/Parabolic/LiquidFlow/AxiSymTheis/axisym_theis.prj
index 219b6b75908..f5d6dd4840a 100644
--- a/Tests/Data/Parabolic/LiquidFlow/AxiSymTheis/axisym_theis.prj
+++ b/Tests/Data/Parabolic/LiquidFlow/AxiSymTheis/axisym_theis.prj
@@ -20,16 +20,6 @@
<secondary_variable internal_name="darcy_velocity" output_name="v"/>
</secondary_variables>
<material_property>
- <fluid>
- <density>
- <type>Constant</type>
- <value> 1.0 </value>
- </density>
- <viscosity>
- <type>Constant</type>
- <value> 1.0 </value>
- </viscosity>
- </fluid>
<porous_medium>
<porous_medium id="0">
<permeability>
@@ -49,6 +39,28 @@
</material_property>
</process>
</processes>
+ <media>
+ <medium>
+ <phases>
+ <phase>
+ <type>AqueousLiquid</type>
+ <properties>
+ <property>
+ <name>density</name>
+ <type>Constant</type>
+ <value> 1.0 </value>
+ </property>
+ <property>
+ <name>viscosity</name>
+ <type>Constant</type>
+ <value> 1.0 </value>
+ </property>
+ </properties>
+ </phase>
+ </phases>
+ <properties/>
+ </medium>
+ </media>
<time_loop>
<processes>
<process ref="LiquidFlow">
diff --git a/Tests/Data/Parabolic/LiquidFlow/BuildupTest/buildup_test.prj b/Tests/Data/Parabolic/LiquidFlow/BuildupTest/buildup_test.prj
index c606bebc361..0c21dfa5017 100644
--- a/Tests/Data/Parabolic/LiquidFlow/BuildupTest/buildup_test.prj
+++ b/Tests/Data/Parabolic/LiquidFlow/BuildupTest/buildup_test.prj
@@ -2,6 +2,28 @@
<OpenGeoSysProject>
<mesh axially_symmetric="true">line_1000_axi.vtu</mesh>
<geometry>line_1000_axi.gml</geometry>
+ <media>
+ <medium>
+ <phases>
+ <phase>
+ <type>AqueousLiquid</type>
+ <properties>
+ <property>
+ <name>viscosity</name>
+ <type>Constant</type>
+ <value> 1.295e-4 </value>
+ </property>
+ <property>
+ <name>density</name>
+ <type>Constant</type>
+ <value> 78.68 </value>
+ </property>
+ </properties>
+ </phase>
+ </phases>
+ <properties/>
+ </medium>
+ </media>
<processes>
<process>
<name>LiquidFlow</name>
@@ -20,16 +42,6 @@
<secondary_variable internal_name="darcy_velocity" output_name="v"/>
</secondary_variables>
<material_property>
- <fluid>
- <density>
- <type>Constant</type>
- <value> 78.68 </value>
- </density>
- <viscosity>
- <type>Constant</type>
- <value> 1.295e-4 </value>
- </viscosity>
- </fluid>
<porous_medium>
<porous_medium id="0">
<permeability>
diff --git a/Tests/Data/Parabolic/LiquidFlow/Dupuit/BC_BC/TestSet_01.prj b/Tests/Data/Parabolic/LiquidFlow/Dupuit/BC_BC/TestSet_01.prj
index f940af89ec1..094699ab226 100644
--- a/Tests/Data/Parabolic/LiquidFlow/Dupuit/BC_BC/TestSet_01.prj
+++ b/Tests/Data/Parabolic/LiquidFlow/Dupuit/BC_BC/TestSet_01.prj
@@ -23,16 +23,6 @@
<secondary_variable internal_name="darcy_velocity" output_name="v"/>
</secondary_variables>
<material_property>
- <fluid>
- <density>
- <type>Constant</type>
- <value> 1 </value>
- </density>
- <viscosity>
- <type>Constant</type>
- <value> 1 </value>
- </viscosity>
- </fluid>
<porous_medium>
<porous_medium id="0">
<permeability>
@@ -92,6 +82,28 @@
</timesteps>
</output>
</time_loop>
+ <media>
+ <medium>
+ <phases>
+ <phase>
+ <type>AqueousLiquid</type>
+ <properties>
+ <property>
+ <name>viscosity</name>
+ <type>Constant</type>
+ <value> 1 </value>
+ </property>
+ <property>
+ <name>density</name>
+ <type>Constant</type>
+ <value> 1 </value>
+ </property>
+ </properties>
+ </phase>
+ </phases>
+ <properties/>
+ </medium>
+ </media>
<parameters>
<parameter>
<name>p0</name>
diff --git a/Tests/Data/Parabolic/LiquidFlow/Dupuit/BC_BC_RECHARGE/TestSet_01.prj b/Tests/Data/Parabolic/LiquidFlow/Dupuit/BC_BC_RECHARGE/TestSet_01.prj
index 3a2ad00aa77..e9da05bcbca 100644
--- a/Tests/Data/Parabolic/LiquidFlow/Dupuit/BC_BC_RECHARGE/TestSet_01.prj
+++ b/Tests/Data/Parabolic/LiquidFlow/Dupuit/BC_BC_RECHARGE/TestSet_01.prj
@@ -24,16 +24,6 @@
<secondary_variable internal_name="darcy_velocity" output_name="v"/>
</secondary_variables>
<material_property>
- <fluid>
- <density>
- <type>Constant</type>
- <value> 1 </value>
- </density>
- <viscosity>
- <type>Constant</type>
- <value> 1 </value>
- </viscosity>
- </fluid>
<porous_medium>
<porous_medium id="0">
<permeability>
@@ -93,6 +83,28 @@
</timesteps>
</output>
</time_loop>
+ <media>
+ <medium>
+ <phases>
+ <phase>
+ <type>AqueousLiquid</type>
+ <properties>
+ <property>
+ <name>density</name>
+ <type>Constant</type>
+ <value> 1 </value>
+ </property>
+ <property>
+ <name>viscosity</name>
+ <type>Constant</type>
+ <value> 1 </value>
+ </property>
+ </properties>
+ </phase>
+ </phases>
+ <properties/>
+ </medium>
+ </media>
<parameters>
<parameter>
<name>p0</name>
diff --git a/Tests/Data/Parabolic/LiquidFlow/Dupuit/BC_BC_RECHARGE2/TestSet_01.prj b/Tests/Data/Parabolic/LiquidFlow/Dupuit/BC_BC_RECHARGE2/TestSet_01.prj
index bb1ce9d48dd..7657235a89f 100644
--- a/Tests/Data/Parabolic/LiquidFlow/Dupuit/BC_BC_RECHARGE2/TestSet_01.prj
+++ b/Tests/Data/Parabolic/LiquidFlow/Dupuit/BC_BC_RECHARGE2/TestSet_01.prj
@@ -24,16 +24,6 @@
<secondary_variable internal_name="darcy_velocity" output_name="v"/>
</secondary_variables>
<material_property>
- <fluid>
- <density>
- <type>Constant</type>
- <value> 1 </value>
- </density>
- <viscosity>
- <type>Constant</type>
- <value> 1 </value>
- </viscosity>
- </fluid>
<porous_medium>
<porous_medium id="0">
<permeability>
@@ -93,6 +83,28 @@
</timesteps>
</output>
</time_loop>
+ <media>
+ <medium>
+ <phases>
+ <phase>
+ <type>AqueousLiquid</type>
+ <properties>
+ <property>
+ <name>density</name>
+ <type>Constant</type>
+ <value> 1 </value>
+ </property>
+ <property>
+ <name>viscosity</name>
+ <type>Constant</type>
+ <value> 1 </value>
+ </property>
+ </properties>
+ </phase>
+ </phases>
+ <properties/>
+ </medium>
+ </media>
<parameters>
<parameter>
<name>p0</name>
diff --git a/Tests/Data/Parabolic/LiquidFlow/Dupuit/BC_BC_STORAGE/TestSet_01.prj b/Tests/Data/Parabolic/LiquidFlow/Dupuit/BC_BC_STORAGE/TestSet_01.prj
index f76ca957222..0af0198508a 100644
--- a/Tests/Data/Parabolic/LiquidFlow/Dupuit/BC_BC_STORAGE/TestSet_01.prj
+++ b/Tests/Data/Parabolic/LiquidFlow/Dupuit/BC_BC_STORAGE/TestSet_01.prj
@@ -24,16 +24,6 @@
<secondary_variable internal_name="darcy_velocity" output_name="v"/>
</secondary_variables>
<material_property>
- <fluid>
- <density>
- <type>Constant</type>
- <value> 1 </value>
- </density>
- <viscosity>
- <type>Constant</type>
- <value> 1 </value>
- </viscosity>
- </fluid>
<porous_medium>
<porous_medium id="0">
<permeability>
@@ -93,6 +83,28 @@
</timesteps>
</output>
</time_loop>
+ <media>
+ <medium>
+ <phases>
+ <phase>
+ <type>AqueousLiquid</type>
+ <properties>
+ <property>
+ <name>viscosity</name>
+ <type>Constant</type>
+ <value> 1 </value>
+ </property>
+ <property>
+ <name>density</name>
+ <type>Constant</type>
+ <value> 1 </value>
+ </property>
+ </properties>
+ </phase>
+ </phases>
+ <properties/>
+ </medium>
+ </media>
<parameters>
<parameter>
<name>p0</name>
diff --git a/Tests/Data/Parabolic/LiquidFlow/Flux/2D/square_1e1_calculatesurfaceflux.prj b/Tests/Data/Parabolic/LiquidFlow/Flux/2D/square_1e1_calculatesurfaceflux.prj
index 4cf7d704cad..ccefc87f684 100644
--- a/Tests/Data/Parabolic/LiquidFlow/Flux/2D/square_1e1_calculatesurfaceflux.prj
+++ b/Tests/Data/Parabolic/LiquidFlow/Flux/2D/square_1e1_calculatesurfaceflux.prj
@@ -29,16 +29,6 @@
<output_mesh>square_1x1_quad_1e1_complete_surface_left_right_dirichlet_specific_flux.vtu</output_mesh>
</calculatesurfaceflux>
<material_property>
- <fluid>
- <density>
- <type>Constant</type>
- <value> 78.68 </value>
- </density>
- <viscosity>
- <type>Constant</type>
- <value> 1.295e-4 </value>
- </viscosity>
- </fluid>
<porous_medium>
<porous_medium id="0">
<permeability>
@@ -98,6 +88,28 @@
</variables>
</output>
</time_loop>
+ <media>
+ <medium>
+ <phases>
+ <phase>
+ <type>AqueousLiquid</type>
+ <properties>
+ <property>
+ <name>density</name>
+ <type>Constant</type>
+ <value> 78.68 </value>
+ </property>
+ <property>
+ <name>viscosity</name>
+ <type>Constant</type>
+ <value> 1.295e-4 </value>
+ </property>
+ </properties>
+ </phase>
+ </phases>
+ <properties/>
+ </medium>
+ </media>
<parameters>
<parameter>
<name>p0</name>
diff --git a/Tests/Data/Parabolic/LiquidFlow/Flux/cube_1e3_calculatesurfaceflux.prj b/Tests/Data/Parabolic/LiquidFlow/Flux/cube_1e3_calculatesurfaceflux.prj
index b1b890a9674..f125358c46d 100644
--- a/Tests/Data/Parabolic/LiquidFlow/Flux/cube_1e3_calculatesurfaceflux.prj
+++ b/Tests/Data/Parabolic/LiquidFlow/Flux/cube_1e3_calculatesurfaceflux.prj
@@ -29,16 +29,6 @@
<output_mesh>cube_1x1x1_hex_1e3_complete_surface_left_right_dirichlet_specific_flux.vtu</output_mesh>
</calculatesurfaceflux>
<material_property>
- <fluid>
- <density>
- <type>Constant</type>
- <value> 78.68 </value>
- </density>
- <viscosity>
- <type>Constant</type>
- <value> 1.295e-4 </value>
- </viscosity>
- </fluid>
<porous_medium>
<porous_medium id="0">
<permeability>
@@ -98,6 +88,28 @@
</variables>
</output>
</time_loop>
+ <media>
+ <medium>
+ <phases>
+ <phase>
+ <type>AqueousLiquid</type>
+ <properties>
+ <property>
+ <name>density</name>
+ <type>Constant</type>
+ <value> 78.68 </value>
+ </property>
+ <property>
+ <name>viscosity</name>
+ <type>Constant</type>
+ <value> 1.295e-4 </value>
+ </property>
+ </properties>
+ </phase>
+ </phases>
+ <properties/>
+ </medium>
+ </media>
<parameters>
<parameter>
<name>p0</name>
diff --git a/Tests/Data/Parabolic/LiquidFlow/GravityDriven/gravity_driven.prj b/Tests/Data/Parabolic/LiquidFlow/GravityDriven/gravity_driven.prj
index 2af4a28e9cd..6097ecb0375 100644
--- a/Tests/Data/Parabolic/LiquidFlow/GravityDriven/gravity_driven.prj
+++ b/Tests/Data/Parabolic/LiquidFlow/GravityDriven/gravity_driven.prj
@@ -20,16 +20,6 @@
<secondary_variable internal_name="darcy_velocity" output_name="v"/>
</secondary_variables>
<material_property>
- <fluid>
- <density>
- <type>Constant</type>
- <value> 1.e3 </value>
- </density>
- <viscosity>
- <type>Constant</type>
- <value> 1.e-3 </value>
- </viscosity>
- </fluid>
<porous_medium>
<porous_medium id="0">
<permeability>
@@ -49,6 +39,28 @@
</material_property>
</process>
</processes>
+ <media>
+ <medium>
+ <phases>
+ <phase>
+ <type>AqueousLiquid</type>
+ <properties>
+ <property>
+ <name>viscosity</name>
+ <type>Constant</type>
+ <value> 1.e-3 </value>
+ </property>
+ <property>
+ <name>density</name>
+ <type>Constant</type>
+ <value> 1.e3 </value>
+ </property>
+ </properties>
+ </phase>
+ </phases>
+ <properties/>
+ </medium>
+ </media>
<time_loop>
<processes>
<process ref="LiquidFlow">
diff --git a/Tests/Data/Parabolic/LiquidFlow/GravityDriven3D/anisotropic_gravity_driven3D.prj b/Tests/Data/Parabolic/LiquidFlow/GravityDriven3D/anisotropic_gravity_driven3D.prj
index 4441f3a030b..e6bc490b94a 100644
--- a/Tests/Data/Parabolic/LiquidFlow/GravityDriven3D/anisotropic_gravity_driven3D.prj
+++ b/Tests/Data/Parabolic/LiquidFlow/GravityDriven3D/anisotropic_gravity_driven3D.prj
@@ -20,16 +20,6 @@
<secondary_variable internal_name="darcy_velocity" output_name="v"/>
</secondary_variables>
<material_property>
- <fluid>
- <density>
- <type>Constant</type>
- <value> 1.e3 </value>
- </density>
- <viscosity>
- <type>Constant</type>
- <value> 1.e-3 </value>
- </viscosity>
- </fluid>
<porous_medium>
<porous_medium id="0">
<permeability>
@@ -49,6 +39,28 @@
</material_property>
</process>
</processes>
+ <media>
+ <medium>
+ <phases>
+ <phase>
+ <type>AqueousLiquid</type>
+ <properties>
+ <property>
+ <name>viscosity</name>
+ <type>Constant</type>
+ <value> 1.e-3 </value>
+ </property>
+ <property>
+ <name>density</name>
+ <type>Constant</type>
+ <value> 1.e3 </value>
+ </property>
+ </properties>
+ </phase>
+ </phases>
+ <properties/>
+ </medium>
+ </media>
<time_loop>
<processes>
<process ref="LiquidFlow">
diff --git a/Tests/Data/Parabolic/LiquidFlow/GravityDriven3D/isotropic_gravity_driven3D.prj b/Tests/Data/Parabolic/LiquidFlow/GravityDriven3D/isotropic_gravity_driven3D.prj
index bf82165ef4b..3adf6d4cd7a 100644
--- a/Tests/Data/Parabolic/LiquidFlow/GravityDriven3D/isotropic_gravity_driven3D.prj
+++ b/Tests/Data/Parabolic/LiquidFlow/GravityDriven3D/isotropic_gravity_driven3D.prj
@@ -20,16 +20,6 @@
<secondary_variable internal_name="darcy_velocity" output_name="v"/>
</secondary_variables>
<material_property>
- <fluid>
- <density>
- <type>Constant</type>
- <value> 1.e3 </value>
- </density>
- <viscosity>
- <type>Constant</type>
- <value> 1.e-3 </value>
- </viscosity>
- </fluid>
<porous_medium>
<porous_medium id="0">
<permeability>
@@ -49,6 +39,28 @@
</material_property>
</process>
</processes>
+ <media>
+ <medium>
+ <phases>
+ <phase>
+ <type>AqueousLiquid</type>
+ <properties>
+ <property>
+ <name>density</name>
+ <type>Constant</type>
+ <value> 1.e3 </value>
+ </property>
+ <property>
+ <name>viscosity</name>
+ <type>Constant</type>
+ <value> 1.e-3 </value>
+ </property>
+ </properties>
+ </phase>
+ </phases>
+ <properties/>
+ </medium>
+ </media>
<time_loop>
<processes>
<process ref="LiquidFlow">
diff --git a/Tests/Data/Parabolic/LiquidFlow/LineDirichletNeumannBC/line_dirichlet_neumannBC.prj b/Tests/Data/Parabolic/LiquidFlow/LineDirichletNeumannBC/line_dirichlet_neumannBC.prj
index 5791d545c4d..e8b046a9b26 100644
--- a/Tests/Data/Parabolic/LiquidFlow/LineDirichletNeumannBC/line_dirichlet_neumannBC.prj
+++ b/Tests/Data/Parabolic/LiquidFlow/LineDirichletNeumannBC/line_dirichlet_neumannBC.prj
@@ -20,16 +20,6 @@
<secondary_variable internal_name="darcy_velocity" output_name="v"/>
</secondary_variables>
<material_property>
- <fluid>
- <density>
- <type>Constant</type>
- <value> 1.e3 </value>
- </density>
- <viscosity>
- <type>Constant</type>
- <value> 1.e-3 </value>
- </viscosity>
- </fluid>
<porous_medium>
<porous_medium id="0">
<permeability>
@@ -49,6 +39,28 @@
</material_property>
</process>
</processes>
+ <media>
+ <medium>
+ <phases>
+ <phase>
+ <type>AqueousLiquid</type>
+ <properties>
+ <property>
+ <name>viscosity</name>
+ <type>Constant</type>
+ <value> 1.e-3 </value>
+ </property>
+ <property>
+ <name>density</name>
+ <type>Constant</type>
+ <value> 1.e3 </value>
+ </property>
+ </properties>
+ </phase>
+ </phases>
+ <properties/>
+ </medium>
+ </media>
<time_loop>
<processes>
<process ref="LiquidFlow">
diff --git a/Tests/Data/Parabolic/LiquidFlow/PressureBCatCornerOfAnisotropicSquare/pressureBC_at_corner_of_anisotropic_square.prj b/Tests/Data/Parabolic/LiquidFlow/PressureBCatCornerOfAnisotropicSquare/pressureBC_at_corner_of_anisotropic_square.prj
index 58b752f3737..004a40d7486 100644
--- a/Tests/Data/Parabolic/LiquidFlow/PressureBCatCornerOfAnisotropicSquare/pressureBC_at_corner_of_anisotropic_square.prj
+++ b/Tests/Data/Parabolic/LiquidFlow/PressureBCatCornerOfAnisotropicSquare/pressureBC_at_corner_of_anisotropic_square.prj
@@ -20,16 +20,6 @@
<secondary_variable internal_name="darcy_velocity" output_name="v"/>
</secondary_variables>
<material_property>
- <fluid>
- <density>
- <type>Constant</type>
- <value> 1.e3 </value>
- </density>
- <viscosity>
- <type>Constant</type>
- <value> 1.e-3 </value>
- </viscosity>
- </fluid>
<porous_medium>
<porous_medium id="0">
<permeability>
@@ -49,6 +39,28 @@
</material_property>
</process>
</processes>
+ <media>
+ <medium>
+ <phases>
+ <phase>
+ <type>AqueousLiquid</type>
+ <properties>
+ <property>
+ <name>density</name>
+ <type>Constant</type>
+ <value> 1.e3 </value>
+ </property>
+ <property>
+ <name>viscosity</name>
+ <type>Constant</type>
+ <value> 1.e-3 </value>
+ </property>
+ </properties>
+ </phase>
+ </phases>
+ <properties/>
+ </medium>
+ </media>
<time_loop>
<processes>
<process ref="LiquidFlow">
diff --git a/Tests/Data/Parabolic/LiquidFlow/TimeDependentHeterogeneousBoundaryConditions/TimeDependentHeterogeneousBoundaryConditions.prj b/Tests/Data/Parabolic/LiquidFlow/TimeDependentHeterogeneousBoundaryConditions/TimeDependentHeterogeneousBoundaryConditions.prj
index 136932a66c5..434ac684f24 100644
--- a/Tests/Data/Parabolic/LiquidFlow/TimeDependentHeterogeneousBoundaryConditions/TimeDependentHeterogeneousBoundaryConditions.prj
+++ b/Tests/Data/Parabolic/LiquidFlow/TimeDependentHeterogeneousBoundaryConditions/TimeDependentHeterogeneousBoundaryConditions.prj
@@ -23,16 +23,6 @@
<secondary_variable internal_name="darcy_velocity" output_name="v"/>
</secondary_variables>
<material_property>
- <fluid>
- <density>
- <type>Constant</type>
- <value> 1.e3 </value>
- </density>
- <viscosity>
- <type>Constant</type>
- <value> 1.e-3 </value>
- </viscosity>
- </fluid>
<porous_medium>
<porous_medium id="0">
<permeability>
@@ -104,6 +94,28 @@
</variables>
</output>
</time_loop>
+ <media>
+ <medium>
+ <phases>
+ <phase>
+ <type>AqueousLiquid</type>
+ <properties>
+ <property>
+ <name>density</name>
+ <type>Constant</type>
+ <value> 1.e3 </value>
+ </property>
+ <property>
+ <name>viscosity</name>
+ <type>Constant</type>
+ <value> 1.e-3 </value>
+ </property>
+ </properties>
+ </phase>
+ </phases>
+ <properties/>
+ </medium>
+ </media>
<parameters>
<parameter>
<name>p0</name>
diff --git a/Tests/Data/Parabolic/LiquidFlow/TimeDependentHeterogeneousSourceTerm/TimeDependentHeterogeneousSourceTerm.prj b/Tests/Data/Parabolic/LiquidFlow/TimeDependentHeterogeneousSourceTerm/TimeDependentHeterogeneousSourceTerm.prj
index 91da3d2d0c3..c37655ff738 100644
--- a/Tests/Data/Parabolic/LiquidFlow/TimeDependentHeterogeneousSourceTerm/TimeDependentHeterogeneousSourceTerm.prj
+++ b/Tests/Data/Parabolic/LiquidFlow/TimeDependentHeterogeneousSourceTerm/TimeDependentHeterogeneousSourceTerm.prj
@@ -24,16 +24,6 @@
<secondary_variable internal_name="darcy_velocity" output_name="v"/>
</secondary_variables>
<material_property>
- <fluid>
- <density>
- <type>Constant</type>
- <value> 1.e3 </value>
- </density>
- <viscosity>
- <type>Constant</type>
- <value> 1.e-3 </value>
- </viscosity>
- </fluid>
<porous_medium>
<porous_medium id="0">
<permeability>
@@ -105,6 +95,28 @@
</variables>
</output>
</time_loop>
+ <media>
+ <medium>
+ <phases>
+ <phase>
+ <type>AqueousLiquid</type>
+ <properties>
+ <property>
+ <name>viscosity</name>
+ <type>Constant</type>
+ <value> 1.e-3 </value>
+ </property>
+ <property>
+ <name>density</name>
+ <type>Constant</type>
+ <value> 1.e3 </value>
+ </property>
+ </properties>
+ </phase>
+ </phases>
+ <properties/>
+ </medium>
+ </media>
<parameters>
<parameter>
<name>p0</name>
diff --git a/Tests/Data/Parabolic/LiquidFlow/TimeIntervalDirichletBC/TimeIntervalDirichletBC.prj b/Tests/Data/Parabolic/LiquidFlow/TimeIntervalDirichletBC/TimeIntervalDirichletBC.prj
index ae93efdf6b5..352b91c38b6 100644
--- a/Tests/Data/Parabolic/LiquidFlow/TimeIntervalDirichletBC/TimeIntervalDirichletBC.prj
+++ b/Tests/Data/Parabolic/LiquidFlow/TimeIntervalDirichletBC/TimeIntervalDirichletBC.prj
@@ -23,16 +23,6 @@
<secondary_variable internal_name="darcy_velocity" output_name="v"/>
</secondary_variables>
<material_property>
- <fluid>
- <density>
- <type>Constant</type>
- <value> 1.e3 </value>
- </density>
- <viscosity>
- <type>Constant</type>
- <value> 1.e-3 </value>
- </viscosity>
- </fluid>
<porous_medium>
<porous_medium id="0">
<permeability>
@@ -92,6 +82,28 @@
</variables>
</output>
</time_loop>
+ <media>
+ <medium>
+ <phases>
+ <phase>
+ <type>AqueousLiquid</type>
+ <properties>
+ <property>
+ <name>viscosity</name>
+ <type>Constant</type>
+ <value> 1.e-3 </value>
+ </property>
+ <property>
+ <name>density</name>
+ <type>Constant</type>
+ <value> 1.e3 </value>
+ </property>
+ </properties>
+ </phase>
+ </phases>
+ <properties/>
+ </medium>
+ </media>
<parameters>
<parameter>
<name>p0</name>
diff --git a/Tests/Data/Parabolic/LiquidFlow/Verification/h1_1Dsource/h1_1Dsource.prj b/Tests/Data/Parabolic/LiquidFlow/Verification/h1_1Dsource/h1_1Dsource.prj
index b6025a18299..d596aaf88d9 100755
--- a/Tests/Data/Parabolic/LiquidFlow/Verification/h1_1Dsource/h1_1Dsource.prj
+++ b/Tests/Data/Parabolic/LiquidFlow/Verification/h1_1Dsource/h1_1Dsource.prj
@@ -18,16 +18,6 @@
<secondary_variable internal_name="darcy_velocity" output_name="q"/>
</secondary_variables>
<material_property>
- <fluid>
- <density>
- <type>Constant</type>
- <value> 1.e+3 </value>
- </density>
- <viscosity>
- <type>Constant</type>
- <value> 1.e-3 </value>
- </viscosity>
- </fluid>
<porous_medium>
<porous_medium id="0">
<permeability>
@@ -61,6 +51,48 @@
</material_property>
</process>
</processes>
+ <media>
+ <medium id="0">
+ <phases>
+ <phase>
+ <type>AqueousLiquid</type>
+ <properties>
+ <property>
+ <name>viscosity</name>
+ <type>Constant</type>
+ <value> 1.e-3 </value>
+ </property>
+ <property>
+ <name>density</name>
+ <type>Constant</type>
+ <value> 1.e+3 </value>
+ </property>
+ </properties>
+ </phase>
+ </phases>
+ <properties/>
+ </medium>
+ <medium id="1">
+ <phases>
+ <phase>
+ <type>AqueousLiquid</type>
+ <properties>
+ <property>
+ <name>viscosity</name>
+ <type>Constant</type>
+ <value> 1.e-3 </value>
+ </property>
+ <property>
+ <name>density</name>
+ <type>Constant</type>
+ <value> 1.e+3 </value>
+ </property>
+ </properties>
+ </phase>
+ </phases>
+ <properties/>
+ </medium>
+ </media>
<time_loop>
<processes>
<process ref="LiquidFlow">
diff --git a/Tests/Data/Parabolic/LiquidFlow/Verification/h1_1Dsteady/h1_1Dsteady.prj b/Tests/Data/Parabolic/LiquidFlow/Verification/h1_1Dsteady/h1_1Dsteady.prj
index 09437df95be..6b6ee6b14be 100755
--- a/Tests/Data/Parabolic/LiquidFlow/Verification/h1_1Dsteady/h1_1Dsteady.prj
+++ b/Tests/Data/Parabolic/LiquidFlow/Verification/h1_1Dsteady/h1_1Dsteady.prj
@@ -18,16 +18,6 @@
<secondary_variable internal_name="darcy_velocity" output_name="q"/>
</secondary_variables>
<material_property>
- <fluid>
- <density>
- <type>Constant</type>
- <value> 1.e+3 </value>
- </density>
- <viscosity>
- <type>Constant</type>
- <value> 1.e-3 </value>
- </viscosity>
- </fluid>
<porous_medium>
<porous_medium id="0">
<permeability>
@@ -47,6 +37,28 @@
</material_property>
</process>
</processes>
+ <media>
+ <medium>
+ <phases>
+ <phase>
+ <type>AqueousLiquid</type>
+ <properties>
+ <property>
+ <name>viscosity</name>
+ <type>Constant</type>
+ <value> 1.e-3 </value>
+ </property>
+ <property>
+ <name>density</name>
+ <type>Constant</type>
+ <value> 1.e+3 </value>
+ </property>
+ </properties>
+ </phase>
+ </phases>
+ <properties/>
+ </medium>
+ </media>
<time_loop>
<processes>
<process ref="LiquidFlow">
diff --git a/Tests/Data/Parabolic/LiquidFlow/Verification/h1_3Dhydstat/h1_3Dhydstat.prj b/Tests/Data/Parabolic/LiquidFlow/Verification/h1_3Dhydstat/h1_3Dhydstat.prj
index 0ba3bcd2f9a..c8774c233ad 100755
--- a/Tests/Data/Parabolic/LiquidFlow/Verification/h1_3Dhydstat/h1_3Dhydstat.prj
+++ b/Tests/Data/Parabolic/LiquidFlow/Verification/h1_3Dhydstat/h1_3Dhydstat.prj
@@ -18,16 +18,6 @@
<secondary_variable internal_name="darcy_velocity" output_name="q"/>
</secondary_variables>
<material_property>
- <fluid>
- <density>
- <type>Constant</type>
- <value> 1.019368E+3 </value>
- </density>
- <viscosity>
- <type>Constant</type>
- <value> 1.e-3 </value>
- </viscosity>
- </fluid>
<porous_medium>
<porous_medium id="0">
<permeability>
@@ -89,6 +79,88 @@
</material_property>
</process>
</processes>
+ <media>
+ <medium id="0">
+ <phases>
+ <phase>
+ <type>AqueousLiquid</type>
+ <properties>
+ <property>
+ <name>density</name>
+ <type>Constant</type>
+ <value> 1.019368E+3 </value>
+ </property>
+ <property>
+ <name>viscosity</name>
+ <type>Constant</type>
+ <value> 1.e-3 </value>
+ </property>
+ </properties>
+ </phase>
+ </phases>
+ <properties/>
+ </medium>
+ <medium id="1">
+ <phases>
+ <phase>
+ <type>AqueousLiquid</type>
+ <properties>
+ <property>
+ <name>density</name>
+ <type>Constant</type>
+ <value> 1.019368E+3 </value>
+ </property>
+ <property>
+ <name>viscosity</name>
+ <type>Constant</type>
+ <value> 1.e-3 </value>
+ </property>
+ </properties>
+ </phase>
+ </phases>
+ <properties/>
+ </medium>
+ <medium id="2">
+ <phases>
+ <phase>
+ <type>AqueousLiquid</type>
+ <properties>
+ <property>
+ <name>density</name>
+ <type>Constant</type>
+ <value> 1.019368E+3 </value>
+ </property>
+ <property>
+ <name>viscosity</name>
+ <type>Constant</type>
+ <value> 1.e-3 </value>
+ </property>
+ </properties>
+ </phase>
+ </phases>
+ <properties/>
+ </medium>
+ <medium id="3">
+ <phases>
+ <phase>
+ <type>AqueousLiquid</type>
+ <properties>
+ <property>
+ <name>density</name>
+ <type>Constant</type>
+ <value> 1.019368E+3 </value>
+ </property>
+ <property>
+ <name>viscosity</name>
+ <type>Constant</type>
+ <value> 1.e-3 </value>
+ </property>
+ </properties>
+ </phase>
+ </phases>
+ <properties/>
+ </medium>
+ </media>
<time_loop>
<processes>
<process ref="LiquidFlow">
diff --git a/Tests/Data/Parabolic/LiquidFlow/Verification/h2_1D1bt/h2_1D1bt.prj b/Tests/Data/Parabolic/LiquidFlow/Verification/h2_1D1bt/h2_1D1bt.prj
index 41eb641d1b2..0d2f6b6c383 100755
--- a/Tests/Data/Parabolic/LiquidFlow/Verification/h2_1D1bt/h2_1D1bt.prj
+++ b/Tests/Data/Parabolic/LiquidFlow/Verification/h2_1D1bt/h2_1D1bt.prj
@@ -18,16 +18,6 @@
<secondary_variable internal_name="darcy_velocity" output_name="q"/>
</secondary_variables>
<material_property>
- <fluid>
- <density>
- <type>Constant</type>
- <value> 1.e+3 </value>
- </density>
- <viscosity>
- <type>Constant</type>
- <value> 1.728e-3 </value>
- </viscosity>
- </fluid>
<porous_medium>
<porous_medium id="0">
<permeability>
@@ -47,6 +37,28 @@
</material_property>
</process>
</processes>
+ <media>
+ <medium>
+ <phases>
+ <phase>
+ <type>AqueousLiquid</type>
+ <properties>
+ <property>
+ <name>density</name>
+ <type>Constant</type>
+ <value> 1.e+3 </value>
+ </property>
+ <property>
+ <name>viscosity</name>
+ <type>Constant</type>
+ <value> 1.728e-3 </value>
+ </property>
+ </properties>
+ </phase>
+ </phases>
+ <properties/>
+ </medium>
+ </media>
<time_loop>
<processes>
<process ref="LiquidFlow">
diff --git a/Tests/Data/Parabolic/LiquidFlow/Verification/h2_1D2bt/h2_1D2bt.prj b/Tests/Data/Parabolic/LiquidFlow/Verification/h2_1D2bt/h2_1D2bt.prj
index 19a9958c5c4..50233577ab5 100755
--- a/Tests/Data/Parabolic/LiquidFlow/Verification/h2_1D2bt/h2_1D2bt.prj
+++ b/Tests/Data/Parabolic/LiquidFlow/Verification/h2_1D2bt/h2_1D2bt.prj
@@ -18,16 +18,6 @@
<secondary_variable internal_name="darcy_velocity" output_name="q"/>
</secondary_variables>
<material_property>
- <fluid>
- <density>
- <type>Constant</type>
- <value> 1.e+3 </value>
- </density>
- <viscosity>
- <type>Constant</type>
- <value> 0.864e-3 </value>
- </viscosity>
- </fluid>
<porous_medium>
<porous_medium id="0">
<permeability>
@@ -61,6 +51,48 @@
</material_property>
</process>
</processes>
+ <media>
+ <medium id="0">
+ <phases>
+ <phase>
+ <type>AqueousLiquid</type>
+ <properties>
+ <property>
+ <name>viscosity</name>
+ <type>Constant</type>
+ <value> 0.864e-3 </value>
+ </property>
+ <property>
+ <name>density</name>
+ <type>Constant</type>
+ <value> 1.e+3 </value>
+ </property>
+ </properties>
+ </phase>
+ </phases>
+ <properties/>
+ </medium>
+ <medium id="1">
+ <phases>
+ <phase>
+ <type>AqueousLiquid</type>
+ <properties>
+ <property>
+ <name>viscosity</name>
+ <type>Constant</type>
+ <value> 0.864e-3 </value>
+ </property>
+ <property>
+ <name>density</name>
+ <type>Constant</type>
+ <value> 1.e+3 </value>
+ </property>
+ </properties>
+ </phase>
+ </phases>
+ <properties/>
+ </medium>
+ </media>
<time_loop>
<processes>
<process ref="LiquidFlow">
--
GitLab