From 9864becdbf70e5c7b7d85b07c29483856b4bf03b Mon Sep 17 00:00:00 2001
From: Florian Zill <florian.zill@ufz.de>
Date: Fri, 23 Aug 2019 15:12:59 +0200
Subject: [PATCH] [T/HM] added fluid_type, removed specific storage

---
 .../Linear/Confined_Compression/cube_1e3.prj             | 7 +------
 .../Linear/Confined_Compression/square_1e2.prj           | 7 +------
 .../Linear/Confined_Compression/square_1e2_quad9.prj     | 7 +------
 .../Linear/Confined_Compression/square_1e2_tri.prj       | 7 +------
 .../Data/HydroMechanics/Linear/Gravity/flow_gravity.prj  | 7 +------
 .../Unconfined_Compression_early/square_1e2_UC_early.prj | 7 +------
 .../Unconfined_Compression_early/square_1e4_UC_early.prj | 7 +------
 .../Unconfined_Compression_late/square_1e2_UC_late.prj   | 7 +------
 .../Unconfined_Compression_late/square_1e4_UC_late.prj   | 7 +------
 .../InjectionProduction1D/InjectionProduction1D.prj      | 9 +++------
 .../InjectionProduction1DMono.prj                        | 9 +++------
 Tests/Data/HydroMechanics/Verification/hm1_1Dbeam.prj    | 7 +------
 Tests/Data/HydroMechanics/Verification/hm1_2Dsquare.prj  | 7 +------
 Tests/Data/HydroMechanics/Verification/hm1_3Dcube.prj    | 7 +------
 Tests/Data/HydroMechanics/Verification/hm1_3Dgravity.prj | 7 +------
 Tests/Data/HydroMechanics/Verification/hm2_1D1bt.prj     | 7 +------
 Tests/Data/HydroMechanics/Verification/hm2_1D2bt.prj     | 7 +------
 Tests/Data/HydroMechanics/Verification/hm2_1Dbiot.prj    | 7 +------
 Tests/Data/HydroMechanics/Verification/hm2_1Dcolumn1.prj | 7 +------
 Tests/Data/HydroMechanics/Verification/hm2_1Dcolumn2.prj | 7 +------
 Tests/Data/HydroMechanics/Verification/hm2_2Dmandel.prj  | 7 +------
 21 files changed, 25 insertions(+), 126 deletions(-)

diff --git a/Tests/Data/HydroMechanics/Linear/Confined_Compression/cube_1e3.prj b/Tests/Data/HydroMechanics/Linear/Confined_Compression/cube_1e3.prj
index de0d4e1d073..3a52e8dcda5 100644
--- a/Tests/Data/HydroMechanics/Linear/Confined_Compression/cube_1e3.prj
+++ b/Tests/Data/HydroMechanics/Linear/Confined_Compression/cube_1e3.prj
@@ -14,7 +14,6 @@
                 <poissons_ratio>nu</poissons_ratio>
             </constitutive_relation>
             <intrinsic_permeability>k</intrinsic_permeability>
-            <specific_storage>S</specific_storage>
             <fluid_viscosity>mu</fluid_viscosity>
             <fluid_density>rho_fr</fluid_density>
             <biot_coefficient>alpha</biot_coefficient>
@@ -27,6 +26,7 @@
             <secondary_variables>
             </secondary_variables>
             <specific_body_force>0 0 0</specific_body_force>
+            <fluid_type>incompressible_fluid</fluid_type>
         </process>
     </processes>
     <time_loop>
@@ -87,11 +87,6 @@
             <type>Constant</type>
             <value>1e-12</value>
         </parameter>
-        <parameter>
-            <name>S</name>
-            <type>Constant</type>
-            <value>0</value>
-        </parameter>
         <parameter>
             <name>mu</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 0e74896a345..9bb973a7942 100644
--- a/Tests/Data/HydroMechanics/Linear/Confined_Compression/square_1e2.prj
+++ b/Tests/Data/HydroMechanics/Linear/Confined_Compression/square_1e2.prj
@@ -14,7 +14,6 @@
                 <poissons_ratio>nu</poissons_ratio>
             </constitutive_relation>
             <intrinsic_permeability>k</intrinsic_permeability>
