From b94a0eb207ead5ce58fd2f07c53c01505c6bcf1c Mon Sep 17 00:00:00 2001
From: renchao_lu <renchao.lu@gmail.com>
Date: Tue, 3 Sep 2019 14:25:50 +0200
Subject: [PATCH] [PL/CT] Dropped porous media properties and fluid properites
from process data.
---
.../ComponentTransportProcessData.h | 11 +----------
.../CreateComponentTransportProcess.cpp | 12 ------------
2 files changed, 1 insertion(+), 22 deletions(-)
diff --git a/ProcessLib/ComponentTransport/ComponentTransportProcessData.h b/ProcessLib/ComponentTransport/ComponentTransportProcessData.h
index 1c2b96961f0..f6c338313b9 100644
--- a/ProcessLib/ComponentTransport/ComponentTransportProcessData.h
+++ b/ProcessLib/ComponentTransport/ComponentTransportProcessData.h
@@ -11,7 +11,6 @@
#include <memory>
-#include "MaterialLib/Fluid/FluidProperties/FluidProperties.h"
#include "MaterialLib/MPL/CreateMaterialSpatialDistributionMap.h"
#include "MaterialLib/PorousMedium/Porosity/Porosity.h"
#include "MaterialLib/PorousMedium/Storage/Storage.h"
@@ -32,19 +31,13 @@ namespace ComponentTransport
struct ComponentTransportProcessData
{
ComponentTransportProcessData(
- MaterialLib::PorousMedium::PorousMediaProperties&&
- porous_media_properties_,
ParameterLib::Parameter<double> const& fluid_reference_density_,
- std::unique_ptr<MaterialLib::Fluid::FluidProperties>&&
- fluid_properties_,
std::unique_ptr<MaterialPropertyLib::MaterialSpatialDistributionMap>&&
media_map_,
ParameterLib::Parameter<double> const& decay_rate_,
Eigen::VectorXd const& specific_body_force_, bool const has_gravity_,
bool const non_advective_form_)
- : porous_media_properties(std::move(porous_media_properties_)),
- fluid_reference_density(fluid_reference_density_),
- fluid_properties(std::move(fluid_properties_)),
+ : fluid_reference_density(fluid_reference_density_),
media_map(std::move(media_map_)),
decay_rate(decay_rate_),
specific_body_force(specific_body_force_),
@@ -53,9 +46,7 @@ struct ComponentTransportProcessData
{
}
- MaterialLib::PorousMedium::PorousMediaProperties porous_media_properties;
ParameterLib::Parameter<double> const& fluid_reference_density;
- std::unique_ptr<MaterialLib::Fluid::FluidProperties> fluid_properties;
std::unique_ptr<MaterialPropertyLib::MaterialSpatialDistributionMap>
media_map;
ParameterLib::Parameter<double> const& decay_rate;
diff --git a/ProcessLib/ComponentTransport/CreateComponentTransportProcess.cpp b/ProcessLib/ComponentTransport/CreateComponentTransportProcess.cpp
index ed8751c9fe1..dfc72d8582c 100644
--- a/ProcessLib/ComponentTransport/CreateComponentTransportProcess.cpp
+++ b/ProcessLib/ComponentTransport/CreateComponentTransportProcess.cpp
@@ -110,16 +110,6 @@ std::unique_ptr<Process> createComponentTransportProcess(
}
}
- MaterialLib::PorousMedium::PorousMediaProperties porous_media_properties{
- MaterialLib::PorousMedium::createPorousMediaProperties(
- mesh, config, parameters)};
-
- //! \ogs_file_param{prj__processes__process__ComponentTransport__fluid}
- auto const& fluid_config = config.getConfigSubtree("fluid");
-
- auto fluid_properties =
- MaterialLib::Fluid::createFluidProperties(fluid_config);
-
// Parameter for the density of the fluid.
auto& fluid_reference_density = ParameterLib::findParameter<double>(
config,
@@ -162,9 +152,7 @@ std::unique_ptr<Process> createComponentTransportProcess(
MaterialPropertyLib::createMaterialSpatialDistributionMap(media, mesh);
ComponentTransportProcessData process_data{
- std::move(porous_media_properties),
fluid_reference_density,
- std::move(fluid_properties),
std::move(media_map),
decay_rate,
specific_body_force,
--
GitLab