From c8e72b79e247cc0d21c5a1440d12f62668ac1150 Mon Sep 17 00:00:00 2001 From: Thomas Fischer <thomas.fischer@ufz.de> Date: Mon, 3 Feb 2020 12:40:04 +0100 Subject: [PATCH] [PL/LiquidFlow] Fwd. media to createLiquidFlowProcess. --- Applications/ApplicationsLib/ProjectData.cpp | 2 +- ProcessLib/LiquidFlow/CreateLiquidFlowProcess.cpp | 3 ++- ProcessLib/LiquidFlow/CreateLiquidFlowProcess.h | 8 +++++++- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/Applications/ApplicationsLib/ProjectData.cpp b/Applications/ApplicationsLib/ProjectData.cpp index c95940db327..a21b5af26b3 100644 --- a/Applications/ApplicationsLib/ProjectData.cpp +++ b/Applications/ApplicationsLib/ProjectData.cpp @@ -551,7 +551,7 @@ void ProjectData::parseProcesses(BaseLib::ConfigTree const& processes_config, process = ProcessLib::LiquidFlow::createLiquidFlowProcess( name, *_mesh_vec[0], std::move(jacobian_assembler), _process_variables, _parameters, integration_order, - process_config, _mesh_vec, output_directory); + process_config, _mesh_vec, output_directory, _media); } else #endif diff --git a/ProcessLib/LiquidFlow/CreateLiquidFlowProcess.cpp b/ProcessLib/LiquidFlow/CreateLiquidFlowProcess.cpp index 4ae75493d11..c99bf8ef25b 100644 --- a/ProcessLib/LiquidFlow/CreateLiquidFlowProcess.cpp +++ b/ProcessLib/LiquidFlow/CreateLiquidFlowProcess.cpp @@ -33,7 +33,8 @@ std::unique_ptr<Process> createLiquidFlowProcess( unsigned const integration_order, BaseLib::ConfigTree const& config, std::vector<std::unique_ptr<MeshLib::Mesh>> const& meshes, - std::string const& output_directory) + std::string const& output_directory, + std::map<int, std::shared_ptr<MaterialPropertyLib::Medium>> const& media) { //! \ogs_file_param{prj__processes__process__type} config.checkConfigParameter("type", "LIQUID_FLOW"); diff --git a/ProcessLib/LiquidFlow/CreateLiquidFlowProcess.h b/ProcessLib/LiquidFlow/CreateLiquidFlowProcess.h index db1ff098a5d..824426e73eb 100644 --- a/ProcessLib/LiquidFlow/CreateLiquidFlowProcess.h +++ b/ProcessLib/LiquidFlow/CreateLiquidFlowProcess.h @@ -15,6 +15,11 @@ #include <memory> #include "ProcessLib/Process.h" +namespace MaterialPropertyLib +{ +class Medium; +} + namespace ProcessLib { namespace LiquidFlow @@ -28,6 +33,7 @@ std::unique_ptr<Process> createLiquidFlowProcess( unsigned const integration_order, BaseLib::ConfigTree const& config, std::vector<std::unique_ptr<MeshLib::Mesh>> const& meshes, - std::string const& output_directory); + std::string const& output_directory, + std::map<int, std::shared_ptr<MaterialPropertyLib::Medium>> const& media); } // namespace LiquidFlow } // namespace ProcessLib -- GitLab