-            <specific_storage>S</specific_storage>
             <fluid_viscosity>mu</fluid_viscosity>
             <fluid_density>rho_fr</fluid_density>
             <biot_coefficient>alpha</biot_coefficient>
@@ -36,6 +35,7 @@
                 <secondary_variable type="static" 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>
@@ -121,11 +121,6 @@
             <type>Constant</type>
             <value>1e-12</value>
         </parameter>
-        <parameter>
-            <name>S</name>
-            <type>Constant</type>
-            <value>0</value>
-        </parameter>
         <parameter>
             <name>mu</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 c926e69279d..7ce892fd904 100644
--- a/Tests/Data/HydroMechanics/Linear/Confined_Compression/square_1e2_quad9.prj
+++ b/Tests/Data/HydroMechanics/Linear/Confined_Compression/square_1e2_quad9.prj
@@ -14,7 +14,6 @@
                 <poissons_ratio>nu</poissons_ratio>
             </constitutive_relation>
             <intrinsic_permeability>k</intrinsic_permeability>
-            <specific_storage>S</specific_storage>
             <fluid_viscosity>mu</fluid_viscosity>
             <fluid_density>rho_fr</fluid_density>
             <biot_coefficient>alpha</biot_coefficient>
@@ -27,6 +26,7 @@
             <secondary_variables>
             </secondary_variables>
             <specific_body_force>0 0</specific_body_force>
+            <fluid_type>incompressible_fluid</fluid_type>
         </process>
     </processes>
     <time_loop>
@@ -87,11 +87,6 @@
             <type>Constant</type>
             <value>1e-12</value>
         </parameter>
-        <parameter>
-            <name>S</name>
-            <type>Constant</type>
-            <value>0</value>
-        </parameter>
         <parameter>
             <name>mu</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 290c1898b2a..8d0e6e84755 100644
--- a/Tests/Data/HydroMechanics/Linear/Confined_Compression/square_1e2_tri.prj
+++ b/Tests/Data/HydroMechanics/Linear/Confined_Compression/square_1e2_tri.prj
@@ -14,7 +14,6 @@
                 <poissons_ratio>nu</poissons_ratio>
             </constitutive_relation>
             <intrinsic_permeability>k</intrinsic_permeability>
-            <specific_storage>S</specific_storage>
             <fluid_viscosity>mu</fluid_viscosity>
             <fluid_density>rho_fr</fluid_density>
             <biot_coefficient>alpha</biot_coefficient>
@@ -27,6 +26,7 @@
             <secondary_variables>
             </secondary_variables>
             <specific_body_force>0 0</specific_body_force>
+            <fluid_type>incompressible_fluid</fluid_type>
         </process>
     </processes>
     <time_loop>
@@ -87,11 +87,6 @@
             <type>Constant</type>
             <value>1e-12</value>
         </parameter>
-        <parameter>
-            <name>S</name>
-            <type>Constant</type>
-            <value>0</value>
-        </parameter>
         <parameter>
             <name>mu</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 ebb4682dc86..d4387af5730 100644
--- a/Tests/Data/HydroMechanics/Linear/Gravity/flow_gravity.prj
+++ b/Tests/Data/HydroMechanics/Linear/Gravity/flow_gravity.prj
@@ -14,7 +14,6 @@
                 <poissons_ratio>nu</poissons_ratio>
             </constitutive_relation>
             <intrinsic_permeability>k</intrinsic_permeability>
-            <specific_storage>S</specific_storage>
             <fluid_viscosity>mu</fluid_viscosity>
             <fluid_density>rho_fr</fluid_density>
             <biot_coefficient>alpha</biot_coefficient>
@@ -36,6 +35,7 @@
                 <secondary_variable type="static" internal_name="velocity" output_name="velocity"/>
             </secondary_variables>
             <specific_body_force>0 -10</specific_body_force>
+            <fluid_type>incompressible_fluid</fluid_type>
         </process>
     </processes>
     <time_loop>
