From d84098515772e4c569cd24ace29a0c3cdecdc27b Mon Sep 17 00:00:00 2001
From: Thomas Fischer <thomas.fischer@ufz.de>
Date: Fri, 20 Sep 2019 08:20:22 +0200
Subject: [PATCH] [T/HT] Mv perm. specific. from solid to medium.
---
.../HT/ConstViscosity/square_5500x5500.prj | 10 ++---
.../FaultedCube/Ra_795_fault_bcgs_jacobi.prj | 40 +++++++++----------
...dPressureParabolicTemperatureParabolic.prj | 10 ++---
...ParabolicTemperatureParabolicStaggered.prj | 10 ++---
.../SimpleSynthetics/IsothermalFluidFlow.prj | 10 ++---
.../IsothermalFluidFlowStaggered.prj | 10 ++---
.../IsothermalFluidFlowWithGravity.prj | 10 ++---
...sothermalFluidFlowWithGravityStaggered.prj | 10 ++---
.../PressureDiffusionTemperatureDiffusion.prj | 10 ++---
...DiffusionTemperatureDiffusionStaggered.prj | 10 ++---
.../PressureParabolicTemperatureParabolic.prj | 10 ++---
...ParabolicTemperatureParabolicStaggered.prj | 10 ++---
.../calculatesurfaceflux_ht_cube_1e3.prj | 10 ++---
.../calculatesurfaceflux_ht_cube_1e4.prj | 10 ++---
.../HT/SimpleSynthetics/constraint_bc_1e3.prj | 10 ++---
.../th_decovalex.prj | 20 +++++-----
.../square_5500x5500_staggered_scheme.prj | 10 ++---
...5500x5500_staggered_scheme_adaptive_dt.prj | 10 ++---
18 files changed, 110 insertions(+), 110 deletions(-)
diff --git a/Tests/Data/Parabolic/HT/ConstViscosity/square_5500x5500.prj b/Tests/Data/Parabolic/HT/ConstViscosity/square_5500x5500.prj
index 147685f6bd9..152079a6fb5 100644
--- a/Tests/Data/Parabolic/HT/ConstViscosity/square_5500x5500.prj
+++ b/Tests/Data/Parabolic/HT/ConstViscosity/square_5500x5500.prj
@@ -53,11 +53,6 @@
<phase>
<type>Solid</type>
<properties>
- <property>
- <name>permeability</name>
- <type>Constant</type>
- <value>1.e-14 0 0 1.e-14</value>
- </property>
<property>
<name>porosity</name>
<type>Constant</type>
@@ -97,6 +92,11 @@
<type>Constant</type>
<value>0</value>
</property>
+ <property>
+ <name>permeability</name>
+ <type>Constant</type>
+ <value>1.e-14 0 0 1.e-14</value>
+ </property>
</properties>
</medium>
</media>
diff --git a/Tests/Data/Parabolic/HT/FaultedCube/Ra_795_fault_bcgs_jacobi.prj b/Tests/Data/Parabolic/HT/FaultedCube/Ra_795_fault_bcgs_jacobi.prj
index f85019a62b9..47073e5f7fc 100644
--- a/Tests/Data/Parabolic/HT/FaultedCube/Ra_795_fault_bcgs_jacobi.prj
+++ b/Tests/Data/Parabolic/HT/FaultedCube/Ra_795_fault_bcgs_jacobi.prj
@@ -44,11 +44,11 @@
<name>density</name>
<type>Linear</type>
<reference_value>1.0e+3</reference_value>
- <independent_variable>
- <variable_name>temperature</variable_name>
- <slope>-4.3e-4</slope>
- <reference_condition>20</reference_condition>
- </independent_variable>
+ <independent_variable>
+ <variable_name>temperature</variable_name>
+ <slope>-4.3e-4</slope>
+ <reference_condition>20</reference_condition>
+ </independent_variable>
</property>
<property>
<name>viscosity</name>
@@ -65,11 +65,6 @@
<phase>
<type>Solid</type>
<properties>
- <property>
- <name>permeability</name>
- <type>Constant</type>
- <value>1.e-18 0 0 0 1.e-18 0 0 0 1.e-18</value>
- </property>
<property>
<name>porosity</name>
<type>Constant</type>
@@ -109,6 +104,11 @@
<type>Constant</type>
<value>0</value>
</property>
+ <property>
+ <name>permeability</name>
+ <type>Constant</type>
+ <value>1.e-18 0 0 0 1.e-18 0 0 0 1.e-18</value>
+ </property>
</properties>
</medium>
<medium id="1">
@@ -130,11 +130,11 @@
<name>density</name>
<type>Linear</type>
<reference_value>1.0e+3</reference_value>
- <independent_variable>
- <variable_name>temperature</variable_name>
- <slope>-4.3e-4</slope>
- <reference_condition>20</reference_condition>
- </independent_variable>
+ <independent_variable>
+ <variable_name>temperature</variable_name>
+ <slope>-4.3e-4</slope>
+ <reference_condition>20</reference_condition>
+ </independent_variable>
</property>
<property>
<name>viscosity</name>
@@ -151,11 +151,6 @@
<phase>
<type>Solid</type>
<properties>
- <property>
- <name>permeability</name>
- <type>Constant</type>
- <value>1.7e-13 0 0 0 1.7e-13 0 0 0 1.7e-13</value>
- </property>
<property>
<name>porosity</name>
<type>Constant</type>
@@ -195,6 +190,11 @@
<type>Constant</type>
<value>0</value>
</property>
+ <property>
+ <name>permeability</name>
+ <type>Constant</type>
+ <value>1.7e-13 0 0 0 1.7e-13 0 0 0 1.7e-13</value>
+ </property>
</properties>
</medium>
</media>
diff --git a/Tests/Data/Parabolic/HT/SimpleSynthetics/CoupledPressureParabolicTemperatureParabolic.prj b/Tests/Data/Parabolic/HT/SimpleSynthetics/CoupledPressureParabolicTemperatureParabolic.prj
index aadd7c1c50a..7d0dad6a2aa 100644
--- a/Tests/Data/Parabolic/HT/SimpleSynthetics/CoupledPressureParabolicTemperatureParabolic.prj
+++ b/Tests/Data/Parabolic/HT/SimpleSynthetics/CoupledPressureParabolicTemperatureParabolic.prj
@@ -48,11 +48,6 @@
<phase>
<type>Solid</type>
<properties>
- <property>
- <name>permeability</name>
- <type>Constant</type>
- <value>1.e-8 0 0 1.e-8</value>
- </property>
<property>
<name>porosity</name>
<type>Constant</type>
@@ -92,6 +87,11 @@
<type>Constant</type>
<value>0</value>
</property>
+ <property>
+ <name>permeability</name>
+ <type>Constant</type>
+ <value>1.e-8 0 0 1.e-8</value>
+ </property>
</properties>
</medium>
</media>
diff --git a/Tests/Data/Parabolic/HT/SimpleSynthetics/CoupledPressureParabolicTemperatureParabolicStaggered.prj b/Tests/Data/Parabolic/HT/SimpleSynthetics/CoupledPressureParabolicTemperatureParabolicStaggered.prj
index f2d1e36a894..9ff73b90c4d 100644
--- a/Tests/Data/Parabolic/HT/SimpleSynthetics/CoupledPressureParabolicTemperatureParabolicStaggered.prj
+++ b/Tests/Data/Parabolic/HT/SimpleSynthetics/CoupledPressureParabolicTemperatureParabolicStaggered.prj
@@ -49,11 +49,6 @@
<phase>
<type>Solid</type>
<properties>
- <property>
- <name>permeability</name>
- <type>Constant</type>
- <value>1.e-8 0 0 1.e-8</value>
- </property>
<property>
<name>porosity</name>
<type>Constant</type>
@@ -93,6 +88,11 @@
<type>Constant</type>
<value>0.0</value>
</property>
+ <property>
+ <name>permeability</name>
+ <type>Constant</type>
+ <value>1.e-8 0 0 1.e-8</value>
+ </property>
</properties>
</medium>
</media>
diff --git a/Tests/Data/Parabolic/HT/SimpleSynthetics/IsothermalFluidFlow.prj b/Tests/Data/Parabolic/HT/SimpleSynthetics/IsothermalFluidFlow.prj
index 8aa02a70dc5..289e19c5a54 100644
--- a/Tests/Data/Parabolic/HT/SimpleSynthetics/IsothermalFluidFlow.prj
+++ b/Tests/Data/Parabolic/HT/SimpleSynthetics/IsothermalFluidFlow.prj
@@ -48,11 +48,6 @@
<phase>
<type>Solid</type>
<properties>
- <property>
- <name>permeability</name>
- <type>Constant</type>
- <value>1.e-14 0 0 1.e-14</value>
- </property>
<property>
<name>porosity</name>
<type>Constant</type>
@@ -92,6 +87,11 @@
<type>Constant</type>
<value>0</value>
</property>
+ <property>
+ <name>permeability</name>
+ <type>Constant</type>
+ <value>1.e-14 0 0 1.e-14</value>
+ </property>
</properties>
</medium>
</media>
diff --git a/Tests/Data/Parabolic/HT/SimpleSynthetics/IsothermalFluidFlowStaggered.prj b/Tests/Data/Parabolic/HT/SimpleSynthetics/IsothermalFluidFlowStaggered.prj
index 7ceb4398c8a..68e02fea105 100644
--- a/Tests/Data/Parabolic/HT/SimpleSynthetics/IsothermalFluidFlowStaggered.prj
+++ b/Tests/Data/Parabolic/HT/SimpleSynthetics/IsothermalFluidFlowStaggered.prj
@@ -49,11 +49,6 @@
<phase>
<type>Solid</type>
<properties>
- <property>
- <name>permeability</name>
- <type>Constant</type>
- <value>1.e-14 0 0 1.e-14</value>
- </property>
<property>
<name>porosity</name>
<type>Constant</type>
@@ -93,6 +88,11 @@
<type>Constant</type>
<value>0.0</value>
</property>
+ <property>
+ <name>permeability</name>
+ <type>Constant</type>
+ <value>1.e-14 0 0 1.e-14</value>
+ </property>
</properties>
</medium>
</media>
diff --git a/Tests/Data/Parabolic/HT/SimpleSynthetics/IsothermalFluidFlowWithGravity.prj b/Tests/Data/Parabolic/HT/SimpleSynthetics/IsothermalFluidFlowWithGravity.prj
index 211a50c4e4c..2a962229f47 100644
--- a/Tests/Data/Parabolic/HT/SimpleSynthetics/IsothermalFluidFlowWithGravity.prj
+++ b/Tests/Data/Parabolic/HT/SimpleSynthetics/IsothermalFluidFlowWithGravity.prj
@@ -48,11 +48,6 @@
<phase>
<type>Solid</type>
<properties>
- <property>
- <name>permeability</name>
- <type>Constant</type>
- <value>1.e-14 0 0 1.e-14</value>
- </property>
<property>
<name>porosity</name>
<type>Constant</type>
@@ -92,6 +87,11 @@
<type>Constant</type>
<value>0</value>
</property>
+ <property>
+ <name>permeability</name>
+ <type>Constant</type>
+ <value>1.e-14 0 0 1.e-14</value>
+ </property>
</properties>
</medium>
</media>
diff --git a/Tests/Data/Parabolic/HT/SimpleSynthetics/IsothermalFluidFlowWithGravityStaggered.prj b/Tests/Data/Parabolic/HT/SimpleSynthetics/IsothermalFluidFlowWithGravityStaggered.prj
index fb10dbf6c49..f5f3adce520 100644
--- a/Tests/Data/Parabolic/HT/SimpleSynthetics/IsothermalFluidFlowWithGravityStaggered.prj
+++ b/Tests/Data/Parabolic/HT/SimpleSynthetics/IsothermalFluidFlowWithGravityStaggered.prj
@@ -49,11 +49,6 @@
<phase>
<type>Solid</type>
<properties>
- <property>
- <name>permeability</name>
- <type>Constant</type>
- <value>1.e-14 0 0 1.e-14</value>
- </property>
<property>
<name>porosity</name>
<type>Constant</type>
@@ -93,6 +88,11 @@
<type>Constant</type>
<value>0.0</value>
</property>
+ <property>
+ <name>permeability</name>
+ <type>Constant</type>
+ <value>1.e-14 0 0 1.e-14</value>
+ </property>
</properties>
</medium>
</media>
diff --git a/Tests/Data/Parabolic/HT/SimpleSynthetics/PressureDiffusionTemperatureDiffusion.prj b/Tests/Data/Parabolic/HT/SimpleSynthetics/PressureDiffusionTemperatureDiffusion.prj
index 2b2c69840ba..1c84e4bc6cd 100644
--- a/Tests/Data/Parabolic/HT/SimpleSynthetics/PressureDiffusionTemperatureDiffusion.prj
+++ b/Tests/Data/Parabolic/HT/SimpleSynthetics/PressureDiffusionTemperatureDiffusion.prj
@@ -48,11 +48,6 @@
<phase>
<type>Solid</type>
<properties>
- <property>
- <name>permeability</name>
- <type>Constant</type>
- <value>1.e-14 0 0 1.e-14</value>
- </property>
<property>
<name>porosity</name>
<type>Constant</type>
@@ -92,6 +87,11 @@
<type>Constant</type>
<value>0</value>
</property>
+ <property>
+ <name>permeability</name>
+ <type>Constant</type>
+ <value>1.e-14 0 0 1.e-14</value>
+ </property>
</properties>
</medium>
</media>
diff --git a/Tests/Data/Parabolic/HT/SimpleSynthetics/PressureDiffusionTemperatureDiffusionStaggered.prj b/Tests/Data/Parabolic/HT/SimpleSynthetics/PressureDiffusionTemperatureDiffusionStaggered.prj
index b0d52179736..357e78ba080 100644
--- a/Tests/Data/Parabolic/HT/SimpleSynthetics/PressureDiffusionTemperatureDiffusionStaggered.prj
+++ b/Tests/Data/Parabolic/HT/SimpleSynthetics/PressureDiffusionTemperatureDiffusionStaggered.prj
@@ -49,11 +49,6 @@
<phase>
<type>Solid</type>
<properties>
- <property>
- <name>permeability</name>
- <type>Constant</type>
- <value>1.e-14 0 0 1.e-14</value>
- </property>
<property>
<name>porosity</name>
<type>Constant</type>
@@ -93,6 +88,11 @@
<type>Constant</type>
<value>0.0</value>
</property>
+ <property>
+ <name>permeability</name>
+ <type>Constant</type>
+ <value>1.e-14 0 0 1.e-14</value>
+ </property>
</properties>
</medium>
</media>
diff --git a/Tests/Data/Parabolic/HT/SimpleSynthetics/PressureParabolicTemperatureParabolic.prj b/Tests/Data/Parabolic/HT/SimpleSynthetics/PressureParabolicTemperatureParabolic.prj
index 517586f6074..058520c4233 100644
--- a/Tests/Data/Parabolic/HT/SimpleSynthetics/PressureParabolicTemperatureParabolic.prj
+++ b/Tests/Data/Parabolic/HT/SimpleSynthetics/PressureParabolicTemperatureParabolic.prj
@@ -48,11 +48,6 @@
<phase>
<type>Solid</type>
<properties>
- <property>
- <name>permeability</name>
- <type>Constant</type>
- <value>1.e-8 0 0 1.e-8</value>
- </property>
<property>
<name>porosity</name>
<type>Constant</type>
@@ -92,6 +87,11 @@
<type>Constant</type>
<value>0</value>
</property>
+ <property>
+ <name>permeability</name>
+ <type>Constant</type>
+ <value>1.e-8 0 0 1.e-8</value>
+ </property>
</properties>
</medium>
</media>
diff --git a/Tests/Data/Parabolic/HT/SimpleSynthetics/PressureParabolicTemperatureParabolicStaggered.prj b/Tests/Data/Parabolic/HT/SimpleSynthetics/PressureParabolicTemperatureParabolicStaggered.prj
index 9af2d4e6925..fc35f3a131a 100644
--- a/Tests/Data/Parabolic/HT/SimpleSynthetics/PressureParabolicTemperatureParabolicStaggered.prj
+++ b/Tests/Data/Parabolic/HT/SimpleSynthetics/PressureParabolicTemperatureParabolicStaggered.prj
@@ -49,11 +49,6 @@
<phase>
<type>Solid</type>
<properties>
- <property>
- <name>permeability</name>
- <type>Constant</type>
- <value>1.e-8 0 0 1.e-8</value>
- </property>
<property>
<name>porosity</name>
<type>Constant</type>
@@ -93,6 +88,11 @@
<type>Constant</type>
<value>0.0</value>
</property>
+ <property>
+ <name>permeability</name>
+ <type>Constant</type>
+ <value>1.e-8 0 0 1.e-8</value>
+ </property>
</properties>
</medium>
</media>
diff --git a/Tests/Data/Parabolic/HT/SimpleSynthetics/calculatesurfaceflux_ht_cube_1e3.prj b/Tests/Data/Parabolic/HT/SimpleSynthetics/calculatesurfaceflux_ht_cube_1e3.prj
index 8b5b7eb40b5..da4c4578620 100644
--- a/Tests/Data/Parabolic/HT/SimpleSynthetics/calculatesurfaceflux_ht_cube_1e3.prj
+++ b/Tests/Data/Parabolic/HT/SimpleSynthetics/calculatesurfaceflux_ht_cube_1e3.prj
@@ -57,11 +57,6 @@
<phase>
<type>Solid</type>
<properties>
- <property>
- <name>permeability</name>
- <type>Constant</type>
- <value>1.e-14 0 0 0 1.e-14 0 0 0 1.e-14</value>
- </property>
<property>
<name>porosity</name>
<type>Constant</type>
@@ -101,6 +96,11 @@
<type>Constant</type>
<value>0</value>
</property>
+ <property>
+ <name>permeability</name>
+ <type>Constant</type>
+ <value>1.e-14 0 0 0 1.e-14 0 0 0 1.e-14</value>
+ </property>
</properties>
</medium>
</media>
diff --git a/Tests/Data/Parabolic/HT/SimpleSynthetics/calculatesurfaceflux_ht_cube_1e4.prj b/Tests/Data/Parabolic/HT/SimpleSynthetics/calculatesurfaceflux_ht_cube_1e4.prj
index 6765dd13440..d4612c6729b 100644
--- a/Tests/Data/Parabolic/HT/SimpleSynthetics/calculatesurfaceflux_ht_cube_1e4.prj
+++ b/Tests/Data/Parabolic/HT/SimpleSynthetics/calculatesurfaceflux_ht_cube_1e4.prj
@@ -62,11 +62,6 @@
<phase>
<type>Solid</type>
<properties>
- <property>
- <name>permeability</name>
- <type>Constant</type>
- <value>1.e-14 0 0 0 1.e-14 0 0 0 1.e-14</value>
- </property>
<property>
<name>porosity</name>
<type>Constant</type>
@@ -106,6 +101,11 @@
<type>Constant</type>
<value>0</value>
</property>
+ <property>
+ <name>permeability</name>
+ <type>Constant</type>
+ <value>1.e-14 0 0 0 1.e-14 0 0 0 1.e-14</value>
+ </property>
</properties>
</medium>
</media>
diff --git a/Tests/Data/Parabolic/HT/SimpleSynthetics/constraint_bc_1e3.prj b/Tests/Data/Parabolic/HT/SimpleSynthetics/constraint_bc_1e3.prj
index 0d5503fed5f..b3e3fdbcd50 100644
--- a/Tests/Data/Parabolic/HT/SimpleSynthetics/constraint_bc_1e3.prj
+++ b/Tests/Data/Parabolic/HT/SimpleSynthetics/constraint_bc_1e3.prj
@@ -53,11 +53,6 @@
<phase>
<type>Solid</type>
<properties>
- <property>
- <name>permeability</name>
- <type>Constant</type>
- <value>1.e-14 0 0 0 1.e-14 0 0 0 1.e-14</value>
- </property>
<property>
<name>porosity</name>
<type>Constant</type>
@@ -97,6 +92,11 @@
<type>Constant</type>
<value>0.0</value>
</property>
+ <property>
+ <name>permeability</name>
+ <type>Constant</type>
+ <value>1.e-14 0 0 0 1.e-14 0 0 0 1.e-14</value>
+ </property>
</properties>
</medium>
</media>
diff --git a/Tests/Data/Parabolic/HT/StaggeredCoupling/ADecovalexTHMCBasedHTExample/th_decovalex.prj b/Tests/Data/Parabolic/HT/StaggeredCoupling/ADecovalexTHMCBasedHTExample/th_decovalex.prj
index edfac132801..fb9e42b1768 100644
--- a/Tests/Data/Parabolic/HT/StaggeredCoupling/ADecovalexTHMCBasedHTExample/th_decovalex.prj
+++ b/Tests/Data/Parabolic/HT/StaggeredCoupling/ADecovalexTHMCBasedHTExample/th_decovalex.prj
@@ -55,11 +55,6 @@
<phase>
<type>Solid</type>
<properties>
- <property>
- <name>permeability</name>
- <type>Constant</type>
- <value>6.3072e-14 0. 0. 6.3072e-14</value>
- </property>
<property>
<name>porosity</name>
<type>Constant</type>
@@ -99,6 +94,11 @@
<type>Constant</type>
<value>0.0</value>
</property>
+ <property>
+ <name>permeability</name>
+ <type>Constant</type>
+ <value>6.3072e-14 0. 0. 6.3072e-14</value>
+ </property>
</properties>
</medium>
<medium id="1">
@@ -137,11 +137,6 @@
<phase>
<type>Solid</type>
<properties>
- <property>
- <name>permeability</name>
- <type>Constant</type>
- <value>3.1536e-10 0. 0. 3.1536e-10</value>
- </property>
<property>
<name>porosity</name>
<type>Constant</type>
@@ -186,6 +181,11 @@
<type>Constant</type>
<value>4000</value>
</property>
+ <property>
+ <name>permeability</name>
+ <type>Constant</type>
+ <value>3.1536e-10 0. 0. 3.1536e-10</value>
+ </property>
</properties>
</medium>
</media>
diff --git a/Tests/Data/Parabolic/HT/StaggeredCoupling/ConstViscosity/square_5500x5500_staggered_scheme.prj b/Tests/Data/Parabolic/HT/StaggeredCoupling/ConstViscosity/square_5500x5500_staggered_scheme.prj
index 11e1a7ba9fe..5d5d4b99a78 100644
--- a/Tests/Data/Parabolic/HT/StaggeredCoupling/ConstViscosity/square_5500x5500_staggered_scheme.prj
+++ b/Tests/Data/Parabolic/HT/StaggeredCoupling/ConstViscosity/square_5500x5500_staggered_scheme.prj
@@ -54,11 +54,6 @@
<phase>
<type>Solid</type>
<properties>
- <property>
- <name>permeability</name>
- <type>Constant</type>
- <value>1.e-14 0 0 1.e-14</value>
- </property>
<property>
<name>porosity</name>
<type>Constant</type>
@@ -98,6 +93,11 @@
<type>Constant</type>
<value>0</value>
</property>
+ <property>
+ <name>permeability</name>
+ <type>Constant</type>
+ <value>1.e-14 0 0 1.e-14</value>
+ </property>
</properties>
</medium>
</media>
diff --git a/Tests/Data/Parabolic/HT/StaggeredCoupling/ConstViscosity/square_5500x5500_staggered_scheme_adaptive_dt.prj b/Tests/Data/Parabolic/HT/StaggeredCoupling/ConstViscosity/square_5500x5500_staggered_scheme_adaptive_dt.prj
index 486dce76e49..93719ab3b7b 100644
--- a/Tests/Data/Parabolic/HT/StaggeredCoupling/ConstViscosity/square_5500x5500_staggered_scheme_adaptive_dt.prj
+++ b/Tests/Data/Parabolic/HT/StaggeredCoupling/ConstViscosity/square_5500x5500_staggered_scheme_adaptive_dt.prj
@@ -54,11 +54,6 @@
<phase>
<type>Solid</type>
<properties>
- <property>
- <name>permeability</name>
- <type>Constant</type>
- <value>1.e-14 0 0 1.e-14</value>
- </property>
<property>
<name>porosity</name>
<type>Constant</type>
@@ -98,6 +93,11 @@
<type>Constant</type>
<value>0</value>
</property>
+ <property>
+ <name>permeability</name>
+ <type>Constant</type>
+ <value>1.e-14 0 0 1.e-14</value>
+ </property>
</properties>
</medium>
</media>
--
GitLab