diff --git a/ProcessLib/LiquidFlow/CreateLiquidFlowProcess.cpp b/ProcessLib/LiquidFlow/CreateLiquidFlowProcess.cpp index 1a276ca6339488e0f5c8e65568dd936418e1db56..9a75f40331017ecf25b43881927d999300fed8a0 100644 --- a/ProcessLib/LiquidFlow/CreateLiquidFlowProcess.cpp +++ b/ProcessLib/LiquidFlow/CreateLiquidFlowProcess.cpp @@ -90,9 +90,6 @@ std::unique_ptr<Process> createLiquidFlowProcess( refT ? *refT : MaterialLib::PhysicalConstant::CelsiusZeroInKelvin + 18.0; - //! \ogs_file_param{prj__processes__process__LIQUID_FLOW__material_property} - auto const& mat_config = config.getConfigSubtree("material_property"); - auto const material_ids = materialIDs(mesh); if (material_ids) { @@ -121,9 +118,8 @@ std::unique_ptr<Process> createLiquidFlowProcess( return std::make_unique<LiquidFlowProcess>( std::move(name), mesh, std::move(jacobian_assembler), parameters, integration_order, std::move(process_variables), - std::move(process_data), std::move(secondary_variables), material_ids, - gravity_axis_id, g, reference_temperature, mat_config, - std::move(surfaceflux)); + std::move(process_data), std::move(secondary_variables), + gravity_axis_id, g, reference_temperature, std::move(surfaceflux)); } } // namespace LiquidFlow diff --git a/ProcessLib/LiquidFlow/LiquidFlowLocalAssembler.h b/ProcessLib/LiquidFlow/LiquidFlowLocalAssembler.h index 1a90b6ed2c95f5a2fa67d03ba0fbfbb703b2a24f..30414b1ba024787376f9e5ee45311af4f9c594e1 100644 --- a/ProcessLib/LiquidFlow/LiquidFlowLocalAssembler.h +++ b/ProcessLib/LiquidFlow/LiquidFlowLocalAssembler.h @@ -20,8 +20,6 @@ #include "MaterialLib/MPL/Medium.h" #include "MaterialLib/MPL/Utils/FormEffectiveThermalConductivity.h" -#include "MaterialLib/PorousMedium/Permeability/Permeability.h" -#include "MaterialLib/PorousMedium/Storage/Storage.h" #include "MathLib/LinAlg/Eigen/EigenMapTools.h" #include "NumLib/DOF/DOFTableUtil.h" #include "NumLib/Extrapolation/ExtrapolatableElement.h" @@ -32,7 +30,6 @@ #include "ProcessLib/LocalAssemblerTraits.h" #include "ProcessLib/Utils/InitShapeMatrices.h" -#include "LiquidFlowMaterialProperties.h" #include "LiquidFlowData.h" namespace ProcessLib @@ -99,14 +96,12 @@ public: int const gravitational_axis_id, double const gravitational_acceleration, double const reference_temperature, - LiquidFlowMaterialProperties const& material_propertries, LiquidFlowData const& process_data) : _element(element), _integration_method(integration_order), _gravitational_axis_id(gravitational_axis_id), _gravitational_acceleration(gravitational_acceleration), _reference_temperature(reference_temperature), - _material_properties(material_propertries), _process_data(process_data) { unsigned const n_integration_points = @@ -228,7 +223,6 @@ private: const int _gravitational_axis_id; const double _gravitational_acceleration; const double _reference_temperature; - const LiquidFlowMaterialProperties& _material_properties; const LiquidFlowData& _process_data; }; diff --git a/ProcessLib/LiquidFlow/LiquidFlowProcess.cpp b/ProcessLib/LiquidFlow/LiquidFlowProcess.cpp index b45fe8779e0d37e24e44648b7ebf8a03a058c94a..ab5e265bc3f951e7dda46efa3678f81251eefdd0 100644 --- a/ProcessLib/LiquidFlow/LiquidFlowProcess.cpp +++ b/ProcessLib/LiquidFlow/LiquidFlowProcess.cpp @@ -14,9 +14,7 @@ #include <cassert> -#include "CreateLiquidFlowMaterialProperties.h" #include "LiquidFlowLocalAssembler.h" -#include "LiquidFlowMaterialProperties.h" #include "MeshLib/PropertyVector.h" // TODO(TF) used for output of flux, if output classes are ready this has to be changed #include "MeshLib/IO/writeMeshToFile.h" @@ -70,11 +68,9 @@ LiquidFlowProcess::LiquidFlowProcess( process_variables, LiquidFlowData&& process_data, SecondaryVariableCollection&& secondary_variables, - MeshLib::PropertyVector<int> const* const material_ids, int const gravitational_axis_id, double const gravitational_acceleration, double const reference_temperature, - BaseLib::ConfigTree const& config, std::unique_ptr<ProcessLib::SurfaceFluxData>&& surfaceflux) : Process(std::move(name), mesh, std::move(jacobian_assembler), parameters, integration_order, std::move(process_variables), @@ -82,8 +78,6 @@ LiquidFlowProcess::LiquidFlowProcess( _gravitational_axis_id(gravitational_axis_id), _gravitational_acceleration(gravitational_acceleration), _reference_temperature(reference_temperature), - _material_properties( - createLiquidFlowMaterialProperties(config, parameters, material_ids)), _process_data(std::move(process_data)), _surfaceflux(std::move(surfaceflux)) { @@ -103,8 +97,7 @@ void LiquidFlowProcess::initializeConcreteProcess( mesh.getDimension(), mesh.getElements(), dof_table, pv.getShapeFunctionOrder(), _local_assemblers, mesh.isAxiallySymmetric(), integration_order, _gravitational_axis_id, - _gravitational_acceleration, _reference_temperature, - *_material_properties, _process_data); + _gravitational_acceleration, _reference_temperature, _process_data); _secondary_variables.addSecondaryVariable( "darcy_velocity", diff --git a/ProcessLib/LiquidFlow/LiquidFlowProcess.h b/ProcessLib/LiquidFlow/LiquidFlowProcess.h index 0b870ef788c1b8f0c931f60e045bc6374867d481..639631370b127c96f85206d009427cfba03d3296 100644 --- a/ProcessLib/LiquidFlow/LiquidFlowProcess.h +++ b/ProcessLib/LiquidFlow/LiquidFlowProcess.h @@ -15,9 +15,7 @@ #include <memory> #include "LiquidFlowLocalAssembler.h" -#include "LiquidFlowMaterialProperties.h" #include "LiquidFlowData.h" -#include "MaterialLib/Fluid/FluidProperties/FluidProperties.h" #include "NumLib/DOF/LocalToGlobalIndexMap.h" #include "ProcessLib/Process.h" #include "ProcessLib/SurfaceFlux/SurfaceFluxData.h" @@ -68,11 +66,9 @@ public: process_variables, LiquidFlowData&& process_data, SecondaryVariableCollection&& secondary_variables, - MeshLib::PropertyVector<int> const* const material_ids, int const gravitational_axis_id, double const gravitational_acceleration, double const reference_temperature, - BaseLib::ConfigTree const& config, std::unique_ptr<ProcessLib::SurfaceFluxData>&& surfaceflux); void computeSecondaryVariableConcrete(double const t, @@ -117,7 +113,6 @@ private: const int _gravitational_axis_id; const double _gravitational_acceleration; const double _reference_temperature; - const std::unique_ptr<LiquidFlowMaterialProperties> _material_properties; LiquidFlowData _process_data; std::vector<std::unique_ptr<LiquidFlowLocalAssemblerInterface>>