@@ -113,11 +113,6 @@
             <type>Constant</type>
             <value>1e-12</value>
         </parameter>
-        <parameter>
-            <name>S</name>
-            <type>Constant</type>
-            <value>0</value>
-        </parameter>
         <parameter>
             <name>mu</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 91ceb317904..d31b77d91e7 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
@@ -14,7 +14,6 @@
                 <poissons_ratio>nu</poissons_ratio>
             </constitutive_relation>
             <intrinsic_permeability>k</intrinsic_permeability>
-            <specific_storage>S</specific_storage>
             <fluid_viscosity>mu</fluid_viscosity>
             <biot_coefficient>alpha</biot_coefficient>
             <porosity>phi</porosity>
@@ -27,6 +26,7 @@
             <secondary_variables>
             </secondary_variables>
             <specific_body_force>0 0</specific_body_force>
+            <fluid_type>incompressible_fluid</fluid_type>
         </process>
     </processes>
     <time_loop>
@@ -87,11 +87,6 @@
             <type>Constant</type>
             <value>1e-10</value>
         </parameter>
-        <parameter>
-            <name>S</name>
-            <type>Constant</type>
-            <value>0</value>
-        </parameter>
         <parameter>
             <name>mu</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 aa33e3d7b0a..73aa98a3ff6 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
@@ -14,7 +14,6 @@
                 <poissons_ratio>nu</poissons_ratio>
             </constitutive_relation>
             <intrinsic_permeability>k</intrinsic_permeability>
-            <specific_storage>S</specific_storage>
             <fluid_viscosity>mu</fluid_viscosity>
             <biot_coefficient>alpha</biot_coefficient>
             <porosity>phi</porosity>
@@ -27,6 +26,7 @@
             <secondary_variables>
             </secondary_variables>
             <specific_body_force>0 0</specific_body_force>
+            <fluid_type>incompressible_fluid</fluid_type>
         </process>
     </processes>
     <time_loop>
@@ -87,11 +87,6 @@
             <type>Constant</type>
             <value>1e-10</value>
         </parameter>
-        <parameter>
-            <name>S</name>
-            <type>Constant</type>
-            <value>0</value>
-        </parameter>
         <parameter>
             <name>mu</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 ccb31ba3c5d..1e4066f63c1 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
@@ -14,7 +14,6 @@
                 <poissons_ratio>nu</poissons_ratio>
             </constitutive_relation>
             <intrinsic_permeability>k</intrinsic_permeability>
-            <specific_storage>S</specific_storage>
             <fluid_viscosity>mu</fluid_viscosity>
             <biot_coefficient>alpha</biot_coefficient>
             <porosity>phi</porosity>
@@ -27,6 +26,7 @@
             <secondary_variables>
             </secondary_variables>
             <specific_body_force>0 0</specific_body_force>
+            <fluid_type>incompressible_fluid</fluid_type>
         </process>
     </processes>
     <time_loop>
@@ -87,11 +87,6 @@
             <type>Constant</type>
             <value>1e-10</value>
         </parameter>
-        <parameter>
-            <name>S</name>
-            <type>Constant</type>
-            <value>0</value>
-        </parameter>
         <parameter>
             <name>mu</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 81918ffcfa0..980b479a734 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
@@ -14,7 +14,6 @@
                 <poissons_ratio>nu</poissons_ratio>
             </constitutive_relation>
             <intrinsic_permeability>k</intrinsic_permeability>
-            <specific_storage>S</specific_storage>
             <fluid_viscosity>mu</fluid_viscosity>
             <biot_coefficient>alpha</biot_coefficient>
             <porosity>phi</porosity>
@@ -27,6 +26,7 @@
             <secondary_variables>
             </secondary_variables>
             <specific_body_force>0 0</specific_body_force>
+            <fluid_type>incompressible_fluid</fluid_type>
         </process>
     </processes>
     <time_loop>
@@ -87,11 +87,6 @@
             <type>Constant</type>
             <value>1e-10</value>
         </parameter>
-        <parameter>
-            <name>S</name>
-            <type>Constant</type>
-            <value>0</value>
-        </parameter>
         <parameter>
             <name>mu</name>
             <type>Constant</type>
