Commit 16245024 authored by joergbuchwald's avatar joergbuchwald
Browse files

move porosity, storage, biot-coefficient and permeability to medium (HM process)

parent 03cfb1ec
......@@ -144,11 +144,12 @@ std::unique_ptr<Process> createHydroMechanicsProcess(
std::array const requiredMediumProperties = {
MaterialPropertyLib::reference_temperature,
MaterialPropertyLib::permeability};
MaterialPropertyLib::permeability,
MaterialPropertyLib::porosity, MaterialPropertyLib::biot_coefficient
};
std::array const requiredGasProperties = {
MaterialPropertyLib::viscosity, MaterialPropertyLib::density};
std::array const requiredSolidProperties = {
MaterialPropertyLib::porosity, MaterialPropertyLib::biot_coefficient,
MaterialPropertyLib::density};
for (auto const& element : mesh.getElements())
......
......@@ -229,14 +229,14 @@ void HydroMechanicsLocalAssembler<ShapeFunctionDisplacement,
auto const K_S = solid_material.getBulkModulus(t, x_position);
auto const alpha = solid.property(MPL::PropertyType::biot_coefficient)
auto const alpha = medium->property(MPL::PropertyType::biot_coefficient)
.template value<double>(vars, x_position, t, dt);
auto const rho_sr =
solid.property(MPL::PropertyType::density)
.template value<double>(vars, x_position, t, dt);
auto const porosity =
solid.property(MPL::PropertyType::porosity)
medium->property(MPL::PropertyType::porosity)
.template value<double>(vars, x_position, t, dt);
auto const mu = gas.property(MPL::PropertyType::viscosity)
......@@ -391,7 +391,6 @@ HydroMechanicsLocalAssembler<ShapeFunctionDisplacement, ShapeFunctionPressure,
auto const& medium = _process_data.media_map->getMedium(_element.getID());
auto const& gas = medium->phase("Gas");
auto const& solid = medium->phase("Solid");
MPL::VariableArray vars;
// TODO (naumov) Temporary value not used by current material models. Need
......@@ -410,7 +409,7 @@ HydroMechanicsLocalAssembler<ShapeFunctionDisplacement, ShapeFunctionPressure,
double const p_int_pt = _ip_data[ip].N_p.dot(p);
vars[static_cast<int>(MPL::Variable::phase_pressure)] = p_int_pt;
auto const alpha = solid.property(MPL::PropertyType::biot_coefficient)
auto const alpha = medium->property(MPL::PropertyType::biot_coefficient)
.template value<double>(vars, x_position, t, dt);
// Set mechanical variables for the intrinsic permeability model
......@@ -503,7 +502,6 @@ void HydroMechanicsLocalAssembler<ShapeFunctionDisplacement,
x_position.setElementID(_element.getID());
auto const& medium = _process_data.media_map->getMedium(_element.getID());
auto const& solid = medium->phase("Solid");
auto const& gas = medium->phase("Gas");
MPL::VariableArray vars;
......@@ -531,7 +529,7 @@ void HydroMechanicsLocalAssembler<ShapeFunctionDisplacement,
auto const K_S = solid_material.getBulkModulus(t, x_position);
auto const alpha_b =
solid.property(MPL::PropertyType::biot_coefficient)
medium->property(MPL::PropertyType::biot_coefficient)
.template value<double>(vars, x_position, t, dt);
// Set mechanical variables for the intrinsic permeability model
......@@ -556,7 +554,7 @@ void HydroMechanicsLocalAssembler<ShapeFunctionDisplacement,
medium->property(MPL::PropertyType::permeability)
.value(vars, x_position, t, dt));
auto const porosity =
solid.property(MPL::PropertyType::porosity)
medium->property(MPL::PropertyType::porosity)
.template value<double>(vars, x_position, t, dt);
auto const mu = gas.property(MPL::PropertyType::viscosity)
......@@ -676,13 +674,13 @@ void HydroMechanicsLocalAssembler<ShapeFunctionDisplacement,
vars[static_cast<int>(MPL::Variable::phase_pressure)] = N_p.dot(p);
auto const alpha = solid.property(MPL::PropertyType::biot_coefficient)
auto const alpha = medium->property(MPL::PropertyType::biot_coefficient)
.template value<double>(vars, x_position, t, dt);
auto const rho_sr =
solid.property(MPL::PropertyType::density)
.template value<double>(vars, x_position, t, dt);
auto const porosity =
solid.property(MPL::PropertyType::porosity)
medium->property(MPL::PropertyType::porosity)
.template value<double>(vars, x_position, t, dt);
auto const rho_fr =
......@@ -918,7 +916,6 @@ void HydroMechanicsLocalAssembler<ShapeFunctionDisplacement,
_integration_method.getNumberOfPoints();
auto const& medium = _process_data.media_map->getMedium(elem_id);
auto const& solid = medium->phase("Solid");
MPL::VariableArray vars;
SymmetricTensor k_sum = SymmetricTensor::Zero(KelvinVectorSize);
......@@ -934,7 +931,7 @@ void HydroMechanicsLocalAssembler<ShapeFunctionDisplacement,
auto const& eps = _ip_data[ip].eps;
sigma_eff_sum += _ip_data[ip].sigma_eff;
auto const alpha = solid.property(MPL::PropertyType::biot_coefficient)
auto const alpha = medium->property(MPL::PropertyType::biot_coefficient)
.template value<double>(vars, x_position, t, dt);
double const p_int_pt = _ip_data[ip].N_p.dot(p);
vars[static_cast<int>(MPL::Variable::phase_pressure)] = p_int_pt;
......
<?xml version="1.0" encoding="ISO-8859-1"?>
<?xml version='1.0' encoding='ISO-8859-1'?>
<OpenGeoSysProject>
<mesh>cube_1x1x1_quad.vtu</mesh>
<geometry>cube_1x1x1.gml</geometry>
......@@ -46,16 +46,6 @@
<phase>
<type>Solid</type>
<properties>
<property>
<name>porosity</name>
<type>Constant</type>
<value>0</value>
</property>
<property>
<name>biot_coefficient</name>
<type>Constant</type>
<value>0</value>
</property>
<property>
<name>density</name>
<type>Constant</type>
......@@ -65,6 +55,16 @@
</phase>
</phases>
<properties>
<property>
<name>porosity</name>
<type>Constant</type>
<value>0</value>
</property>
<property>
<name>biot_coefficient</name>
<type>Constant</type>
<value>0</value>
</property>
<property>
<name>reference_temperature</name>
<type>Constant</type>
......
<?xml version="1.0" encoding="ISO-8859-1"?>
<?xml version='1.0' encoding='ISO-8859-1'?>
<OpenGeoSysProject>
<meshes>
<mesh>quad_with_half_hole_q.vtu</mesh>
......@@ -97,25 +97,25 @@
<phase>
<type>Solid</type>
<properties>
<property>
<name>porosity</name>
<type>Constant</type>
<value>0.15</value>
</property>
<property>
<name>density</name>
<type>Constant</type>
<value>2.65e+3</value>
</property>
<property>
<name>biot_coefficient</name>
<type>Constant</type>
<value>0.6</value>
</property>
</properties>
</phase>
</phases>
<properties>
<property>
<name>porosity</name>
<type>Constant</type>
<value>0.15</value>
</property>
<property>
<name>biot_coefficient</name>
<type>Constant</type>
<value>0.6</value>
</property>
<property>
<name>reference_temperature</name>
<type>Constant</type>
......
<?xml version="1.0" encoding="ISO-8859-1"?>
<?xml version='1.0' encoding='ISO-8859-1'?>
<OpenGeoSysProject>
<mesh>cube_1x1x1_quad.vtu</mesh>
<geometry>cube_1x1x1.gml</geometry>
......@@ -50,25 +50,25 @@
<phase>
<type>Solid</type>
<properties>
<property>
<name>porosity</name>
<type>Constant</type>
<value>0.3</value>
</property>
<property>
<name>density</name>
<type>Constant</type>
<value>1.43e3</value>
</property>
<property>
<name>biot_coefficient</name>
<type>Constant</type>
<value>0.6</value>
</property>
</properties>
</phase>
</phases>
<properties>
<property>
<name>porosity</name>
<type>Constant</type>
<value>0.3</value>
</property>
<property>
<name>biot_coefficient</name>
<type>Constant</type>
<value>0.6</value>
</property>
<property>
<name>reference_temperature</name>
<type>Constant</type>
......
<?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>
......@@ -50,25 +50,25 @@
<phase>
<type>Solid</type>
<properties>
<property>
<name>porosity</name>
<type>Constant</type>
<value>0.03</value>
</property>
<property>
<name>density</name>
<type>Constant</type>
<value>2.17e3</value>
</property>
<property>
<name>biot_coefficient</name>
<type>Constant</type>
<value>0.6</value>
</property>
</properties>
</phase>
</phases>
<properties>
<property>
<name>porosity</name>
<type>Constant</type>
<value>0.03</value>
</property>
<property>
<name>biot_coefficient</name>
<type>Constant</type>
<value>0.6</value>
</property>
<property>
<name>reference_temperature</name>
<type>Constant</type>
......
<?xml version="1.0" encoding="ISO-8859-1"?>
<?xml version='1.0' encoding='ISO-8859-1'?>
<OpenGeoSysProject>
<mesh>quad_1x10.vtu</mesh>
<geometry>quad_1x10.gml</geometry>
......@@ -50,25 +50,25 @@
<phase>
<type>Solid</type>
<properties>
<property>
<name>porosity</name>
<type>Constant</type>
<value>0.1</value>
</property>
<property>
<name>density</name>
<type>Constant</type>
<value>2.2e3</value>
</property>
<property>
<name>biot_coefficient</name>
<type>Constant</type>
<value>1.0</value>
</property>
</properties>
</phase>
</phases>
<properties>
<property>
<name>porosity</name>
<type>Constant</type>
<value>0.1</value>
</property>
<property>
<name>biot_coefficient</name>
<type>Constant</type>
<value>1.0</value>
</property>
<property>
<name>reference_temperature</name>
<type>Constant</type>
......
<?xml version="1.0" encoding="ISO-8859-1"?>
<?xml version='1.0' encoding='ISO-8859-1'?>
<OpenGeoSysProject>
<mesh>cube_1x1x1_hex20_1e3.vtu</mesh>
<geometry>cube_1x1x1.gml</geometry>
......@@ -17,8 +17,7 @@
<displacement>displacement</displacement>
<pressure>pressure</pressure>
</process_variables>
<secondary_variables>
</secondary_variables>
<secondary_variables/>
<specific_body_force>0 0 0</specific_body_force>
</process>
</processes>
......@@ -43,25 +42,25 @@
<phase>
<type>Solid</type>
<properties>
<property>
<name>porosity</name>
<type>Constant</type>
<value>0.8</value>
</property>
<property>
<name>density</name>
<type>Constant</type>
<value>1.2e-6</value>
</property>
<property>
<name>biot_coefficient</name>
<type>Constant</type>
<value>1</value>
</property>
</properties>
</phase>
</phases>
<properties>
<property>
<name>porosity</name>
<type>Constant</type>
<value>0.8</value>
</property>
<property>
<name>biot_coefficient</name>
<type>Constant</type>
<value>1</value>
</property>
<property>
<name>reference_temperature</name>
<type>Constant</type>
......
<?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>
......@@ -46,25 +46,25 @@
<phase>
<type>Solid</type>
<properties>
<property>
<name>porosity</name>
<type>Constant</type>
<value>0.8</value>
</property>
<property>
<name>density</name>
<type>Constant</type>
<value>1.2e-6</value>
</property>
<property>
<name>biot_coefficient</name>
<type>Constant</type>
<value>1</value>
</property>
</properties>
</phase>
</phases>
<properties>
<property>
<name>porosity</name>
<type>Constant</type>
<value>0.8</value>
</property>
<property>
<name>biot_coefficient</name>
<type>Constant</type>
<value>1</value>
</property>
<property>
<name>reference_temperature</name>
<type>Constant</type>
......
<?xml version="1.0" encoding="ISO-8859-1"?>
<?xml version='1.0' encoding='ISO-8859-1'?>
<OpenGeoSysProject>
<mesh>square_1x1_quad4_1e2.vtu</mesh>
<geometry>square_1x1.gml</geometry>
......@@ -46,25 +46,25 @@
<phase>
<type>Solid</type>
<properties>
<property>
<name>porosity</name>
<type>Constant</type>
<value>0.8</value>
</property>
<property>
<name>density</name>
<type>Constant</type>
<value>1.2e-6</value>
</property>
<property>
<name>biot_coefficient</name>
<type>Constant</type>
<value>1</value>
</property>
</properties>
</phase>
</phases>
<properties>
<property>
<name>porosity</name>
<type>Constant</type>
<value>0.8</value>
</property>
<property>
<name>biot_coefficient</name>
<type>Constant</type>
<value>1</value>
</property>
<property>
<name>reference_temperature</name>
<type>Constant</type>
......
<?xml version="1.0" encoding="ISO-8859-1"?>
<?xml version='1.0' encoding='ISO-8859-1'?>
<OpenGeoSysProject>
<mesh>square_1x1_quad9_1e2.vtu</mesh>
<geometry>square_1x1.gml</geometry>
......@@ -17,8 +17,7 @@
<displacement>displacement</displacement>
<pressure>pressure</pressure>
</process_variables>
<secondary_variables>
</secondary_variables>
<secondary_variables/>
<specific_body_force>0 0</specific_body_force>
</process>
</processes>
......@@ -43,25 +42,25 @@
<phase>
<type>Solid</type>
<properties>
<property>
<name>porosity</name>
<type>Constant</type>
<value>0.8</value>
</property>
<property>
<name>density</name>
<type>Constant</type>
<value>1.2e-6</value>
</property>
<property>
<name>biot_coefficient</name>
<type>Constant</type>
<value>1</value>
</property>
</properties>
</phase>
</phases>
<properties>
<property>
<name>porosity</name>
<type>Constant</type>
<value>0.8</value>
</property>
<property>
<name>biot_coefficient</name>
<type>Constant</type>
<value>1</value>
</property>
<property>
<name>reference_temperature</name>
<type>Constant</type>
......
<?xml version="1.0" encoding="ISO-8859-1"?>
<?xml version='1.0' encoding='ISO-8859-1'?>
<OpenGeoSysProject>
<mesh>square_1x1_tri6_1e2.vtu</mesh>
<geometry>square_1x1.gml</geometry>
......@@ -17,8 +17,7 @@
<displacement>displacement</displacement>
<pressure>pressure</pressure>
</process_variables>
<secondary_variables>
</secondary_variables>
<secondary_variables/>
<specific_body_force>0 0</specific_body_force>
</process>
</processes>
......@@ -43,25 +42,25 @@
<phase>
<type>Solid</type>
<properties>
<property>
<name>porosity</name>
<type>Constant</type>
<value>0.8</value>
</property>
<property>
<name>density</name>
<type>Constant</type>
<value>1.2e-6</value>
</property>
<property>
<name>biot_coefficient</name>
<type>Constant</type>
<value>1</value>
</property>
</properties>
</phase>
</phases>
<properties>
<property>
<name>porosity</name>
<type>Constant</type>
<value>0.8</value>
</property>
<property>
<name>biot_coefficient</name>
<type>Constant</type>
<value>1</value>
</property>
<property>
<name>reference_temperature</name>
<type>Constant</type>
......
<?xml version="1.0" encoding="ISO-8859-1"?>
<?xml version='1.0' encoding='ISO-8859-1'?>
<OpenGeoSysProject>
<mesh>drainage_quad.vtu</mesh>
<geometry>drainage_geo.gml</geometry>
......@@ -46,25 +46,25 @@
<phase>
<type>Solid</type>
<properties>
<property>
<name>porosity</name>
<type>Constant</type>
<value>0.35</value>
</property>
<property>
<name>density</name>
<type>Parameter</type>
<parameter_name>load-solid</parameter_name>
</property>
<property>
<name>biot_coefficient</name>
<type>Constant</type>
<value>1</value>
</property>
</properties>
</phase>
</phases>
<properties>
<property>
<name>porosity</name>
<type>Constant</type>
<value>0.35</value>
</property>
<property>
<name>biot_coefficient</name>
<type>Constant</type>
<value>1</value>
</property>
<property>