From c00e98a5877fb16228e54d810b59de6dea77ca2b Mon Sep 17 00:00:00 2001
From: Thomas Fischer <thomas.fischer@ufz.de>
Date: Fri, 20 Sep 2019 11:58:08 +0200
Subject: [PATCH] [PL/HT] Mv perm. specific. from solid to medium.
---
ProcessLib/HT/HTFEM.h | 8 ++------
ProcessLib/HT/MonolithicHTFEM.h | 2 +-
ProcessLib/HT/StaggeredHTFEM-impl.h | 5 ++---
3 files changed, 5 insertions(+), 10 deletions(-)
diff --git a/ProcessLib/HT/HTFEM.h b/ProcessLib/HT/HTFEM.h
index d92822dd710..804836e85fa 100644
--- a/ProcessLib/HT/HTFEM.h
+++ b/ProcessLib/HT/HTFEM.h
@@ -130,11 +130,9 @@ public:
auto const& medium =
*_process_data.media_map->getMedium(_element.getID());
auto const& liquid_phase = medium.phase("AqueousLiquid");
- auto const& solid_phase = medium.phase("Solid");
auto const K = MaterialPropertyLib::formEigenTensor<GlobalDim>(
- solid_phase
- .property(MaterialPropertyLib::PropertyType::permeability)
+ medium.property(MaterialPropertyLib::PropertyType::permeability)
.value(vars, pos, t));
auto const mu =
@@ -273,7 +271,6 @@ protected:
auto const& medium =
*_process_data.media_map->getMedium(_element.getID());
auto const& liquid_phase = medium.phase("AqueousLiquid");
- auto const& solid_phase = medium.phase("Solid");
for (unsigned ip = 0; ip < n_integration_points; ++ip)
{
@@ -294,8 +291,7 @@ protected:
MaterialPropertyLib::Variable::phase_pressure)] = p_int_pt;
auto const K = MaterialPropertyLib::formEigenTensor<GlobalDim>(
- solid_phase
- .property(MaterialPropertyLib::PropertyType::permeability)
+ medium.property(MaterialPropertyLib::PropertyType::permeability)
.value(vars, pos, t));
auto const mu =
diff --git a/ProcessLib/HT/MonolithicHTFEM.h b/ProcessLib/HT/MonolithicHTFEM.h
index ce0e7da613d..18a9a47a59e 100644
--- a/ProcessLib/HT/MonolithicHTFEM.h
+++ b/ProcessLib/HT/MonolithicHTFEM.h
@@ -143,7 +143,7 @@ public:
auto const intrinsic_permeability =
MaterialPropertyLib::formEigenTensor<GlobalDim>(
- solid_phase
+ medium
.property(
MaterialPropertyLib::PropertyType::permeability)
.value(vars, pos, t));
diff --git a/ProcessLib/HT/StaggeredHTFEM-impl.h b/ProcessLib/HT/StaggeredHTFEM-impl.h
index 2d94a53c4bf..ddba8cbc160 100644
--- a/ProcessLib/HT/StaggeredHTFEM-impl.h
+++ b/ProcessLib/HT/StaggeredHTFEM-impl.h
@@ -129,8 +129,7 @@ void StaggeredHTFEM<ShapeFunction, IntegrationMethod, GlobalDim>::
auto const intrinsic_permeability =
MaterialPropertyLib::formEigenTensor<GlobalDim>(
- solid_phase
- .property(MaterialPropertyLib::PropertyType::permeability)
+ medium.property(MaterialPropertyLib::PropertyType::permeability)
.value(vars, pos, t));
GlobalDimMatrixType const K_over_mu =
intrinsic_permeability / viscosity;
@@ -267,7 +266,7 @@ void StaggeredHTFEM<ShapeFunction, IntegrationMethod, GlobalDim>::
auto const intrinsic_permeability =
MaterialPropertyLib::formEigenTensor<GlobalDim>(
- solid_phase
+ medium
.property(MaterialPropertyLib::PropertyType::permeability)
.value(vars, pos, t));
--
GitLab