diff --git a/Tests/Data/HydroMechanics/StaggeredScheme/InjectionProduction1D/InjectionProduction1D.prj b/Tests/Data/HydroMechanics/StaggeredScheme/InjectionProduction1D/InjectionProduction1D.prj
index 2af65e40ae5..f0a7d36cb42 100644
--- a/Tests/Data/HydroMechanics/StaggeredScheme/InjectionProduction1D/InjectionProduction1D.prj
+++ b/Tests/Data/HydroMechanics/StaggeredScheme/InjectionProduction1D/InjectionProduction1D.prj
@@ -15,7 +15,6 @@
                 <poissons_ratio>nu</poissons_ratio>
             </constitutive_relation>
             <intrinsic_permeability>k</intrinsic_permeability>
-            <specific_storage>S</specific_storage>
             <fluid_viscosity>mu</fluid_viscosity>
             <fluid_density>rho_f</fluid_density>
             <biot_coefficient>alpha</biot_coefficient>
@@ -37,6 +36,9 @@
                 <secondary_variable type="static" internal_name="velocity" output_name="velocity"/>
             </secondary_variables>
             <specific_body_force>0 0</specific_body_force>
+            <fluid_type>compressible_fluid</fluid_type>
+            <!--this value creates the same result as a specific storage of S = 1e-5 -->
+            <fluid_compressibility>3.33333333333e-5</fluid_compressibility>
         </process>
     </processes>
     <time_loop>
@@ -155,11 +157,6 @@
             <type>Constant</type>
             <value>4.9346165e-11</value>
         </parameter>
-        <parameter>
-            <name>S</name>
-            <type>Constant</type>
-            <value>1e-5</value>
-        </parameter>
         <parameter>
             <name>mu</name>
             <type>Constant</type>
diff --git a/Tests/Data/HydroMechanics/StaggeredScheme/InjectionProduction1D/RerefenceSolutionByMonolithicScheme/InjectionProduction1DMono.prj b/Tests/Data/HydroMechanics/StaggeredScheme/InjectionProduction1D/RerefenceSolutionByMonolithicScheme/InjectionProduction1DMono.prj
index e9fd97d658f..e1c8b8c1df1 100644
--- a/Tests/Data/HydroMechanics/StaggeredScheme/InjectionProduction1D/RerefenceSolutionByMonolithicScheme/InjectionProduction1DMono.prj
+++ b/Tests/Data/HydroMechanics/StaggeredScheme/InjectionProduction1D/RerefenceSolutionByMonolithicScheme/InjectionProduction1DMono.prj
@@ -14,7 +14,6 @@
                 <poissons_ratio>nu</poissons_ratio>
             </constitutive_relation>
             <intrinsic_permeability>k</intrinsic_permeability>
-            <specific_storage>S</specific_storage>
             <fluid_viscosity>mu</fluid_viscosity>
             <fluid_density>rho_f</fluid_density>
             <biot_coefficient>alpha</biot_coefficient>
@@ -36,6 +35,9 @@
                 <secondary_variable type="static" internal_name="velocity" output_name="velocity"/>
             </secondary_variables>
             <specific_body_force>0 0</specific_body_force>
+            <fluid_type>compressible_fluid</fluid_type>
+            <!--this value creates the same result as a specific storage of S = 1e-5 -->
+            <fluid_compressibility>3.33333333333e-5</fluid_compressibility>
         </process>
     </processes>
     <time_loop>
@@ -114,11 +116,6 @@
             <type>Constant</type>
             <value>4.9346165e-11</value>
         </parameter>
-        <parameter>
-            <name>S</name>
-            <type>Constant</type>
-            <value>1e-5</value>
-        </parameter>
         <parameter>
             <name>mu</name>
             <type>Constant</type>
