From 234c3d6f103c9adee31f45d1fa6adb702fd9fb83 Mon Sep 17 00:00:00 2001
From: Dmitri Naumov <dmitri.naumov@ufz.de>
Date: Fri, 30 Sep 2016 18:03:18 +0200
Subject: [PATCH] [PL] Update GroundwaterFlow.
---
ProcessLib/GroundwaterFlow/CreateGroundwaterFlowProcess.cpp | 3 ++-
ProcessLib/GroundwaterFlow/CreateGroundwaterFlowProcess.h | 1 +
ProcessLib/GroundwaterFlow/GroundwaterFlowProcess.cpp | 5 +++--
ProcessLib/GroundwaterFlow/GroundwaterFlowProcess.h | 1 +
4 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/ProcessLib/GroundwaterFlow/CreateGroundwaterFlowProcess.cpp b/ProcessLib/GroundwaterFlow/CreateGroundwaterFlowProcess.cpp
index 8a4cb4fd0ab..7139f9d7cbe 100644
--- a/ProcessLib/GroundwaterFlow/CreateGroundwaterFlowProcess.cpp
+++ b/ProcessLib/GroundwaterFlow/CreateGroundwaterFlowProcess.cpp
@@ -26,6 +26,7 @@ std::unique_ptr<Process> createGroundwaterFlowProcess(
std::unique_ptr<ProcessLib::AbstractJacobianAssembler>&& jacobian_assembler,
std::vector<ProcessVariable> const& variables,
std::vector<std::unique_ptr<ParameterBase>> const& parameters,
+ unsigned const integration_order,
BaseLib::ConfigTree const& config,
std::string const& project_directory,
std::string const& output_directory)
@@ -88,7 +89,7 @@ std::unique_ptr<Process> createGroundwaterFlowProcess(
}
return std::unique_ptr<Process>{new GroundwaterFlowProcess{
- mesh, std::move(jacobian_assembler), parameters,
+ mesh, std::move(jacobian_assembler), parameters, integration_order,
std::move(process_variables), std::move(process_data),
std::move(secondary_variables), std::move(named_function_caller),
surface_mesh.release(), std::move(balance_pv_name),
diff --git a/ProcessLib/GroundwaterFlow/CreateGroundwaterFlowProcess.h b/ProcessLib/GroundwaterFlow/CreateGroundwaterFlowProcess.h
index 9294b02ada5..8bc087e3790 100644
--- a/ProcessLib/GroundwaterFlow/CreateGroundwaterFlowProcess.h
+++ b/ProcessLib/GroundwaterFlow/CreateGroundwaterFlowProcess.h
@@ -23,6 +23,7 @@ std::unique_ptr<Process> createGroundwaterFlowProcess(
std::unique_ptr<ProcessLib::AbstractJacobianAssembler>&& jacobian_assembler,
std::vector<ProcessVariable> const& variables,
std::vector<std::unique_ptr<ParameterBase>> const& parameters,
+ unsigned const integration_order,
BaseLib::ConfigTree const& config,
std::string const& project_directory,
std::string const& output_directory);
diff --git a/ProcessLib/GroundwaterFlow/GroundwaterFlowProcess.cpp b/ProcessLib/GroundwaterFlow/GroundwaterFlowProcess.cpp
index 38c6120716e..4170854f7dc 100644
--- a/ProcessLib/GroundwaterFlow/GroundwaterFlowProcess.cpp
+++ b/ProcessLib/GroundwaterFlow/GroundwaterFlowProcess.cpp
@@ -21,6 +21,7 @@ GroundwaterFlowProcess::GroundwaterFlowProcess(
MeshLib::Mesh& mesh,
std::unique_ptr<ProcessLib::AbstractJacobianAssembler>&& jacobian_assembler,
std::vector<std::unique_ptr<ParameterBase>> const& parameters,
+ unsigned const integration_order,
std::vector<std::reference_wrapper<ProcessVariable>>&& process_variables,
GroundwaterFlowProcessData&& process_data,
SecondaryVariableCollection&& secondary_variables,
@@ -29,8 +30,8 @@ GroundwaterFlowProcess::GroundwaterFlowProcess(
std::string&& balance_pv_name,
std::string&& balance_out_fname)
: Process(mesh, std::move(jacobian_assembler), parameters,
- std::move(process_variables), std::move(secondary_variables),
- std::move(named_function_caller)),
+ integration_order, std::move(process_variables),
+ std::move(secondary_variables), std::move(named_function_caller)),
_process_data(std::move(process_data)),
_balance_mesh(balance_mesh),
_balance_pv_name(std::move(balance_pv_name)),
diff --git a/ProcessLib/GroundwaterFlow/GroundwaterFlowProcess.h b/ProcessLib/GroundwaterFlow/GroundwaterFlowProcess.h
index d93ef4fe1f3..44d86480df6 100644
--- a/ProcessLib/GroundwaterFlow/GroundwaterFlowProcess.h
+++ b/ProcessLib/GroundwaterFlow/GroundwaterFlowProcess.h
@@ -34,6 +34,7 @@ public:
std::unique_ptr<ProcessLib::AbstractJacobianAssembler>&&
jacobian_assembler,
std::vector<std::unique_ptr<ParameterBase>> const& parameters,
+ unsigned const integration_order,
std::vector<std::reference_wrapper<ProcessVariable>>&&
process_variables,
GroundwaterFlowProcessData&& process_data,
--
GitLab