Skip to content
Snippets Groups Projects
Commit 27a15c88 authored by Tom Fischer's avatar Tom Fischer Committed by Dmitri Naumov
Browse files

[PL/HT] Remove PorousMediaProperties from HT.

parent 25de3305
No related branches found
No related tags found
No related merge requests found
...@@ -9,9 +9,7 @@ ...@@ -9,9 +9,7 @@
#include "CreateHTProcess.h" #include "CreateHTProcess.h"
#include "MaterialLib/Fluid/FluidProperties/CreateFluidProperties.h"
#include "MaterialLib/MPL/CreateMaterialSpatialDistributionMap.h" #include "MaterialLib/MPL/CreateMaterialSpatialDistributionMap.h"
#include "MaterialLib/PorousMedium/CreatePorousMediaProperties.h"
#include "MeshLib/IO/readMeshFromFile.h" #include "MeshLib/IO/readMeshFromFile.h"
#include "ParameterLib/ConstantParameter.h" #include "ParameterLib/ConstantParameter.h"
#include "ParameterLib/Utils.h" #include "ParameterLib/Utils.h"
...@@ -81,10 +79,6 @@ std::unique_ptr<Process> createHTProcess( ...@@ -81,10 +79,6 @@ std::unique_ptr<Process> createHTProcess(
const int _heat_transport_process_id = 0; const int _heat_transport_process_id = 0;
const int _hydraulic_process_id = 1; 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. // Parameter for the density of the solid.
auto& density_solid = ParameterLib::findParameter<double>( auto& density_solid = ParameterLib::findParameter<double>(
config, config,
...@@ -170,7 +164,6 @@ std::unique_ptr<Process> createHTProcess( ...@@ -170,7 +164,6 @@ std::unique_ptr<Process> createHTProcess(
std::unique_ptr<HTMaterialProperties> material_properties = std::unique_ptr<HTMaterialProperties> material_properties =
std::make_unique<HTMaterialProperties>( std::make_unique<HTMaterialProperties>(
std::move(porous_media_properties),
density_solid, density_solid,
std::move(media_map), std::move(media_map),
specific_heat_capacity_solid, specific_heat_capacity_solid,
......
...@@ -12,9 +12,7 @@ ...@@ -12,9 +12,7 @@
#include <memory> #include <memory>
#include <utility> #include <utility>
#include "MaterialLib/Fluid/FluidProperties/FluidProperties.h"
#include "MaterialLib/MPL/MaterialSpatialDistributionMap.h" #include "MaterialLib/MPL/MaterialSpatialDistributionMap.h"
#include "MaterialLib/PorousMedium/PorousMediaProperties.h"
namespace ProcessLib namespace ProcessLib
{ {
...@@ -26,8 +24,6 @@ namespace HT ...@@ -26,8 +24,6 @@ namespace HT
struct HTMaterialProperties final struct HTMaterialProperties final
{ {
HTMaterialProperties( HTMaterialProperties(
MaterialLib::PorousMedium::PorousMediaProperties&&
porous_media_properties_,
ParameterLib::Parameter<double> const& density_solid_, ParameterLib::Parameter<double> const& density_solid_,
std::unique_ptr<MaterialPropertyLib::MaterialSpatialDistributionMap>&& std::unique_ptr<MaterialPropertyLib::MaterialSpatialDistributionMap>&&
media_map_, media_map_,
...@@ -38,8 +34,7 @@ struct HTMaterialProperties final ...@@ -38,8 +34,7 @@ struct HTMaterialProperties final
ParameterLib::Parameter<double> const& biot_constant_, ParameterLib::Parameter<double> const& biot_constant_,
Eigen::VectorXd specific_body_force_, Eigen::VectorXd specific_body_force_,
bool const has_gravity_) 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_)), media_map(std::move(media_map_)),
specific_heat_capacity_solid(specific_heat_capacity_solid_), specific_heat_capacity_solid(specific_heat_capacity_solid_),
thermal_conductivity_solid(thermal_conductivity_solid_), thermal_conductivity_solid(thermal_conductivity_solid_),
...@@ -56,7 +51,6 @@ struct HTMaterialProperties final ...@@ -56,7 +51,6 @@ struct HTMaterialProperties final
void operator=(HTMaterialProperties&&) = delete; void operator=(HTMaterialProperties&&) = delete;
void operator=(HTMaterialProperties const&) = delete; void operator=(HTMaterialProperties const&) = delete;
MaterialLib::PorousMedium::PorousMediaProperties porous_media_properties;
ParameterLib::Parameter<double> const& density_solid; ParameterLib::Parameter<double> const& density_solid;
std::unique_ptr<MaterialPropertyLib::MaterialSpatialDistributionMap> std::unique_ptr<MaterialPropertyLib::MaterialSpatialDistributionMap>
media_map; media_map;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment