From d8b826d344caa66abbcc3d86852ea99e6a14a329 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Buchwald?= <joerg.buchwald@ufz.de>
Date: Mon, 8 Mar 2021 21:38:20 +0100
Subject: [PATCH] move porosity, transport_porosity, permeability,
biot_coefficient and storage to medium in RM process and MPL properties
---
.../PermeabilityOrthotropicPowerLaw.cpp | 21 +++-----
.../Properties/PorosityFromMassBalance.cpp | 14 ++---
.../TransportPorosityFromMassBalance.cpp | 14 ++---
.../CreateRichardsMechanicsProcess.cpp | 5 +-
.../RichardsMechanicsFEM-impl.h | 37 +++++++------
.../LiakopoulosHM/liakopoulos.prj | 32 ++++++------
.../LiakopoulosHM/liakopoulos_QN.prj | 30 +++++------
.../RichardsFlow_2d_quasinewton.prj | 46 ++++++++--------
.../RichardsFlow_2d_richardsflow.prj | 2 +-
.../RichardsFlow_2d_small.prj | 46 ++++++++--------
.../RichardsFlow_2d_small_masslumping.prj | 46 ++++++++--------
...lternative_mass_balance_anzInterval_10.prj | 36 ++++++-------
.../bishops_effective_stress_power_law.prj | 36 ++++++-------
...ops_effective_stress_saturation_cutoff.prj | 36 ++++++-------
.../confined_compression_fully_saturated.prj | 46 ++++++++--------
...ed_compression_fully_saturated_restart.prj | 46 ++++++++--------
.../deformation_dependent_porosity.prj | 36 ++++++-------
...eformation_dependent_porosity_swelling.prj | 50 +++++++++---------
.../double_porosity_swelling.prj | 50 +++++++++---------
.../flow_fully_saturated.prj | 46 ++++++++--------
.../flow_fully_saturated_anisotropic.prj | 46 ++++++++--------
...flow_fully_saturated_coordinate_system.prj | 46 ++++++++--------
.../flow_fully_saturated_linear.prj | 46 ++++++++--------
Tests/Data/RichardsMechanics/gravity.prj | 46 ++++++++--------
.../RichardsMechanics/mechanics_linear.prj | 36 ++++++-------
...orthotropic_power_law_permeability_xyz.prj | 52 +++++++++----------
.../orthotropic_swelling_xy.prj | 36 ++++++-------
.../orthotropic_swelling_xyz.prj | 36 ++++++-------
.../rotated_consolidation.prj | 46 ++++++++--------
29 files changed, 520 insertions(+), 545 deletions(-)
diff --git a/MaterialLib/MPL/Properties/PermeabilityOrthotropicPowerLaw.cpp b/MaterialLib/MPL/Properties/PermeabilityOrthotropicPowerLaw.cpp
index f03c06e630f..4974f4544d6 100644
--- a/MaterialLib/MPL/Properties/PermeabilityOrthotropicPowerLaw.cpp
+++ b/MaterialLib/MPL/Properties/PermeabilityOrthotropicPowerLaw.cpp
@@ -37,20 +37,11 @@ PermeabilityOrthotropicPowerLaw<DisplacementDim>::
template <int DisplacementDim>
void PermeabilityOrthotropicPowerLaw<DisplacementDim>::checkScale() const
{
- if (!std::holds_alternative<Phase*>(scale_))
+ if (!std::holds_alternative<Medium*>(scale_))
{
OGS_FATAL(
"The property 'PermeabilityOrthotropicPowerLaw' is "
- "implemented on the 'phase' scales only.");
- }
-
- auto const phase = std::get<Phase*>(scale_);
- if (phase->name != "Solid")
- {
- OGS_FATAL(
- "The property 'PermeabilityOrthotropicPowerLaw' must be given in "
- "the 'Solid' phase, not in '{:s}' phase.",
- phase->name);
+ "implemented on the 'medium' scales only.");
}
}
template <int DisplacementDim>
@@ -64,13 +55,13 @@ PropertyDataType PermeabilityOrthotropicPowerLaw<DisplacementDim>::value(
// TODO (naumov) The phi0 must be evaluated once upon
// creation/initialization and be stored in a local state.
// For now assume porosity's initial value does not change with time.
- auto const phase = std::get<Phase*>(scale_);
+ auto const medium = std::get<Medium*>(scale_);
auto const phi_0 =
- phase->hasProperty(PropertyType::transport_porosity)
- ? phase->property(PropertyType::transport_porosity)
+ medium->hasProperty(PropertyType::transport_porosity)
+ ? medium->property(PropertyType::transport_porosity)
.template initialValue<double>(
pos, std::numeric_limits<double>::quiet_NaN())
- : phase->property(PropertyType::porosity)
+ : medium->property(PropertyType::porosity)
.template initialValue<double>(
pos, std::numeric_limits<double>::quiet_NaN());
diff --git a/MaterialLib/MPL/Properties/PorosityFromMassBalance.cpp b/MaterialLib/MPL/Properties/PorosityFromMassBalance.cpp
index da5296b23fc..c58c63b5e4b 100644
--- a/MaterialLib/MPL/Properties/PorosityFromMassBalance.cpp
+++ b/MaterialLib/MPL/Properties/PorosityFromMassBalance.cpp
@@ -18,19 +18,11 @@ namespace MaterialPropertyLib
{
void PorosityFromMassBalance::checkScale() const
{
- if (!std::holds_alternative<Phase*>(scale_))
+ if (!std::holds_alternative<Medium*>(scale_))
{
OGS_FATAL(
"The property 'PorosityFromMassBalance' is "
- "implemented on the 'phase' scales only.");
- }
- auto const phase = std::get<Phase*>(scale_);
- if (phase->name != "Solid")
- {
- OGS_FATAL(
- "The property 'PorosityFromMassBalance' must be given in the "
- "'Solid' phase, not in '{:s}' phase.",
- phase->name);
+ "implemented on the 'medium' scales only.");
}
}
@@ -53,7 +45,7 @@ PropertyDataType PorosityFromMassBalance::value(
double const beta_SR = std::get<double>(
variable_array[static_cast<int>(Variable::grain_compressibility)]);
auto const alpha_b =
- std::get<Phase*>(scale_)
+ std::get<Medium*>(scale_)
->property(PropertyType::biot_coefficient)
.template value<double>(variable_array, pos, t, dt);
diff --git a/MaterialLib/MPL/Properties/TransportPorosityFromMassBalance.cpp b/MaterialLib/MPL/Properties/TransportPorosityFromMassBalance.cpp
index f53492e289c..09f6e2f68ab 100644
--- a/MaterialLib/MPL/Properties/TransportPorosityFromMassBalance.cpp
+++ b/MaterialLib/MPL/Properties/TransportPorosityFromMassBalance.cpp
@@ -18,19 +18,11 @@ namespace MaterialPropertyLib
{
void TransportPorosityFromMassBalance::checkScale() const
{
- if (!std::holds_alternative<Phase*>(scale_))
+ if (!std::holds_alternative<Medium*>(scale_))
{
OGS_FATAL(
"The property 'TransportPorosityFromMassBalance' is "
- "implemented on the 'phase' scales only.");
- }
- auto const phase = std::get<Phase*>(scale_);
- if (phase->name != "Solid")
- {
- OGS_FATAL(
- "The property 'TransportPorosityFromMassBalance' must be given in "
- "the 'Solid' phase, not in '{:s}' phase.",
- phase->name);
+ "implemented on the 'medium' scales only.");
}
}
@@ -43,7 +35,7 @@ PropertyDataType TransportPorosityFromMassBalance::value(
double const beta_SR = std::get<double>(
variable_array[static_cast<int>(Variable::grain_compressibility)]);
auto const alpha_b =
- std::get<Phase*>(scale_)
+ std::get<Medium*>(scale_)
->property(PropertyType::biot_coefficient)
.template value<double>(variable_array, pos, t, dt);
diff --git a/ProcessLib/RichardsMechanics/CreateRichardsMechanicsProcess.cpp b/ProcessLib/RichardsMechanics/CreateRichardsMechanicsProcess.cpp
index 91b50a3c999..9095d1b4cf9 100644
--- a/ProcessLib/RichardsMechanics/CreateRichardsMechanicsProcess.cpp
+++ b/ProcessLib/RichardsMechanics/CreateRichardsMechanicsProcess.cpp
@@ -35,11 +35,12 @@ void checkMPLProperties(
MaterialPropertyLib::reference_temperature,
MaterialPropertyLib::bishops_effective_stress,
MaterialPropertyLib::relative_permeability,
- MaterialPropertyLib::saturation};
+ MaterialPropertyLib::saturation,
+ MaterialPropertyLib::porosity, MaterialPropertyLib::biot_coefficient
+ };
std::array const required_liquid_properties = {
MaterialPropertyLib::viscosity, MaterialPropertyLib::density};
std::array const required_solid_properties = {
- MaterialPropertyLib::porosity, MaterialPropertyLib::biot_coefficient,
MaterialPropertyLib::density};
for (auto const& m : media)
diff --git a/ProcessLib/RichardsMechanics/RichardsMechanicsFEM-impl.h b/ProcessLib/RichardsMechanics/RichardsMechanicsFEM-impl.h
index 6823983d15c..ad200b0860d 100644
--- a/ProcessLib/RichardsMechanics/RichardsMechanicsFEM-impl.h
+++ b/ProcessLib/RichardsMechanics/RichardsMechanicsFEM-impl.h
@@ -66,7 +66,6 @@ RichardsMechanicsLocalAssembler<ShapeFunctionDisplacement,
e.getID());
auto const& medium = _process_data.media_map->getMedium(_element.getID());
- auto const& solid_phase = medium->phase("Solid");
ParameterLib::SpatialPosition x_position;
x_position.setElementID(_element.getID());
@@ -99,17 +98,17 @@ RichardsMechanicsLocalAssembler<ShapeFunctionDisplacement,
// Initial porosity. Could be read from integration point data or mesh.
ip_data.porosity =
- solid_phase.property(MPL::porosity)
+ medium->property(MPL::porosity)
.template initialValue<double>(
x_position,
std::numeric_limits<
double>::quiet_NaN() /* t independent */);
ip_data.transport_porosity = ip_data.porosity;
- if (solid_phase.hasProperty(MPL::PropertyType::transport_porosity))
+ if (medium->hasProperty(MPL::PropertyType::transport_porosity))
{
ip_data.transport_porosity =
- solid_phase.property(MPL::transport_porosity)
+ medium->property(MPL::transport_porosity)
.template initialValue<double>(
x_position,
std::numeric_limits<
@@ -370,7 +369,7 @@ void RichardsMechanicsLocalAssembler<
variables[static_cast<int>(MPL::Variable::temperature)] = temperature;
auto const alpha =
- solid_phase.property(MPL::PropertyType::biot_coefficient)
+ medium->property(MPL::PropertyType::biot_coefficient)
.template value<double>(variables, x_position, t, dt);
auto const C_el = _ip_data[ip].computeElasticTangentStiffness(
t, x_position, dt, temperature);
@@ -430,7 +429,7 @@ void RichardsMechanicsLocalAssembler<
{ // Porosity update
variables_prev[static_cast<int>(MPL::Variable::porosity)] =
_ip_data[ip].porosity_prev;
- phi = solid_phase.property(MPL::PropertyType::porosity)
+ phi = medium->property(MPL::PropertyType::porosity)
.template value<double>(variables, variables_prev,
x_position, t, dt);
variables[static_cast<int>(MPL::Variable::porosity)] = phi;
@@ -474,14 +473,14 @@ void RichardsMechanicsLocalAssembler<
identity2.transpose() * C_el.inverse() * sigma_sw_prev;
}
- if (solid_phase.hasProperty(MPL::PropertyType::transport_porosity))
+ if (medium->hasProperty(MPL::PropertyType::transport_porosity))
{
variables_prev[static_cast<int>(
MPL::Variable::transport_porosity)] =
_ip_data[ip].transport_porosity_prev;
_ip_data[ip].transport_porosity =
- solid_phase.property(MPL::PropertyType::transport_porosity)
+ medium->property(MPL::PropertyType::transport_porosity)
.template value<double>(variables, variables_prev,
x_position, t, dt);
variables[static_cast<int>(MPL::Variable::transport_porosity)] =
@@ -522,7 +521,7 @@ void RichardsMechanicsLocalAssembler<
_ip_data[ip].material_state_variables->getEquivalentPlasticStrain();
auto const K_intrinsic = MPL::formEigenTensor<DisplacementDim>(
- solid_phase.property(MPL::PropertyType::permeability)
+ medium->property(MPL::PropertyType::permeability)
.value(variables, x_position, t, dt));
GlobalDimMatrixType const rho_K_over_mu =
@@ -738,7 +737,7 @@ void RichardsMechanicsLocalAssembler<ShapeFunctionDisplacement,
auto& S_L = _ip_data[ip].saturation;
auto const S_L_prev = _ip_data[ip].saturation_prev;
auto const alpha =
- solid_phase.property(MPL::PropertyType::biot_coefficient)
+ medium->property(MPL::PropertyType::biot_coefficient)
.template value<double>(variables, x_position, t, dt);
auto const C_el = _ip_data[ip].computeElasticTangentStiffness(
@@ -799,7 +798,7 @@ void RichardsMechanicsLocalAssembler<ShapeFunctionDisplacement,
variables_prev[static_cast<int>(MPL::Variable::porosity)] =
_ip_data[ip].porosity_prev;
- phi = solid_phase.property(MPL::PropertyType::porosity)
+ phi = medium->property(MPL::PropertyType::porosity)
.template value<double>(variables, variables_prev,
x_position, t, dt);
variables[static_cast<int>(MPL::Variable::porosity)] = phi;
@@ -894,14 +893,14 @@ void RichardsMechanicsLocalAssembler<ShapeFunctionDisplacement,
sigma_sw = sigma_sw_prev + delta_sigma_sw;
}
- if (solid_phase.hasProperty(MPL::PropertyType::transport_porosity))
+ if (medium->hasProperty(MPL::PropertyType::transport_porosity))
{
variables_prev[static_cast<int>(
MPL::Variable::transport_porosity)] =
_ip_data[ip].transport_porosity_prev;
_ip_data[ip].transport_porosity =
- solid_phase.property(MPL::PropertyType::transport_porosity)
+ medium->property(MPL::PropertyType::transport_porosity)
.template value<double>(variables, variables_prev,
x_position, t, dt);
variables[static_cast<int>(MPL::Variable::transport_porosity)] =
@@ -934,7 +933,7 @@ void RichardsMechanicsLocalAssembler<ShapeFunctionDisplacement,
_ip_data[ip].material_state_variables->getEquivalentPlasticStrain();
auto const K_intrinsic = MPL::formEigenTensor<DisplacementDim>(
- solid_phase.property(MPL::PropertyType::permeability)
+ medium->property(MPL::PropertyType::permeability)
.value(variables, x_position, t, dt));
GlobalDimMatrixType const rho_Ki_over_mu = K_intrinsic * rho_LR / mu;
@@ -1612,7 +1611,7 @@ void RichardsMechanicsLocalAssembler<ShapeFunctionDisplacement,
double const chi_S_L_prev = chi(S_L_prev);
auto const alpha =
- solid_phase.property(MPL::PropertyType::biot_coefficient)
+ medium->property(MPL::PropertyType::biot_coefficient)
.template value<double>(variables, x_position, t, dt);
auto const C_el = _ip_data[ip].computeElasticTangentStiffness(
@@ -1640,7 +1639,7 @@ void RichardsMechanicsLocalAssembler<ShapeFunctionDisplacement,
{ // Porosity update
variables_prev[static_cast<int>(MPL::Variable::porosity)] =
_ip_data[ip].porosity_prev;
- phi = solid_phase.property(MPL::PropertyType::porosity)
+ phi = medium->property(MPL::PropertyType::porosity)
.template value<double>(variables, variables_prev,
x_position, t, dt);
variables[static_cast<int>(MPL::Variable::porosity)] = phi;
@@ -1676,14 +1675,14 @@ void RichardsMechanicsLocalAssembler<ShapeFunctionDisplacement,
identity2.transpose() * C_el.inverse() * sigma_sw_prev;
}
- if (solid_phase.hasProperty(MPL::PropertyType::transport_porosity))
+ if (medium->hasProperty(MPL::PropertyType::transport_porosity))
{
variables_prev[static_cast<int>(
MPL::Variable::transport_porosity)] =
_ip_data[ip].transport_porosity_prev;
_ip_data[ip].transport_porosity =
- solid_phase.property(MPL::PropertyType::transport_porosity)
+ medium->property(MPL::PropertyType::transport_porosity)
.template value<double>(variables, variables_prev,
x_position, t, dt);
variables[static_cast<int>(MPL::Variable::transport_porosity)] =
@@ -1720,7 +1719,7 @@ void RichardsMechanicsLocalAssembler<ShapeFunctionDisplacement,
_ip_data[ip].material_state_variables->getEquivalentPlasticStrain();
auto const K_intrinsic = MPL::formEigenTensor<DisplacementDim>(
- solid_phase.property(MPL::PropertyType::permeability)
+ medium->property(MPL::PropertyType::permeability)
.value(variables, x_position, t, dt));
double const k_rel =
diff --git a/Tests/Data/RichardsMechanics/LiakopoulosHM/liakopoulos.prj b/Tests/Data/RichardsMechanics/LiakopoulosHM/liakopoulos.prj
index 3ab898901f7..ab932b49e06 100644
--- a/Tests/Data/RichardsMechanics/LiakopoulosHM/liakopoulos.prj
+++ b/Tests/Data/RichardsMechanics/LiakopoulosHM/liakopoulos.prj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version='1.0' encoding='ISO-8859-1'?>
<OpenGeoSysProject>
<meshes>
<mesh axially_symmetric="true">liakopoulos.vtu</mesh>
@@ -69,25 +69,25 @@
<type>Constant</type>
<value>1e12</value>
</property>
- <property>
- <name>biot_coefficient</name>
- <type>Constant</type>
- <value>1</value>
- </property>
- <property>
- <name>porosity</name>
- <type>Constant</type>
- <value>0.2975</value>
- </property>
- <property>
- <name>permeability</name>
- <type>Constant</type>
- <value>4.5e-13</value>
- </property>
</properties>
</phase>
</phases>
<properties>
+ <property>
+ <name>biot_coefficient</name>
+ <type>Constant</type>
+ <value>1</value>
+ </property>
+ <property>
+ <name>porosity</name>
+ <type>Constant</type>
+ <value>0.2975</value>
+ </property>
+ <property>
+ <name>permeability</name>
+ <type>Constant</type>
+ <value>4.5e-13</value>
+ </property>
<property>
<name>saturation</name>
<type>SaturationLiakopoulos</type>
diff --git a/Tests/Data/RichardsMechanics/LiakopoulosHM/liakopoulos_QN.prj b/Tests/Data/RichardsMechanics/LiakopoulosHM/liakopoulos_QN.prj
index d650a131fe8..f2c6c325561 100644
--- a/Tests/Data/RichardsMechanics/LiakopoulosHM/liakopoulos_QN.prj
+++ b/Tests/Data/RichardsMechanics/LiakopoulosHM/liakopoulos_QN.prj
@@ -89,25 +89,25 @@
<type>Constant</type>
<value>1e12</value>
</property>
- <property>
- <name>biot_coefficient</name>
- <type>Constant</type>
- <value>1</value>
- </property>
- <property>
- <name>porosity</name>
- <type>Constant</type>
- <value>0.2975</value>
- </property>
- <property>
- <name>permeability</name>
- <type>Constant</type>
- <value>4.5e-13</value>
- </property>
</properties>
</phase>
</phases>
<properties>
+ <property>
+ <name>biot_coefficient</name>
+ <type>Constant</type>
+ <value>1</value>
+ </property>
+ <property>
+ <name>porosity</name>
+ <type>Constant</type>
+ <value>0.2975</value>
+ </property>
+ <property>
+ <name>permeability</name>
+ <type>Constant</type>
+ <value>4.5e-13</value>
+ </property>
<property>
<name>saturation</name>
<type>SaturationLiakopoulos</type>
diff --git a/Tests/Data/RichardsMechanics/RichardsFlow_2d_quasinewton.prj b/Tests/Data/RichardsMechanics/RichardsFlow_2d_quasinewton.prj
index 5fc7f7f5038..d2401a89aa8 100644
--- a/Tests/Data/RichardsMechanics/RichardsFlow_2d_quasinewton.prj
+++ b/Tests/Data/RichardsMechanics/RichardsFlow_2d_quasinewton.prj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version='1.0' encoding='ISO-8859-1'?>
<OpenGeoSysProject>
<mesh>Richards_2d.vtu</mesh>
<geometry>Richards_2d.gml</geometry>
@@ -57,37 +57,37 @@
<phase>
<type>Solid</type>
<properties>
- <property>
- <name>biot_coefficient</name>
- <type>Constant</type>
- <value>0.38000000000000006</value>
- </property>
<property>
<name>density</name>
<type>Constant</type>
<value>1</value>
</property>
- <property>
- <name>porosity</name>
- <type>PorosityFromMassBalance</type>
- <initial_porosity>phi0</initial_porosity>
- <minimal_porosity>0</minimal_porosity>
- <maximal_porosity>1</maximal_porosity>
- </property>
- <property>
- <name>permeability</name>
- <type>Constant</type>
- <value>4.46e-13</value>
- </property>
- <property>
- <name>storage</name>
- <type>Constant</type>
- <value> 0.0 </value>
- </property>
</properties>
</phase>
</phases>
<properties>
+ <property>
+ <name>biot_coefficient</name>
+ <type>Constant</type>
+ <value>0.38000000000000006</value>
+ </property>
+ <property>
+ <name>porosity</name>
+ <type>PorosityFromMassBalance</type>
+ <initial_porosity>phi0</initial_porosity>
+ <minimal_porosity>0</minimal_porosity>
+ <maximal_porosity>1</maximal_porosity>
+ </property>
+ <property>
+ <name>permeability</name>
+ <type>Constant</type>
+ <value>4.46e-13</value>
+ </property>
+ <property>
+ <name>storage</name>
+ <type>Constant</type>
+ <value> 0.0 </value>
+ </property>
<property>
<name>reference_temperature</name>
<type>Constant</type>
diff --git a/Tests/Data/RichardsMechanics/RichardsFlow_2d_richardsflow.prj b/Tests/Data/RichardsMechanics/RichardsFlow_2d_richardsflow.prj
index c84e569c8df..48892f6632b 100644
--- a/Tests/Data/RichardsMechanics/RichardsFlow_2d_richardsflow.prj
+++ b/Tests/Data/RichardsMechanics/RichardsFlow_2d_richardsflow.prj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version='1.0' encoding='ISO-8859-1'?>
<OpenGeoSysProject>
<mesh>Richards_2d_linear.vtu</mesh>
<geometry>Richards_2d.gml</geometry>
diff --git a/Tests/Data/RichardsMechanics/RichardsFlow_2d_small.prj b/Tests/Data/RichardsMechanics/RichardsFlow_2d_small.prj
index e48a44a5ad2..d725516efce 100644
--- a/Tests/Data/RichardsMechanics/RichardsFlow_2d_small.prj
+++ b/Tests/Data/RichardsMechanics/RichardsFlow_2d_small.prj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version='1.0' encoding='ISO-8859-1'?>
<OpenGeoSysProject>
<mesh>RichardsFlow_2d_small.vtu</mesh>
<geometry>RichardsFlow_2d_small.gml</geometry>
@@ -52,37 +52,37 @@
<phase>
<type>Solid</type>
<properties>
- <property>
- <name>biot_coefficient</name>
- <type>Constant</type>
- <value>0.38</value>
- </property>
<property>
<name>density</name>
<type>Constant</type>
<value>1</value>
</property>
- <property>
- <name>porosity</name>
- <type>PorosityFromMassBalance</type>
- <initial_porosity>phi0</initial_porosity>
- <minimal_porosity>0</minimal_porosity>
- <maximal_porosity>1</maximal_porosity>
- </property>
- <property>
- <name>permeability</name>
- <type>Constant</type>
- <value>4.46e-13</value>
- </property>
- <property>
- <name>storage</name>
- <type>Constant</type>
- <value> 0.0 </value>
- </property>
</properties>
</phase>
</phases>
<properties>
+ <property>
+ <name>biot_coefficient</name>
+ <type>Constant</type>
+ <value>0.38</value>
+ </property>
+ <property>
+ <name>porosity</name>
+ <type>PorosityFromMassBalance</type>
+ <initial_porosity>phi0</initial_porosity>
+ <minimal_porosity>0</minimal_porosity>
+ <maximal_porosity>1</maximal_porosity>
+ </property>
+ <property>
+ <name>permeability</name>
+ <type>Constant</type>
+ <value>4.46e-13</value>
+ </property>
+ <property>
+ <name>storage</name>
+ <type>Constant</type>
+ <value> 0.0 </value>
+ </property>
<property>
<name>reference_temperature</name>
<type>Constant</type>
diff --git a/Tests/Data/RichardsMechanics/RichardsFlow_2d_small_masslumping.prj b/Tests/Data/RichardsMechanics/RichardsFlow_2d_small_masslumping.prj
index cffc79f4541..21907174531 100644
--- a/Tests/Data/RichardsMechanics/RichardsFlow_2d_small_masslumping.prj
+++ b/Tests/Data/RichardsMechanics/RichardsFlow_2d_small_masslumping.prj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version='1.0' encoding='ISO-8859-1'?>
<OpenGeoSysProject>
<mesh>Richards_2d.vtu</mesh>
<geometry>Richards_2d.gml</geometry>
@@ -58,32 +58,32 @@
<type>Constant</type>
<value>1</value>
</property>
- <property>
- <name>biot_coefficient</name>
- <type>Constant</type>
- <value>0.38</value>
- </property>
- <property>
- <name>porosity</name>
- <type>PorosityFromMassBalance</type>
- <initial_porosity>phi0</initial_porosity>
- <minimal_porosity>0</minimal_porosity>
- <maximal_porosity>1</maximal_porosity>
- </property>
- <property>
- <name>storage</name>
- <type>Constant</type>
- <value> 0.0 </value>
- </property>
- <property>
- <name>permeability</name>
- <type>Constant</type>
- <value>4.46e-13</value>
- </property>
</properties>
</phase>
</phases>
<properties>
+ <property>
+ <name>biot_coefficient</name>
+ <type>Constant</type>
+ <value>0.38</value>
+ </property>
+ <property>
+ <name>porosity</name>
+ <type>PorosityFromMassBalance</type>
+ <initial_porosity>phi0</initial_porosity>
+ <minimal_porosity>0</minimal_porosity>
+ <maximal_porosity>1</maximal_porosity>
+ </property>
+ <property>
+ <name>storage</name>
+ <type>Constant</type>
+ <value> 0.0 </value>
+ </property>
+ <property>
+ <name>permeability</name>
+ <type>Constant</type>
+ <value>4.46e-13</value>
+ </property>
<property>
<name>reference_temperature</name>
<type>Constant</type>
diff --git a/Tests/Data/RichardsMechanics/alternative_mass_balance_anzInterval_10.prj b/Tests/Data/RichardsMechanics/alternative_mass_balance_anzInterval_10.prj
index 173a64e13fa..a5345576e63 100644
--- a/Tests/Data/RichardsMechanics/alternative_mass_balance_anzInterval_10.prj
+++ b/Tests/Data/RichardsMechanics/alternative_mass_balance_anzInterval_10.prj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version='1.0' encoding='ISO-8859-1'?>
<OpenGeoSysProject>
<mesh>square_1x1_quad_1e0.vtu</mesh>
<geometry>square_1x1.gml</geometry>
@@ -57,27 +57,27 @@
<type>Constant</type>
<value>2.6e3</value>
</property>
- <property>
- <name>biot_coefficient</name>
- <type>Constant</type>
- <value>0.72222222222222222222</value>
- </property>
- <property>
- <name>porosity</name>
- <type>PorosityFromMassBalance</type>
- <initial_porosity>phi0</initial_porosity>
- <minimal_porosity>0</minimal_porosity>
- <maximal_porosity>1</maximal_porosity>
- </property>
- <property>
- <name>permeability</name>
- <type>Constant</type>
- <value>1e-12</value>
- </property>
</properties>
</phase>
</phases>
<properties>
+ <property>
+ <name>biot_coefficient</name>
+ <type>Constant</type>
+ <value>0.72222222222222222222</value>
+ </property>
+ <property>
+ <name>porosity</name>
+ <type>PorosityFromMassBalance</type>
+ <initial_porosity>phi0</initial_porosity>
+ <minimal_porosity>0</minimal_porosity>
+ <maximal_porosity>1</maximal_porosity>
+ </property>
+ <property>
+ <name>permeability</name>
+ <type>Constant</type>
+ <value>1e-12</value>
+ </property>
<property>
<name>saturation</name>
<type>SaturationVanGenuchten</type>
diff --git a/Tests/Data/RichardsMechanics/bishops_effective_stress_power_law.prj b/Tests/Data/RichardsMechanics/bishops_effective_stress_power_law.prj
index 49082707f50..534e4245ac9 100644
--- a/Tests/Data/RichardsMechanics/bishops_effective_stress_power_law.prj
+++ b/Tests/Data/RichardsMechanics/bishops_effective_stress_power_law.prj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version='1.0' encoding='ISO-8859-1'?>
<OpenGeoSysProject>
<mesh>cube_1x1x1_hex20_1e0.vtu</mesh>
<geometry>cube_1x1x1.gml</geometry>
@@ -60,32 +60,32 @@
<phase>
<type>Solid</type>
<properties>
- <property>
- <name>biot_coefficient</name>
- <type>Constant</type>
- <value>1</value>
- </property>
<property>
<name>density</name>
<type>Constant</type>
<value>1</value>
</property>
- <property>
- <name>porosity</name>
- <type>PorosityFromMassBalance</type>
- <initial_porosity>phi0</initial_porosity>
- <minimal_porosity>0</minimal_porosity>
- <maximal_porosity>1</maximal_porosity>
- </property>
- <property>
- <name>permeability</name>
- <type>Constant</type>
- <value>1</value>
- </property>
</properties>
</phase>
</phases>
<properties>
+ <property>
+ <name>biot_coefficient</name>
+ <type>Constant</type>
+ <value>1</value>
+ </property>
+ <property>
+ <name>porosity</name>
+ <type>PorosityFromMassBalance</type>
+ <initial_porosity>phi0</initial_porosity>
+ <minimal_porosity>0</minimal_porosity>
+ <maximal_porosity>1</maximal_porosity>
+ </property>
+ <property>
+ <name>permeability</name>
+ <type>Constant</type>
+ <value>1</value>
+ </property>
<property>
<name>reference_temperature</name>
<type>Constant</type>
diff --git a/Tests/Data/RichardsMechanics/bishops_effective_stress_saturation_cutoff.prj b/Tests/Data/RichardsMechanics/bishops_effective_stress_saturation_cutoff.prj
index c3fc61049a4..266d4b4efe9 100644
--- a/Tests/Data/RichardsMechanics/bishops_effective_stress_saturation_cutoff.prj
+++ b/Tests/Data/RichardsMechanics/bishops_effective_stress_saturation_cutoff.prj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version='1.0' encoding='ISO-8859-1'?>
<OpenGeoSysProject>
<mesh>cube_1x1x1_hex20_1e0.vtu</mesh>
<geometry>cube_1x1x1.gml</geometry>
@@ -60,32 +60,32 @@
<phase>
<type>Solid</type>
<properties>
- <property>
- <name>biot_coefficient</name>
- <type>Constant</type>
- <value>1</value>
- </property>
<property>
<name>density</name>
<type>Constant</type>
<value>1</value>
</property>
- <property>
- <name>porosity</name>
- <type>PorosityFromMassBalance</type>
- <initial_porosity>phi0</initial_porosity>
- <minimal_porosity>0</minimal_porosity>
- <maximal_porosity>1</maximal_porosity>
- </property>
- <property>
- <name>permeability</name>
- <type>Constant</type>
- <value>1</value>
- </property>
</properties>
</phase>
</phases>
<properties>
+ <property>
+ <name>biot_coefficient</name>
+ <type>Constant</type>
+ <value>1</value>
+ </property>
+ <property>
+ <name>porosity</name>
+ <type>PorosityFromMassBalance</type>
+ <initial_porosity>phi0</initial_porosity>
+ <minimal_porosity>0</minimal_porosity>
+ <maximal_porosity>1</maximal_porosity>
+ </property>
+ <property>
+ <name>permeability</name>
+ <type>Constant</type>
+ <value>1</value>
+ </property>
<property>
<name>reference_temperature</name>
<type>Constant</type>
diff --git a/Tests/Data/RichardsMechanics/confined_compression_fully_saturated.prj b/Tests/Data/RichardsMechanics/confined_compression_fully_saturated.prj
index 767d566c676..7cc12f8749a 100644
--- a/Tests/Data/RichardsMechanics/confined_compression_fully_saturated.prj
+++ b/Tests/Data/RichardsMechanics/confined_compression_fully_saturated.prj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version='1.0' encoding='ISO-8859-1'?>
<OpenGeoSysProject>
<mesh>square_1x1_quad8_1e2.vtu</mesh>
<geometry>square_1x1.gml</geometry>
@@ -64,32 +64,32 @@
<type>Constant</type>
<value>1.2e-6</value>
</property>
- <property>
- <name>biot_coefficient</name>
- <type>Constant</type>
- <value>1</value>
- </property>
- <property>
- <name>porosity</name>
- <type>PorosityFromMassBalance</type>
- <initial_porosity>phi0</initial_porosity>
- <minimal_porosity>0</minimal_porosity>
- <maximal_porosity>1</maximal_porosity>
- </property>
- <property>
- <name>permeability</name>
- <type>Constant</type>
- <value>1e-12</value>
- </property>
- <property>
- <name>storage</name>
- <type>Constant</type>
- <value>1e+300</value>
- </property>
</properties>
</phase>
</phases>
<properties>
+ <property>
+ <name>biot_coefficient</name>
+ <type>Constant</type>
+ <value>1</value>
+ </property>
+ <property>
+ <name>porosity</name>
+ <type>PorosityFromMassBalance</type>
+ <initial_porosity>phi0</initial_porosity>
+ <minimal_porosity>0</minimal_porosity>
+ <maximal_porosity>1</maximal_porosity>
+ </property>
+ <property>
+ <name>permeability</name>
+ <type>Constant</type>
+ <value>1e-12</value>
+ </property>
+ <property>
+ <name>storage</name>
+ <type>Constant</type>
+ <value>1e+300</value>
+ </property>
<property>
<name>reference_temperature</name>
<type>Constant</type>
diff --git a/Tests/Data/RichardsMechanics/confined_compression_fully_saturated_restart.prj b/Tests/Data/RichardsMechanics/confined_compression_fully_saturated_restart.prj
index 151f3b8e7bf..c26b568d822 100644
--- a/Tests/Data/RichardsMechanics/confined_compression_fully_saturated_restart.prj
+++ b/Tests/Data/RichardsMechanics/confined_compression_fully_saturated_restart.prj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version='1.0' encoding='ISO-8859-1'?>
<OpenGeoSysProject>
<mesh>confined_compression_fully_saturated_ts_20_t_100.000000.vtu</mesh>
<geometry>square_1x1.gml</geometry>
@@ -64,32 +64,32 @@
<type>Constant</type>
<value>1.2e-6</value>
</property>
- <property>
- <name>biot_coefficient</name>
- <type>Constant</type>
- <value>1</value>
- </property>
- <property>
- <name>porosity</name>
- <type>PorosityFromMassBalance</type>
- <initial_porosity>phi0</initial_porosity>
- <minimal_porosity>0</minimal_porosity>
- <maximal_porosity>1</maximal_porosity>
- </property>
- <property>
- <name>permeability</name>
- <type>Constant</type>
- <value>1e-12</value>
- </property>
- <property>
- <name>storage</name>
- <type>Constant</type>
- <value>1e+300</value>
- </property>
</properties>
</phase>
</phases>
<properties>
+ <property>
+ <name>biot_coefficient</name>
+ <type>Constant</type>
+ <value>1</value>
+ </property>
+ <property>
+ <name>porosity</name>
+ <type>PorosityFromMassBalance</type>
+ <initial_porosity>phi0</initial_porosity>
+ <minimal_porosity>0</minimal_porosity>
+ <maximal_porosity>1</maximal_porosity>
+ </property>
+ <property>
+ <name>permeability</name>
+ <type>Constant</type>
+ <value>1e-12</value>
+ </property>
+ <property>
+ <name>storage</name>
+ <type>Constant</type>
+ <value>1e+300</value>
+ </property>
<property>
<name>reference_temperature</name>
<type>Constant</type>
diff --git a/Tests/Data/RichardsMechanics/deformation_dependent_porosity.prj b/Tests/Data/RichardsMechanics/deformation_dependent_porosity.prj
index f4af3f63b4c..d3edf835699 100644
--- a/Tests/Data/RichardsMechanics/deformation_dependent_porosity.prj
+++ b/Tests/Data/RichardsMechanics/deformation_dependent_porosity.prj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version='1.0' encoding='ISO-8859-1'?>
<OpenGeoSysProject>
<mesh>square_1x1_quad8_1e2.vtu</mesh>
<geometry>square_1x1.gml</geometry>
@@ -60,32 +60,32 @@
<phase>
<type>Solid</type>
<properties>
- <property>
- <name>biot_coefficient</name>
- <type>Constant</type>
- <value>0.9166666666666666666</value>
- </property>
<property>
<name>density</name>
<type>Constant</type>
<value>1</value>
</property>
- <property>
- <name>porosity</name>
- <type>PorosityFromMassBalance</type>
- <initial_porosity>phi0</initial_porosity>
- <minimal_porosity>0</minimal_porosity>
- <maximal_porosity>1</maximal_porosity>
- </property>
- <property>
- <name>permeability</name>
- <type>Constant</type>
- <value>1</value>
- </property>
</properties>
</phase>
</phases>
<properties>
+ <property>
+ <name>biot_coefficient</name>
+ <type>Constant</type>
+ <value>0.9166666666666666666</value>
+ </property>
+ <property>
+ <name>porosity</name>
+ <type>PorosityFromMassBalance</type>
+ <initial_porosity>phi0</initial_porosity>
+ <minimal_porosity>0</minimal_porosity>
+ <maximal_porosity>1</maximal_porosity>
+ </property>
+ <property>
+ <name>permeability</name>
+ <type>Constant</type>
+ <value>1</value>
+ </property>
<property>
<name>reference_temperature</name>
<type>Constant</type>
diff --git a/Tests/Data/RichardsMechanics/deformation_dependent_porosity_swelling.prj b/Tests/Data/RichardsMechanics/deformation_dependent_porosity_swelling.prj
index b89a4fc64d6..8e1cca41544 100644
--- a/Tests/Data/RichardsMechanics/deformation_dependent_porosity_swelling.prj
+++ b/Tests/Data/RichardsMechanics/deformation_dependent_porosity_swelling.prj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version='1.0' encoding='ISO-8859-1'?>
<OpenGeoSysProject>
<mesh>square_1x1_quad8_1e2.vtu</mesh>
<geometry>square_1x1.gml</geometry>
@@ -63,11 +63,6 @@
<phase>
<type>Solid</type>
<properties>
- <property>
- <name>biot_coefficient</name>
- <type>Constant</type>
- <value>0.9166666666666666666</value>
- </property>
<property>
<name>density</name>
<type>Exponential</type>
@@ -82,25 +77,6 @@
<factor>0.1</factor>
</exponent>
</property>
- <property>
- <name>porosity</name>
- <type>PorosityFromMassBalance</type>
- <initial_porosity>phi0</initial_porosity>
- <minimal_porosity>0</minimal_porosity>
- <maximal_porosity>1</maximal_porosity>
- </property>
- <property>
- <name>transport_porosity</name>
- <type>TransportPorosityFromMassBalance</type>
- <initial_porosity>phi0</initial_porosity>
- <minimal_porosity>0</minimal_porosity>
- <maximal_porosity>1</maximal_porosity>
- </property>
- <property>
- <name>permeability</name>
- <type>Constant</type>
- <value>1</value>
- </property>
<property>
<name>swelling_stress_rate</name>
<type>SaturationDependentSwelling</type>
@@ -113,6 +89,30 @@
</phase>
</phases>
<properties>
+ <property>
+ <name>transport_porosity</name>
+ <type>TransportPorosityFromMassBalance</type>
+ <initial_porosity>phi0</initial_porosity>
+ <minimal_porosity>0</minimal_porosity>
+ <maximal_porosity>1</maximal_porosity>
+ </property>
+ <property>
+ <name>biot_coefficient</name>
+ <type>Constant</type>
+ <value>0.9166666666666666666</value>
+ </property>
+ <property>
+ <name>porosity</name>
+ <type>PorosityFromMassBalance</type>
+ <initial_porosity>phi0</initial_porosity>
+ <minimal_porosity>0</minimal_porosity>
+ <maximal_porosity>1</maximal_porosity>
+ </property>
+ <property>
+ <name>permeability</name>
+ <type>Constant</type>
+ <value>1</value>
+ </property>
<property>
<name>reference_temperature</name>
<type>Constant</type>
diff --git a/Tests/Data/RichardsMechanics/double_porosity_swelling.prj b/Tests/Data/RichardsMechanics/double_porosity_swelling.prj
index ddd75f69dc2..1b80e4b2fb3 100644
--- a/Tests/Data/RichardsMechanics/double_porosity_swelling.prj
+++ b/Tests/Data/RichardsMechanics/double_porosity_swelling.prj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version='1.0' encoding='ISO-8859-1'?>
<OpenGeoSysProject>
<mesh>square_1x1_quad_1e2.vtu</mesh>
<geometry>square_1x1.gml</geometry>
@@ -68,30 +68,6 @@
<type>Constant</type>
<value>2e3</value>
</property>
- <property>
- <name>biot_coefficient</name>
- <type>Constant</type>
- <value>0.6</value>
- </property>
- <property>
- <name>permeability</name>
- <type>Constant</type>
- <value>1e-21</value>
- </property>
- <property>
- <name>porosity</name>
- <type>PorosityFromMassBalance</type>
- <initial_porosity>phi0</initial_porosity>
- <minimal_porosity>0</minimal_porosity>
- <maximal_porosity>1</maximal_porosity>
- </property>
- <property>
- <name>transport_porosity</name>
- <type>TransportPorosityFromMassBalance</type>
- <initial_porosity>phi_tr0</initial_porosity>
- <minimal_porosity>0</minimal_porosity>
- <maximal_porosity>1</maximal_porosity>
- </property>
<property>
<name>swelling_stress_rate</name>
<type>SaturationDependentSwelling</type>
@@ -104,6 +80,30 @@
</phase>
</phases>
<properties>
+ <property>
+ <name>transport_porosity</name>
+ <type>TransportPorosityFromMassBalance</type>
+ <initial_porosity>phi_tr0</initial_porosity>
+ <minimal_porosity>0</minimal_porosity>
+ <maximal_porosity>1</maximal_porosity>
+ </property>
+ <property>
+ <name>biot_coefficient</name>
+ <type>Constant</type>
+ <value>0.6</value>
+ </property>
+ <property>
+ <name>permeability</name>
+ <type>Constant</type>
+ <value>1e-21</value>
+ </property>
+ <property>
+ <name>porosity</name>
+ <type>PorosityFromMassBalance</type>
+ <initial_porosity>phi0</initial_porosity>
+ <minimal_porosity>0</minimal_porosity>
+ <maximal_porosity>1</maximal_porosity>
+ </property>
<property>
<name>reference_temperature</name>
<type>Constant</type>
diff --git a/Tests/Data/RichardsMechanics/flow_fully_saturated.prj b/Tests/Data/RichardsMechanics/flow_fully_saturated.prj
index 1e0c4f33d2b..f6399282c2a 100644
--- a/Tests/Data/RichardsMechanics/flow_fully_saturated.prj
+++ b/Tests/Data/RichardsMechanics/flow_fully_saturated.prj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version='1.0' encoding='ISO-8859-1'?>
<OpenGeoSysProject>
<mesh>square_1x1_quad8_1e2.vtu</mesh>
<geometry>square_1x1.gml</geometry>
@@ -57,32 +57,32 @@
<type>Constant</type>
<value>1</value>
</property>
- <property>
- <name>biot_coefficient</name>
- <type>Constant</type>
- <value>1</value>
- </property>
- <property>
- <name>porosity</name>
- <type>PorosityFromMassBalance</type>
- <initial_porosity>phi0</initial_porosity>
- <minimal_porosity>0</minimal_porosity>
- <maximal_porosity>1</maximal_porosity>
- </property>
- <property>
- <name>storage</name>
- <type>Constant</type>
- <value>1e+300</value>
- </property>
- <property>
- <name>permeability</name>
- <type>Constant</type>
- <value>1e-12</value>
- </property>
</properties>
</phase>
</phases>
<properties>
+ <property>
+ <name>biot_coefficient</name>
+ <type>Constant</type>
+ <value>1</value>
+ </property>
+ <property>
+ <name>porosity</name>
+ <type>PorosityFromMassBalance</type>
+ <initial_porosity>phi0</initial_porosity>
+ <minimal_porosity>0</minimal_porosity>
+ <maximal_porosity>1</maximal_porosity>
+ </property>
+ <property>
+ <name>storage</name>
+ <type>Constant</type>
+ <value>1e+300</value>
+ </property>
+ <property>
+ <name>permeability</name>
+ <type>Constant</type>
+ <value>1e-12</value>
+ </property>
<property>
<name>saturation</name>
<type>Constant</type>
diff --git a/Tests/Data/RichardsMechanics/flow_fully_saturated_anisotropic.prj b/Tests/Data/RichardsMechanics/flow_fully_saturated_anisotropic.prj
index b94b8598c69..83bbe072e3f 100644
--- a/Tests/Data/RichardsMechanics/flow_fully_saturated_anisotropic.prj
+++ b/Tests/Data/RichardsMechanics/flow_fully_saturated_anisotropic.prj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version='1.0' encoding='ISO-8859-1'?>
<OpenGeoSysProject>
<mesh>square_1x1_quad8_1e2.vtu</mesh>
<geometry>square_1x1.gml</geometry>
@@ -57,32 +57,32 @@
<type>Constant</type>
<value>1</value>
</property>
- <property>
- <name>biot_coefficient</name>
- <type>Constant</type>
- <value>1</value>
- </property>
- <property>
- <name>porosity</name>
- <type>PorosityFromMassBalance</type>
- <initial_porosity>phi0</initial_porosity>
- <minimal_porosity>0</minimal_porosity>
- <maximal_porosity>1</maximal_porosity>
- </property>
- <property>
- <name>permeability</name>
- <type>Constant</type>
- <value>7.75e-13 3.8971143170299739104e-13 3.8971143170299739104e-13 3.25e-13</value>
- </property>
- <property>
- <name>storage</name>
- <type>Constant</type>
- <value>1e+300</value>
- </property>
</properties>
</phase>
</phases>
<properties>
+ <property>
+ <name>biot_coefficient</name>
+ <type>Constant</type>
+ <value>1</value>
+ </property>
+ <property>
+ <name>porosity</name>
+ <type>PorosityFromMassBalance</type>
+ <initial_porosity>phi0</initial_porosity>
+ <minimal_porosity>0</minimal_porosity>
+ <maximal_porosity>1</maximal_porosity>
+ </property>
+ <property>
+ <name>permeability</name>
+ <type>Constant</type>
+ <value>7.75e-13 3.8971143170299739104e-13 3.8971143170299739104e-13 3.25e-13</value>
+ </property>
+ <property>
+ <name>storage</name>
+ <type>Constant</type>
+ <value>1e+300</value>
+ </property>
<property>
<name>saturation</name>
<type>Constant</type>
diff --git a/Tests/Data/RichardsMechanics/flow_fully_saturated_coordinate_system.prj b/Tests/Data/RichardsMechanics/flow_fully_saturated_coordinate_system.prj
index a8718407e65..9054472c1e6 100644
--- a/Tests/Data/RichardsMechanics/flow_fully_saturated_coordinate_system.prj
+++ b/Tests/Data/RichardsMechanics/flow_fully_saturated_coordinate_system.prj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version='1.0' encoding='ISO-8859-1'?>
<OpenGeoSysProject>
<mesh>square_1x1_quad8_1e2.vtu</mesh>
<geometry>square_1x1.gml</geometry>
@@ -52,37 +52,37 @@
<phase>
<type>Solid</type>
<properties>
- <property>
- <name>biot_coefficient</name>
- <type>Constant</type>
- <value>1</value>
- </property>
<property>
<name>density</name>
<type>Constant</type>
<value>1</value>
</property>
- <property>
- <name>porosity</name>
- <type>PorosityFromMassBalance</type>
- <initial_porosity>phi0</initial_porosity>
- <minimal_porosity>0</minimal_porosity>
- <maximal_porosity>1</maximal_porosity>
- </property>
- <property>
- <name>permeability</name>
- <type>Parameter</type>
- <parameter_name>k</parameter_name>
- </property>
- <property>
- <name>storage</name>
- <type>Constant</type>
- <value>1e+300</value>
- </property>
</properties>
</phase>
</phases>
<properties>
+ <property>
+ <name>biot_coefficient</name>
+ <type>Constant</type>
+ <value>1</value>
+ </property>
+ <property>
+ <name>porosity</name>
+ <type>PorosityFromMassBalance</type>
+ <initial_porosity>phi0</initial_porosity>
+ <minimal_porosity>0</minimal_porosity>
+ <maximal_porosity>1</maximal_porosity>
+ </property>
+ <property>
+ <name>permeability</name>
+ <type>Parameter</type>
+ <parameter_name>k</parameter_name>
+ </property>
+ <property>
+ <name>storage</name>
+ <type>Constant</type>
+ <value>1e+300</value>
+ </property>
<property>
<name>saturation</name>
<type>Constant</type>
diff --git a/Tests/Data/RichardsMechanics/flow_fully_saturated_linear.prj b/Tests/Data/RichardsMechanics/flow_fully_saturated_linear.prj
index af25126e129..f1e346bdd93 100644
--- a/Tests/Data/RichardsMechanics/flow_fully_saturated_linear.prj
+++ b/Tests/Data/RichardsMechanics/flow_fully_saturated_linear.prj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version='1.0' encoding='ISO-8859-1'?>
<OpenGeoSysProject>
<mesh>square_1x1_quad_1e2.vtu</mesh>
<geometry>square_1x1.gml</geometry>
@@ -57,32 +57,32 @@
<type>Constant</type>
<value>1</value>
</property>
- <property>
- <name>biot_coefficient</name>
- <type>Constant</type>
- <value>1</value>
- </property>
- <property>
- <name>porosity</name>
- <type>PorosityFromMassBalance</type>
- <initial_porosity>phi0</initial_porosity>
- <minimal_porosity>0</minimal_porosity>
- <maximal_porosity>1</maximal_porosity>
- </property>
- <property>
- <name>storage</name>
- <type>Constant</type>
- <value>1e+300</value>
- </property>
- <property>
- <name>permeability</name>
- <type>Constant</type>
- <value>1e-12</value>
- </property>
</properties>
</phase>
</phases>
<properties>
+ <property>
+ <name>biot_coefficient</name>
+ <type>Constant</type>
+ <value>1</value>
+ </property>
+ <property>
+ <name>porosity</name>
+ <type>PorosityFromMassBalance</type>
+ <initial_porosity>phi0</initial_porosity>
+ <minimal_porosity>0</minimal_porosity>
+ <maximal_porosity>1</maximal_porosity>
+ </property>
+ <property>
+ <name>storage</name>
+ <type>Constant</type>
+ <value>1e+300</value>
+ </property>
+ <property>
+ <name>permeability</name>
+ <type>Constant</type>
+ <value>1e-12</value>
+ </property>
<property>
<name>saturation</name>
<type>Constant</type>
diff --git a/Tests/Data/RichardsMechanics/gravity.prj b/Tests/Data/RichardsMechanics/gravity.prj
index f58db23e3e0..5852cfe24ff 100644
--- a/Tests/Data/RichardsMechanics/gravity.prj
+++ b/Tests/Data/RichardsMechanics/gravity.prj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version='1.0' encoding='ISO-8859-1'?>
<OpenGeoSysProject>
<mesh>square_1x1_quad8_1e2.vtu</mesh>
<geometry>square_1x1.gml</geometry>
@@ -59,37 +59,37 @@
<phase>
<type>Solid</type>
<properties>
- <property>
- <name>biot_coefficient</name>
- <type>Constant</type>
- <value>0.5</value>
- </property>
<property>
<name>density</name>
<type>Constant</type>
<value>1e3</value>
</property>
- <property>
- <name>porosity</name>
- <type>PorosityFromMassBalance</type>
- <initial_porosity>phi0</initial_porosity>
- <minimal_porosity>0</minimal_porosity>
- <maximal_porosity>1</maximal_porosity>
- </property>
- <property>
- <name>permeability</name>
- <type>Constant</type>
- <value>1e-12</value>
- </property>
- <property>
- <name>storage</name>
- <type>Constant</type>
- <value> 0.0 </value>
- </property>
</properties>
</phase>
</phases>
<properties>
+ <property>
+ <name>biot_coefficient</name>
+ <type>Constant</type>
+ <value>0.5</value>
+ </property>
+ <property>
+ <name>porosity</name>
+ <type>PorosityFromMassBalance</type>
+ <initial_porosity>phi0</initial_porosity>
+ <minimal_porosity>0</minimal_porosity>
+ <maximal_porosity>1</maximal_porosity>
+ </property>
+ <property>
+ <name>permeability</name>
+ <type>Constant</type>
+ <value>1e-12</value>
+ </property>
+ <property>
+ <name>storage</name>
+ <type>Constant</type>
+ <value> 0.0 </value>
+ </property>
<property>
<name>reference_temperature</name>
<type>Constant</type>
diff --git a/Tests/Data/RichardsMechanics/mechanics_linear.prj b/Tests/Data/RichardsMechanics/mechanics_linear.prj
index e6b12323ca6..9ed864d8803 100644
--- a/Tests/Data/RichardsMechanics/mechanics_linear.prj
+++ b/Tests/Data/RichardsMechanics/mechanics_linear.prj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version='1.0' encoding='ISO-8859-1'?>
<!--
Mechanics setup identical to Mechanics/Linear/square_1e2.prj.
No flow and no coupling between pressure and displacement.
@@ -65,32 +65,32 @@
<phase>
<type>Solid</type>
<properties>
- <property>
- <name>biot_coefficient</name>
- <type>Constant</type>
- <value>0.5</value>
- </property>
<property>
<name>density</name>
<type>Constant</type>
<value>1</value>
</property>
- <property>
- <name>porosity</name>
- <type>PorosityFromMassBalance</type>
- <initial_porosity>phi0</initial_porosity>
- <minimal_porosity>0</minimal_porosity>
- <maximal_porosity>1</maximal_porosity>
- </property>
- <property>
- <name>permeability</name>
- <type>Constant</type>
- <value>1</value>
- </property>
</properties>
</phase>
</phases>
<properties>
+ <property>
+ <name>biot_coefficient</name>
+ <type>Constant</type>
+ <value>0.5</value>
+ </property>
+ <property>
+ <name>porosity</name>
+ <type>PorosityFromMassBalance</type>
+ <initial_porosity>phi0</initial_porosity>
+ <minimal_porosity>0</minimal_porosity>
+ <maximal_porosity>1</maximal_porosity>
+ </property>
+ <property>
+ <name>permeability</name>
+ <type>Constant</type>
+ <value>1</value>
+ </property>
<property>
<name>saturation</name>
<type>Constant</type>
diff --git a/Tests/Data/RichardsMechanics/orthotropic_power_law_permeability_xyz.prj b/Tests/Data/RichardsMechanics/orthotropic_power_law_permeability_xyz.prj
index 613b6e754ec..ddd221c6019 100644
--- a/Tests/Data/RichardsMechanics/orthotropic_power_law_permeability_xyz.prj
+++ b/Tests/Data/RichardsMechanics/orthotropic_power_law_permeability_xyz.prj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version='1.0' encoding='ISO-8859-1'?>
<OpenGeoSysProject>
<mesh>square_1x1_quad8_1e2.vtu</mesh>
<geometry>square_1x1.gml</geometry>
@@ -61,40 +61,40 @@
<phase>
<type>Solid</type>
<properties>
- <property>
- <name>biot_coefficient</name>
- <type>Constant</type>
- <value>0.94444444444444444444</value>
- </property>
<property>
<name>density</name>
<type>Constant</type>
<value>1</value>
</property>
- <property>
- <name>porosity</name>
- <type>PorosityFromMassBalance</type>
- <initial_porosity>phi0</initial_porosity>
- <minimal_porosity>0</minimal_porosity>
- <maximal_porosity>1</maximal_porosity>
- </property>
- <property>
- <name>transport_porosity</name>
- <type>TransportPorosityFromMassBalance</type>
- <initial_porosity>phi0</initial_porosity>
- <minimal_porosity>0</minimal_porosity>
- <maximal_porosity>1</maximal_porosity>
- </property>
- <property>
- <name>permeability</name>
- <type>PermeabilityOrthotropicPowerLaw</type>
- <intrinsic_permeabilities>0 1</intrinsic_permeabilities>
- <exponents>1 1</exponents>
- </property>
</properties>
</phase>
</phases>
<properties>
+ <property>
+ <name>transport_porosity</name>
+ <type>TransportPorosityFromMassBalance</type>
+ <initial_porosity>phi0</initial_porosity>
+ <minimal_porosity>0</minimal_porosity>
+ <maximal_porosity>1</maximal_porosity>
+ </property>
+ <property>
+ <name>biot_coefficient</name>
+ <type>Constant</type>
+ <value>0.94444444444444444444</value>
+ </property>
+ <property>
+ <name>porosity</name>
+ <type>PorosityFromMassBalance</type>
+ <initial_porosity>phi0</initial_porosity>
+ <minimal_porosity>0</minimal_porosity>
+ <maximal_porosity>1</maximal_porosity>
+ </property>
+ <property>
+ <name>permeability</name>
+ <type>PermeabilityOrthotropicPowerLaw</type>
+ <intrinsic_permeabilities>0 1</intrinsic_permeabilities>
+ <exponents>1 1</exponents>
+ </property>
<property>
<name>reference_temperature</name>
<type>Constant</type>
diff --git a/Tests/Data/RichardsMechanics/orthotropic_swelling_xy.prj b/Tests/Data/RichardsMechanics/orthotropic_swelling_xy.prj
index 7a252dfe3bf..a45669255e7 100644
--- a/Tests/Data/RichardsMechanics/orthotropic_swelling_xy.prj
+++ b/Tests/Data/RichardsMechanics/orthotropic_swelling_xy.prj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version='1.0' encoding='ISO-8859-1'?>
<OpenGeoSysProject>
<mesh>square_1x1_quad8_1e0.vtu</mesh>
<geometry>square_1x1.gml</geometry>
@@ -61,28 +61,11 @@
<phase>
<type>Solid</type>
<properties>
- <property>
- <name>biot_coefficient</name>
- <type>Constant</type>
- <value>0.5</value>
- </property>
<property>
<name>density</name>
<type>Constant</type>
<value>1</value>
</property>
- <property>
- <name>porosity</name>
- <type>PorosityFromMassBalance</type>
- <initial_porosity>phi0</initial_porosity>
- <minimal_porosity>0</minimal_porosity>
- <maximal_porosity>1</maximal_porosity>
- </property>
- <property>
- <name>permeability</name>
- <type>Constant</type>
- <value>1</value>
- </property>
<property>
<name>swelling_stress_rate</name>
<type>SaturationDependentSwelling</type>
@@ -95,6 +78,23 @@
</phase>
</phases>
<properties>
+ <property>
+ <name>biot_coefficient</name>
+ <type>Constant</type>
+ <value>0.5</value>
+ </property>
+ <property>
+ <name>porosity</name>
+ <type>PorosityFromMassBalance</type>
+ <initial_porosity>phi0</initial_porosity>
+ <minimal_porosity>0</minimal_porosity>
+ <maximal_porosity>1</maximal_porosity>
+ </property>
+ <property>
+ <name>permeability</name>
+ <type>Constant</type>
+ <value>1</value>
+ </property>
<property>
<name>reference_temperature</name>
<type>Constant</type>
diff --git a/Tests/Data/RichardsMechanics/orthotropic_swelling_xyz.prj b/Tests/Data/RichardsMechanics/orthotropic_swelling_xyz.prj
index 39dcbb6a7ab..4fa60dc19ab 100644
--- a/Tests/Data/RichardsMechanics/orthotropic_swelling_xyz.prj
+++ b/Tests/Data/RichardsMechanics/orthotropic_swelling_xyz.prj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version='1.0' encoding='ISO-8859-1'?>
<OpenGeoSysProject>
<mesh>cube_1x1x1_hex20_1e0.vtu</mesh>
<geometry>cube_1x1x1.gml</geometry>
@@ -64,28 +64,11 @@
<phase>
<type>Solid</type>
<properties>
- <property>
- <name>biot_coefficient</name>
- <type>Constant</type>
- <value>0.5</value>
- </property>
<property>
<name>density</name>
<type>Constant</type>
<value>1</value>
</property>
- <property>
- <name>porosity</name>
- <type>PorosityFromMassBalance</type>
- <initial_porosity>phi0</initial_porosity>
- <minimal_porosity>0</minimal_porosity>
- <maximal_porosity>1</maximal_porosity>
- </property>
- <property>
- <name>permeability</name>
- <type>Constant</type>
- <value>1</value>
- </property>
<property>
<name>swelling_stress_rate</name>
<type>SaturationDependentSwelling</type>
@@ -98,6 +81,23 @@
</phase>
</phases>
<properties>
+ <property>
+ <name>biot_coefficient</name>
+ <type>Constant</type>
+ <value>0.5</value>
+ </property>
+ <property>
+ <name>porosity</name>
+ <type>PorosityFromMassBalance</type>
+ <initial_porosity>phi0</initial_porosity>
+ <minimal_porosity>0</minimal_porosity>
+ <maximal_porosity>1</maximal_porosity>
+ </property>
+ <property>
+ <name>permeability</name>
+ <type>Constant</type>
+ <value>1</value>
+ </property>
<property>
<name>reference_temperature</name>
<type>Constant</type>
diff --git a/Tests/Data/RichardsMechanics/rotated_consolidation.prj b/Tests/Data/RichardsMechanics/rotated_consolidation.prj
index 515d67cc279..196e685253c 100644
--- a/Tests/Data/RichardsMechanics/rotated_consolidation.prj
+++ b/Tests/Data/RichardsMechanics/rotated_consolidation.prj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version='1.0' encoding='ISO-8859-1'?>
<!--
Modified consolidation test
- Column geometry rotated at -45 degrees
@@ -85,32 +85,32 @@
<type>Constant</type>
<value>2780.0</value>
</property>
- <property>
- <name>biot_coefficient</name>
- <type>Constant</type>
- <value>1</value>
- </property>
- <property>
- <name>permeability</name>
- <type>Parameter</type>
- <parameter_name>k_i</parameter_name>
- </property>
- <property>
- <name>storage</name>
- <type>Constant</type>
- <value>1e-10</value>
- </property>
- <property>
- <name>porosity</name>
- <type>PorosityFromMassBalance</type>
- <initial_porosity>phi0</initial_porosity>
- <minimal_porosity>0</minimal_porosity>
- <maximal_porosity>1</maximal_porosity>
- </property>
</properties>
</phase>
</phases>
<properties>
+ <property>
+ <name>biot_coefficient</name>
+ <type>Constant</type>
+ <value>1</value>
+ </property>
+ <property>
+ <name>permeability</name>
+ <type>Parameter</type>
+ <parameter_name>k_i</parameter_name>
+ </property>
+ <property>
+ <name>storage</name>
+ <type>Constant</type>
+ <value>1e-10</value>
+ </property>
+ <property>
+ <name>porosity</name>
+ <type>PorosityFromMassBalance</type>
+ <initial_porosity>phi0</initial_porosity>
+ <minimal_porosity>0</minimal_porosity>
+ <maximal_porosity>1</maximal_porosity>
+ </property>
<property>
<name>reference_temperature</name>
<type>Constant</type>
--
GitLab