diff --git a/Tests/Data/HydroMechanics/Verification/hm1_1Dbeam.prj b/Tests/Data/HydroMechanics/Verification/hm1_1Dbeam.prj
index f459664d1a9..0a1f540888a 100755
--- a/Tests/Data/HydroMechanics/Verification/hm1_1Dbeam.prj
+++ b/Tests/Data/HydroMechanics/Verification/hm1_1Dbeam.prj
@@ -15,7 +15,6 @@
                 <poissons_ratio>nu</poissons_ratio>
             </constitutive_relation>
             <intrinsic_permeability>k</intrinsic_permeability>
-            <specific_storage>S</specific_storage>
             <fluid_viscosity>mu</fluid_viscosity>
             <fluid_density>rho_liquid</fluid_density>
             <biot_coefficient>alpha</biot_coefficient>
@@ -41,6 +40,7 @@
                 <secondary_variable type="static" 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>
     <time_loop>
@@ -199,11 +199,6 @@
             <type>Constant</type>
             <value>1e-3</value>
         </parameter>
-        <parameter>
-            <name>S</name>
-            <type>Constant</type>
-            <value>0</value>
-        </parameter>
         <parameter>
             <name>rho_liquid</name>
             <type>Constant</type>
diff --git a/Tests/Data/HydroMechanics/Verification/hm1_2Dsquare.prj b/Tests/Data/HydroMechanics/Verification/hm1_2Dsquare.prj
index f4c24762767..477a7495bcf 100755
--- a/Tests/Data/HydroMechanics/Verification/hm1_2Dsquare.prj
+++ b/Tests/Data/HydroMechanics/Verification/hm1_2Dsquare.prj
@@ -15,7 +15,6 @@
                 <poissons_ratio>nu</poissons_ratio>
             </constitutive_relation>
             <intrinsic_permeability>k</intrinsic_permeability>
-            <specific_storage>S</specific_storage>
             <fluid_viscosity>mu</fluid_viscosity>
             <fluid_density>rho_liquid</fluid_density>
             <biot_coefficient>alpha</biot_coefficient>
@@ -41,6 +40,7 @@
                 <secondary_variable type="static" 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>
     <time_loop>
@@ -198,11 +198,6 @@
             <type>Constant</type>
             <value>1e-3</value>
         </parameter>
-        <parameter>
-            <name>S</name>
-            <type>Constant</type>
-            <value>0</value>
-        </parameter>
         <parameter>
             <name>rho_liquid</name>
             <type>Constant</type>
diff --git a/Tests/Data/HydroMechanics/Verification/hm1_3Dcube.prj b/Tests/Data/HydroMechanics/Verification/hm1_3Dcube.prj
index 8523394a989..88588a196fa 100755
--- a/Tests/Data/HydroMechanics/Verification/hm1_3Dcube.prj
+++ b/Tests/Data/HydroMechanics/Verification/hm1_3Dcube.prj
@@ -15,7 +15,6 @@
                 <poissons_ratio>nu</poissons_ratio>
             </constitutive_relation>
             <intrinsic_permeability>k</intrinsic_permeability>
-            <specific_storage>S</specific_storage>
             <fluid_viscosity>mu</fluid_viscosity>
             <fluid_density>rho_liquid</fluid_density>
             <biot_coefficient>alpha</biot_coefficient>
@@ -41,6 +40,7 @@
                 <secondary_variable type="static" 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>
     <time_loop>
@@ -198,11 +198,6 @@
             <type>Constant</type>
             <value>1e-3</value>
         </parameter>
-        <parameter>
-            <name>S</name>
-            <type>Constant</type>
-            <value>0</value>
-        </parameter>
         <parameter>
             <name>rho_liquid</name>
             <type>Constant</type>
diff --git a/Tests/Data/HydroMechanics/Verification/hm1_3Dgravity.prj b/Tests/Data/HydroMechanics/Verification/hm1_3Dgravity.prj
index 6e49ed6a57e..716f8fd439a 100755
--- a/Tests/Data/HydroMechanics/Verification/hm1_3Dgravity.prj
+++ b/Tests/Data/HydroMechanics/Verification/hm1_3Dgravity.prj
@@ -15,7 +15,6 @@
                 <poissons_ratio>nu</poissons_ratio>
             </constitutive_relation>
             <intrinsic_permeability>k</intrinsic_permeability>
-            <specific_storage>S</specific_storage>
             <fluid_viscosity>mu</fluid_viscosity>
             <fluid_density>rho_liquid</fluid_density>
             <biot_coefficient>alpha</biot_coefficient>
@@ -41,6 +40,7 @@
                 <secondary_variable type="static" 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>
     <time_loop>
@@ -270,11 +270,6 @@
             <type>Constant</type>
             <value>1e-3</value>
         </parameter>
-        <parameter>
-            <name>S</name>
-            <type>Constant</type>
-            <value>0</value>
-        </parameter>
         <parameter>
             <name>rho_liquid</name>
             <type>Constant</type>
diff --git a/Tests/Data/HydroMechanics/Verification/hm2_1D1bt.prj b/Tests/Data/HydroMechanics/Verification/hm2_1D1bt.prj
index a79b55245f1..bf0f5dc1769 100755
--- a/Tests/Data/HydroMechanics/Verification/hm2_1D1bt.prj
+++ b/Tests/Data/HydroMechanics/Verification/hm2_1D1bt.prj
@@ -14,7 +14,6 @@
                 <poissons_ratio>nu</poissons_ratio>
             </constitutive_relation>
             <intrinsic_permeability>k</intrinsic_permeability>
-            <specific_storage>S</specific_storage>
             <fluid_viscosity>mu</fluid_viscosity>
             <fluid_density>rho_liquid</fluid_density>
             <biot_coefficient>alpha</biot_coefficient>
@@ -40,6 +39,7 @@
                <secondary_variable type="static" 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>
     <time_loop>
@@ -152,11 +152,6 @@
             <type>Constant</type>
             <value>1e-3</value>
         </parameter>
-        <parameter>
-            <name>S</name>
-            <type>Constant</type>
-            <value>0</value>
-        </parameter>
         <parameter>
             <name>rho_liquid</name>
             <type>Constant</type>
diff --git a/Tests/Data/HydroMechanics/Verification/hm2_1D2bt.prj b/Tests/Data/HydroMechanics/Verification/hm2_1D2bt.prj
index 996b4ac1791..2f1945b6b9d 100755
--- a/Tests/Data/HydroMechanics/Verification/hm2_1D2bt.prj
+++ b/Tests/Data/HydroMechanics/Verification/hm2_1D2bt.prj
@@ -14,7 +14,6 @@
                 <poissons_ratio>nu</poissons_ratio>
             </constitutive_relation>
             <intrinsic_permeability>k</intrinsic_permeability>
-            <specific_storage>S</specific_storage>
             <fluid_viscosity>mu</fluid_viscosity>
             <fluid_density>rho_liquid</fluid_density>
             <biot_coefficient>alpha</biot_coefficient>
@@ -40,6 +39,7 @@
                 <secondary_variable type="static" 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>
     <time_loop>
@@ -152,11 +152,6 @@
             <type>Constant</type>
             <value>1e-3</value>
         </parameter>
-        <parameter>
-            <name>S</name>
-            <type>Constant</type>
-            <value>0</value>
-        </parameter>
         <parameter>
             <name>rho_liquid</name>
             <type>Constant</type>
diff --git a/Tests/Data/HydroMechanics/Verification/hm2_1Dbiot.prj b/Tests/Data/HydroMechanics/Verification/hm2_1Dbiot.prj
index 70ae31c01cf..4cc2face5c3 100755
--- a/Tests/Data/HydroMechanics/Verification/hm2_1Dbiot.prj
+++ b/Tests/Data/HydroMechanics/Verification/hm2_1Dbiot.prj
@@ -14,7 +14,6 @@
                 <poissons_ratio>nu</poissons_ratio>
             </constitutive_relation>
             <intrinsic_permeability>k</intrinsic_permeability>
-            <specific_storage>S</specific_storage>
             <fluid_viscosity>mu</fluid_viscosity>
             <fluid_density>rho_liquid</fluid_density>
             <biot_coefficient>alpha</biot_coefficient>
@@ -40,6 +39,7 @@
                 <secondary_variable type="static" 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>
     <time_loop>
