From 3174a7fc701ed81d41d2c16da89c98ffcb7cfb9b Mon Sep 17 00:00:00 2001 From: Thomas Fischer <thomas.fischer@ufz.de> Date: Mon, 3 Feb 2020 13:02:41 +0100 Subject: [PATCH] [PL/LiquidFlow] Fwd. process data to assembler. --- ProcessLib/LiquidFlow/LiquidFlowLocalAssembler.h | 8 ++++++-- ProcessLib/LiquidFlow/LiquidFlowProcess.cpp | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/ProcessLib/LiquidFlow/LiquidFlowLocalAssembler.h b/ProcessLib/LiquidFlow/LiquidFlowLocalAssembler.h index 21a470d0302..7a16aed174e 100644 --- a/ProcessLib/LiquidFlow/LiquidFlowLocalAssembler.h +++ b/ProcessLib/LiquidFlow/LiquidFlowLocalAssembler.h @@ -30,6 +30,7 @@ #include "ProcessLib/Utils/InitShapeMatrices.h" #include "LiquidFlowMaterialProperties.h" +#include "LiquidFlowData.h" namespace ProcessLib { @@ -95,13 +96,15 @@ public: int const gravitational_axis_id, double const gravitational_acceleration, double const reference_temperature, - LiquidFlowMaterialProperties const& material_propertries) + 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) + _material_properties(material_propertries), + _process_data(process_data) { unsigned const n_integration_points = _integration_method.getNumberOfPoints(); @@ -225,6 +228,7 @@ private: const double _gravitational_acceleration; const double _reference_temperature; const LiquidFlowMaterialProperties& _material_properties; + const LiquidFlowData& _process_data; }; } // namespace LiquidFlow diff --git a/ProcessLib/LiquidFlow/LiquidFlowProcess.cpp b/ProcessLib/LiquidFlow/LiquidFlowProcess.cpp index f505220747c..6fcf80c7c93 100644 --- a/ProcessLib/LiquidFlow/LiquidFlowProcess.cpp +++ b/ProcessLib/LiquidFlow/LiquidFlowProcess.cpp @@ -68,7 +68,7 @@ void LiquidFlowProcess::initializeConcreteProcess( pv.getShapeFunctionOrder(), _local_assemblers, mesh.isAxiallySymmetric(), integration_order, _gravitational_axis_id, _gravitational_acceleration, _reference_temperature, - *_material_properties); + *_material_properties, _process_data); _secondary_variables.addSecondaryVariable( "darcy_velocity", -- GitLab