From 7eb55c87130f8a565da2c01da06ae27ab2b8b09c Mon Sep 17 00:00:00 2001
From: Dmitri Naumov <github@naumov.de>
Date: Mon, 26 Oct 2020 23:51:08 +0100
Subject: [PATCH] [T/RM] Use porosity from mass balance model.
---
.../RichardsMechanics/LiakopoulosHM/liakopoulos.prj | 11 +++++++++--
.../RichardsMechanics/RichardsFlow_2d_quasinewton.prj | 11 +++++++++--
.../Data/RichardsMechanics/RichardsFlow_2d_small.prj | 11 +++++++++--
.../RichardsFlow_2d_small_masslumping.prj | 11 +++++++++--
.../alternative_mass_balance_anzInterval_10.prj | 11 +++++++++--
.../bishops_effective_stress_power_law.prj | 11 +++++++++--
.../bishops_effective_stress_saturation_cutoff.prj | 11 +++++++++--
.../confined_compression_fully_saturated.prj | 11 +++++++++--
.../confined_compression_fully_saturated_restart.prj | 11 +++++++++--
.../deformation_dependent_porosity_swelling.prj | 6 ++++--
Tests/Data/RichardsMechanics/flow_fully_saturated.prj | 11 +++++++++--
.../flow_fully_saturated_anisotropic.prj | 11 +++++++++--
.../flow_fully_saturated_coordinate_system.prj | 11 +++++++++--
.../RichardsMechanics/flow_fully_saturated_linear.prj | 11 +++++++++--
Tests/Data/RichardsMechanics/gravity.prj | 11 +++++++++--
Tests/Data/RichardsMechanics/mechanics_linear.prj | 11 +++++++++--
.../RichardsMechanics/orthotropic_swelling_xy.prj | 11 +++++++++--
.../RichardsMechanics/orthotropic_swelling_xyz.prj | 11 +++++++++--
.../Data/RichardsMechanics/rotated_consolidation.prj | 11 +++++++++--
19 files changed, 166 insertions(+), 38 deletions(-)
diff --git a/Tests/Data/RichardsMechanics/LiakopoulosHM/liakopoulos.prj b/Tests/Data/RichardsMechanics/LiakopoulosHM/liakopoulos.prj
index 9259d88c975..fbebf6b2411 100644
--- a/Tests/Data/RichardsMechanics/LiakopoulosHM/liakopoulos.prj
+++ b/Tests/Data/RichardsMechanics/LiakopoulosHM/liakopoulos.prj
@@ -76,8 +76,10 @@
</property>
<property>
<name>porosity</name>
- <type>Constant</type>
- <value>0.2975</value>
+ <type>PorosityFromMassBalance</type>
+ <initial_porosity>phi0</initial_porosity>
+ <minimal_porosity>0</minimal_porosity>
+ <maximal_porosity>1</maximal_porosity>
</property>
<property>
<name>permeability</name>
@@ -202,6 +204,11 @@
<type>Constant</type>
<value>0.4</value>
</parameter>
+ <parameter>
+ <name>phi0</name>
+ <type>Constant</type>
+ <value>0.2975</value>
+ </parameter>
<!-- Model parameters -->
<parameter>
<name>displacement_ic</name>
diff --git a/Tests/Data/RichardsMechanics/RichardsFlow_2d_quasinewton.prj b/Tests/Data/RichardsMechanics/RichardsFlow_2d_quasinewton.prj
index a278c0dd627..8579fe3fc00 100644
--- a/Tests/Data/RichardsMechanics/RichardsFlow_2d_quasinewton.prj
+++ b/Tests/Data/RichardsMechanics/RichardsFlow_2d_quasinewton.prj
@@ -69,8 +69,10 @@
</property>
<property>
<name>porosity</name>
- <type>Constant</type>
- <value>0.38</value>
+ <type>PorosityFromMassBalance</type>
+ <initial_porosity>phi0</initial_porosity>
+ <minimal_porosity>0</minimal_porosity>
+ <maximal_porosity>1</maximal_porosity>
</property>
<property>
<name>permeability</name>
@@ -193,6 +195,11 @@
<type>Constant</type>
<value>.1</value>
</parameter>
+ <parameter>
+ <name>phi0</name>
+ <type>Constant</type>
+ <value>0.38</value>
+ </parameter>
<!-- Model parameters -->
<parameter>
<name>displacement0</name>
diff --git a/Tests/Data/RichardsMechanics/RichardsFlow_2d_small.prj b/Tests/Data/RichardsMechanics/RichardsFlow_2d_small.prj
index 3452ad99e50..4433a08499d 100644
--- a/Tests/Data/RichardsMechanics/RichardsFlow_2d_small.prj
+++ b/Tests/Data/RichardsMechanics/RichardsFlow_2d_small.prj
@@ -64,8 +64,10 @@
</property>
<property>
<name>porosity</name>
- <type>Constant</type>
- <value>0.38</value>
+ <type>PorosityFromMassBalance</type>
+ <initial_porosity>phi0</initial_porosity>
+ <minimal_porosity>0</minimal_porosity>
+ <maximal_porosity>1</maximal_porosity>
</property>
<property>
<name>permeability</name>
@@ -193,6 +195,11 @@
<type>Constant</type>
<value>.1</value>
</parameter>
+ <parameter>
+ <name>phi0</name>
+ <type>Constant</type>
+ <value>0.38</value>
+ </parameter>
<!-- Model parameters -->
<parameter>
<name>displacement0</name>
diff --git a/Tests/Data/RichardsMechanics/RichardsFlow_2d_small_masslumping.prj b/Tests/Data/RichardsMechanics/RichardsFlow_2d_small_masslumping.prj
index 8e8d5f9358d..2c707d8bb9f 100644
--- a/Tests/Data/RichardsMechanics/RichardsFlow_2d_small_masslumping.prj
+++ b/Tests/Data/RichardsMechanics/RichardsFlow_2d_small_masslumping.prj
@@ -65,8 +65,10 @@
</property>
<property>
<name>porosity</name>
- <type>Constant</type>
- <value>0.38</value>
+ <type>PorosityFromMassBalance</type>
+ <initial_porosity>phi0</initial_porosity>
+ <minimal_porosity>0</minimal_porosity>
+ <maximal_porosity>1</maximal_porosity>
</property>
<property>
<name>storage</name>
@@ -189,6 +191,11 @@
<type>Constant</type>
<value>.1</value>
</parameter>
+ <parameter>
+ <name>phi0</name>
+ <type>Constant</type>
+ <value>0.38</value>
+ </parameter>
<!-- Model parameters -->
<parameter>
<name>displacement0</name>
diff --git a/Tests/Data/RichardsMechanics/alternative_mass_balance_anzInterval_10.prj b/Tests/Data/RichardsMechanics/alternative_mass_balance_anzInterval_10.prj
index 4b2727f622b..301ddf084c6 100644
--- a/Tests/Data/RichardsMechanics/alternative_mass_balance_anzInterval_10.prj
+++ b/Tests/Data/RichardsMechanics/alternative_mass_balance_anzInterval_10.prj
@@ -64,8 +64,10 @@
</property>
<property>
<name>porosity</name>
- <type>Constant</type>
- <value>0.5</value>
+ <type>PorosityFromMassBalance</type>
+ <initial_porosity>phi0</initial_porosity>
+ <minimal_porosity>0</minimal_porosity>
+ <maximal_porosity>1</maximal_porosity>
</property>
<property>
<name>permeability</name>
@@ -162,6 +164,11 @@
<type>Constant</type>
<value>0.3</value>
</parameter>
+ <parameter>
+ <name>phi0</name>
+ <type>Constant</type>
+ <value>0.5</value>
+ </parameter>
<!-- Model parameters -->
<parameter>
<name>displacement_ic</name>
diff --git a/Tests/Data/RichardsMechanics/bishops_effective_stress_power_law.prj b/Tests/Data/RichardsMechanics/bishops_effective_stress_power_law.prj
index 06a955c85e7..c3ceb4a3116 100644
--- a/Tests/Data/RichardsMechanics/bishops_effective_stress_power_law.prj
+++ b/Tests/Data/RichardsMechanics/bishops_effective_stress_power_law.prj
@@ -72,8 +72,10 @@
</property>
<property>
<name>porosity</name>
- <type>Constant</type>
- <value>0.5</value>
+ <type>PorosityFromMassBalance</type>
+ <initial_porosity>phi0</initial_porosity>
+ <minimal_porosity>0</minimal_porosity>
+ <maximal_porosity>1</maximal_porosity>
</property>
<property>
<name>permeability</name>
@@ -197,6 +199,11 @@
<type>Constant</type>
<value>.3</value>
</parameter>
+ <parameter>
+ <name>phi0</name>
+ <type>Constant</type>
+ <value>0.5</value>
+ </parameter>
<!-- Model parameters -->
<parameter>
<name>displacement0</name>
diff --git a/Tests/Data/RichardsMechanics/bishops_effective_stress_saturation_cutoff.prj b/Tests/Data/RichardsMechanics/bishops_effective_stress_saturation_cutoff.prj
index 4448650073a..57b3172df6e 100644
--- a/Tests/Data/RichardsMechanics/bishops_effective_stress_saturation_cutoff.prj
+++ b/Tests/Data/RichardsMechanics/bishops_effective_stress_saturation_cutoff.prj
@@ -72,8 +72,10 @@
</property>
<property>
<name>porosity</name>
- <type>Constant</type>
- <value>0.5</value>
+ <type>PorosityFromMassBalance</type>
+ <initial_porosity>phi0</initial_porosity>
+ <minimal_porosity>0</minimal_porosity>
+ <maximal_porosity>1</maximal_porosity>
</property>
<property>
<name>permeability</name>
@@ -197,6 +199,11 @@
<type>Constant</type>
<value>.3</value>
</parameter>
+ <parameter>
+ <name>phi0</name>
+ <type>Constant</type>
+ <value>0.5</value>
+ </parameter>
<!-- Model parameters -->
<parameter>
<name>displacement0</name>
diff --git a/Tests/Data/RichardsMechanics/confined_compression_fully_saturated.prj b/Tests/Data/RichardsMechanics/confined_compression_fully_saturated.prj
index f2b727480b8..33556c35af8 100644
--- a/Tests/Data/RichardsMechanics/confined_compression_fully_saturated.prj
+++ b/Tests/Data/RichardsMechanics/confined_compression_fully_saturated.prj
@@ -71,8 +71,10 @@
</property>
<property>
<name>porosity</name>
- <type>Constant</type>
- <value>0.8</value>
+ <type>PorosityFromMassBalance</type>
+ <initial_porosity>phi0</initial_porosity>
+ <minimal_porosity>0</minimal_porosity>
+ <maximal_porosity>1</maximal_porosity>
</property>
<property>
<name>permeability</name>
@@ -184,6 +186,11 @@
<type>Constant</type>
<value>.1</value>
</parameter>
+ <parameter>
+ <name>phi0</name>
+ <type>Constant</type>
+ <value>0.8</value>
+ </parameter>
<!-- Model parameters -->
<parameter>
<name>mu</name>
diff --git a/Tests/Data/RichardsMechanics/confined_compression_fully_saturated_restart.prj b/Tests/Data/RichardsMechanics/confined_compression_fully_saturated_restart.prj
index 11bff8e6d85..041cc2e6bee 100644
--- a/Tests/Data/RichardsMechanics/confined_compression_fully_saturated_restart.prj
+++ b/Tests/Data/RichardsMechanics/confined_compression_fully_saturated_restart.prj
@@ -71,8 +71,10 @@
</property>
<property>
<name>porosity</name>
- <type>Constant</type>
- <value>0.8</value>
+ <type>PorosityFromMassBalance</type>
+ <initial_porosity>phi0</initial_porosity>
+ <minimal_porosity>0</minimal_porosity>
+ <maximal_porosity>1</maximal_porosity>
</property>
<property>
<name>permeability</name>
@@ -176,6 +178,11 @@
<type>Constant</type>
<value>.1</value>
</parameter>
+ <parameter>
+ <name>phi0</name>
+ <type>Constant</type>
+ <value>0.8</value>
+ </parameter>
<!-- Model parameters -->
<parameter>
<name>mu</name>
diff --git a/Tests/Data/RichardsMechanics/deformation_dependent_porosity_swelling.prj b/Tests/Data/RichardsMechanics/deformation_dependent_porosity_swelling.prj
index cecf76c97aa..9c05210a538 100644
--- a/Tests/Data/RichardsMechanics/deformation_dependent_porosity_swelling.prj
+++ b/Tests/Data/RichardsMechanics/deformation_dependent_porosity_swelling.prj
@@ -84,8 +84,10 @@
</property>
<property>
<name>porosity</name>
- <type>Constant</type>
- <value>0.5</value>
+ <type>PorosityFromMassBalance</type>
+ <initial_porosity>phi0</initial_porosity>
+ <minimal_porosity>0</minimal_porosity>
+ <maximal_porosity>1</maximal_porosity>
</property>
<property>
<name>transport_porosity</name>
diff --git a/Tests/Data/RichardsMechanics/flow_fully_saturated.prj b/Tests/Data/RichardsMechanics/flow_fully_saturated.prj
index e1194d78880..53df7edee15 100644
--- a/Tests/Data/RichardsMechanics/flow_fully_saturated.prj
+++ b/Tests/Data/RichardsMechanics/flow_fully_saturated.prj
@@ -64,8 +64,10 @@
</property>
<property>
<name>porosity</name>
- <type>Constant</type>
- <value>0.8</value>
+ <type>PorosityFromMassBalance</type>
+ <initial_porosity>phi0</initial_porosity>
+ <minimal_porosity>0</minimal_porosity>
+ <maximal_porosity>1</maximal_porosity>
</property>
<property>
<name>storage</name>
@@ -161,6 +163,11 @@
<type>Constant</type>
<value>.3</value>
</parameter>
+ <parameter>
+ <name>phi0</name>
+ <type>Constant</type>
+ <value>0.8</value>
+ </parameter>
<!-- Model parameters -->
<parameter>
<name>mu</name>
diff --git a/Tests/Data/RichardsMechanics/flow_fully_saturated_anisotropic.prj b/Tests/Data/RichardsMechanics/flow_fully_saturated_anisotropic.prj
index c01f178ac4c..15f5e39d5aa 100644
--- a/Tests/Data/RichardsMechanics/flow_fully_saturated_anisotropic.prj
+++ b/Tests/Data/RichardsMechanics/flow_fully_saturated_anisotropic.prj
@@ -64,8 +64,10 @@
</property>
<property>
<name>porosity</name>
- <type>Constant</type>
- <value>0.8</value>
+ <type>PorosityFromMassBalance</type>
+ <initial_porosity>phi0</initial_porosity>
+ <minimal_porosity>0</minimal_porosity>
+ <maximal_porosity>1</maximal_porosity>
</property>
<property>
<name>permeability</name>
@@ -161,6 +163,11 @@
<type>Constant</type>
<value>.3</value>
</parameter>
+ <parameter>
+ <name>phi0</name>
+ <type>Constant</type>
+ <value>0.8</value>
+ </parameter>
<!-- Model parameters -->
<parameter>
<name>mu</name>
diff --git a/Tests/Data/RichardsMechanics/flow_fully_saturated_coordinate_system.prj b/Tests/Data/RichardsMechanics/flow_fully_saturated_coordinate_system.prj
index 2dd7e31942a..95bf6e469ff 100644
--- a/Tests/Data/RichardsMechanics/flow_fully_saturated_coordinate_system.prj
+++ b/Tests/Data/RichardsMechanics/flow_fully_saturated_coordinate_system.prj
@@ -64,8 +64,10 @@
</property>
<property>
<name>porosity</name>
- <type>Constant</type>
- <value>0.8</value>
+ <type>PorosityFromMassBalance</type>
+ <initial_porosity>phi0</initial_porosity>
+ <minimal_porosity>0</minimal_porosity>
+ <maximal_porosity>1</maximal_porosity>
</property>
<property>
<name>permeability</name>
@@ -175,6 +177,11 @@
<type>Constant</type>
<value>.3</value>
</parameter>
+ <parameter>
+ <name>phi0</name>
+ <type>Constant</type>
+ <value>0.8</value>
+ </parameter>
<!-- Model parameters -->
<parameter>
<name>k</name>
diff --git a/Tests/Data/RichardsMechanics/flow_fully_saturated_linear.prj b/Tests/Data/RichardsMechanics/flow_fully_saturated_linear.prj
index 61bee1ef857..fc65c7ee006 100644
--- a/Tests/Data/RichardsMechanics/flow_fully_saturated_linear.prj
+++ b/Tests/Data/RichardsMechanics/flow_fully_saturated_linear.prj
@@ -64,8 +64,10 @@
</property>
<property>
<name>porosity</name>
- <type>Constant</type>
- <value>0.8</value>
+ <type>PorosityFromMassBalance</type>
+ <initial_porosity>phi0</initial_porosity>
+ <minimal_porosity>0</minimal_porosity>
+ <maximal_porosity>1</maximal_porosity>
</property>
<property>
<name>storage</name>
@@ -161,6 +163,11 @@
<type>Constant</type>
<value>.3</value>
</parameter>
+ <parameter>
+ <name>phi0</name>
+ <type>Constant</type>
+ <value>0.8</value>
+ </parameter>
<!-- Model parameters -->
<parameter>
<name>mu</name>
diff --git a/Tests/Data/RichardsMechanics/gravity.prj b/Tests/Data/RichardsMechanics/gravity.prj
index adc5279e71d..602940fff60 100644
--- a/Tests/Data/RichardsMechanics/gravity.prj
+++ b/Tests/Data/RichardsMechanics/gravity.prj
@@ -71,8 +71,10 @@
</property>
<property>
<name>porosity</name>
- <type>Constant</type>
- <value>0.5</value>
+ <type>PorosityFromMassBalance</type>
+ <initial_porosity>phi0</initial_porosity>
+ <minimal_porosity>0</minimal_porosity>
+ <maximal_porosity>1</maximal_porosity>
</property>
<property>
<name>permeability</name>
@@ -195,6 +197,11 @@
<type>Constant</type>
<value>.3</value>
</parameter>
+ <parameter>
+ <name>phi0</name>
+ <type>Constant</type>
+ <value>0.5</value>
+ </parameter>
<!-- Model parameters -->
<parameter>
<name>mu</name>
diff --git a/Tests/Data/RichardsMechanics/mechanics_linear.prj b/Tests/Data/RichardsMechanics/mechanics_linear.prj
index 2bf07665d22..3207747880d 100644
--- a/Tests/Data/RichardsMechanics/mechanics_linear.prj
+++ b/Tests/Data/RichardsMechanics/mechanics_linear.prj
@@ -77,8 +77,10 @@
</property>
<property>
<name>porosity</name>
- <type>Constant</type>
- <value>0.5</value>
+ <type>PorosityFromMassBalance</type>
+ <initial_porosity>phi0</initial_porosity>
+ <minimal_porosity>0</minimal_porosity>
+ <maximal_porosity>1</maximal_porosity>
</property>
<property>
<name>permeability</name>
@@ -169,6 +171,11 @@
<type>Constant</type>
<value>.3</value>
</parameter>
+ <parameter>
+ <name>phi0</name>
+ <type>Constant</type>
+ <value>0</value>
+ </parameter>
<!-- Model parameters -->
<parameter>
<name>mu</name>
diff --git a/Tests/Data/RichardsMechanics/orthotropic_swelling_xy.prj b/Tests/Data/RichardsMechanics/orthotropic_swelling_xy.prj
index b6abe0de889..e7343ff0581 100644
--- a/Tests/Data/RichardsMechanics/orthotropic_swelling_xy.prj
+++ b/Tests/Data/RichardsMechanics/orthotropic_swelling_xy.prj
@@ -73,8 +73,10 @@
</property>
<property>
<name>porosity</name>
- <type>Constant</type>
- <value>0.5</value>
+ <type>PorosityFromMassBalance</type>
+ <initial_porosity>phi0</initial_porosity>
+ <minimal_porosity>0</minimal_porosity>
+ <maximal_porosity>1</maximal_porosity>
</property>
<property>
<name>permeability</name>
@@ -201,6 +203,11 @@
<type>Constant</type>
<value>.3</value>
</parameter>
+ <parameter>
+ <name>phi0</name>
+ <type>Constant</type>
+ <value>0.5</value>
+ </parameter>
<!-- Model parameters -->
<parameter>
<name>displacement0</name>
diff --git a/Tests/Data/RichardsMechanics/orthotropic_swelling_xyz.prj b/Tests/Data/RichardsMechanics/orthotropic_swelling_xyz.prj
index c490a61f996..b0c09749857 100644
--- a/Tests/Data/RichardsMechanics/orthotropic_swelling_xyz.prj
+++ b/Tests/Data/RichardsMechanics/orthotropic_swelling_xyz.prj
@@ -73,8 +73,10 @@
</property>
<property>
<name>porosity</name>
- <type>Constant</type>
- <value>0.5</value>
+ <type>PorosityFromMassBalance</type>
+ <initial_porosity>phi0</initial_porosity>
+ <minimal_porosity>0</minimal_porosity>
+ <maximal_porosity>1</maximal_porosity>
</property>
<property>
<name>permeability</name>
@@ -207,6 +209,11 @@
<type>Constant</type>
<value>.3</value>
</parameter>
+ <parameter>
+ <name>phi0</name>
+ <type>Constant</type>
+ <value>0.5</value>
+ </parameter>
<!-- Model parameters -->
<parameter>
<name>displacement0</name>
diff --git a/Tests/Data/RichardsMechanics/rotated_consolidation.prj b/Tests/Data/RichardsMechanics/rotated_consolidation.prj
index cb30b312c7e..1310ea0f5ac 100644
--- a/Tests/Data/RichardsMechanics/rotated_consolidation.prj
+++ b/Tests/Data/RichardsMechanics/rotated_consolidation.prj
@@ -102,8 +102,10 @@
</property>
<property>
<name>porosity</name>
- <type>Constant</type>
- <value>0.4</value>
+ <type>PorosityFromMassBalance</type>
+ <initial_porosity>phi0</initial_porosity>
+ <minimal_porosity>0</minimal_porosity>
+ <maximal_porosity>1</maximal_porosity>
</property>
</properties>
</phase>
@@ -228,6 +230,11 @@
<type>Constant</type>
<values>.0 .0 .0</values>
</parameter>
+ <parameter>
+ <name>phi0</name>
+ <type>Constant</type>
+ <value>0.4</value>
+ </parameter>
<parameter>
<name>displacement0</name>
<type>Constant</type>
--
GitLab