diff --git a/ProcessLib/HT/HTFEM.h b/ProcessLib/HT/HTFEM.h
index 69f1ab0adfc28d19a1a67852f354b5e87b941a47..669958c905f8328dad07422ccf9f265382537c07 100644
--- a/ProcessLib/HT/HTFEM.h
+++ b/ProcessLib/HT/HTFEM.h
@@ -16,7 +16,7 @@
#include "HTLocalAssemblerInterface.h"
#include "HTProcessData.h"
#include "MaterialLib/MPL/Medium.h"
-#include "MaterialLib/MPL/Utils/FormEffectiveThermalConductivity.h"
+#include "MaterialLib/MPL/Utils/FormEigenTensor.h"
#include "NumLib/DOF/DOFTableUtil.h"
#include "NumLib/Extrapolation/ExtrapolatableElement.h"
#include "NumLib/Fem/FiniteElement/TemplateIsoparametric.h"
@@ -193,7 +193,7 @@ protected:
}
GlobalDimMatrixType getThermalConductivityDispersivity(
- MaterialPropertyLib::VariableArray const& vars, const double porosity,
+ MaterialPropertyLib::VariableArray const& vars,
const double fluid_density, const double specific_heat_capacity_fluid,
const GlobalDimVectorType& velocity, const GlobalDimMatrixType& I,
ParameterLib::SpatialPosition const& pos, double const t,
@@ -201,25 +201,13 @@ protected:
{
auto const& medium =
*_process_data.media_map->getMedium(_element.getID());
- auto const& solid_phase = medium.phase("Solid");
- auto const& liquid_phase = medium.phase("AqueousLiquid");
-
- auto const thermal_conductivity_solid =
- solid_phase
- .property(
- MaterialPropertyLib::PropertyType::thermal_conductivity)
- .value(vars, pos, t, dt);
-
- auto const thermal_conductivity_fluid =
- liquid_phase
- .property(
- MaterialPropertyLib::PropertyType::thermal_conductivity)
- .template value<double>(vars, pos, t, dt);
auto const thermal_conductivity =
- MaterialPropertyLib::formEffectiveThermalConductivity<GlobalDim>(
- thermal_conductivity_solid, thermal_conductivity_fluid,
- porosity);
+ MaterialPropertyLib::formEigenTensor<GlobalDim>(
+ medium
+ .property(
+ MaterialPropertyLib::PropertyType::thermal_conductivity)
+ .value(vars, pos, t, dt));
auto const thermal_dispersivity_longitudinal =
medium
diff --git a/ProcessLib/HT/MonolithicHTFEM.h b/ProcessLib/HT/MonolithicHTFEM.h
index ee92d8111b07f7898ea697c7c9ac74e573c580c6..d4a824c797900a41ccd5638b45f2ed3d7c9c3279 100644
--- a/ProcessLib/HT/MonolithicHTFEM.h
+++ b/ProcessLib/HT/MonolithicHTFEM.h
@@ -134,6 +134,7 @@ public:
vars[static_cast<int>(
MaterialPropertyLib::Variable::phase_pressure)] = p_int_pt;
+ vars[static_cast<int>(MaterialPropertyLib::Variable::liquid_saturation)] = 1.0;
// \todo the argument to getValue() has to be changed for non
// constant storage model
auto const specific_storage =
@@ -178,7 +179,7 @@ public:
// matrix assembly
GlobalDimMatrixType const thermal_conductivity_dispersivity =
this->getThermalConductivityDispersivity(
- vars, porosity, fluid_density, specific_heat_capacity_fluid,
+ vars, fluid_density, specific_heat_capacity_fluid,
velocity, I, pos, t, dt);
KTT.noalias() +=
(dNdx.transpose() * thermal_conductivity_dispersivity * dNdx +
diff --git a/ProcessLib/HT/StaggeredHTFEM-impl.h b/ProcessLib/HT/StaggeredHTFEM-impl.h
index 4bd8f2a2adde746d32af3cbeab17042ce6f50620..6e1136f62c32ec8c9ae7c809f6cfeaaa43695f34 100644
--- a/ProcessLib/HT/StaggeredHTFEM-impl.h
+++ b/ProcessLib/HT/StaggeredHTFEM-impl.h
@@ -103,6 +103,8 @@ void StaggeredHTFEM<ShapeFunction, IntegrationMethod, GlobalDim>::
vars[static_cast<int>(MaterialPropertyLib::Variable::phase_pressure)] =
p_int_pt;
+ vars[static_cast<int>(MaterialPropertyLib::Variable::liquid_saturation)] = 1.0;
+
auto const porosity =
medium.property(MaterialPropertyLib::PropertyType::porosity)
.template value<double>(vars, pos, t, dt);
@@ -231,6 +233,8 @@ void StaggeredHTFEM<ShapeFunction, IntegrationMethod, GlobalDim>::
vars[static_cast<int>(MaterialPropertyLib::Variable::phase_pressure)] =
p_at_xi;
+ vars[static_cast<int>(MaterialPropertyLib::Variable::liquid_saturation)] = 1.0;
+
auto const porosity =
medium.property(MaterialPropertyLib::PropertyType::porosity)
.template value<double>(vars, pos, t, dt);
@@ -271,7 +275,7 @@ void StaggeredHTFEM<ShapeFunction, IntegrationMethod, GlobalDim>::
GlobalDimMatrixType const thermal_conductivity_dispersivity =
this->getThermalConductivityDispersivity(
- vars, porosity, fluid_density, specific_heat_capacity_fluid,
+ vars, fluid_density, specific_heat_capacity_fluid,
velocity, I, pos, t, dt);
local_K.noalias() +=
diff --git a/ProcessLib/ThermoHydroMechanics/ThermoHydroMechanicsFEM-impl.h b/ProcessLib/ThermoHydroMechanics/ThermoHydroMechanicsFEM-impl.h
index 539f16af0c8a56f8cb68c2b8641159d88898b994..9f92d22c4f0c02d1358f312c64cab58f5e72dd4b 100644
--- a/ProcessLib/ThermoHydroMechanics/ThermoHydroMechanicsFEM-impl.h
+++ b/ProcessLib/ThermoHydroMechanics/ThermoHydroMechanicsFEM-impl.h
@@ -12,7 +12,6 @@
#include "MaterialLib/MPL/Medium.h"
#include "MaterialLib/MPL/Property.h"
-#include "MaterialLib/MPL/Utils/FormEffectiveThermalConductivity.h"
#include "MaterialLib/MPL/Utils/FormEigenTensor.h"
#include "MaterialLib/MPL/Utils/FormKelvinVectorFromThermalExpansivity.h"
#include "MaterialLib/MPL/Utils/GetLiquidThermalExpansivity.h"
@@ -240,6 +239,8 @@ void ThermoHydroMechanicsLocalAssembler<ShapeFunctionDisplacement,
vars[static_cast<int>(MaterialPropertyLib::Variable::phase_pressure)] =
p_int_pt;
+ vars[static_cast<int>(MaterialPropertyLib::Variable::liquid_saturation)] = 1.0;
+
auto const solid_density =
solid_phase.property(MaterialPropertyLib::PropertyType::density)
.template value<double>(vars, x_position, t, dt);
@@ -406,23 +407,14 @@ void ThermoHydroMechanicsLocalAssembler<ShapeFunctionDisplacement,
.property(
MaterialPropertyLib::PropertyType::specific_heat_capacity)
.template value<double>(vars, x_position, t, dt);
- auto const fluid_thermal_conductivity =
- liquid_phase
- .property(
- MaterialPropertyLib::PropertyType::thermal_conductivity)
- .template value<double>(vars, x_position, t, dt);
- GlobalDimMatrixType effective_thermal_condictivity =
- MaterialPropertyLib::formEffectiveThermalConductivity<
- DisplacementDim>(
- solid_phase
- .property(
- MaterialPropertyLib::PropertyType::thermal_conductivity)
- .value(vars, x_position, t, dt),
- fluid_thermal_conductivity, porosity);
+ auto const effective_thermal_conductivity =
+ MaterialPropertyLib::formEigenTensor<DisplacementDim>(medium
+ ->property(MaterialPropertyLib::PropertyType::thermal_conductivity)
+ .value(vars, x_position, t, dt));
// Add thermo-osmosis effect on KTT
KTT.noalias() +=
- (dNdx_T.transpose() * effective_thermal_condictivity * dNdx_T +
+ (dNdx_T.transpose() * effective_thermal_conductivity * dNdx_T +
N_T.transpose() * velocity.transpose() * dNdx_T * fluid_density * c_f) *
w -
fluid_density * c_f * N_T.transpose() * (dNdx_T * T).transpose() *
diff --git a/ProcessLib/ThermoRichardsMechanics/ThermoRichardsMechanicsFEM-impl.h b/ProcessLib/ThermoRichardsMechanics/ThermoRichardsMechanicsFEM-impl.h
index 2d4dd6350ee6f53ccc713b6cdd1de02b51d669d4..be7fd25d28dd549dc743ad33e0ce1ad07aa40ce7 100644
--- a/ProcessLib/ThermoRichardsMechanics/ThermoRichardsMechanicsFEM-impl.h
+++ b/ProcessLib/ThermoRichardsMechanics/ThermoRichardsMechanicsFEM-impl.h
@@ -14,7 +14,6 @@
#include <cassert>
#include "MaterialLib/MPL/Medium.h"
-#include "MaterialLib/MPL/Utils/FormEffectiveThermalConductivity.h"
#include "MaterialLib/MPL/Utils/FormEigenTensor.h"
#include "MaterialLib/MPL/Utils/FormKelvinVectorFromThermalExpansivity.h"
#include "MaterialLib/MPL/Utils/GetLiquidThermalExpansivity.h"
@@ -745,23 +744,10 @@ void ThermoRichardsMechanicsLocalAssembler<ShapeFunctionDisplacement,
(S_L * rho_LR * specific_heat_capacity_fluid) * phi) *
N.transpose() * N;
- auto const thermal_conductivity_solid =
- solid_phase
- .property(
- MaterialPropertyLib::PropertyType::thermal_conductivity)
- .value(variables, x_position, t, dt);
-
- auto const thermal_conductivity_fluid =
- liquid_phase
- .property(
- MaterialPropertyLib::PropertyType::thermal_conductivity)
- .template value<double>(variables, x_position, t, dt) *
- S_L;
-
- GlobalDimMatrixType const thermal_conductivity =
- MaterialPropertyLib::formEffectiveThermalConductivity<
- DisplacementDim>(thermal_conductivity_solid,
- thermal_conductivity_fluid, phi);
+ auto const thermal_conductivity =
+ MaterialPropertyLib::formEigenTensor<DisplacementDim>(medium
+ ->property(MaterialPropertyLib::PropertyType::thermal_conductivity)
+ .value(variables, x_position, t, dt));
GlobalDimVectorType const velocity_l =
GlobalDimVectorType(-Ki_over_mu * (dNdx * p_L - rho_LR * b));
diff --git a/Tests/Data/Parabolic/ComponentTransport/ThermalDiffusion/TemperatureField.prj b/Tests/Data/Parabolic/ComponentTransport/ThermalDiffusion/TemperatureField.prj
index c1511aadcfa19ee64e2924849d9ff1ace26b8596..66285f94e98b29c6ad0b5d0755fb92720dcc7438 100644
--- a/Tests/Data/Parabolic/ComponentTransport/ThermalDiffusion/TemperatureField.prj
+++ b/Tests/Data/Parabolic/ComponentTransport/ThermalDiffusion/TemperatureField.prj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version='1.0' encoding='ISO-8859-1'?>
<OpenGeoSysProject>
<meshes>
<mesh>TemperatureField.vtu</mesh>
@@ -106,6 +106,10 @@
<type>Constant</type>
<value>0.15</value>
</property>
+ <property>
+ <name>thermal_conductivity</name>
+ <type>EffectiveThermalConductivityPorosityMixing</type>
+ </property>
</properties>
</medium>
</media>
diff --git a/Tests/Data/Parabolic/HT/ConstViscosity/square_5500x5500.prj b/Tests/Data/Parabolic/HT/ConstViscosity/square_5500x5500.prj
index bb8ec48a2a3d9b4132eb7453f557a0113ac749a4..8c27308059267c9cb0884e566305a3551af37a5a 100644
--- a/Tests/Data/Parabolic/HT/ConstViscosity/square_5500x5500.prj
+++ b/Tests/Data/Parabolic/HT/ConstViscosity/square_5500x5500.prj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version='1.0' encoding='ISO-8859-1'?>
<OpenGeoSysProject>
<mesh>square_5500x5500.vtu</mesh>
<geometry>square_5500x5500.gml</geometry>
@@ -97,6 +97,10 @@
<type>Constant</type>
<value>0.001</value>
</property>
+ <property>
+ <name>thermal_conductivity</name>
+ <type>EffectiveThermalConductivityPorosityMixing</type>
+ </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 10c463bf6a6f2d6d1dcd288789fc63ad736f475a..ecc51928ebc5cb204e544130136cf6805364c3bc 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
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version='1.0' encoding='ISO-8859-1'?>
<OpenGeoSysProject>
<meshes>
<mesh>Ra_795_fault_with_ic_on_fault.vtu</mesh>
@@ -110,6 +110,10 @@
<type>Constant</type>
<value>0.001</value>
</property>
+ <property>
+ <name>thermal_conductivity</name>
+ <type>EffectiveThermalConductivityPorosityMixing</type>
+ </property>
</properties>
</medium>
<medium id="1">
@@ -197,6 +201,10 @@
<type>Constant</type>
<value>0.001</value>
</property>
+ <property>
+ <name>thermal_conductivity</name>
+ <type>EffectiveThermalConductivityPorosityMixing</type>
+ </property>
</properties>
</medium>
</media>
diff --git a/Tests/Data/Parabolic/HT/HeatTransportInStationaryFlow/HeatTransportInStationaryFlow.prj b/Tests/Data/Parabolic/HT/HeatTransportInStationaryFlow/HeatTransportInStationaryFlow.prj
index 8891cd1dc91963cffe39b12df252d1af598ec57d..7b102e843d07da0bc25b77a372cbf83f29e90ced 100644
--- a/Tests/Data/Parabolic/HT/HeatTransportInStationaryFlow/HeatTransportInStationaryFlow.prj
+++ b/Tests/Data/Parabolic/HT/HeatTransportInStationaryFlow/HeatTransportInStationaryFlow.prj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version='1.0' encoding='ISO-8859-1'?>
<OpenGeoSysProject>
<meshes>
<mesh>mesh.vtu</mesh>
@@ -97,6 +97,10 @@
<type>Constant</type>
<value>1.0</value>
</property>
+ <property>
+ <name>thermal_conductivity</name>
+ <type>EffectiveThermalConductivityPorosityMixing</type>
+ </property>
</properties>
</medium>
</media>
diff --git a/Tests/Data/Parabolic/HT/SimpleSynthetics/CoupledPressureParabolicTemperatureParabolic.prj b/Tests/Data/Parabolic/HT/SimpleSynthetics/CoupledPressureParabolicTemperatureParabolic.prj
index 5f4d03c10c2cd2b29991afe9e6426e442c8dbaee..78563287f5a14e47363f377d99308babee1d88f3 100644
--- a/Tests/Data/Parabolic/HT/SimpleSynthetics/CoupledPressureParabolicTemperatureParabolic.prj
+++ b/Tests/Data/Parabolic/HT/SimpleSynthetics/CoupledPressureParabolicTemperatureParabolic.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_1e3.vtu</mesh>
<geometry>square_1x1.gml</geometry>
@@ -92,6 +92,10 @@
<type>Constant</type>
<value>0.001</value>
</property>
+ <property>
+ <name>thermal_conductivity</name>
+ <type>EffectiveThermalConductivityPorosityMixing</type>
+ </property>
</properties>
</medium>
</media>
diff --git a/Tests/Data/Parabolic/HT/SimpleSynthetics/CoupledPressureParabolicTemperatureParabolicStaggered.prj b/Tests/Data/Parabolic/HT/SimpleSynthetics/CoupledPressureParabolicTemperatureParabolicStaggered.prj
index 32618b68e9b15a058dc5a8c9415508f8f6b1b54a..027457fc218e120ad9648e49cfb06ecd52d80039 100644
--- a/Tests/Data/Parabolic/HT/SimpleSynthetics/CoupledPressureParabolicTemperatureParabolicStaggered.prj
+++ b/Tests/Data/Parabolic/HT/SimpleSynthetics/CoupledPressureParabolicTemperatureParabolicStaggered.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_1e3.vtu</mesh>
<geometry>square_1x1.gml</geometry>
@@ -93,6 +93,10 @@
<type>Constant</type>
<value>0.001</value>
</property>
+ <property>
+ <name>thermal_conductivity</name>
+ <type>EffectiveThermalConductivityPorosityMixing</type>
+ </property>
</properties>
</medium>
</media>
diff --git a/Tests/Data/Parabolic/HT/SimpleSynthetics/IsothermalFluidFlow.prj b/Tests/Data/Parabolic/HT/SimpleSynthetics/IsothermalFluidFlow.prj
index 7c7c11aa663d8051d2aa72a3ed8270cf00b31aad..e9c4fde0f152c58915f0b3a773993a8dfebd506a 100644
--- a/Tests/Data/Parabolic/HT/SimpleSynthetics/IsothermalFluidFlow.prj
+++ b/Tests/Data/Parabolic/HT/SimpleSynthetics/IsothermalFluidFlow.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_1e3.vtu</mesh>
<geometry>square_1x1.gml</geometry>
@@ -92,6 +92,10 @@
<type>Constant</type>
<value>0.001</value>
</property>
+ <property>
+ <name>thermal_conductivity</name>
+ <type>EffectiveThermalConductivityPorosityMixing</type>
+ </property>
</properties>
</medium>
</media>
diff --git a/Tests/Data/Parabolic/HT/SimpleSynthetics/IsothermalFluidFlowStaggered.prj b/Tests/Data/Parabolic/HT/SimpleSynthetics/IsothermalFluidFlowStaggered.prj
index 6a2ddb070b878c9ad4a95ea7809d67da94b80c37..66a3e77c35b963217f3f5bbc736ba23bc52214f8 100644
--- a/Tests/Data/Parabolic/HT/SimpleSynthetics/IsothermalFluidFlowStaggered.prj
+++ b/Tests/Data/Parabolic/HT/SimpleSynthetics/IsothermalFluidFlowStaggered.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_1e3.vtu</mesh>
<geometry>square_1x1.gml</geometry>
@@ -93,6 +93,10 @@
<type>Constant</type>
<value>0.001</value>
</property>
+ <property>
+ <name>thermal_conductivity</name>
+ <type>EffectiveThermalConductivityPorosityMixing</type>
+ </property>
</properties>
</medium>
</media>
diff --git a/Tests/Data/Parabolic/HT/SimpleSynthetics/IsothermalFluidFlowWithGravity.prj b/Tests/Data/Parabolic/HT/SimpleSynthetics/IsothermalFluidFlowWithGravity.prj
index dcf181e9a2ac04872170d6223834ce43b7fcc017..664b1ccdcb90cb3c88f4747efe533332aedebf3a 100644
--- a/Tests/Data/Parabolic/HT/SimpleSynthetics/IsothermalFluidFlowWithGravity.prj
+++ b/Tests/Data/Parabolic/HT/SimpleSynthetics/IsothermalFluidFlowWithGravity.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_1e3.vtu</mesh>
<geometry>square_1x1.gml</geometry>
@@ -92,6 +92,10 @@
<type>Constant</type>
<value>0.001</value>
</property>
+ <property>
+ <name>thermal_conductivity</name>
+ <type>EffectiveThermalConductivityPorosityMixing</type>
+ </property>
</properties>
</medium>
</media>
diff --git a/Tests/Data/Parabolic/HT/SimpleSynthetics/IsothermalFluidFlowWithGravityStaggered.prj b/Tests/Data/Parabolic/HT/SimpleSynthetics/IsothermalFluidFlowWithGravityStaggered.prj
index 0b3392b069ef1ae5ccdaa8fbbf128f7e60ccbe62..22e98bc357222438509287b84fbb50b548d616a2 100644
--- a/Tests/Data/Parabolic/HT/SimpleSynthetics/IsothermalFluidFlowWithGravityStaggered.prj
+++ b/Tests/Data/Parabolic/HT/SimpleSynthetics/IsothermalFluidFlowWithGravityStaggered.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_1e3.vtu</mesh>
<geometry>square_1x1.gml</geometry>
@@ -93,6 +93,10 @@
<type>Constant</type>
<value>0.001</value>
</property>
+ <property>
+ <name>thermal_conductivity</name>
+ <type>EffectiveThermalConductivityPorosityMixing</type>
+ </property>
</properties>
</medium>
</media>
diff --git a/Tests/Data/Parabolic/HT/SimpleSynthetics/PressureDiffusionTemperatureDiffusion.prj b/Tests/Data/Parabolic/HT/SimpleSynthetics/PressureDiffusionTemperatureDiffusion.prj
index 819ff464c111e6534bbfc9edbcc896b6d9d657bd..4b1934e7bddf8ca2f5727253035580038be8f6e6 100644
--- a/Tests/Data/Parabolic/HT/SimpleSynthetics/PressureDiffusionTemperatureDiffusion.prj
+++ b/Tests/Data/Parabolic/HT/SimpleSynthetics/PressureDiffusionTemperatureDiffusion.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_1e3.vtu</mesh>
<geometry>square_1x1.gml</geometry>
@@ -92,6 +92,10 @@
<type>Constant</type>
<value>0.001</value>
</property>
+ <property>
+ <name>thermal_conductivity</name>
+ <type>EffectiveThermalConductivityPorosityMixing</type>
+ </property>
</properties>
</medium>
</media>
diff --git a/Tests/Data/Parabolic/HT/SimpleSynthetics/PressureDiffusionTemperatureDiffusionStaggered.prj b/Tests/Data/Parabolic/HT/SimpleSynthetics/PressureDiffusionTemperatureDiffusionStaggered.prj
index a1939af70b3f93523a325b83f788f065c3b27a83..62126797d129340b43b6a32d1a3bf8bea68ea3fa 100644
--- a/Tests/Data/Parabolic/HT/SimpleSynthetics/PressureDiffusionTemperatureDiffusionStaggered.prj
+++ b/Tests/Data/Parabolic/HT/SimpleSynthetics/PressureDiffusionTemperatureDiffusionStaggered.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_1e3.vtu</mesh>
<geometry>square_1x1.gml</geometry>
@@ -93,6 +93,10 @@
<type>Constant</type>
<value>0.001</value>
</property>
+ <property>
+ <name>thermal_conductivity</name>
+ <type>EffectiveThermalConductivityPorosityMixing</type>
+ </property>
</properties>
</medium>
</media>
diff --git a/Tests/Data/Parabolic/HT/SimpleSynthetics/PressureParabolicTemperatureParabolic.prj b/Tests/Data/Parabolic/HT/SimpleSynthetics/PressureParabolicTemperatureParabolic.prj
index 6aa75aa63c663508bd4bd70098a8131cd07de7ce..15d9b4a50c9f435d2d84a615cfd559d176c74893 100644
--- a/Tests/Data/Parabolic/HT/SimpleSynthetics/PressureParabolicTemperatureParabolic.prj
+++ b/Tests/Data/Parabolic/HT/SimpleSynthetics/PressureParabolicTemperatureParabolic.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_1e3.vtu</mesh>
<geometry>square_1x1.gml</geometry>
@@ -92,6 +92,10 @@
<type>Constant</type>
<value>0.001</value>
</property>
+ <property>
+ <name>thermal_conductivity</name>
+ <type>EffectiveThermalConductivityPorosityMixing</type>
+ </property>
</properties>
</medium>
</media>
diff --git a/Tests/Data/Parabolic/HT/SimpleSynthetics/PressureParabolicTemperatureParabolicStaggered.prj b/Tests/Data/Parabolic/HT/SimpleSynthetics/PressureParabolicTemperatureParabolicStaggered.prj
index 913d9fe0ecb81bea415e7a504e49a9b38c1980ab..2deebe302d4fc1cae1451d6f8c3d4985f93b7269 100644
--- a/Tests/Data/Parabolic/HT/SimpleSynthetics/PressureParabolicTemperatureParabolicStaggered.prj
+++ b/Tests/Data/Parabolic/HT/SimpleSynthetics/PressureParabolicTemperatureParabolicStaggered.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_1e3.vtu</mesh>
<geometry>square_1x1.gml</geometry>
@@ -93,6 +93,10 @@
<type>Constant</type>
<value>0.001</value>
</property>
+ <property>
+ <name>thermal_conductivity</name>
+ <type>EffectiveThermalConductivityPorosityMixing</type>
+ </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 5953a9de8842d3c6f4cf072f3480840df4781c7a..44f921f8d42be8f4cce729bb27ee8406a789f0d7 100644
--- a/Tests/Data/Parabolic/HT/SimpleSynthetics/calculatesurfaceflux_ht_cube_1e3.prj
+++ b/Tests/Data/Parabolic/HT/SimpleSynthetics/calculatesurfaceflux_ht_cube_1e3.prj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version='1.0' encoding='ISO-8859-1'?>
<OpenGeoSysProject>
<meshes>
<mesh>cube_1x1x1_hex_1e3.vtu</mesh>
@@ -100,6 +100,10 @@
<type>Constant</type>
<value>0.001</value>
</property>
+ <property>
+ <name>thermal_conductivity</name>
+ <type>EffectiveThermalConductivityPorosityMixing</type>
+ </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 d50fe60d9e8dccbb4f614a9cb54051689f7d5928..fdb7a2720035a162b0db8cea5ae7905c4deb13e5 100644
--- a/Tests/Data/Parabolic/HT/SimpleSynthetics/calculatesurfaceflux_ht_cube_1e4.prj
+++ b/Tests/Data/Parabolic/HT/SimpleSynthetics/calculatesurfaceflux_ht_cube_1e4.prj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version='1.0' encoding='ISO-8859-1'?>
<OpenGeoSysProject>
<meshes>
<mesh>cube_1x1x1_hex_1e4.vtu</mesh>
@@ -105,6 +105,10 @@
<type>Constant</type>
<value>0.001</value>
</property>
+ <property>
+ <name>thermal_conductivity</name>
+ <type>EffectiveThermalConductivityPorosityMixing</type>
+ </property>
</properties>
</medium>
</media>
diff --git a/Tests/Data/Parabolic/HT/SimpleSynthetics/deactivated_subdomain/HT_DeactivatedSubdomain.prj b/Tests/Data/Parabolic/HT/SimpleSynthetics/deactivated_subdomain/HT_DeactivatedSubdomain.prj
index feca5232855e0879ad177fd9e0782333a3420da2..34648b926e0755897f1fee1680416f9766902aa7 100644
--- a/Tests/Data/Parabolic/HT/SimpleSynthetics/deactivated_subdomain/HT_DeactivatedSubdomain.prj
+++ b/Tests/Data/Parabolic/HT/SimpleSynthetics/deactivated_subdomain/HT_DeactivatedSubdomain.prj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version='1.0' encoding='ISO-8859-1'?>
<OpenGeoSysProject>
<meshes>
<mesh>square_1x1_quad_16.vtu</mesh>
@@ -95,6 +95,10 @@
<type>Constant</type>
<value>0.5</value>
</property>
+ <property>
+ <name>thermal_conductivity</name>
+ <type>EffectiveThermalConductivityPorosityMixing</type>
+ </property>
</properties>
</medium>
<medium id="1">
@@ -171,6 +175,10 @@
<type>Constant</type>
<value>0.5</value>
</property>
+ <property>
+ <name>thermal_conductivity</name>
+ <type>EffectiveThermalConductivityPorosityMixing</type>
+ </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 81d8bdb3c8d60d37b31facb631be740ab2c01067..eff55d488a82acdc3b8cfd13a417dbcf14f40713 100644
--- a/Tests/Data/Parabolic/HT/StaggeredCoupling/ADecovalexTHMCBasedHTExample/th_decovalex.prj
+++ b/Tests/Data/Parabolic/HT/StaggeredCoupling/ADecovalexTHMCBasedHTExample/th_decovalex.prj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version='1.0' encoding='ISO-8859-1'?>
<OpenGeoSysProject>
<mesh>th_decovalex.vtu</mesh>
<geometry>boundary.gml</geometry>
@@ -99,6 +99,10 @@
<type>Constant</type>
<value>0.01</value>
</property>
+ <property>
+ <name>thermal_conductivity</name>
+ <type>EffectiveThermalConductivityPorosityMixing</type>
+ </property>
</properties>
</medium>
<medium id="1">
@@ -186,6 +190,10 @@
<type>Constant</type>
<value>0.41</value>
</property>
+ <property>
+ <name>thermal_conductivity</name>
+ <type>EffectiveThermalConductivityPorosityMixing</type>
+ </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 42bc0e86a995af76a38ddaa09b815c1e0d6fe7c3..dbb0e93deea050ef0c9e286808664c7c49c00990 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
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version='1.0' encoding='ISO-8859-1'?>
<OpenGeoSysProject>
<mesh>square_5500x5500.vtu</mesh>
<geometry>square_5500x5500.gml</geometry>
@@ -98,6 +98,10 @@
<type>Constant</type>
<value>0.001</value>
</property>
+ <property>
+ <name>thermal_conductivity</name>
+ <type>EffectiveThermalConductivityPorosityMixing</type>
+ </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 8809cb08da5897a8e91ee2f2a10a6ccc6b4bbb99..664a0d698ef5e753bdd2a9d95accd6be76ed757f 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
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version='1.0' encoding='ISO-8859-1'?>
<OpenGeoSysProject>
<mesh>square_5500x5500.vtu</mesh>
<geometry>square_5500x5500.gml</geometry>
@@ -98,6 +98,10 @@
<type>Constant</type>
<value>0.001</value>
</property>
+ <property>
+ <name>thermal_conductivity</name>
+ <type>EffectiveThermalConductivityPorosityMixing</type>
+ </property>
</properties>
</medium>
</media>
diff --git a/Tests/Data/ThermoHydroMechanics/Linear/Beam_sealed_bimaterial/square_1e2.prj b/Tests/Data/ThermoHydroMechanics/Linear/Beam_sealed_bimaterial/square_1e2.prj
index ac2294e5890153658247e2ba117155118821e90c..603d79303aec38f25dc12e74c4af4d34ddaa7710 100644
--- a/Tests/Data/ThermoHydroMechanics/Linear/Beam_sealed_bimaterial/square_1e2.prj
+++ b/Tests/Data/ThermoHydroMechanics/Linear/Beam_sealed_bimaterial/square_1e2.prj
@@ -106,6 +106,10 @@
<type>Constant</type>
<value>1.0</value>
</property>
+ <property>
+ <name>thermal_conductivity</name>
+ <type>EffectiveThermalConductivityPorosityMixing</type>
+ </property>
</properties>
</medium>
<medium id="1">
@@ -187,6 +191,10 @@
<type>Constant</type>
<value>0.0</value>
</property>
+ <property>
+ <name>thermal_conductivity</name>
+ <type>EffectiveThermalConductivityPorosityMixing</type>
+ </property>
</properties>
</medium>
<medium id="2">
@@ -268,6 +276,10 @@
<type>Constant</type>
<value>1.0</value>
</property>
+ <property>
+ <name>thermal_conductivity</name>
+ <type>EffectiveThermalConductivityPorosityMixing</type>
+ </property>
</properties>
</medium>
</media>
diff --git a/Tests/Data/ThermoHydroMechanics/Linear/Beam_unsealed_bimaterial/square_1e2.prj b/Tests/Data/ThermoHydroMechanics/Linear/Beam_unsealed_bimaterial/square_1e2.prj
index 17fe980f50e10416e9ccd2216e67c5f9207a8d61..66a9464c4a5ca457a351c027cb3ab452a1ef2139 100644
--- a/Tests/Data/ThermoHydroMechanics/Linear/Beam_unsealed_bimaterial/square_1e2.prj
+++ b/Tests/Data/ThermoHydroMechanics/Linear/Beam_unsealed_bimaterial/square_1e2.prj
@@ -106,6 +106,10 @@
<type>Constant</type>
<value>1.0</value>
</property>
+ <property>
+ <name>thermal_conductivity</name>
+ <type>EffectiveThermalConductivityPorosityMixing</type>
+ </property>
</properties>
</medium>
<medium id="1">
@@ -192,6 +196,10 @@
<type>Constant</type>
<value>0.0</value>
</property>
+ <property>
+ <name>thermal_conductivity</name>
+ <type>EffectiveThermalConductivityPorosityMixing</type>
+ </property>
</properties>
</medium>
<medium id="2">
@@ -273,6 +281,10 @@
<type>Constant</type>
<value>1.0</value>
</property>
+ <property>
+ <name>thermal_conductivity</name>
+ <type>EffectiveThermalConductivityPorosityMixing</type>
+ </property>
</properties>
</medium>
</media>
diff --git a/Tests/Data/ThermoHydroMechanics/Linear/CylindricalCavity/CylindricalCavity.prj b/Tests/Data/ThermoHydroMechanics/Linear/CylindricalCavity/CylindricalCavity.prj
index 67a86fa21b3ba73db3db1809324fa5923ff82f35..f5a5669e6db83a837b65146aa0f7e127933878e0 100644
--- a/Tests/Data/ThermoHydroMechanics/Linear/CylindricalCavity/CylindricalCavity.prj
+++ b/Tests/Data/ThermoHydroMechanics/Linear/CylindricalCavity/CylindricalCavity.prj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version='1.0' encoding='ISO-8859-1'?>
<OpenGeoSysProject>
<mesh axially_symmetric="true">CylindricalCavity_msh.vtu</mesh>
<geometry>CylindricalCavity.gml</geometry>
@@ -26,7 +26,6 @@
<specific_body_force>0 0</specific_body_force>
</process>
</processes>
-
<media>
<medium id="0">
<phases>
@@ -53,11 +52,11 @@
<slope>-3.0e-4</slope>
</independent_variable>
<independent_variable>
- <variable_name>phase_pressure</variable_name>
- <reference_condition>0.0</reference_condition>
- <slope>0.303e-9</slope>
- <!-- drho_dp=1/(3.3.e9) -->
- </independent_variable>
+ <variable_name>phase_pressure</variable_name>
+ <reference_condition>0.0</reference_condition>
+ <slope>0.303e-9</slope>
+ <!-- drho_dp=1/(3.3.e9) -->
+ </independent_variable>
</property>
<property>
<name>thermal_expansivity</name>
@@ -119,6 +118,10 @@
<value>0.9999728813559</value>
<!-- alpha=1-beta_skp/beta_sp=1-E/(3*(1-2*miu))/(5.9e10) -->
</property>
+ <property>
+ <name>thermal_conductivity</name>
+ <type>EffectiveThermalConductivityPorosityMixing</type>
+ </property>
</properties>
</medium>
</media>
@@ -147,49 +150,49 @@
<repeat>10</repeat>
<delta_t>7200</delta_t>
</pair>
- <pair>
+ <pair>
<repeat>1</repeat>
<delta_t>10000</delta_t>
</pair>
- <pair>
+ <pair>
<repeat>10</repeat>
<delta_t>10000</delta_t>
</pair>
- <pair>
+ <pair>
<repeat>10</repeat>
<delta_t>50000</delta_t>
</pair>
- <pair>
+ <pair>
<repeat>15</repeat>
<delta_t>100000</delta_t>
</pair>
- <pair>
+ <pair>
<repeat>9</repeat>
<delta_t>200000</delta_t>
</pair>
- <pair>
+ <pair>
<repeat>10</repeat>
<delta_t>400000</delta_t>
</pair>
- <pair>
+ <pair>
<repeat>4</repeat>
<delta_t>500000</delta_t>
</pair>
- <pair>
+ <pair>
<repeat>10</repeat>
<delta_t>1000000</delta_t>
</pair>
- <pair>
+ <pair>
<repeat>5</repeat>
<delta_t>2000000</delta_t>
</pair>
- <pair>
+ <pair>
<repeat>25</repeat>
<delta_t>2000000</delta_t>
</pair>
- <pair>
+ <pair>
<repeat>10</repeat>
- <delta_t>10000000</delta_t>
+ <delta_t>10000000</delta_t>
</pair>
</timesteps>
</time_stepping>
@@ -281,7 +284,7 @@
<component>0</component>
<parameter>dirichlet0</parameter>
</boundary_condition>
- <boundary_condition>
+ <boundary_condition>
<geometrical_set>CylindricalCavity_geometry</geometrical_set>
<geometry>top</geometry>
<type>Dirichlet</type>
diff --git a/Tests/Data/ThermoHydroMechanics/Linear/HeatTransportInStationaryFlow/HeatTransportInStationaryFlow.prj b/Tests/Data/ThermoHydroMechanics/Linear/HeatTransportInStationaryFlow/HeatTransportInStationaryFlow.prj
index 55c702bd0bf5a03b8ed4af9fdc0e38248fb20cfa..193bedde9f8377a2acdd79fe770017be8ff4fd34 100644
--- a/Tests/Data/ThermoHydroMechanics/Linear/HeatTransportInStationaryFlow/HeatTransportInStationaryFlow.prj
+++ b/Tests/Data/ThermoHydroMechanics/Linear/HeatTransportInStationaryFlow/HeatTransportInStationaryFlow.prj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version='1.0' encoding='ISO-8859-1'?>
<OpenGeoSysProject>
<meshes>
<mesh>mesh.vtu</mesh>
@@ -107,6 +107,10 @@
<type>Constant</type>
<value>1.0</value>
</property>
+ <property>
+ <name>thermal_conductivity</name>
+ <type>EffectiveThermalConductivityPorosityMixing</type>
+ </property>
</properties>
</medium>
</media>
diff --git a/Tests/Data/ThermoHydroMechanics/Linear/Point_injection/square_1e2.prj b/Tests/Data/ThermoHydroMechanics/Linear/Point_injection/square_1e2.prj
index 77144a897037614f3263bd05488e7f7ca1c3fde0..aaab112b52c3d85b66382df8a34880f91d807476 100644
--- a/Tests/Data/ThermoHydroMechanics/Linear/Point_injection/square_1e2.prj
+++ b/Tests/Data/ThermoHydroMechanics/Linear/Point_injection/square_1e2.prj
@@ -106,6 +106,10 @@
<type>Constant</type>
<value>1.0</value>
</property>
+ <property>
+ <name>thermal_conductivity</name>
+ <type>EffectiveThermalConductivityPorosityMixing</type>
+ </property>
</properties>
</medium>
</media>
diff --git a/Tests/Data/ThermoHydroMechanics/Linear/Point_injection/square_1e2_lin.prj b/Tests/Data/ThermoHydroMechanics/Linear/Point_injection/square_1e2_lin.prj
index f39f5c9b0bc6558fe72af2ccdab22c383a14dc8a..8b08c2dafd10b60b47a56bc1c935c306ab8049aa 100644
--- a/Tests/Data/ThermoHydroMechanics/Linear/Point_injection/square_1e2_lin.prj
+++ b/Tests/Data/ThermoHydroMechanics/Linear/Point_injection/square_1e2_lin.prj
@@ -106,6 +106,10 @@
<type>Constant</type>
<value>1.0</value>
</property>
+ <property>
+ <name>thermal_conductivity</name>
+ <type>EffectiveThermalConductivityPorosityMixing</type>
+ </property>
</properties>
</medium>
</media>
diff --git a/Tests/Data/ThermoHydroMechanics/Linear/Square_sealed_homogeneous/square_1e0.prj b/Tests/Data/ThermoHydroMechanics/Linear/Square_sealed_homogeneous/square_1e0.prj
index 494a9ecb1145a9b8fc6e67dd394eb959b086eac8..eab4284ecbc624cfea1585ff3a45eaba53b098d1 100644
--- a/Tests/Data/ThermoHydroMechanics/Linear/Square_sealed_homogeneous/square_1e0.prj
+++ b/Tests/Data/ThermoHydroMechanics/Linear/Square_sealed_homogeneous/square_1e0.prj
@@ -106,6 +106,10 @@
<type>Constant</type>
<value>1.0</value>
</property>
+ <property>
+ <name>thermal_conductivity</name>
+ <type>EffectiveThermalConductivityPorosityMixing</type>
+ </property>
</properties>
</medium>
</media>
diff --git a/Tests/Data/ThermoHydroMechanics/Linear/Storage/cube_incompressible_fluid.prj b/Tests/Data/ThermoHydroMechanics/Linear/Storage/cube_incompressible_fluid.prj
index c39285ada39cfae43f0a148e605f2dd869d51665..57d64a2ea3fe792119ed0e5dec8aa5360260f934 100644
--- a/Tests/Data/ThermoHydroMechanics/Linear/Storage/cube_incompressible_fluid.prj
+++ b/Tests/Data/ThermoHydroMechanics/Linear/Storage/cube_incompressible_fluid.prj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version='1.0' encoding='ISO-8859-1'?>
<OpenGeoSysProject>
<meshes>
<mesh>single_cube_bulk.vtu</mesh>
@@ -119,6 +119,10 @@
<type>Constant</type>
<value>0.623</value>
</property>
+ <property>
+ <name>thermal_conductivity</name>
+ <type>EffectiveThermalConductivityPorosityMixing</type>
+ </property>
</properties>
</medium>
</media>
diff --git a/Tests/Data/ThermoHydroMechanics/Linear/Storage/cube_isochoric_heat-up.prj b/Tests/Data/ThermoHydroMechanics/Linear/Storage/cube_isochoric_heat-up.prj
index bb74d2e8b45c4adbe402c7379ed15ba8bc436c0e..7b577a47281dcaddda238aa1dca7916305d45414 100644
--- a/Tests/Data/ThermoHydroMechanics/Linear/Storage/cube_isochoric_heat-up.prj
+++ b/Tests/Data/ThermoHydroMechanics/Linear/Storage/cube_isochoric_heat-up.prj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version='1.0' encoding='ISO-8859-1'?>
<OpenGeoSysProject>
<meshes>
<mesh>single_cube_bulk.vtu</mesh>
@@ -119,6 +119,10 @@
<type>Constant</type>
<value>1</value>
</property>
+ <property>
+ <name>thermal_conductivity</name>
+ <type>EffectiveThermalConductivityPorosityMixing</type>
+ </property>
</properties>
</medium>
</media>
diff --git a/Tests/Data/ThermoHydroMechanics/Linear/anisotropic_thermal_expansivity/cube_ortho_phi0.0.prj b/Tests/Data/ThermoHydroMechanics/Linear/anisotropic_thermal_expansivity/cube_ortho_phi0.0.prj
index c1301fe4b9c418b203bd65a1f9e39cfc50b239e9..0b7f3573108c6c12096769930cb67cf1ed645aaf 100644
--- a/Tests/Data/ThermoHydroMechanics/Linear/anisotropic_thermal_expansivity/cube_ortho_phi0.0.prj
+++ b/Tests/Data/ThermoHydroMechanics/Linear/anisotropic_thermal_expansivity/cube_ortho_phi0.0.prj
@@ -119,6 +119,10 @@
<type>Constant</type>
<value>1.0</value>
</property>
+ <property>
+ <name>thermal_conductivity</name>
+ <type>EffectiveThermalConductivityPorosityMixing</type>
+ </property>
</properties>
</medium>
</media>
diff --git a/Tests/Data/ThermoHydroMechanics/Linear/anisotropic_thermal_expansivity/cube_ortho_phi0.183.prj b/Tests/Data/ThermoHydroMechanics/Linear/anisotropic_thermal_expansivity/cube_ortho_phi0.183.prj
index 97f8bd57d54ce9fcde4116a8a04620a51ad8d26a..b69f38856602f173d00b470dda46cfc5c11964d2 100644
--- a/Tests/Data/ThermoHydroMechanics/Linear/anisotropic_thermal_expansivity/cube_ortho_phi0.183.prj
+++ b/Tests/Data/ThermoHydroMechanics/Linear/anisotropic_thermal_expansivity/cube_ortho_phi0.183.prj
@@ -121,6 +121,10 @@
<type>Constant</type>
<value>1.0</value>
</property>
+ <property>
+ <name>thermal_conductivity</name>
+ <type>EffectiveThermalConductivityPorosityMixing</type>
+ </property>
</properties>
</medium>
</media>
diff --git a/Tests/Data/ThermoHydroMechanics/Linear/anisotropic_thermal_expansivity/square_ortho_phi0.0.prj b/Tests/Data/ThermoHydroMechanics/Linear/anisotropic_thermal_expansivity/square_ortho_phi0.0.prj
index 79d23b112a8eebcaa4876e3465cac25d6bc289b8..856d2c15e6030147d44457cb45924fe83078707d 100644
--- a/Tests/Data/ThermoHydroMechanics/Linear/anisotropic_thermal_expansivity/square_ortho_phi0.0.prj
+++ b/Tests/Data/ThermoHydroMechanics/Linear/anisotropic_thermal_expansivity/square_ortho_phi0.0.prj
@@ -112,6 +112,10 @@
<type>Constant</type>
<value>1.0</value>
</property>
+ <property>
+ <name>thermal_conductivity</name>
+ <type>EffectiveThermalConductivityPorosityMixing</type>
+ </property>
</properties>
</medium>
</media>
diff --git a/Tests/Data/ThermoHydroMechanics/Linear/anisotropic_thermal_expansivity/square_ortho_phi0.183.prj b/Tests/Data/ThermoHydroMechanics/Linear/anisotropic_thermal_expansivity/square_ortho_phi0.183.prj
index 4b2ec148f0c9106a9d986c43044d5937adafc3f3..eeef5990785b1cca1a454c34589e8429c37023d2 100644
--- a/Tests/Data/ThermoHydroMechanics/Linear/anisotropic_thermal_expansivity/square_ortho_phi0.183.prj
+++ b/Tests/Data/ThermoHydroMechanics/Linear/anisotropic_thermal_expansivity/square_ortho_phi0.183.prj
@@ -115,6 +115,10 @@
<type>Constant</type>
<value>1.0</value>
</property>
+ <property>
+ <name>thermal_conductivity</name>
+ <type>EffectiveThermalConductivityPorosityMixing</type>
+ </property>
</properties>
</medium>
</media>
diff --git a/Tests/Data/ThermoHydroMechanics/Linear/verification/thm2_1Dfixd/thm2_1Dfixd.prj b/Tests/Data/ThermoHydroMechanics/Linear/verification/thm2_1Dfixd/thm2_1Dfixd.prj
index 272327acbca3e6d2dd237c536d26a377d7de5bcd..bdad6e62979423865b5cf75a69c06f2e4abb7129 100755
--- a/Tests/Data/ThermoHydroMechanics/Linear/verification/thm2_1Dfixd/thm2_1Dfixd.prj
+++ b/Tests/Data/ThermoHydroMechanics/Linear/verification/thm2_1Dfixd/thm2_1Dfixd.prj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version='1.0' encoding='ISO-8859-1'?>
<OpenGeoSysProject>
<mesh>thm2_1Dfixd.vtu</mesh>
<geometry>thm2_1Dfixd.gml</geometry>
@@ -101,6 +101,10 @@
<type>Constant</type>
<value>1.0</value>
</property>
+ <property>
+ <name>thermal_conductivity</name>
+ <type>EffectiveThermalConductivityPorosityMixing</type>
+ </property>
</properties>
</medium>
</media>
@@ -121,9 +125,18 @@
<t_initial>0</t_initial>
<t_end>2e4</t_end>
<timesteps>
- <pair><repeat>8</repeat><delta_t>25</delta_t></pair>
- <pair><repeat>8</repeat><delta_t>100</delta_t></pair>
- <pair><repeat>80</repeat><delta_t>250</delta_t></pair>
+ <pair>
+ <repeat>8</repeat>
+ <delta_t>25</delta_t>
+ </pair>
+ <pair>
+ <repeat>8</repeat>
+ <delta_t>100</delta_t>
+ </pair>
+ <pair>
+ <repeat>80</repeat>
+ <delta_t>250</delta_t>
+ </pair>
</timesteps>
</time_stepping>
</process>
@@ -132,8 +145,14 @@
<type>VTK</type>
<prefix>thm2_1Dfixd</prefix>
<timesteps>
- <pair><repeat>1</repeat><each_steps>52</each_steps></pair>
- <pair><repeat>1</repeat><each_steps>40</each_steps></pair>
+ <pair>
+ <repeat>1</repeat>
+ <each_steps>52</each_steps>
+ </pair>
+ <pair>
+ <repeat>1</repeat>
+ <each_steps>40</each_steps>
+ </pair>
</timesteps>
<variables>
<variable>displacement</variable>
diff --git a/Tests/Data/ThermoRichardsMechanics/FullySaturatedFlowMechanics/flow_fully_saturated.prj b/Tests/Data/ThermoRichardsMechanics/FullySaturatedFlowMechanics/flow_fully_saturated.prj
index 31341911023876091346f2f63d4ca41f4df9584f..eb621d39edd57bda01b662367af94a0f1da64a98 100644
--- a/Tests/Data/ThermoRichardsMechanics/FullySaturatedFlowMechanics/flow_fully_saturated.prj
+++ b/Tests/Data/ThermoRichardsMechanics/FullySaturatedFlowMechanics/flow_fully_saturated.prj
@@ -116,7 +116,10 @@
<type>Constant</type>
<value>0.8</value>
</property>
-
+ <property>
+ <name>thermal_conductivity</name>
+ <type>EffectiveThermalConductivityPorosityMixing</type>
+ </property>
</properties>
</medium>
</media>
@@ -224,7 +227,6 @@
</boundary_condition>
</boundary_conditions>
</process_variable>
-
<process_variable>
<name>displacement</name>
<components>2</components>
diff --git a/Tests/Data/ThermoRichardsMechanics/HeatTransportInStationaryFlow/HeatTransportInStationaryFlow.prj b/Tests/Data/ThermoRichardsMechanics/HeatTransportInStationaryFlow/HeatTransportInStationaryFlow.prj
index b13c3f3f2f832c8a35ae868520f96c0bdec0f782..6c08c96c557dd856930c015fc503b9aeb10dd5f0 100644
--- a/Tests/Data/ThermoRichardsMechanics/HeatTransportInStationaryFlow/HeatTransportInStationaryFlow.prj
+++ b/Tests/Data/ThermoRichardsMechanics/HeatTransportInStationaryFlow/HeatTransportInStationaryFlow.prj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version='1.0' encoding='ISO-8859-1'?>
<OpenGeoSysProject>
<meshes>
<mesh>mesh.vtu</mesh>
@@ -121,6 +121,10 @@
<type>Constant</type>
<value>1.0</value>
</property>
+ <property>
+ <name>thermal_conductivity</name>
+ <type>EffectiveThermalConductivityPorosityMixing</type>
+ </property>
</properties>
</medium>
</media>
@@ -185,7 +189,6 @@
<type>Constant</type>
<value>.3</value>
</parameter>
-
<parameter>
<name>T0</name>
<type>Constant</type>
@@ -286,7 +289,6 @@
</boundary_condition>
</boundary_conditions>
</process_variable>
-
</process_variables>
<nonlinear_solvers>
<nonlinear_solver>
diff --git a/Tests/Data/ThermoRichardsMechanics/LiakopoulosHM/liakopoulos.prj b/Tests/Data/ThermoRichardsMechanics/LiakopoulosHM/liakopoulos.prj
index 53cd980fbccbfbedb9b2637a981f242ab6ac7da0..8b0112df0dfc765bf33ee00ead46a5200828be99 100644
--- a/Tests/Data/ThermoRichardsMechanics/LiakopoulosHM/liakopoulos.prj
+++ b/Tests/Data/ThermoRichardsMechanics/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>
@@ -112,7 +112,6 @@
<name>saturation</name>
<type>SaturationLiakopoulos</type>
</property>
-
<property>
<name>bishops_effective_stress</name>
<type>BishopsPowerLaw</type>
@@ -129,6 +128,10 @@
<independent_variable>liquid_saturation</independent_variable>
<curve>k_rel</curve>
</property>
+ <property>
+ <name>thermal_conductivity</name>
+ <type>EffectiveThermalConductivityPorosityMixing</type>
+ </property>
</properties>
</medium>
</media>
@@ -151,18 +154,30 @@
<t_initial> 0.0 </t_initial>
<t_end>7200</t_end>
<timesteps>
- <pair><repeat>10</repeat>
- <delta_t>1</delta_t></pair>
- <pair><repeat>9</repeat>
- <delta_t>10</delta_t></pair>
- <pair><repeat>11</repeat>
- <delta_t>100</delta_t></pair>
- <pair><repeat>3</repeat>
- <delta_t>200</delta_t></pair>
- <pair><repeat>3</repeat>
- <delta_t>400</delta_t></pair>
- <pair><repeat>7</repeat>
- <delta_t>600</delta_t></pair>
+ <pair>
+ <repeat>10</repeat>
+ <delta_t>1</delta_t>
+ </pair>
+ <pair>
+ <repeat>9</repeat>
+ <delta_t>10</delta_t>
+ </pair>
+ <pair>
+ <repeat>11</repeat>
+ <delta_t>100</delta_t>
+ </pair>
+ <pair>
+ <repeat>3</repeat>
+ <delta_t>200</delta_t>
+ </pair>
+ <pair>
+ <repeat>3</repeat>
+ <delta_t>400</delta_t>
+ </pair>
+ <pair>
+ <repeat>7</repeat>
+ <delta_t>600</delta_t>
+ </pair>
</timesteps>
</time_stepping>
</process>
@@ -248,7 +263,6 @@
<value>293.15</value>
</parameter>
</parameters>
-
<curves>
<curve>
<name>k_rel</name>
@@ -394,7 +408,6 @@
</boundary_condition>
</boundary_conditions>
</process_variable>
-
<process_variable>
<name>pressure</name>
<components>1</components>
diff --git a/Tests/Data/ThermoRichardsMechanics/LinearMechanics/mechanics_linear.prj b/Tests/Data/ThermoRichardsMechanics/LinearMechanics/mechanics_linear.prj
index fb045ac904e7bf8f1332245d77ac8283db8492ed..05e5b4b09391e159a72259a5718e6e34c31797fe 100644
--- a/Tests/Data/ThermoRichardsMechanics/LinearMechanics/mechanics_linear.prj
+++ b/Tests/Data/ThermoRichardsMechanics/LinearMechanics/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.
@@ -134,6 +134,10 @@
<type>Constant</type>
<value>0.1</value>
</property>
+ <property>
+ <name>thermal_conductivity</name>
+ <type>EffectiveThermalConductivityPorosityMixing</type>
+ </property>
</properties>
</medium>
</media>
diff --git a/Tests/Data/ThermoRichardsMechanics/RichardsFlow2D/RichardsFlow_2d_small.prj b/Tests/Data/ThermoRichardsMechanics/RichardsFlow2D/RichardsFlow_2d_small.prj
index 53ff679b49d079e864bfca61ebb0e684d2ba584a..6f2daf9c69a2eea966cae4fbfb62ad6bc2df2751 100644
--- a/Tests/Data/ThermoRichardsMechanics/RichardsFlow2D/RichardsFlow_2d_small.prj
+++ b/Tests/Data/ThermoRichardsMechanics/RichardsFlow2D/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>
@@ -127,6 +127,10 @@
<type>BishopsPowerLaw</type>
<exponent>1</exponent>
</property>
+ <property>
+ <name>thermal_conductivity</name>
+ <type>EffectiveThermalConductivityPorosityMixing</type>
+ </property>
</properties>
</medium>
</media>
diff --git a/Tests/Data/ThermoRichardsMechanics/Simple3DThermoMechanicsFromTM/cube_1e3.prj b/Tests/Data/ThermoRichardsMechanics/Simple3DThermoMechanicsFromTM/cube_1e3.prj
index 02a9d225a4c3142cbe17dc1baa7f1d5b2acb90e2..3d0646ffa2d406ae3de758f152e8fbf09190cb9f 100644
--- a/Tests/Data/ThermoRichardsMechanics/Simple3DThermoMechanicsFromTM/cube_1e3.prj
+++ b/Tests/Data/ThermoRichardsMechanics/Simple3DThermoMechanicsFromTM/cube_1e3.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_hex_1e3.vtu</mesh>
<geometry>cube_1x1x1.gml</geometry>
@@ -111,6 +111,10 @@
<type>Constant</type>
<value>0.0</value>
</property>
+ <property>
+ <name>thermal_conductivity</name>
+ <type>EffectiveThermalConductivityPorosityMixing</type>
+ </property>
</properties>
</medium>
</media>