From 01f0a42fe6e853dfa258773a18a274a64dc7a9cf Mon Sep 17 00:00:00 2001
From: Dmitri Naumov <dmitri.naumov@ufz.de>
Date: Fri, 30 Sep 2016 18:03:31 +0200
Subject: [PATCH] [PL] Update HeatConduction.
---
ProcessLib/HeatConduction/CreateHeatConductionProcess.cpp | 3 ++-
ProcessLib/HeatConduction/CreateHeatConductionProcess.h | 1 +
ProcessLib/HeatConduction/HeatConductionProcess.cpp | 5 +++--
ProcessLib/HeatConduction/HeatConductionProcess.h | 1 +
4 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/ProcessLib/HeatConduction/CreateHeatConductionProcess.cpp b/ProcessLib/HeatConduction/CreateHeatConductionProcess.cpp
index 47fa8a0c1b0..b5c86f603bb 100644
--- a/ProcessLib/HeatConduction/CreateHeatConductionProcess.cpp
+++ b/ProcessLib/HeatConduction/CreateHeatConductionProcess.cpp
@@ -23,6 +23,7 @@ std::unique_ptr<Process> createHeatConductionProcess(
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)
{
//! \ogs_file_param{process__type}
@@ -73,7 +74,7 @@ std::unique_ptr<Process> createHeatConductionProcess(
named_function_caller);
return std::unique_ptr<Process>{new HeatConductionProcess{
- 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)}};
}
diff --git a/ProcessLib/HeatConduction/CreateHeatConductionProcess.h b/ProcessLib/HeatConduction/CreateHeatConductionProcess.h
index 36efe857499..a5ad1a420d0 100644
--- a/ProcessLib/HeatConduction/CreateHeatConductionProcess.h
+++ b/ProcessLib/HeatConduction/CreateHeatConductionProcess.h
@@ -22,6 +22,7 @@ std::unique_ptr<Process> createHeatConductionProcess(
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);
} // namespace HeatConduction
diff --git a/ProcessLib/HeatConduction/HeatConductionProcess.cpp b/ProcessLib/HeatConduction/HeatConductionProcess.cpp
index 4b556ed908e..d481370cf12 100644
--- a/ProcessLib/HeatConduction/HeatConductionProcess.cpp
+++ b/ProcessLib/HeatConduction/HeatConductionProcess.cpp
@@ -21,13 +21,14 @@ HeatConductionProcess::HeatConductionProcess(
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,
HeatConductionProcessData&& process_data,
SecondaryVariableCollection&& secondary_variables,
NumLib::NamedFunctionCaller&& named_function_caller)
: 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))
{
}
diff --git a/ProcessLib/HeatConduction/HeatConductionProcess.h b/ProcessLib/HeatConduction/HeatConductionProcess.h
index d5862b9536a..7d8566e7e27 100644
--- a/ProcessLib/HeatConduction/HeatConductionProcess.h
+++ b/ProcessLib/HeatConduction/HeatConductionProcess.h
@@ -28,6 +28,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,
HeatConductionProcessData&& process_data,
--
GitLab