From 1218b3f2fcf84a80e48ce054b340bfc5ebe41025 Mon Sep 17 00:00:00 2001
From: Christoph Lehmann <christoph.lehmann@ufz.de>
Date: Fri, 26 Aug 2016 16:02:51 +0200
Subject: [PATCH] [PL] changed ctor arg order
---
.../GroundwaterFlow/CreateGroundwaterFlowProcess.cpp | 9 +++++----
ProcessLib/GroundwaterFlow/GroundwaterFlowProcess.cpp | 10 +++++-----
ProcessLib/GroundwaterFlow/GroundwaterFlowProcess.h | 2 +-
ProcessLib/Process.cpp | 2 +-
ProcessLib/Process.h | 2 +-
ProcessLib/TES/CreateTESProcess.cpp | 8 ++++----
ProcessLib/TES/TESProcess.cpp | 10 +++++-----
ProcessLib/TES/TESProcess.h | 2 +-
8 files changed, 23 insertions(+), 22 deletions(-)
diff --git a/ProcessLib/GroundwaterFlow/CreateGroundwaterFlowProcess.cpp b/ProcessLib/GroundwaterFlow/CreateGroundwaterFlowProcess.cpp
index 71728cf8ea6..64b79443c5e 100644
--- a/ProcessLib/GroundwaterFlow/CreateGroundwaterFlowProcess.cpp
+++ b/ProcessLib/GroundwaterFlow/CreateGroundwaterFlowProcess.cpp
@@ -62,10 +62,11 @@ std::unique_ptr<Process> createGroundwaterFlowProcess(
ProcessOutput process_output{config.getConfigSubtree("output")};
return std::unique_ptr<Process>{new GroundwaterFlowProcess{
- parameters, mesh, nonlinear_solver, std::move(time_discretization),
- std::move(convergence_criterion), std::move(process_variables),
- std::move(process_data), std::move(secondary_variables),
- std::move(process_output), std::move(named_function_caller)}};
+ mesh, nonlinear_solver, std::move(time_discretization),
+ std::move(convergence_criterion), parameters,
+ std::move(process_variables), std::move(process_data),
+ std::move(secondary_variables), std::move(process_output),
+ std::move(named_function_caller)}};
}
} // namespace GroundwaterFlow
diff --git a/ProcessLib/GroundwaterFlow/GroundwaterFlowProcess.cpp b/ProcessLib/GroundwaterFlow/GroundwaterFlowProcess.cpp
index 46af91c86c1..e077af27838 100644
--- a/ProcessLib/GroundwaterFlow/GroundwaterFlowProcess.cpp
+++ b/ProcessLib/GroundwaterFlow/GroundwaterFlowProcess.cpp
@@ -18,20 +18,20 @@ namespace ProcessLib
namespace GroundwaterFlow
{
GroundwaterFlowProcess::GroundwaterFlowProcess(
- std::vector<std::unique_ptr<ParameterBase>> const& parameters,
MeshLib::Mesh& mesh,
Base::NonlinearSolver& nonlinear_solver,
std::unique_ptr<Base::TimeDiscretization>&& time_discretization,
std::unique_ptr<NumLib::ConvergenceCriterion>&& convergence_criterion,
+ std::vector<std::unique_ptr<ParameterBase>> const& parameters,
std::vector<std::reference_wrapper<ProcessVariable>>&& process_variables,
GroundwaterFlowProcessData&& process_data,
SecondaryVariableCollection&& secondary_variables,
ProcessOutput&& process_output,
NumLib::NamedFunctionCaller&& named_function_caller)
- : Process(parameters, mesh, nonlinear_solver, std::move(time_discretization),
- std::move(convergence_criterion), std::move(process_variables),
- std::move(secondary_variables), std::move(process_output),
- std::move(named_function_caller)),
+ : Process(mesh, nonlinear_solver, std::move(time_discretization),
+ std::move(convergence_criterion), parameters,
+ std::move(process_variables), std::move(secondary_variables),
+ std::move(process_output), std::move(named_function_caller)),
_process_data(std::move(process_data))
{
if (dynamic_cast<NumLib::ForwardEuler*>(
diff --git a/ProcessLib/GroundwaterFlow/GroundwaterFlowProcess.h b/ProcessLib/GroundwaterFlow/GroundwaterFlowProcess.h
index b0e2365c3c8..8f043ea6dcd 100644
--- a/ProcessLib/GroundwaterFlow/GroundwaterFlowProcess.h
+++ b/ProcessLib/GroundwaterFlow/GroundwaterFlowProcess.h
@@ -26,11 +26,11 @@ class GroundwaterFlowProcess final : public Process
public:
GroundwaterFlowProcess(
- std::vector<std::unique_ptr<ParameterBase>> const& parameters,
MeshLib::Mesh& mesh,
Base::NonlinearSolver& nonlinear_solver,
std::unique_ptr<Base::TimeDiscretization>&& time_discretization,
std::unique_ptr<NumLib::ConvergenceCriterion>&& convergence_criterion,
+ std::vector<std::unique_ptr<ParameterBase>> const& parameters,
std::vector<std::reference_wrapper<ProcessVariable>>&&
process_variables,
GroundwaterFlowProcessData&& process_data,
diff --git a/ProcessLib/Process.cpp b/ProcessLib/Process.cpp
index 8c42836da92..d41463c125b 100644
--- a/ProcessLib/Process.cpp
+++ b/ProcessLib/Process.cpp
@@ -19,11 +19,11 @@
namespace ProcessLib
{
Process::Process(
- std::vector<std::unique_ptr<ParameterBase>> const& parameters,
MeshLib::Mesh& mesh,
NonlinearSolver& nonlinear_solver,
std::unique_ptr<TimeDiscretization>&& time_discretization,
std::unique_ptr<NumLib::ConvergenceCriterion>&& convergence_criterion,
+ std::vector<std::unique_ptr<ParameterBase>> const& parameters,
std::vector<std::reference_wrapper<ProcessVariable>>&& process_variables,
SecondaryVariableCollection&& secondary_variables,
ProcessOutput&& process_output,
diff --git a/ProcessLib/Process.h b/ProcessLib/Process.h
index 870960a9746..650ffb7d6fb 100644
--- a/ProcessLib/Process.h
+++ b/ProcessLib/Process.h
@@ -39,11 +39,11 @@ public:
using TimeDiscretization = NumLib::TimeDiscretization;
Process(
- std::vector<std::unique_ptr<ParameterBase>> const& parameters,
MeshLib::Mesh& mesh,
NonlinearSolver& nonlinear_solver,
std::unique_ptr<TimeDiscretization>&& time_discretization,
std::unique_ptr<NumLib::ConvergenceCriterion>&& convergence_criterion,
+ std::vector<std::unique_ptr<ParameterBase>> const& parameters,
std::vector<std::reference_wrapper<ProcessVariable>>&&
process_variables,
SecondaryVariableCollection&& secondary_variables,
diff --git a/ProcessLib/TES/CreateTESProcess.cpp b/ProcessLib/TES/CreateTESProcess.cpp
index 41748152207..2c5393eb0d6 100644
--- a/ProcessLib/TES/CreateTESProcess.cpp
+++ b/ProcessLib/TES/CreateTESProcess.cpp
@@ -46,10 +46,10 @@ std::unique_ptr<Process> createTESProcess(
ProcessOutput process_output{config.getConfigSubtree("output")};
return std::unique_ptr<Process>{new TESProcess{
- parameters, mesh, nonlinear_solver, std::move(time_discretization),
- std::move(convergence_criterion), std::move(process_variables),
- std::move(secondary_variables), std::move(process_output),
- std::move(named_function_caller), config}};
+ mesh, nonlinear_solver, std::move(time_discretization),
+ std::move(convergence_criterion), parameters,
+ std::move(process_variables), std::move(secondary_variables),
+ std::move(process_output), std::move(named_function_caller), config}};
}
} // namespace TES
diff --git a/ProcessLib/TES/TESProcess.cpp b/ProcessLib/TES/TESProcess.cpp
index 73affd4a525..c53b16cebdf 100644
--- a/ProcessLib/TES/TESProcess.cpp
+++ b/ProcessLib/TES/TESProcess.cpp
@@ -54,20 +54,20 @@ namespace ProcessLib
namespace TES
{
TESProcess::TESProcess(
- std::vector<std::unique_ptr<ParameterBase>> const& parameters,
MeshLib::Mesh& mesh,
Process::NonlinearSolver& nonlinear_solver,
std::unique_ptr<Process::TimeDiscretization>&& time_discretization,
std::unique_ptr<NumLib::ConvergenceCriterion>&& convergence_criterion,
+ std::vector<std::unique_ptr<ParameterBase>> const& parameters,
std::vector<std::reference_wrapper<ProcessVariable>>&& process_variables,
SecondaryVariableCollection&& secondary_variables,
ProcessOutput&& process_output,
NumLib::NamedFunctionCaller&& named_function_caller,
const BaseLib::ConfigTree& config)
- : Process(parameters, mesh, nonlinear_solver, std::move(time_discretization),
- std::move(convergence_criterion), std::move(process_variables),
- std::move(secondary_variables), std::move(process_output),
- std::move(named_function_caller))
+ : Process(mesh, nonlinear_solver, std::move(time_discretization),
+ std::move(convergence_criterion), parameters,
+ std::move(process_variables), std::move(secondary_variables),
+ std::move(process_output), std::move(named_function_caller))
{
DBUG("Create TESProcess.");
diff --git a/ProcessLib/TES/TESProcess.h b/ProcessLib/TES/TESProcess.h
index 1546937f0b3..84dbb50132e 100644
--- a/ProcessLib/TES/TESProcess.h
+++ b/ProcessLib/TES/TESProcess.h
@@ -32,11 +32,11 @@ class TESProcess final : public Process
{
public:
TESProcess(
- std::vector<std::unique_ptr<ParameterBase>> const& parameters,
MeshLib::Mesh& mesh,
Process::NonlinearSolver& nonlinear_solver,
std::unique_ptr<Process::TimeDiscretization>&& time_discretization,
std::unique_ptr<NumLib::ConvergenceCriterion>&& convergence_criterion,
+ std::vector<std::unique_ptr<ParameterBase>> const& parameters,
std::vector<std::reference_wrapper<ProcessVariable>>&&
process_variables,
SecondaryVariableCollection&& secondary_variables,
--
GitLab