@@ -152,11 +152,6 @@
             <type>Constant</type>
             <value>1e-3</value>
         </parameter>
-        <parameter>
-            <name>S</name>
-            <type>Constant</type>
-            <value>0</value>
-        </parameter>
         <parameter>
             <name>rho_liquid</name>
             <type>Constant</type>
diff --git a/Tests/Data/HydroMechanics/Verification/hm2_1Dcolumn1.prj b/Tests/Data/HydroMechanics/Verification/hm2_1Dcolumn1.prj
index 1399cd7996f..338e3ae40cb 100755
--- a/Tests/Data/HydroMechanics/Verification/hm2_1Dcolumn1.prj
+++ b/Tests/Data/HydroMechanics/Verification/hm2_1Dcolumn1.prj
@@ -14,7 +14,6 @@
                 <poissons_ratio>nu</poissons_ratio>
             </constitutive_relation>
             <intrinsic_permeability>k</intrinsic_permeability>
-            <specific_storage>S</specific_storage>
             <fluid_viscosity>mu</fluid_viscosity>
             <fluid_density>rho_liquid</fluid_density>
             <biot_coefficient>alpha</biot_coefficient>
@@ -40,6 +39,7 @@
                 <secondary_variable type="static" 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>
     <time_loop>
@@ -152,11 +152,6 @@
             <type>Constant</type>
             <value>1e-3</value>
         </parameter>
-        <parameter>
-            <name>S</name>
-            <type>Constant</type>
-            <value>0</value>
-        </parameter>
         <parameter>
             <name>rho_liquid</name>
             <type>Constant</type>
diff --git a/Tests/Data/HydroMechanics/Verification/hm2_1Dcolumn2.prj b/Tests/Data/HydroMechanics/Verification/hm2_1Dcolumn2.prj
index 8c1a5a4f5b8..eea967213e5 100755
--- a/Tests/Data/HydroMechanics/Verification/hm2_1Dcolumn2.prj
+++ b/Tests/Data/HydroMechanics/Verification/hm2_1Dcolumn2.prj
@@ -14,7 +14,6 @@
                 <poissons_ratio>nu</poissons_ratio>
             </constitutive_relation>
             <intrinsic_permeability>k</intrinsic_permeability>
-            <specific_storage>S</specific_storage>
             <fluid_viscosity>mu</fluid_viscosity>
             <fluid_density>rho_liquid</fluid_density>
             <biot_coefficient>alpha</biot_coefficient>
@@ -40,6 +39,7 @@
                 <secondary_variable type="static" 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>
     <time_loop>
@@ -156,11 +156,6 @@
             <type>Constant</type>
             <value>1e-3</value>
         </parameter>
-        <parameter>
-            <name>S</name>
-            <type>Constant</type>
-            <value>0</value>
-        </parameter>
         <parameter>
             <name>rho_liquid</name>
             <type>Constant</type>
diff --git a/Tests/Data/HydroMechanics/Verification/hm2_2Dmandel.prj b/Tests/Data/HydroMechanics/Verification/hm2_2Dmandel.prj
index 4861e698940..87534d1bd54 100755
--- a/Tests/Data/HydroMechanics/Verification/hm2_2Dmandel.prj
+++ b/Tests/Data/HydroMechanics/Verification/hm2_2Dmandel.prj
@@ -14,7 +14,6 @@
                 <poissons_ratio>nu</poissons_ratio>
             </constitutive_relation>
             <intrinsic_permeability>k</intrinsic_permeability>
-            <specific_storage>S</specific_storage>
             <fluid_viscosity>mu</fluid_viscosity>
             <fluid_density>rho_liquid</fluid_density>
             <biot_coefficient>alpha</biot_coefficient>
@@ -40,6 +39,7 @@
                 <secondary_variable type="static" 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>
     <time_loop>
@@ -156,11 +156,6 @@
             <type>Constant</type>
             <value>1e-3</value>
         </parameter>
-        <parameter>
-            <name>S</name>
-            <type>Constant</type>
-            <value>0</value>
-        </parameter>
         <parameter>
             <name>rho_liquid</name>
             <type>Constant</type>
-- 
GitLab