Skip to content
Snippets Groups Projects
Commit b94a0eb2 authored by renchao.lu's avatar renchao.lu
Browse files

[PL/CT] Dropped porous media properties and fluid properites from process data.

parent f238b11a
No related branches found
No related tags found
No related merge requests found
...@@ -11,7 +11,6 @@ ...@@ -11,7 +11,6 @@
#include <memory> #include <memory>
#include "MaterialLib/Fluid/FluidProperties/FluidProperties.h"
#include "MaterialLib/MPL/CreateMaterialSpatialDistributionMap.h" #include "MaterialLib/MPL/CreateMaterialSpatialDistributionMap.h"
#include "MaterialLib/PorousMedium/Porosity/Porosity.h" #include "MaterialLib/PorousMedium/Porosity/Porosity.h"
#include "MaterialLib/PorousMedium/Storage/Storage.h" #include "MaterialLib/PorousMedium/Storage/Storage.h"
...@@ -32,19 +31,13 @@ namespace ComponentTransport ...@@ -32,19 +31,13 @@ namespace ComponentTransport
struct ComponentTransportProcessData struct ComponentTransportProcessData
{ {
ComponentTransportProcessData( ComponentTransportProcessData(
MaterialLib::PorousMedium::PorousMediaProperties&&
porous_media_properties_,
ParameterLib::Parameter<double> const& fluid_reference_density_, ParameterLib::Parameter<double> const& fluid_reference_density_,
std::unique_ptr<MaterialLib::Fluid::FluidProperties>&&
fluid_properties_,
std::unique_ptr<MaterialPropertyLib::MaterialSpatialDistributionMap>&& std::unique_ptr<MaterialPropertyLib::MaterialSpatialDistributionMap>&&
media_map_, media_map_,
ParameterLib::Parameter<double> const& decay_rate_, ParameterLib::Parameter<double> const& decay_rate_,
Eigen::VectorXd const& specific_body_force_, bool const has_gravity_, Eigen::VectorXd const& specific_body_force_, bool const has_gravity_,
bool const non_advective_form_) bool const non_advective_form_)
: porous_media_properties(std::move(porous_media_properties_)), : fluid_reference_density(fluid_reference_density_),
fluid_reference_density(fluid_reference_density_),
fluid_properties(std::move(fluid_properties_)),
media_map(std::move(media_map_)), media_map(std::move(media_map_)),
decay_rate(decay_rate_), decay_rate(decay_rate_),
specific_body_force(specific_body_force_), specific_body_force(specific_body_force_),
...@@ -53,9 +46,7 @@ struct ComponentTransportProcessData ...@@ -53,9 +46,7 @@ struct ComponentTransportProcessData
{ {
} }
MaterialLib::PorousMedium::PorousMediaProperties porous_media_properties;
ParameterLib::Parameter<double> const& fluid_reference_density; ParameterLib::Parameter<double> const& fluid_reference_density;
std::unique_ptr<MaterialLib::Fluid::FluidProperties> fluid_properties;
std::unique_ptr<MaterialPropertyLib::MaterialSpatialDistributionMap> std::unique_ptr<MaterialPropertyLib::MaterialSpatialDistributionMap>
media_map; media_map;
ParameterLib::Parameter<double> const& decay_rate; ParameterLib::Parameter<double> const& decay_rate;
......
...@@ -110,16 +110,6 @@ std::unique_ptr<Process> createComponentTransportProcess( ...@@ -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. // Parameter for the density of the fluid.
auto& fluid_reference_density = ParameterLib::findParameter<double>( auto& fluid_reference_density = ParameterLib::findParameter<double>(
config, config,
...@@ -162,9 +152,7 @@ std::unique_ptr<Process> createComponentTransportProcess( ...@@ -162,9 +152,7 @@ std::unique_ptr<Process> createComponentTransportProcess(
MaterialPropertyLib::createMaterialSpatialDistributionMap(media, mesh); MaterialPropertyLib::createMaterialSpatialDistributionMap(media, mesh);
ComponentTransportProcessData process_data{ ComponentTransportProcessData process_data{
std::move(porous_media_properties),
fluid_reference_density, fluid_reference_density,
std::move(fluid_properties),
std::move(media_map), std::move(media_map),
decay_rate, decay_rate,
specific_body_force, specific_body_force,
......
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