From f2b50c94697ec6f52f32df0a2ff96546f251bd41 Mon Sep 17 00:00:00 2001
From: Thomas Fischer <thomas.fischer@ufz.de>
Date: Tue, 27 Jun 2017 10:44:04 +0200
Subject: [PATCH] [PL/Material] Move parsing of porous medium to
createPorousMediaProperties.
---
.../ComponentTransport/porous_medium/i_porous_medium.md | 1 -
MaterialLib/PorousMedium/CreatePorousMediaProperties.cpp | 6 +++++-
.../ComponentTransport/CreateComponentTransportProcess.cpp | 5 +----
ProcessLib/HT/CreateHTProcess.cpp | 5 +----
4 files changed, 7 insertions(+), 10 deletions(-)
delete mode 100644 Documentation/ProjectFile/prj/processes/process/ComponentTransport/porous_medium/i_porous_medium.md
diff --git a/Documentation/ProjectFile/prj/processes/process/ComponentTransport/porous_medium/i_porous_medium.md b/Documentation/ProjectFile/prj/processes/process/ComponentTransport/porous_medium/i_porous_medium.md
deleted file mode 100644
index b0d0a13f289..00000000000
--- a/Documentation/ProjectFile/prj/processes/process/ComponentTransport/porous_medium/i_porous_medium.md
+++ /dev/null
@@ -1 +0,0 @@
-Tag to specify various porous media.
diff --git a/MaterialLib/PorousMedium/CreatePorousMediaProperties.cpp b/MaterialLib/PorousMedium/CreatePorousMediaProperties.cpp
index 4fabe59600e..cb789ea32fa 100644
--- a/MaterialLib/PorousMedium/CreatePorousMediaProperties.cpp
+++ b/MaterialLib/PorousMedium/CreatePorousMediaProperties.cpp
@@ -24,10 +24,14 @@ namespace MaterialLib
namespace PorousMedium
{
PorousMediaProperties createPorousMediaProperties(
- MeshLib::Mesh& mesh, BaseLib::ConfigTree const& porous_medium_configs)
+ MeshLib::Mesh& mesh, BaseLib::ConfigTree const& configs)
{
DBUG("Create PorousMediaProperties.");
+ auto const& porous_medium_configs =
+ //! \ogs_file_param{material__porous_medium__porous_medium}
+ configs.getConfigSubtree("porous_medium");
+
std::vector<Eigen::MatrixXd> intrinsic_permeability_models;
std::vector<std::unique_ptr<MaterialLib::PorousMedium::Porosity>>
porosity_models;
diff --git a/ProcessLib/ComponentTransport/CreateComponentTransportProcess.cpp b/ProcessLib/ComponentTransport/CreateComponentTransportProcess.cpp
index 1e0ec9d1c5e..505d50217ae 100644
--- a/ProcessLib/ComponentTransport/CreateComponentTransportProcess.cpp
+++ b/ProcessLib/ComponentTransport/CreateComponentTransportProcess.cpp
@@ -49,12 +49,9 @@ std::unique_ptr<Process> createComponentTransportProcess(
//! \ogs_file_param_special{prj__processes__process__ComponentTransport__process_variables__pressure}
"pressure"});
- auto const& porous_medium_configs =
- //! \ogs_file_param{prj__processes__process__ComponentTransport__porous_medium}
- config.getConfigSubtree("porous_medium");
MaterialLib::PorousMedium::PorousMediaProperties porous_media_properties{
MaterialLib::PorousMedium::createPorousMediaProperties(
- mesh, porous_medium_configs)};
+ mesh, config)};
//! \ogs_file_param{prj__processes__process__ComponentTransport__fluid}
auto const& fluid_config = config.getConfigSubtree("fluid");
diff --git a/ProcessLib/HT/CreateHTProcess.cpp b/ProcessLib/HT/CreateHTProcess.cpp
index ba29d0cea53..c1c10be3ceb 100644
--- a/ProcessLib/HT/CreateHTProcess.cpp
+++ b/ProcessLib/HT/CreateHTProcess.cpp
@@ -49,12 +49,9 @@ std::unique_ptr<Process> createHTProcess(
//! \ogs_file_param_special{prj__processes__process__HT__process_variables__pressure}
"pressure"});
- auto const& porous_medium_configs =
- //! \ogs_file_param{prj__processes__process__HT__porous_medium}
- config.getConfigSubtree("porous_medium");
MaterialLib::PorousMedium::PorousMediaProperties porous_media_properties{
MaterialLib::PorousMedium::createPorousMediaProperties(
- mesh, porous_medium_configs)};
+ mesh, config)};
//! \ogs_file_param{prj__processes__process__HT__fluid}
auto const& fluid_config = config.getConfigSubtree("fluid");
--
GitLab