diff --git a/Tests/Data/HydroMechanics/IdealGas/flow_free_expansion/flow_free_expansion.prj b/Tests/Data/HydroMechanics/IdealGas/flow_free_expansion/flow_free_expansion.prj
index 5513b4fade5482232f5237db9a7e6069b75abeca..ff4e70f4ff015b644c44036a8032a282ae7a4839 100644
--- a/Tests/Data/HydroMechanics/IdealGas/flow_free_expansion/flow_free_expansion.prj
+++ b/Tests/Data/HydroMechanics/IdealGas/flow_free_expansion/flow_free_expansion.prj
@@ -13,8 +13,6 @@
<youngs_modulus>E</youngs_modulus>
<poissons_ratio>nu</poissons_ratio>
</constitutive_relation>
- <intrinsic_permeability>k</intrinsic_permeability>
- <fluid_density>rho_fr</fluid_density>
<process_variables>
<displacement>displacement</displacement>
<pressure>pressure</pressure>
@@ -31,9 +29,6 @@
<secondary_variable internal_name="velocity" output_name="velocity"/>
</secondary_variables>
<specific_body_force>0 0 0</specific_body_force>
- <fluid_type>ideal_gas</fluid_type>
- <reference_temperature>293.15</reference_temperature>
- <specific_gas_constant>287.058</specific_gas_constant>
</process>
</processes>
<media>
@@ -47,6 +42,15 @@
<type>Constant</type>
<value>1e-5</value>
</property>
+ <property>
+ <name>density</name>
+ <type>IdealGasLaw</type>
+ </property>
+ <property>
+ <name>molar_mass</name>
+ <type>Constant</type>
+ <value>0.028964397787206768</value>
+ </property>
</properties>
</phase>
<phase>
@@ -70,6 +74,18 @@
</properties>
</phase>
</phases>
+ <properties>
+ <property>
+ <name>reference_temperature</name>
+ <type>Constant</type>
+ <value>293.15</value>
+ </property>
+ <property>
+ <name>permeability</name>
+ <type>Constant</type>
+ <value>1e-5</value>
+ </property>
+ </properties>
</medium>
</media>
<time_loop>
@@ -134,16 +150,6 @@
<value>.3</value>
</parameter>
<!-- Model parameters -->
- <parameter>
- <name>k</name>
- <type>Constant</type>
- <value>1e-5</value>
- </parameter>
- <parameter>
- <name>rho_fr</name>
- <type>Constant</type>
- <value>1.188339263639</value>
- </parameter>
<parameter>
<name>displacement0</name>
<type>Constant</type>
diff --git a/Tests/Data/HydroMechanics/IdealGas/flow_no_strain/flow_no_strain.prj b/Tests/Data/HydroMechanics/IdealGas/flow_no_strain/flow_no_strain.prj
index a9a204e6b193d04ee907a0fa2f179f7d4d1151af..266e2c193df61099501ee132cf8988d2a72853a9 100644
--- a/Tests/Data/HydroMechanics/IdealGas/flow_no_strain/flow_no_strain.prj
+++ b/Tests/Data/HydroMechanics/IdealGas/flow_no_strain/flow_no_strain.prj
@@ -13,8 +13,6 @@
<youngs_modulus>E</youngs_modulus>
<poissons_ratio>nu</poissons_ratio>
</constitutive_relation>
- <intrinsic_permeability>k</intrinsic_permeability>
- <fluid_density>rho_fr</fluid_density>
<process_variables>
<displacement>displacement</displacement>
<pressure>pressure</pressure>
@@ -31,9 +29,6 @@
<secondary_variable internal_name="velocity" output_name="velocity"/>
</secondary_variables>
<specific_body_force>0 0</specific_body_force>
- <fluid_type>ideal_gas</fluid_type>
- <reference_temperature>293.15</reference_temperature>
- <specific_gas_constant>287.058</specific_gas_constant>
</process>
</processes>
<media>
@@ -47,6 +42,15 @@
<type>Constant</type>
<value>1e-5</value>
</property>
+ <property>
+ <name>density</name>
+ <type>IdealGasLaw</type>
+ </property>
+ <property>
+ <name>molar_mass</name>
+ <type>Constant</type>
+ <value>0.028964397787206768</value>
+ </property>
</properties>
</phase>
<phase>
@@ -70,6 +74,18 @@
</properties>
</phase>
</phases>
+ <properties>
+ <property>
+ <name>reference_temperature</name>
+ <type>Constant</type>
+ <value>293.15</value>
+ </property>
+ <property>
+ <name>permeability</name>
+ <type>Constant</type>
+ <value>1e-4</value>
+ </property>
+ </properties>
</medium>
</media>
<time_loop>
@@ -134,16 +150,6 @@
<value>.3</value>
</parameter>
<!-- Model parameters -->
- <parameter>
- <name>k</name>
- <type>Constant</type>
- <value>1e-4</value>
- </parameter>
- <parameter>
- <name>rho_fr</name>
- <type>Constant</type>
- <value>1.1883543</value>
- </parameter>
<parameter>
<name>displacement0</name>
<type>Constant</type>
diff --git a/Tests/Data/HydroMechanics/IdealGas/flow_pressure_boundary/flow_pressure_boundary.prj b/Tests/Data/HydroMechanics/IdealGas/flow_pressure_boundary/flow_pressure_boundary.prj
index 2363b308060fe7d95d70a9eaaee6950b0ddaeeb7..7c3629154a6c18faf24411473a55bc7e9efa8d8c 100644
--- a/Tests/Data/HydroMechanics/IdealGas/flow_pressure_boundary/flow_pressure_boundary.prj
+++ b/Tests/Data/HydroMechanics/IdealGas/flow_pressure_boundary/flow_pressure_boundary.prj
@@ -13,8 +13,6 @@
<youngs_modulus>E</youngs_modulus>
<poissons_ratio>nu</poissons_ratio>
</constitutive_relation>
- <intrinsic_permeability>k</intrinsic_permeability>
- <fluid_density>rho_fr</fluid_density>
<process_variables>
<displacement>displacement</displacement>
<pressure>pressure</pressure>
@@ -31,9 +29,6 @@
<secondary_variable internal_name="velocity" output_name="velocity"/>
</secondary_variables>
<specific_body_force>0 0</specific_body_force>
- <fluid_type>ideal_gas</fluid_type>
- <reference_temperature>293.15</reference_temperature>
- <specific_gas_constant>287.058</specific_gas_constant>
</process>
</processes>
<media>
@@ -47,6 +42,15 @@
<type>Constant</type>
<value>1e-5</value>
</property>
+ <property>
+ <name>density</name>
+ <type>IdealGasLaw</type>
+ </property>
+ <property>
+ <name>molar_mass</name>
+ <type>Constant</type>
+ <value>0.028964397787206768</value>
+ </property>
</properties>
</phase>
<phase>
@@ -70,6 +74,18 @@
</properties>
</phase>
</phases>
+ <properties>
+ <property>
+ <name>reference_temperature</name>
+ <type>Constant</type>
+ <value>293.15</value>
+ </property>
+ <property>
+ <name>permeability</name>
+ <type>Constant</type>
+ <value>1e-12</value>
+ </property>
+ </properties>
</medium>
</media>
<time_loop>
@@ -134,16 +150,6 @@
<value>.3</value>
</parameter>
<!-- Model parameters -->
- <parameter>
- <name>k</name>
- <type>Constant</type>
- <value>1e-12</value>
- </parameter>
- <parameter>
- <name>rho_fr</name>
- <type>Constant</type>
- <value>1.0</value>
- </parameter>
<parameter>
<name>displacement0</name>
<type>Constant</type>
diff --git a/Tests/Data/HydroMechanics/Linear/Confined_Compression/cube_1e3.prj b/Tests/Data/HydroMechanics/Linear/Confined_Compression/cube_1e3.prj
index bc7f03be1ce966f4edc0a20a03af98306eda9edf..32cd1a6ee4d08c0fec913ffb0ac349ec0f9c7afc 100644
--- a/Tests/Data/HydroMechanics/Linear/Confined_Compression/cube_1e3.prj
+++ b/Tests/Data/HydroMechanics/Linear/Confined_Compression/cube_1e3.prj
@@ -13,8 +13,6 @@
<youngs_modulus>E</youngs_modulus>
<poissons_ratio>nu</poissons_ratio>
</constitutive_relation>
- <intrinsic_permeability>k</intrinsic_permeability>
- <fluid_density>rho_fr</fluid_density>
<process_variables>
<displacement>displacement</displacement>
<pressure>pressure</pressure>
@@ -22,7 +20,6 @@
<secondary_variables>
</secondary_variables>
<specific_body_force>0 0 0</specific_body_force>
- <fluid_type>incompressible_fluid</fluid_type>
</process>
</processes>
<media>
@@ -36,6 +33,11 @@
<type>Constant</type>
<value>1e-9</value>
</property>
+ <property>
+ <name>density</name>
+ <type>Constant</type>
+ <value>1.0e-6</value>
+ </property>
</properties>
</phase>
<phase>
@@ -59,6 +61,18 @@
</properties>
</phase>
</phases>
+ <properties>
+ <property>
+ <name>reference_temperature</name>
+ <type>Constant</type>
+ <value>293.15</value>
+ </property>
+ <property>
+ <name>permeability</name>
+ <type>Constant</type>
+ <value>1e-12</value>
+ </property>
+ </properties>
</medium>
</media>
<time_loop>
@@ -114,16 +128,6 @@
<value>.1</value>
</parameter>
<!-- Model parameters -->
- <parameter>
- <name>k</name>
- <type>Constant</type>
- <value>1e-12</value>
- </parameter>
- <parameter>
- <name>rho_fr</name>
- <type>Constant</type>
- <value>1.0e-6</value>
- </parameter>
<parameter>
<name>displacement0</name>
<type>Constant</type>
diff --git a/Tests/Data/HydroMechanics/Linear/Confined_Compression/square_1e2.prj b/Tests/Data/HydroMechanics/Linear/Confined_Compression/square_1e2.prj
index b7acdc9b947c2869233b51f6c0b0b7359ed41132..46e59f92a78eb694f126a71d7b851bd22fc2c9ae 100644
--- a/Tests/Data/HydroMechanics/Linear/Confined_Compression/square_1e2.prj
+++ b/Tests/Data/HydroMechanics/Linear/Confined_Compression/square_1e2.prj
@@ -13,8 +13,6 @@
<youngs_modulus>E</youngs_modulus>
<poissons_ratio>nu</poissons_ratio>
</constitutive_relation>
- <intrinsic_permeability>k</intrinsic_permeability>
- <fluid_density>rho_fr</fluid_density>
<process_variables>
<displacement>displacement</displacement>
<pressure>pressure</pressure>
@@ -31,7 +29,6 @@
<secondary_variable internal_name="velocity" output_name="velocity"/>
</secondary_variables>
<specific_body_force>0 0</specific_body_force>
- <fluid_type>incompressible_fluid</fluid_type>
</process>
</processes>
<media>
@@ -45,6 +42,11 @@
<type>Constant</type>
<value>1e-9</value>
</property>
+ <property>
+ <name>density</name>
+ <type>Constant</type>
+ <value>1.0e-6</value>
+ </property>
</properties>
</phase>
<phase>
@@ -68,6 +70,18 @@
</properties>
</phase>
</phases>
+ <properties>
+ <property>
+ <name>reference_temperature</name>
+ <type>Constant</type>
+ <value>293.15</value>
+ </property>
+ <property>
+ <name>permeability</name>
+ <type>Constant</type>
+ <value>1e-12</value>
+ </property>
+ </properties>
</medium>
</media>
<time_loop>
@@ -148,16 +162,6 @@
<value>.1</value>
</parameter>
<!-- Model parameters -->
- <parameter>
- <name>k</name>
- <type>Constant</type>
- <value>1e-12</value>
- </parameter>
- <parameter>
- <name>rho_fr</name>
- <type>Constant</type>
- <value>1.0e-6</value>
- </parameter>
<parameter>
<name>displacement0</name>
<type>Constant</type>
diff --git a/Tests/Data/HydroMechanics/Linear/Confined_Compression/square_1e2_quad9.prj b/Tests/Data/HydroMechanics/Linear/Confined_Compression/square_1e2_quad9.prj
index 645b25d4fa669e9529073e0e501106698de6ce12..5c54933ff18b307c77454b1da817d1222b08331d 100644
--- a/Tests/Data/HydroMechanics/Linear/Confined_Compression/square_1e2_quad9.prj
+++ b/Tests/Data/HydroMechanics/Linear/Confined_Compression/square_1e2_quad9.prj
@@ -13,8 +13,6 @@
<youngs_modulus>E</youngs_modulus>
<poissons_ratio>nu</poissons_ratio>
</constitutive_relation>
- <intrinsic_permeability>k</intrinsic_permeability>
- <fluid_density>rho_fr</fluid_density>
<process_variables>
<displacement>displacement</displacement>
<pressure>pressure</pressure>
@@ -22,7 +20,6 @@
<secondary_variables>
</secondary_variables>
<specific_body_force>0 0</specific_body_force>
- <fluid_type>incompressible_fluid</fluid_type>
</process>
</processes>
<media>
@@ -36,6 +33,11 @@
<type>Constant</type>
<value>1e-9</value>
</property>
+ <property>
+ <name>density</name>
+ <type>Constant</type>
+ <value>1.0e-6</value>
+ </property>
</properties>
</phase>
<phase>
@@ -59,6 +61,18 @@
</properties>
</phase>
</phases>
+ <properties>
+ <property>
+ <name>reference_temperature</name>
+ <type>Constant</type>
+ <value>293.15</value>
+ </property>
+ <property>
+ <name>permeability</name>
+ <type>Constant</type>
+ <value>1e-12</value>
+ </property>
+ </properties>
</medium>
</media>
<time_loop>
@@ -114,16 +128,6 @@
<value>.1</value>
</parameter>
<!-- Model parameters -->
- <parameter>
- <name>k</name>
- <type>Constant</type>
- <value>1e-12</value>
- </parameter>
- <parameter>
- <name>rho_fr</name>
- <type>Constant</type>
- <value>1.0e-6</value>
- </parameter>
<parameter>
<name>displacement0</name>
<type>Constant</type>
diff --git a/Tests/Data/HydroMechanics/Linear/Confined_Compression/square_1e2_tri.prj b/Tests/Data/HydroMechanics/Linear/Confined_Compression/square_1e2_tri.prj
index b12a70e732149f130db197a142d2da4d2e2da4f5..3ef77d7770873f287e5aa7841609173230c32190 100644
--- a/Tests/Data/HydroMechanics/Linear/Confined_Compression/square_1e2_tri.prj
+++ b/Tests/Data/HydroMechanics/Linear/Confined_Compression/square_1e2_tri.prj
@@ -13,8 +13,6 @@
<youngs_modulus>E</youngs_modulus>
<poissons_ratio>nu</poissons_ratio>
</constitutive_relation>
- <intrinsic_permeability>k</intrinsic_permeability>
- <fluid_density>rho_fr</fluid_density>
<process_variables>
<displacement>displacement</displacement>
<pressure>pressure</pressure>
@@ -22,7 +20,6 @@
<secondary_variables>
</secondary_variables>
<specific_body_force>0 0</specific_body_force>
- <fluid_type>incompressible_fluid</fluid_type>
</process>
</processes>
<media>
@@ -36,6 +33,11 @@
<type>Constant</type>
<value>1e-9</value>
</property>
+ <property>
+ <name>density</name>
+ <type>Constant</type>
+ <value>1.0e-6</value>
+ </property>
</properties>
</phase>
<phase>
@@ -59,6 +61,18 @@
</properties>
</phase>
</phases>
+ <properties>
+ <property>
+ <name>reference_temperature</name>
+ <type>Constant</type>
+ <value>293.15</value>
+ </property>
+ <property>
+ <name>permeability</name>
+ <type>Constant</type>
+ <value>1e-12</value>
+ </property>
+ </properties>
</medium>
</media>
<time_loop>
@@ -114,16 +128,6 @@
<value>.1</value>
</parameter>
<!-- Model parameters -->
- <parameter>
- <name>k</name>
- <type>Constant</type>
- <value>1e-12</value>
- </parameter>
- <parameter>
- <name>rho_fr</name>
- <type>Constant</type>
- <value>1.0e-6</value>
- </parameter>
<parameter>
<name>displacement0</name>
<type>Constant</type>
diff --git a/Tests/Data/HydroMechanics/Linear/Gravity/flow_gravity.prj b/Tests/Data/HydroMechanics/Linear/Gravity/flow_gravity.prj
index 0ff488d471f30b11f780e13ebbce077f21613f36..8d60f88a6e3cd3a0163cbb1463adcd766250e29f 100644
--- a/Tests/Data/HydroMechanics/Linear/Gravity/flow_gravity.prj
+++ b/Tests/Data/HydroMechanics/Linear/Gravity/flow_gravity.prj
@@ -13,8 +13,6 @@
<youngs_modulus>E</youngs_modulus>
<poissons_ratio>nu</poissons_ratio>
</constitutive_relation>
- <intrinsic_permeability>k</intrinsic_permeability>
- <fluid_density>rho_fr</fluid_density>
<process_variables>
<displacement>displacement</displacement>
<pressure>pressure</pressure>
@@ -31,7 +29,6 @@
<secondary_variable internal_name="velocity" output_name="velocity"/>
</secondary_variables>
<specific_body_force>0 -10</specific_body_force>
- <fluid_type>incompressible_fluid</fluid_type>
</process>
</processes>
<media>
@@ -45,6 +42,11 @@
<type>Constant</type>
<value>1e-3</value>
</property>
+ <property>
+ <name>density</name>
+ <type>Constant</type>
+ <value>1.0e3</value>
+ </property>
</properties>
</phase>
<phase>
@@ -68,6 +70,18 @@
</properties>
</phase>
</phases>
+ <properties>
+ <property>
+ <name>reference_temperature</name>
+ <type>Constant</type>
+ <value>293.15</value>
+ </property>
+ <property>
+ <name>permeability</name>
+ <type>Constant</type>
+ <value>1e-12</value>
+ </property>
+ </properties>
</medium>
</media>
<time_loop>
@@ -140,16 +154,6 @@
<value>.1</value>
</parameter>
<!-- Model parameters -->
- <parameter>
- <name>k</name>
- <type>Constant</type>
- <value>1e-12</value>
- </parameter>
- <parameter>
- <name>rho_fr</name>
- <type>Constant</type>
- <value>1.0e3</value>
- </parameter>
<parameter>
<name>displacement0</name>
<type>Constant</type>
diff --git a/Tests/Data/HydroMechanics/Linear/Unconfined_Compression_early/square_1e2_UC_early.prj b/Tests/Data/HydroMechanics/Linear/Unconfined_Compression_early/square_1e2_UC_early.prj
index 011958f0aaf0b3957fcd23bfd3a447f981a69816..9a3f9d79d0c53232180cf1245f543ea6c2ddb1c0 100644
--- a/Tests/Data/HydroMechanics/Linear/Unconfined_Compression_early/square_1e2_UC_early.prj
+++ b/Tests/Data/HydroMechanics/Linear/Unconfined_Compression_early/square_1e2_UC_early.prj
@@ -13,8 +13,6 @@
<youngs_modulus>E</youngs_modulus>
<poissons_ratio>nu</poissons_ratio>
</constitutive_relation>
- <intrinsic_permeability>k</intrinsic_permeability>
- <fluid_density>rho_fr</fluid_density>
<process_variables>
<displacement>displacement</displacement>
<pressure>pressure</pressure>
@@ -22,7 +20,6 @@
<secondary_variables>
</secondary_variables>
<specific_body_force>0 0</specific_body_force>
- <fluid_type>incompressible_fluid</fluid_type>
</process>
</processes>
<media>
@@ -36,6 +33,11 @@
<type>Constant</type>
<value>1e-3</value>
</property>
+ <property>
+ <name>density</name>
+ <type>Constant</type>
+ <value>1.0e-6</value>
+ </property>
</properties>
</phase>
<phase>
@@ -59,6 +61,18 @@
</properties>
</phase>
</phases>
+ <properties>
+ <property>
+ <name>reference_temperature</name>
+ <type>Constant</type>
+ <value>293.15</value>
+ </property>
+ <property>
+ <name>permeability</name>
+ <type>Constant</type>
+ <value>1e-10</value>
+ </property>
+ </properties>
</medium>
</media>
<time_loop>
@@ -114,16 +128,6 @@
<value>0.2</value>
</parameter>
<!-- Model parameters -->
- <parameter>
- <name>k</name>
- <type>Constant</type>
- <value>1e-10</value>
- </parameter>
- <parameter>
- <name>rho_fr</name>
- <type>Constant</type>
- <value>1.0e-6</value>
- </parameter>
<parameter>
<name>displacement0</name>
<type>Constant</type>
diff --git a/Tests/Data/HydroMechanics/Linear/Unconfined_Compression_early/square_1e4_UC_early.prj b/Tests/Data/HydroMechanics/Linear/Unconfined_Compression_early/square_1e4_UC_early.prj
index 840b6a07d998e51ef20ffa6bb72363df6e5039c9..b996f7f4eb8371490f475f7c15dd0992e17dc0d9 100644
--- a/Tests/Data/HydroMechanics/Linear/Unconfined_Compression_early/square_1e4_UC_early.prj
+++ b/Tests/Data/HydroMechanics/Linear/Unconfined_Compression_early/square_1e4_UC_early.prj
@@ -13,8 +13,6 @@
<youngs_modulus>E</youngs_modulus>
<poissons_ratio>nu</poissons_ratio>
</constitutive_relation>
- <intrinsic_permeability>k</intrinsic_permeability>
- <fluid_density>rho_fr</fluid_density>
<process_variables>
<displacement>displacement</displacement>
<pressure>pressure</pressure>
@@ -22,7 +20,6 @@
<secondary_variables>
</secondary_variables>
<specific_body_force>0 0</specific_body_force>
- <fluid_type>incompressible_fluid</fluid_type>
</process>
</processes>
<media>
@@ -36,6 +33,11 @@
<type>Constant</type>
<value>1e-3</value>
</property>
+ <property>
+ <name>density</name>
+ <type>Constant</type>
+ <value>1.0e-6</value>
+ </property>
</properties>
</phase>
<phase>
@@ -59,6 +61,18 @@
</properties>
</phase>
</phases>
+ <properties>
+ <property>
+ <name>reference_temperature</name>
+ <type>Constant</type>
+ <value>293.15</value>
+ </property>
+ <property>
+ <name>permeability</name>
+ <type>Constant</type>
+ <value>1e-10</value>
+ </property>
+ </properties>
</medium>
</media>
<time_loop>
@@ -114,16 +128,6 @@
<value>0.2</value>
</parameter>
<!-- Model parameters -->
- <parameter>
- <name>k</name>
- <type>Constant</type>
- <value>1e-10</value>
- </parameter>
- <parameter>
- <name>rho_fr</name>
- <type>Constant</type>
- <value>1.0e-6</value>
- </parameter>
<parameter>
<name>displacement0</name>
<type>Constant</type>
diff --git a/Tests/Data/HydroMechanics/Linear/Unconfined_Compression_late/square_1e2_UC_late.prj b/Tests/Data/HydroMechanics/Linear/Unconfined_Compression_late/square_1e2_UC_late.prj
index c6c68fdfb82220c8fb66f89a5cdd411f5ec3213d..5500784b0c9599ddd8ca96bda6d03be0068fffae 100644
--- a/Tests/Data/HydroMechanics/Linear/Unconfined_Compression_late/square_1e2_UC_late.prj
+++ b/Tests/Data/HydroMechanics/Linear/Unconfined_Compression_late/square_1e2_UC_late.prj
@@ -13,8 +13,6 @@
<youngs_modulus>E</youngs_modulus>
<poissons_ratio>nu</poissons_ratio>
</constitutive_relation>
- <intrinsic_permeability>k</intrinsic_permeability>
- <fluid_density>rho_fr</fluid_density>
<process_variables>
<displacement>displacement</displacement>
<pressure>pressure</pressure>
@@ -22,7 +20,6 @@
<secondary_variables>
</secondary_variables>
<specific_body_force>0 0</specific_body_force>
- <fluid_type>incompressible_fluid</fluid_type>
</process>
</processes>
<media>
@@ -36,6 +33,11 @@
<type>Constant</type>
<value>1e-3</value>
</property>
+ <property>
+ <name>density</name>
+ <type>Constant</type>
+ <value>1.0e-6</value>
+ </property>
</properties>
</phase>
<phase>
@@ -59,6 +61,18 @@
</properties>
</phase>
</phases>
+ <properties>
+ <property>
+ <name>reference_temperature</name>
+ <type>Constant</type>
+ <value>293.15</value>
+ </property>
+ <property>
+ <name>permeability</name>
+ <type>Constant</type>
+ <value>1e-10</value>
+ </property>
+ </properties>
</medium>
</media>
<time_loop>
@@ -114,16 +128,6 @@
<value>0.2</value>
</parameter>
<!-- Model parameters -->
- <parameter>
- <name>k</name>
- <type>Constant</type>
- <value>1e-10</value>
- </parameter>
- <parameter>
- <name>rho_fr</name>
- <type>Constant</type>
- <value>1.0e-6</value>
- </parameter>
<parameter>
<name>displacement0</name>
<type>Constant</type>
diff --git a/Tests/Data/HydroMechanics/Linear/Unconfined_Compression_late/square_1e4_UC_late.prj b/Tests/Data/HydroMechanics/Linear/Unconfined_Compression_late/square_1e4_UC_late.prj
index cefbc07b42bd893a642572a504a11db00248d0e2..ead2fa0366c38379d149e77d1f416bb788fcbf82 100644
--- a/Tests/Data/HydroMechanics/Linear/Unconfined_Compression_late/square_1e4_UC_late.prj
+++ b/Tests/Data/HydroMechanics/Linear/Unconfined_Compression_late/square_1e4_UC_late.prj
@@ -13,8 +13,6 @@
<youngs_modulus>E</youngs_modulus>
<poissons_ratio>nu</poissons_ratio>
</constitutive_relation>
- <intrinsic_permeability>k</intrinsic_permeability>
- <fluid_density>rho_fr</fluid_density>
<process_variables>
<displacement>displacement</displacement>
<pressure>pressure</pressure>
@@ -22,7 +20,6 @@
<secondary_variables>
</secondary_variables>
<specific_body_force>0 0</specific_body_force>
- <fluid_type>incompressible_fluid</fluid_type>
</process>
</processes>
<media>
@@ -36,6 +33,11 @@
<type>Constant</type>
<value>1e-3</value>
</property>
+ <property>
+ <name>density</name>
+ <type>Constant</type>
+ <value>1.0e-6</value>
+ </property>
</properties>
</phase>
<phase>
@@ -59,6 +61,18 @@
</properties>
</phase>
</phases>
+ <properties>
+ <property>
+ <name>reference_temperature</name>
+ <type>Constant</type>
+ <value>293.15</value>
+ </property>
+ <property>
+ <name>permeability</name>
+ <type>Constant</type>
+ <value>1e-10</value>
+ </property>
+ </properties>
</medium>
</media>
<time_loop>
@@ -114,16 +128,6 @@
<value>0.2</value>
</parameter>
<!-- Model parameters -->
- <parameter>
- <name>k</name>
- <type>Constant</type>
- <value>1e-10</value>
- </parameter>
- <parameter>
- <name>rho_fr</name>
- <type>Constant</type>
- <value>1.0e-6</value>
- </parameter>
<parameter>
<name>displacement0</name>
<type>Constant</type>
diff --git a/Tests/Data/HydroMechanics/Principal_Stress/Hollow_Sphere/sphere.prj b/Tests/Data/HydroMechanics/Principal_Stress/Hollow_Sphere/sphere.prj
index 6901a060dfe41b64a75edf7ccfd8ce6c03033c8b..090cb271d77f6c4195a38588bc7232f73b0a8b71 100644
--- a/Tests/Data/HydroMechanics/Principal_Stress/Hollow_Sphere/sphere.prj
+++ b/Tests/Data/HydroMechanics/Principal_Stress/Hollow_Sphere/sphere.prj
@@ -18,8 +18,6 @@
<youngs_modulus>E</youngs_modulus>
<poissons_ratio>nu</poissons_ratio>
</constitutive_relation>
- <intrinsic_permeability>k</intrinsic_permeability>
- <fluid_density>rho_fr</fluid_density>
<process_variables>
<displacement>displacement</displacement>
<pressure>pressure</pressure>
@@ -36,7 +34,6 @@
<secondary_variable internal_name="velocity" output_name="velocity"/>
</secondary_variables>
<specific_body_force>0 0</specific_body_force>
- <fluid_type>incompressible_fluid</fluid_type>
</process>
</processes>
<time_loop>
@@ -99,6 +96,11 @@
<type>Constant</type>
<value>1e-3</value>
</property>
+ <property>
+ <name>density</name>
+ <type>Constant</type>
+ <value>1</value>
+ </property>
</properties>
</phase>
<phase>
@@ -122,6 +124,18 @@
</properties>
</phase>
</phases>
+ <properties>
+ <property>
+ <name>reference_temperature</name>
+ <type>Constant</type>
+ <value>293.15</value>
+ </property>
+ <property>
+ <name>permeability</name>
+ <type>Constant</type>
+ <value>1e-16</value>
+ </property>
+ </properties>
</medium>
</media>
<parameters>
@@ -137,16 +151,6 @@
<value>0.3</value>
</parameter>
<!-- Model parameters -->
- <parameter>
- <name>k</name>
- <type>Constant</type>
- <value>1e-16</value>
- </parameter>
- <parameter>
- <name>rho_fr</name>
- <type>Constant</type>
- <value>1</value>
- </parameter>
<parameter>
<name>displacement0</name>
<type>Constant</type>
diff --git a/Tests/Data/HydroMechanics/Principal_Stress/Tube/tube.prj b/Tests/Data/HydroMechanics/Principal_Stress/Tube/tube.prj
index 914112316c02ef43753707aee7d7fc064c246bb1..32a396eba681427b7b94cd0a8675f383e6128490 100644
--- a/Tests/Data/HydroMechanics/Principal_Stress/Tube/tube.prj
+++ b/Tests/Data/HydroMechanics/Principal_Stress/Tube/tube.prj
@@ -18,8 +18,6 @@
<youngs_modulus>E</youngs_modulus>
<poissons_ratio>nu</poissons_ratio>
</constitutive_relation>
- <intrinsic_permeability>k</intrinsic_permeability>
- <fluid_density>rho_fr</fluid_density>
<process_variables>
<displacement>displacement</displacement>
<pressure>pressure</pressure>
@@ -36,7 +34,6 @@
<secondary_variable internal_name="velocity" output_name="velocity"/>
</secondary_variables>
<specific_body_force>0 0</specific_body_force>
- <fluid_type>incompressible_fluid</fluid_type>
</process>
</processes>
<time_loop>
@@ -99,6 +96,11 @@
<type>Constant</type>
<value>1e-3</value>
</property>
+ <property>
+ <name>density</name>
+ <type>Constant</type>
+ <value>1</value>
+ </property>
</properties>
</phase>
<phase>
@@ -122,6 +124,18 @@
</properties>
</phase>
</phases>
+ <properties>
+ <property>
+ <name>reference_temperature</name>
+ <type>Constant</type>
+ <value>293.15</value>
+ </property>
+ <property>
+ <name>permeability</name>
+ <type>Constant</type>
+ <value>1e-16</value>
+ </property>
+ </properties>
</medium>
</media>
<parameters>
@@ -137,16 +151,6 @@
<value>0.3</value>
</parameter>
<!-- Model parameters -->
- <parameter>
- <name>k</name>
- <type>Constant</type>
- <value>1e-16</value>
- </parameter>
- <parameter>
- <name>rho_fr</name>
- <type>Constant</type>
- <value>1</value>
- </parameter>
<parameter>
<name>displacement0</name>
<type>Constant</type>
diff --git a/Tests/Data/HydroMechanics/Verification/hm1_1Dbeam.prj b/Tests/Data/HydroMechanics/Verification/hm1_1Dbeam.prj
index 7e5c53fff206c08914f7bd98ba1ab7505cb783d7..457380aaa9fc51021b0a71bb5d2995c573f871ba 100755
--- a/Tests/Data/HydroMechanics/Verification/hm1_1Dbeam.prj
+++ b/Tests/Data/HydroMechanics/Verification/hm1_1Dbeam.prj
@@ -14,8 +14,6 @@
<youngs_modulus>E</youngs_modulus>
<poissons_ratio>nu</poissons_ratio>
</constitutive_relation>
- <intrinsic_permeability>k</intrinsic_permeability>
- <fluid_density>rho_liquid</fluid_density>
<process_variables>
<pressure>pressure</pressure>
<displacement>displacement</displacement>
@@ -36,7 +34,6 @@
<secondary_variable internal_name="epsilon_yz" output_name="epsilon_yz"/>
</secondary_variables>
<specific_body_force> 0 0 0 </specific_body_force>
- <fluid_type>incompressible_fluid</fluid_type>
</process>
</processes>
<media>
@@ -50,6 +47,11 @@
<type>Constant</type>
<value>1e-3</value>
</property>
+ <property>
+ <name>density</name>
+ <type>Constant</type>
+ <value>1</value>
+ </property>
</properties>
</phase>
<phase>
@@ -73,6 +75,18 @@
</properties>
</phase>
</phases>
+ <properties>
+ <property>
+ <name>reference_temperature</name>
+ <type>Constant</type>
+ <value>293.15</value>
+ </property>
+ <property>
+ <name>permeability</name>
+ <type>Constant</type>
+ <value>1e-12</value>
+ </property>
+ </properties>
</medium>
</media>
<time_loop>
@@ -173,35 +187,13 @@
<parameters>
<parameter>
<name>E</name>
- <type>Group</type>
- <group_id_property>MaterialIDs</group_id_property>
- <index_values>
- <index>0</index>
- <value>2.5e+10</value>
- </index_values>
+ <type>Constant</type>
+ <value>2.5e10</value>
</parameter>
<parameter>
<name>nu</name>
- <type>Group</type>
- <group_id_property>MaterialIDs</group_id_property>
- <index_values>
- <index>0</index>
- <value>0.25</value>
- </index_values>
- </parameter>
- <parameter>
- <name>k</name>
- <type>Group</type>
- <group_id_property>MaterialIDs</group_id_property>
- <index_values>
- <index>0</index>
- <value>1e-12</value>
- </index_values>
- </parameter>
- <parameter>
- <name>rho_liquid</name>
<type>Constant</type>
- <value>1</value>
+ <value>0.25</value>
</parameter>
<parameter>
<name>zero</name>
diff --git a/Tests/Data/HydroMechanics/Verification/hm1_2Dsquare.prj b/Tests/Data/HydroMechanics/Verification/hm1_2Dsquare.prj
index 645ef8c852371700fb3c9b2961549619451726ff..b5fc49fd392ad6bd0db261c1bc29085b8a0411fe 100755
--- a/Tests/Data/HydroMechanics/Verification/hm1_2Dsquare.prj
+++ b/Tests/Data/HydroMechanics/Verification/hm1_2Dsquare.prj
@@ -14,8 +14,6 @@
<youngs_modulus>E</youngs_modulus>
<poissons_ratio>nu</poissons_ratio>
</constitutive_relation>
- <intrinsic_permeability>k</intrinsic_permeability>
- <fluid_density>rho_liquid</fluid_density>
<process_variables>
<pressure>pressure</pressure>
<displacement>displacement</displacement>
@@ -36,7 +34,6 @@
<secondary_variable internal_name="epsilon_yz" output_name="epsilon_yz"/>
</secondary_variables>
<specific_body_force> 0 0 0 </specific_body_force>
- <fluid_type>incompressible_fluid</fluid_type>
</process>
</processes>
<media>
@@ -50,6 +47,11 @@
<type>Constant</type>
<value>1e-3</value>
</property>
+ <property>
+ <name>density</name>
+ <type>Constant</type>
+ <value>1</value>
+ </property>
</properties>
</phase>
<phase>
@@ -73,6 +75,18 @@
</properties>
</phase>
</phases>
+ <properties>
+ <property>
+ <name>reference_temperature</name>
+ <type>Constant</type>
+ <value>293.15</value>
+ </property>
+ <property>
+ <name>permeability</name>
+ <type>Constant</type>
+ <value>1e-11</value>
+ </property>
+ </properties>
</medium>
</media>
<time_loop>
@@ -173,35 +187,13 @@
<parameters>
<parameter>
<name>E</name>
- <type>Group</type>
- <group_id_property>MaterialIDs</group_id_property>
- <index_values>
- <index>0</index>
- <value>1.0e+10</value>
- </index_values>
+ <type>Constant</type>
+ <value>1e10</value>
</parameter>
<parameter>
<name>nu</name>
- <type>Group</type>
- <group_id_property>MaterialIDs</group_id_property>
- <index_values>
- <index>0</index>
- <value>0.25</value>
- </index_values>
- </parameter>
- <parameter>
- <name>k</name>
- <type>Group</type>
- <group_id_property>MaterialIDs</group_id_property>
- <index_values>
- <index>0</index>
- <value>1e-11</value>
- </index_values>
- </parameter>
- <parameter>
- <name>rho_liquid</name>
<type>Constant</type>
- <value>1</value>
+ <value>0.25</value>
</parameter>
<parameter>
<name>zero</name>
diff --git a/Tests/Data/HydroMechanics/Verification/hm1_3Dcube.prj b/Tests/Data/HydroMechanics/Verification/hm1_3Dcube.prj
index ba601930d6f4c8586d665a4b3dc95757f296f1b3..f87141d186ac5eea75646c961c9d16510c291766 100755
--- a/Tests/Data/HydroMechanics/Verification/hm1_3Dcube.prj
+++ b/Tests/Data/HydroMechanics/Verification/hm1_3Dcube.prj
@@ -14,8 +14,6 @@
<youngs_modulus>E</youngs_modulus>
<poissons_ratio>nu</poissons_ratio>
</constitutive_relation>
- <intrinsic_permeability>k</intrinsic_permeability>
- <fluid_density>rho_liquid</fluid_density>
<process_variables>
<pressure>pressure</pressure>
<displacement>displacement</displacement>
@@ -36,7 +34,6 @@
<secondary_variable internal_name="epsilon_yz" output_name="epsilon_yz"/>
</secondary_variables>
<specific_body_force> 0 0 0 </specific_body_force>
- <fluid_type>incompressible_fluid</fluid_type>
</process>
</processes>
<media>
@@ -50,6 +47,11 @@
<type>Constant</type>
<value>1e-3</value>
</property>
+ <property>
+ <name>density</name>
+ <type>Constant</type>
+ <value>1</value>
+ </property>
</properties>
</phase>
<phase>
@@ -73,6 +75,18 @@
</properties>
</phase>
</phases>
+ <properties>
+ <property>
+ <name>reference_temperature</name>
+ <type>Constant</type>
+ <value>293.15</value>
+ </property>
+ <property>
+ <name>permeability</name>
+ <type>Constant</type>
+ <value>1e-10</value>
+ </property>
+ </properties>
</medium>
</media>
<time_loop>
@@ -173,35 +187,13 @@
<parameters>
<parameter>
<name>E</name>
- <type>Group</type>
- <group_id_property>MaterialIDs</group_id_property>
- <index_values>
- <index>0</index>
- <value>1.0e+10</value>
- </index_values>
+ <type>Constant</type>
+ <value>1e10</value>
</parameter>
<parameter>
<name>nu</name>
- <type>Group</type>
- <group_id_property>MaterialIDs</group_id_property>
- <index_values>
- <index>0</index>
- <value>0.25</value>
- </index_values>
- </parameter>
- <parameter>
- <name>k</name>
- <type>Group</type>
- <group_id_property>MaterialIDs</group_id_property>
- <index_values>
- <index>0</index>
- <value>1e-10</value>
- </index_values>
- </parameter>
- <parameter>
- <name>rho_liquid</name>
<type>Constant</type>
- <value>1</value>
+ <value>0.25</value>
</parameter>
<parameter>
<name>zero</name>
diff --git a/Tests/Data/HydroMechanics/Verification/hm1_3Dgravity.prj b/Tests/Data/HydroMechanics/Verification/hm1_3Dgravity.prj
index a5064b8d6fc68560ebadb8bef7f6020adeba9c7c..ec8b306f6ff7222b37631327dc13cfe108b84438 100755
--- a/Tests/Data/HydroMechanics/Verification/hm1_3Dgravity.prj
+++ b/Tests/Data/HydroMechanics/Verification/hm1_3Dgravity.prj
@@ -14,8 +14,6 @@
<youngs_modulus>E</youngs_modulus>
<poissons_ratio>nu</poissons_ratio>
</constitutive_relation>
- <intrinsic_permeability>k</intrinsic_permeability>
- <fluid_density>rho_liquid</fluid_density>
<process_variables>
<pressure>pressure</pressure>
<displacement>displacement</displacement>
@@ -36,7 +34,6 @@
<secondary_variable internal_name="epsilon_yz" output_name="epsilon_yz"/>
</secondary_variables>
<specific_body_force> 0 0 -9.81 </specific_body_force>
- <fluid_type>incompressible_fluid</fluid_type>
</process>
</processes>
<media>
@@ -50,6 +47,11 @@
<type>Constant</type>
<value>1e-3</value>
</property>
+ <property>
+ <name>density</name>
+ <type>Constant</type>
+ <value>1.019368e+3</value>
+ </property>
</properties>
</phase>
<phase>
@@ -73,6 +75,18 @@
</properties>
</phase>
</phases>
+ <properties>
+ <property>
+ <name>reference_temperature</name>
+ <type>Constant</type>
+ <value>293.15</value>
+ </property>
+ <property>
+ <name>permeability</name>
+ <type>Constant</type>
+ <value>1e-15</value>
+ </property>
+ </properties>
</medium>
<medium id="1">
<phases>
@@ -84,6 +98,11 @@
<type>Constant</type>
<value>1e-3</value>
</property>
+ <property>
+ <name>density</name>
+ <type>Constant</type>
+ <value>1.019368e+3</value>
+ </property>
</properties>
</phase>
<phase>
@@ -107,6 +126,18 @@
</properties>
</phase>
</phases>
+ <properties>
+ <property>
+ <name>reference_temperature</name>
+ <type>Constant</type>
+ <value>293.15</value>
+ </property>
+ <property>
+ <name>permeability</name>
+ <type>Constant</type>
+ <value>1e-14</value>
+ </property>
+ </properties>
</medium>
<medium id="2">
<phases>
@@ -118,6 +149,11 @@
<type>Constant</type>
<value>1e-3</value>
</property>
+ <property>
+ <name>density</name>
+ <type>Constant</type>
+ <value>1.019368e+3</value>
+ </property>
</properties>
</phase>
<phase>
@@ -141,6 +177,18 @@
</properties>
</phase>
</phases>
+ <properties>
+ <property>
+ <name>reference_temperature</name>
+ <type>Constant</type>
+ <value>293.15</value>
+ </property>
+ <property>
+ <name>permeability</name>
+ <type>Constant</type>
+ <value>1e-13</value>
+ </property>
+ </properties>
</medium>
<medium id="3">
<phases>
@@ -152,6 +200,11 @@
<type>Constant</type>
<value>1e-3</value>
</property>
+ <property>
+ <name>density</name>
+ <type>Constant</type>
+ <value>1.019368e+3</value>
+ </property>
</properties>
</phase>
<phase>
@@ -175,6 +228,18 @@
</properties>
</phase>
</phases>
+ <properties>
+ <property>
+ <name>reference_temperature</name>
+ <type>Constant</type>
+ <value>293.15</value>
+ </property>
+ <property>
+ <name>permeability</name>
+ <type>Constant</type>
+ <value>1e-12</value>
+ </property>
+ </properties>
</medium>
</media>
<time_loop>
@@ -275,71 +340,13 @@
<parameters>
<parameter>
<name>E</name>
- <type>Group</type>
- <group_id_property>MaterialIDs</group_id_property>
- <index_values>
- <index>0</index>
- <value>1.0e+10</value>
- </index_values>
- <index_values>
- <index>1</index>
- <value>1.0e+10</value>
- </index_values>
- <index_values>
- <index>2</index>
- <value>1.0e+10</value>
- </index_values>
- <index_values>
- <index>3</index>
- <value>1.0e+10</value>
- </index_values>
+ <type>Constant</type>
+ <value>1e10</value>
</parameter>
<parameter>
<name>nu</name>
- <type>Group</type>
- <group_id_property>MaterialIDs</group_id_property>
- <index_values>
- <index>0</index>
- <value>0.25</value>
- </index_values>
- <index_values>
- <index>1</index>
- <value>0.25</value>
- </index_values>
- <index_values>
- <index>2</index>
- <value>0.25</value>
- </index_values>
- <index_values>
- <index>3</index>
- <value>0.25</value>
- </index_values>
- </parameter>
- <parameter>
- <name>k</name>
- <type>Group</type>
- <group_id_property>MaterialIDs</group_id_property>
- <index_values>
- <index>0</index>
- <value>1e-15</value>
- </index_values>
- <index_values>
- <index>1</index>
- <value>1e-14</value>
- </index_values>
- <index_values>
- <index>2</index>
- <value>1e-13</value>
- </index_values>
- <index_values>
- <index>3</index>
- <value>1e-12</value>
- </index_values>
- </parameter>
- <parameter>
- <name>rho_liquid</name>
<type>Constant</type>
- <value>1.019368e+3</value>
+ <value>0.25</value>
</parameter>
<parameter>
<name>zero</name>
diff --git a/Tests/Data/HydroMechanics/Verification/hm2_1D1bt.prj b/Tests/Data/HydroMechanics/Verification/hm2_1D1bt.prj
index 7102d199dd60b716f55369151d72bb277647a97f..847c8be6e34f11e9eff3fe14d46e7bec20d5a499 100755
--- a/Tests/Data/HydroMechanics/Verification/hm2_1D1bt.prj
+++ b/Tests/Data/HydroMechanics/Verification/hm2_1D1bt.prj
@@ -13,8 +13,6 @@
<youngs_modulus>E</youngs_modulus>
<poissons_ratio>nu</poissons_ratio>
</constitutive_relation>
- <intrinsic_permeability>k</intrinsic_permeability>
- <fluid_density>rho_liquid</fluid_density>
<process_variables>
<pressure>pressure</pressure>
<displacement>displacement</displacement>
@@ -35,7 +33,6 @@
<secondary_variable internal_name="epsilon_yz" output_name="epsilon_yz"/>
</secondary_variables>
<specific_body_force>0 0 0</specific_body_force>
- <fluid_type>incompressible_fluid</fluid_type>
</process>
</processes>
<media>
@@ -49,6 +46,11 @@
<type>Constant</type>
<value>1e-3</value>
</property>
+ <property>
+ <name>density</name>
+ <type>Constant</type>
+ <value> 1 </value>
+ </property>
</properties>
</phase>
<phase>
@@ -72,6 +74,18 @@
</properties>
</phase>
</phases>
+ <properties>
+ <property>
+ <name>reference_temperature</name>
+ <type>Constant</type>
+ <value>293.15</value>
+ </property>
+ <property>
+ <name>permeability</name>
+ <type>Constant</type>
+ <value>1e-10</value>
+ </property>
+ </properties>
</medium>
</media>
<time_loop>
@@ -127,35 +141,13 @@
<parameters>
<parameter>
<name>E</name>
- <type>Group</type>
- <group_id_property>MaterialIDs</group_id_property>
- <index_values>
- <index>0</index>
- <value>27000</value>
- </index_values>
+ <type>Constant</type>
+ <value>27000</value>
</parameter>
<parameter>
<name>nu</name>
- <type>Group</type>
- <group_id_property>MaterialIDs</group_id_property>
- <index_values>
- <index>0</index>
- <value>0.2</value>
- </index_values>
- </parameter>
- <parameter>
- <name>k</name>
- <type>Group</type>
- <group_id_property>MaterialIDs</group_id_property>
- <index_values>
- <index>0</index>
- <value>1e-10</value>
- </index_values>
- </parameter>
- <parameter>
- <name>rho_liquid</name>
<type>Constant</type>
- <value> 1 </value>
+ <value>0.2</value>
</parameter>
<parameter>
<name>zero</name>
diff --git a/Tests/Data/HydroMechanics/Verification/hm2_1D2bt.prj b/Tests/Data/HydroMechanics/Verification/hm2_1D2bt.prj
index 7377b2ec18fe5c6583f3c8c3668a8a67d5812910..7071c0e5e4f8275389a98ba425f4c2617d4029bc 100755
--- a/Tests/Data/HydroMechanics/Verification/hm2_1D2bt.prj
+++ b/Tests/Data/HydroMechanics/Verification/hm2_1D2bt.prj
@@ -13,8 +13,6 @@
<youngs_modulus>E</youngs_modulus>
<poissons_ratio>nu</poissons_ratio>
</constitutive_relation>
- <intrinsic_permeability>k</intrinsic_permeability>
- <fluid_density>rho_liquid</fluid_density>
<process_variables>
<pressure>pressure</pressure>
<displacement>displacement</displacement>
@@ -35,7 +33,6 @@
<secondary_variable internal_name="epsilon_yz" output_name="epsilon_yz"/>
</secondary_variables>
<specific_body_force>0 0 0</specific_body_force>
- <fluid_type>incompressible_fluid</fluid_type>
</process>
</processes>
<media>
@@ -49,6 +46,11 @@
<type>Constant</type>
<value>1e-3</value>
</property>
+ <property>
+ <name>density</name>
+ <type>Constant</type>
+ <value> 1 </value>
+ </property>
</properties>
</phase>
<phase>
@@ -72,6 +74,18 @@
</properties>
</phase>
</phases>
+ <properties>
+ <property>
+ <name>reference_temperature</name>
+ <type>Constant</type>
+ <value>293.15</value>
+ </property>
+ <property>
+ <name>permeability</name>
+ <type>Constant</type>
+ <value>1e-10</value>
+ </property>
+ </properties>
</medium>
</media>
<time_loop>
@@ -127,35 +141,13 @@
<parameters>
<parameter>
<name>E</name>
- <type>Group</type>
- <group_id_property>MaterialIDs</group_id_property>
- <index_values>
- <index>0</index>
- <value>27000</value>
- </index_values>
+ <type>Constant</type>
+ <value>27000</value>
</parameter>
<parameter>
<name>nu</name>
- <type>Group</type>
- <group_id_property>MaterialIDs</group_id_property>
- <index_values>
- <index>0</index>
- <value>0.2</value>
- </index_values>
- </parameter>
- <parameter>
- <name>k</name>
- <type>Group</type>
- <group_id_property>MaterialIDs</group_id_property>
- <index_values>
- <index>0</index>
- <value>1e-10</value>
- </index_values>
- </parameter>
- <parameter>
- <name>rho_liquid</name>
<type>Constant</type>
- <value> 1 </value>
+ <value>0.2</value>
</parameter>
<parameter>
<name>zero</name>
diff --git a/Tests/Data/HydroMechanics/Verification/hm2_1Dbiot.prj b/Tests/Data/HydroMechanics/Verification/hm2_1Dbiot.prj
index f541846920d052bd4a413de9b290af5a421d8f3c..27b36930503e846a39cdeae13017b0cb11482c14 100755
--- a/Tests/Data/HydroMechanics/Verification/hm2_1Dbiot.prj
+++ b/Tests/Data/HydroMechanics/Verification/hm2_1Dbiot.prj
@@ -13,8 +13,6 @@
<youngs_modulus>E</youngs_modulus>
<poissons_ratio>nu</poissons_ratio>
</constitutive_relation>
- <intrinsic_permeability>k</intrinsic_permeability>
- <fluid_density>rho_liquid</fluid_density>
<process_variables>
<pressure>pressure</pressure>
<displacement>displacement</displacement>
@@ -35,7 +33,6 @@
<secondary_variable internal_name="epsilon_yz" output_name="epsilon_yz"/>
</secondary_variables>
<specific_body_force>0 0 0</specific_body_force>
- <fluid_type>incompressible_fluid</fluid_type>
</process>
</processes>
<media>
@@ -49,6 +46,11 @@
<type>Constant</type>
<value>1e-3</value>
</property>
+ <property>
+ <name>density</name>
+ <type>Constant</type>
+ <value> 1 </value>
+ </property>
</properties>
</phase>
<phase>
@@ -72,6 +74,18 @@
</properties>
</phase>
</phases>
+ <properties>
+ <property>
+ <name>reference_temperature</name>
+ <type>Constant</type>
+ <value>293.15</value>
+ </property>
+ <property>
+ <name>permeability</name>
+ <type>Constant</type>
+ <value>1e-10</value>
+ </property>
+ </properties>
</medium>
</media>
<time_loop>
@@ -127,35 +141,13 @@
<parameters>
<parameter>
<name>E</name>
- <type>Group</type>
- <group_id_property>MaterialIDs</group_id_property>
- <index_values>
- <index>0</index>
- <value>30000</value>
- </index_values>
+ <type>Constant</type>
+ <value>30000</value>
</parameter>
<parameter>
<name>nu</name>
- <type>Group</type>
- <group_id_property>MaterialIDs</group_id_property>
- <index_values>
- <index>0</index>
- <value>0.2</value>
- </index_values>
- </parameter>
- <parameter>
- <name>k</name>
- <type>Group</type>
- <group_id_property>MaterialIDs</group_id_property>
- <index_values>
- <index>0</index>
- <value>1e-10</value>
- </index_values>
- </parameter>
- <parameter>
- <name>rho_liquid</name>
<type>Constant</type>
- <value> 1 </value>
+ <value>0.2</value>
</parameter>
<parameter>
<name>zero</name>
diff --git a/Tests/Data/HydroMechanics/Verification/hm2_1Dcolumn1.prj b/Tests/Data/HydroMechanics/Verification/hm2_1Dcolumn1.prj
index bda66183cf323a6b8b2bfc8c1a8baf234383617c..82ea9f43c521a37419f477bba3fd484b2b74f397 100755
--- a/Tests/Data/HydroMechanics/Verification/hm2_1Dcolumn1.prj
+++ b/Tests/Data/HydroMechanics/Verification/hm2_1Dcolumn1.prj
@@ -13,8 +13,6 @@
<youngs_modulus>E</youngs_modulus>
<poissons_ratio>nu</poissons_ratio>
</constitutive_relation>
- <intrinsic_permeability>k</intrinsic_permeability>
- <fluid_density>rho_liquid</fluid_density>
<process_variables>
<pressure>pressure</pressure>
<displacement>displacement</displacement>
@@ -35,7 +33,6 @@
<secondary_variable internal_name="epsilon_yz" output_name="epsilon_yz"/>
</secondary_variables>
<specific_body_force>0 0 0</specific_body_force>
- <fluid_type>incompressible_fluid</fluid_type>
</process>
</processes>
<media>
@@ -49,6 +46,11 @@
<type>Constant</type>
<value>1e-3</value>
</property>
+ <property>
+ <name>density</name>
+ <type>Constant</type>
+ <value> 1 </value>
+ </property>
</properties>
</phase>
<phase>
@@ -72,6 +74,18 @@
</properties>
</phase>
</phases>
+ <properties>
+ <property>
+ <name>reference_temperature</name>
+ <type>Constant</type>
+ <value>293.15</value>
+ </property>
+ <property>
+ <name>permeability</name>
+ <type>Constant</type>
+ <value>1e-10</value>
+ </property>
+ </properties>
</medium>
</media>
<time_loop>
@@ -127,35 +141,13 @@
<parameters>
<parameter>
<name>E</name>
- <type>Group</type>
- <group_id_property>MaterialIDs</group_id_property>
- <index_values>
- <index>0</index>
- <value>30000</value>
- </index_values>
+ <type>Constant</type>
+ <value>30000</value>
</parameter>
<parameter>
<name>nu</name>
- <type>Group</type>
- <group_id_property>MaterialIDs</group_id_property>
- <index_values>
- <index>0</index>
- <value>0.2</value>
- </index_values>
- </parameter>
- <parameter>
- <name>k</name>
- <type>Group</type>
- <group_id_property>MaterialIDs</group_id_property>
- <index_values>
- <index>0</index>
- <value>1e-10</value>
- </index_values>
- </parameter>
- <parameter>
- <name>rho_liquid</name>
<type>Constant</type>
- <value> 1 </value>
+ <value>0.2</value>
</parameter>
<parameter>
<name>zero</name>
diff --git a/Tests/Data/HydroMechanics/Verification/hm2_1Dcolumn2.prj b/Tests/Data/HydroMechanics/Verification/hm2_1Dcolumn2.prj
index 0b144ef5bd76b9cfe779f984e39c34d38d6b66d2..a7e2ceba724a91f33885153a21a17665117c4c97 100755
--- a/Tests/Data/HydroMechanics/Verification/hm2_1Dcolumn2.prj
+++ b/Tests/Data/HydroMechanics/Verification/hm2_1Dcolumn2.prj
@@ -13,8 +13,6 @@
<youngs_modulus>E</youngs_modulus>
<poissons_ratio>nu</poissons_ratio>
</constitutive_relation>
- <intrinsic_permeability>k</intrinsic_permeability>
- <fluid_density>rho_liquid</fluid_density>
<process_variables>
<pressure>pressure</pressure>
<displacement>displacement</displacement>
@@ -35,7 +33,6 @@
<secondary_variable internal_name="epsilon_yz" output_name="epsilon_yz"/>
</secondary_variables>
<specific_body_force>0 0 0</specific_body_force>
- <fluid_type>incompressible_fluid</fluid_type>
</process>
</processes>
<media>
@@ -49,6 +46,11 @@
<type>Constant</type>
<value>1e-3</value>
</property>
+ <property>
+ <name>density</name>
+ <type>Constant</type>
+ <value> 1 </value>
+ </property>
</properties>
</phase>
<phase>
@@ -72,6 +74,18 @@
</properties>
</phase>
</phases>
+ <properties>
+ <property>
+ <name>reference_temperature</name>
+ <type>Constant</type>
+ <value>293.15</value>
+ </property>
+ <property>
+ <name>permeability</name>
+ <type>Constant</type>
+ <value>1e-10</value>
+ </property>
+ </properties>
</medium>
</media>
<time_loop>
@@ -131,35 +145,13 @@
<parameters>
<parameter>
<name>E</name>
- <type>Group</type>
- <group_id_property>MaterialIDs</group_id_property>
- <index_values>
- <index>0</index>
- <value>30000</value>
- </index_values>
+ <type>Constant</type>
+ <value>30000</value>
</parameter>
<parameter>
<name>nu</name>
- <type>Group</type>
- <group_id_property>MaterialIDs</group_id_property>
- <index_values>
- <index>0</index>
- <value>0.2</value>
- </index_values>
- </parameter>
- <parameter>
- <name>k</name>
- <type>Group</type>
- <group_id_property>MaterialIDs</group_id_property>
- <index_values>
- <index>0</index>
- <value>1e-10</value>
- </index_values>
- </parameter>
- <parameter>
- <name>rho_liquid</name>
<type>Constant</type>
- <value> 1 </value>
+ <value>0.2</value>
</parameter>
<parameter>
<name>zero</name>
diff --git a/Tests/Data/HydroMechanics/Verification/hm2_2Dmandel.prj b/Tests/Data/HydroMechanics/Verification/hm2_2Dmandel.prj
index f1fec60354a919898c02ebc463e3a47f179d2aa1..d27b7929011a59935211d9b5507470f79c55d1e2 100755
--- a/Tests/Data/HydroMechanics/Verification/hm2_2Dmandel.prj
+++ b/Tests/Data/HydroMechanics/Verification/hm2_2Dmandel.prj
@@ -13,8 +13,6 @@
<youngs_modulus>E</youngs_modulus>
<poissons_ratio>nu</poissons_ratio>
</constitutive_relation>
- <intrinsic_permeability>k</intrinsic_permeability>
- <fluid_density>rho_liquid</fluid_density>
<process_variables>
<pressure>pressure</pressure>
<displacement>displacement</displacement>
@@ -35,7 +33,6 @@
<secondary_variable internal_name="epsilon_yz" output_name="epsilon_yz"/>
</secondary_variables>
<specific_body_force>0 0 0</specific_body_force>
- <fluid_type>incompressible_fluid</fluid_type>
</process>
</processes>
<media>
@@ -49,6 +46,11 @@
<type>Constant</type>
<value>1e-3</value>
</property>
+ <property>
+ <name>density</name>
+ <type>Constant</type>
+ <value> 1 </value>
+ </property>
</properties>
</phase>
<phase>
@@ -72,6 +74,18 @@
</properties>
</phase>
</phases>
+ <properties>
+ <property>
+ <name>reference_temperature</name>
+ <type>Constant</type>
+ <value>293.15</value>
+ </property>
+ <property>
+ <name>permeability</name>
+ <type>Constant</type>
+ <value>1e-10</value>
+ </property>
+ </properties>
</medium>
</media>
<time_loop>
@@ -131,35 +145,13 @@
<parameters>
<parameter>
<name>E</name>
- <type>Group</type>
- <group_id_property>MaterialIDs</group_id_property>
- <index_values>
- <index>0</index>
- <value>30000</value>
- </index_values>
+ <type>Constant</type>
+ <value>30000</value>
</parameter>
<parameter>
<name>nu</name>
- <type>Group</type>
- <group_id_property>MaterialIDs</group_id_property>
- <index_values>
- <index>0</index>
- <value>0.2</value>
- </index_values>
- </parameter>
- <parameter>
- <name>k</name>
- <type>Group</type>
- <group_id_property>MaterialIDs</group_id_property>
- <index_values>
- <index>0</index>
- <value>1e-10</value>
- </index_values>
- </parameter>
- <parameter>
- <name>rho_liquid</name>
<type>Constant</type>
- <value> 1 </value>
+ <value>0.2</value>
</parameter>
<parameter>
<name>zero</name>