diff --git a/Tests/Data/Parabolic/HT/ConstViscosity/square_5500x5500.prj b/Tests/Data/Parabolic/HT/ConstViscosity/square_5500x5500.prj index 147685f6bd9de939ba23f564db1a160e902f690e..152079a6fb5408c403086adffcf3a5c1a48edcf4 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 f85019a62b93e58ed5aa0f2e7154ac7f7cec8dfa..47073e5f7fc3a0aa4a7d6984078fc2883c3cce48 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 aadd7c1c50a8ac231b42a0d3a06a0ff8cb01c87b..7d0dad6a2aad4d88a14714f64113d9a5bc446958 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 f2d1e36a8943669995dd5e0543f9c49c5fa6e1f1..9ff73b90c4d21d6bd28f96ecb4b97d957accb051 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 8aa02a70dc5e6b0d25f03e83f62115c701e0697b..289e19c5a544fe4d42365177bb2e1a8418bf0d2b 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 7ceb4398c8a7f0a68e408a851260500df296e0fb..68e02fea105acfb7b74ef8e8e443179962cb565e 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 211a50c4e4c9c119599d1e699d57bba595f85b08..2a962229f47d890e10ac97d098884f2dac6cd94d 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 fb10dbf6c49549f3d083f83621953ba2fafb87ec..f5f3adce5204f316eba86e641efe9c87cf0986ea 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 2b2c69840bad2e68b0b464064b20364d6bfe4f4d..1c84e4bc6cdd985f6bfe5c120afeea4abc802d20 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 b0d521797365ec573c08fca262b757e4b44b23e6..357e78ba08017994478f2484153c4a7047243a55 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 517586f60742c8f84a70f75a1e3958de7103d7d8..058520c4233cef4fd551abad85b52671b43fd747 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 9af2d4e692581ce6188264888be37609aa15fc15..fc35f3a131a4591c7614db7fea663ecc1a0871f4 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 8b5b7eb40b537ca893d9d6f66dae2687fc6f193b..da4c4578620b82d3a5dc9641480a9464553d4075 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 6765dd13440661f56bbbbdb54793588040576bf0..d4612c6729b08df8e6d7eeeb7df46547d693e0ae 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 0d5503fed5f892eec93b4a68cfab008a8197f928..b3e3fdbcd50f4cebcd7dc30a396bd96a9b210f64 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 edfac132801f13fb4a16781545a41d4030157266..fb9e42b1768598a15e4203eb062b556aa76ee803 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 11e1a7ba9fe2e2747115d108f5b67760a563b7b0..5d5d4b99a780e9899b2d3b7c079e88d4ec685ab0 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 486dce76e493ccce28d51556bac0026dca3a638a..93719ab3b7b3763f4907d1e8208b59a1ee3e55c4 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>