diff --git a/Tests/Data/Parabolic/LiquidFlow/AxiSymTheis/axisym_theis.prj b/Tests/Data/Parabolic/LiquidFlow/AxiSymTheis/axisym_theis.prj
index 219b6b759080e64c1843e86af99be5c4ae72d1cf..f5d6dd4840a074238c5fb7a34436804331c77c8d 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 c606bebc361b2614f004ac77b111f601d176248b..0c21dfa5017fccc46f2e84f74c112d572d3d010e 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 f940af89ec1652d5d6ade6d453beeab8b1053e14..094699ab22650b7183134e82fccb5524f35b17d3 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 3a2ad00aa774e4415704e3c04a2fbff9075369af..e9da05bcbca768a195507351fb9d13e08ae533b9 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 bb1ce9d48ddabb9165365ff93b1cfcd761199388..7657235a89fd9c5d982af965d540df1e4326a09c 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 f76ca95722287ab177f029f98904979907a3ff29..0af0198508a54a9eebda0e603617a87f93e53477 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 4cf7d704cada8c92fe450fa9cef57112e6236532..ccefc87f6849a99efc1177c08c2bf1052a78bc97 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 b1b890a967422118e6b3d7e74759ff9046dbd1c0..f125358c46d6854594ba070b0a30cd33f60044ec 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 2af4a28e9cd305435609db9903fdc6f17bd4fa6a..6097ecb0375a77cb7630c5ef881b06e4677e3c30 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 4441f3a030b703eb5011d780eb79f2a0aac927ea..e6bc490b94a40546688715bfa25e3fa9bef37915 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 bf82165ef4bb1f9c5027085e459faeb88d4f6ae9..3adf6d4cd7ae62ce0038f685d512f9c510f6042c 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 5791d545c4dd8530835dc3295812c0eb1d25cae5..e8b046a9b26eb9cc73c9b43bd4b788f3b1847ea1 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 58b752f3737b2c24955a185be2d08d7453c52519..004a40d7486ff733458158140ccd7ff3e116dbce 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 136932a66c584d66d4fd69ce85dcd7203b16cc53..434ac684f247b5c50340113e052c889adfc44169 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 91da3d2d0c3a93dca1f2d50225a9bd4a1d5d2de8..c37655ff738b305732f2f81d54a0614b83074163 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 ae93efdf6b5924839fcd8b0222026a65bd51856c..352b91c38b6a2046d37daa85791b8e43f37d1aed 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 b6025a1829933f099fc3aaa296c39d5a630e23ef..d596aaf88d9251a55743f1e1e34f9df9324e8642 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 09437df95be8248e90c4e1c807b7657add44368e..6b6ee6b14be4770b345854b6c3f553d7e6ae957d 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 0ba3bcd2f9a22e31b46eb185e18c00fdcdd6dbd2..c8774c233adb6470611bd5d422a7b452998d9fdf 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 41eb641d1b21c9325cfd39f9e839686d35eeab74..0d2f6b6c383846c9585d3e8f24edd9f26145193f 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 19a9958c5c4545fd2ac81c297a599c217d03ccb1..50233577ab5d4e0af3d404fa1fafc04611922c29 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">