From 27a15c884076fce24c44d558d1d9ee8975b2f9ed Mon Sep 17 00:00:00 2001
From: Thomas Fischer <thomas.fischer@ufz.de>
Date: Fri, 15 Mar 2019 08:46:15 +0100
Subject: [PATCH] [PL/HT] Remove PorousMediaProperties from HT.
---
ProcessLib/HT/CreateHTProcess.cpp | 7 -------
ProcessLib/HT/HTMaterialProperties.h | 8 +-------
2 files changed, 1 insertion(+), 14 deletions(-)
diff --git a/ProcessLib/HT/CreateHTProcess.cpp b/ProcessLib/HT/CreateHTProcess.cpp
index 142c7cd987d..20602e81b21 100644
--- a/ProcessLib/HT/CreateHTProcess.cpp
+++ b/ProcessLib/HT/CreateHTProcess.cpp
@@ -9,9 +9,7 @@
#include "CreateHTProcess.h"
-#include "MaterialLib/Fluid/FluidProperties/CreateFluidProperties.h"
#include "MaterialLib/MPL/CreateMaterialSpatialDistributionMap.h"
-#include "MaterialLib/PorousMedium/CreatePorousMediaProperties.h"
#include "MeshLib/IO/readMeshFromFile.h"
#include "ParameterLib/ConstantParameter.h"
#include "ParameterLib/Utils.h"
@@ -81,10 +79,6 @@ std::unique_ptr<Process> createHTProcess(
const int _heat_transport_process_id = 0;
const int _hydraulic_process_id = 1;
- MaterialLib::PorousMedium::PorousMediaProperties porous_media_properties{
- MaterialLib::PorousMedium::createPorousMediaProperties(mesh, config,
- parameters)};
-
// Parameter for the density of the solid.
auto& density_solid = ParameterLib::findParameter<double>(
config,
@@ -170,7 +164,6 @@ std::unique_ptr<Process> createHTProcess(
std::unique_ptr<HTMaterialProperties> material_properties =
std::make_unique<HTMaterialProperties>(
- std::move(porous_media_properties),
density_solid,
std::move(media_map),
specific_heat_capacity_solid,
diff --git a/ProcessLib/HT/HTMaterialProperties.h b/ProcessLib/HT/HTMaterialProperties.h
index b375e6e5f94..bab6e5e08b7 100644
--- a/ProcessLib/HT/HTMaterialProperties.h
+++ b/ProcessLib/HT/HTMaterialProperties.h
@@ -12,9 +12,7 @@
#include <memory>
#include <utility>
-#include "MaterialLib/Fluid/FluidProperties/FluidProperties.h"
#include "MaterialLib/MPL/MaterialSpatialDistributionMap.h"
-#include "MaterialLib/PorousMedium/PorousMediaProperties.h"
namespace ProcessLib
{
@@ -26,8 +24,6 @@ namespace HT
struct HTMaterialProperties final
{
HTMaterialProperties(
- MaterialLib::PorousMedium::PorousMediaProperties&&
- porous_media_properties_,
ParameterLib::Parameter<double> const& density_solid_,
std::unique_ptr<MaterialPropertyLib::MaterialSpatialDistributionMap>&&
media_map_,
@@ -38,8 +34,7 @@ struct HTMaterialProperties final
ParameterLib::Parameter<double> const& biot_constant_,
Eigen::VectorXd specific_body_force_,
bool const has_gravity_)
- : porous_media_properties(std::move(porous_media_properties_)),
- density_solid(density_solid_),
+ : density_solid(density_solid_),
media_map(std::move(media_map_)),
specific_heat_capacity_solid(specific_heat_capacity_solid_),
thermal_conductivity_solid(thermal_conductivity_solid_),
@@ -56,7 +51,6 @@ struct HTMaterialProperties final
void operator=(HTMaterialProperties&&) = delete;
void operator=(HTMaterialProperties const&) = delete;
- MaterialLib::PorousMedium::PorousMediaProperties porous_media_properties;
ParameterLib::Parameter<double> const& density_solid;
std::unique_ptr<MaterialPropertyLib::MaterialSpatialDistributionMap>
media_map;
--
GitLab