From ce79f156f2c8c7bbf25d53c0c182e2af0ba9d5aa Mon Sep 17 00:00:00 2001
From: Wenqing Wang <wenqing.wang@ufz.de>
Date: Fri, 10 Nov 2017 15:43:17 +0100
Subject: [PATCH] [PCS] Changed the type of the process class member of process
variables
---
.../ComponentTransportProcess.cpp | 3 ++-
.../ComponentTransportProcess.h | 2 +-
.../GroundwaterFlowProcess.cpp | 3 ++-
.../GroundwaterFlow/GroundwaterFlowProcess.h | 2 +-
ProcessLib/HT/HTProcess.cpp | 3 ++-
ProcessLib/HT/HTProcess.h | 21 ++++++++++---------
.../HeatConduction/HeatConductionProcess.cpp | 3 ++-
.../HeatConduction/HeatConductionProcess.h | 2 +-
.../HydroMechanicsProcess-impl.h | 3 ++-
.../HydroMechanics/HydroMechanicsProcess.h | 2 +-
.../HydroMechanics/HydroMechanicsProcess.cpp | 2 +-
.../HydroMechanics/HydroMechanicsProcess.h | 2 +-
.../SmallDeformationProcess.cpp | 12 +++++++----
.../SmallDeformationProcess.h | 2 +-
ProcessLib/LiquidFlow/LiquidFlowProcess.cpp | 3 ++-
ProcessLib/LiquidFlow/LiquidFlowProcess.h | 2 +-
.../PhaseField/PhaseFieldProcess-impl.h | 3 ++-
ProcessLib/PhaseField/PhaseFieldProcess.h | 2 +-
.../RichardsComponentTransportProcess.cpp | 3 ++-
.../RichardsComponentTransportProcess.h | 2 +-
.../RichardsFlow/RichardsFlowProcess.cpp | 3 ++-
ProcessLib/RichardsFlow/RichardsFlowProcess.h | 2 +-
.../SmallDeformationProcess-impl.h | 3 ++-
.../SmallDeformationProcess.h | 2 +-
ProcessLib/TES/TESProcess.cpp | 3 ++-
ProcessLib/TES/TESProcess.h | 2 +-
.../ThermalTwoPhaseFlowWithPPProcess.cpp | 3 ++-
.../ThermalTwoPhaseFlowWithPPProcess.h | 2 +-
.../ThermoMechanicsProcess-impl.h | 3 ++-
.../ThermoMechanics/ThermoMechanicsProcess.h | 2 +-
.../TwoPhaseFlowWithPPProcess.cpp | 3 ++-
.../TwoPhaseFlowWithPPProcess.h | 2 +-
.../TwoPhaseFlowWithPrhoProcess.cpp | 3 ++-
.../TwoPhaseFlowWithPrhoProcess.h | 2 +-
34 files changed, 66 insertions(+), 46 deletions(-)
diff --git a/ProcessLib/ComponentTransport/ComponentTransportProcess.cpp b/ProcessLib/ComponentTransport/ComponentTransportProcess.cpp
index 68bd1a4a59d..342f6e3409d 100644
--- a/ProcessLib/ComponentTransport/ComponentTransportProcess.cpp
+++ b/ProcessLib/ComponentTransport/ComponentTransportProcess.cpp
@@ -22,7 +22,8 @@ ComponentTransportProcess::ComponentTransportProcess(
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,
+ std::vector<std::vector<std::reference_wrapper<ProcessVariable>>>&&
+ process_variables,
ComponentTransportProcessData&& process_data,
SecondaryVariableCollection&& secondary_variables,
NumLib::NamedFunctionCaller&& named_function_caller)
diff --git a/ProcessLib/ComponentTransport/ComponentTransportProcess.h b/ProcessLib/ComponentTransport/ComponentTransportProcess.h
index 20f7dc87c0b..95cf302a4a5 100644
--- a/ProcessLib/ComponentTransport/ComponentTransportProcess.h
+++ b/ProcessLib/ComponentTransport/ComponentTransportProcess.h
@@ -83,7 +83,7 @@ public:
jacobian_assembler,
std::vector<std::unique_ptr<ParameterBase>> const& parameters,
unsigned const integration_order,
- std::vector<std::reference_wrapper<ProcessVariable>>&&
+ std::vector<std::vector<std::reference_wrapper<ProcessVariable>>>&&
process_variables,
ComponentTransportProcessData&& process_data,
SecondaryVariableCollection&& secondary_variables,
diff --git a/ProcessLib/GroundwaterFlow/GroundwaterFlowProcess.cpp b/ProcessLib/GroundwaterFlow/GroundwaterFlowProcess.cpp
index 68d90027557..90c27d71016 100644
--- a/ProcessLib/GroundwaterFlow/GroundwaterFlowProcess.cpp
+++ b/ProcessLib/GroundwaterFlow/GroundwaterFlowProcess.cpp
@@ -22,7 +22,8 @@ GroundwaterFlowProcess::GroundwaterFlowProcess(
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,
+ std::vector<std::vector<std::reference_wrapper<ProcessVariable>>>&&
+ process_variables,
GroundwaterFlowProcessData&& process_data,
SecondaryVariableCollection&& secondary_variables,
NumLib::NamedFunctionCaller&& named_function_caller,
diff --git a/ProcessLib/GroundwaterFlow/GroundwaterFlowProcess.h b/ProcessLib/GroundwaterFlow/GroundwaterFlowProcess.h
index dad280e9418..b63029f0bf8 100644
--- a/ProcessLib/GroundwaterFlow/GroundwaterFlowProcess.h
+++ b/ProcessLib/GroundwaterFlow/GroundwaterFlowProcess.h
@@ -33,7 +33,7 @@ public:
jacobian_assembler,
std::vector<std::unique_ptr<ParameterBase>> const& parameters,
unsigned const integration_order,
- std::vector<std::reference_wrapper<ProcessVariable>>&&
+ std::vector<std::vector<std::reference_wrapper<ProcessVariable>>>&&
process_variables,
GroundwaterFlowProcessData&& process_data,
SecondaryVariableCollection&& secondary_variables,
diff --git a/ProcessLib/HT/HTProcess.cpp b/ProcessLib/HT/HTProcess.cpp
index 98e305be1df..21ff4a0dfc9 100644
--- a/ProcessLib/HT/HTProcess.cpp
+++ b/ProcessLib/HT/HTProcess.cpp
@@ -27,7 +27,8 @@ HTProcess::HTProcess(
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,
+ std::vector<std::vector<std::reference_wrapper<ProcessVariable>>>&&
+ process_variables,
std::unique_ptr<HTMaterialProperties>&& material_properties,
SecondaryVariableCollection&& secondary_variables,
NumLib::NamedFunctionCaller&& named_function_caller)
diff --git a/ProcessLib/HT/HTProcess.h b/ProcessLib/HT/HTProcess.h
index 0d5672d187a..661782095f4 100644
--- a/ProcessLib/HT/HTProcess.h
+++ b/ProcessLib/HT/HTProcess.h
@@ -43,16 +43,17 @@ struct HTMaterialProperties;
class HTProcess final : public Process
{
public:
- HTProcess(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,
- std::unique_ptr<HTMaterialProperties>&& material_properties,
- SecondaryVariableCollection&& secondary_variables,
- NumLib::NamedFunctionCaller&& named_function_caller);
+ HTProcess(
+ 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::vector<std::reference_wrapper<ProcessVariable>>>&&
+ process_variables,
+ std::unique_ptr<HTMaterialProperties>&& material_properties,
+ SecondaryVariableCollection&& secondary_variables,
+ NumLib::NamedFunctionCaller&& named_function_caller);
//! \name ODESystem interface
//! @{
diff --git a/ProcessLib/HeatConduction/HeatConductionProcess.cpp b/ProcessLib/HeatConduction/HeatConductionProcess.cpp
index 4644395a05f..cf2e4bc68b2 100644
--- a/ProcessLib/HeatConduction/HeatConductionProcess.cpp
+++ b/ProcessLib/HeatConduction/HeatConductionProcess.cpp
@@ -22,7 +22,8 @@ HeatConductionProcess::HeatConductionProcess(
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,
+ std::vector<std::vector<std::reference_wrapper<ProcessVariable>>>&&
+ process_variables,
HeatConductionProcessData&& process_data,
SecondaryVariableCollection&& secondary_variables,
NumLib::NamedFunctionCaller&& named_function_caller)
diff --git a/ProcessLib/HeatConduction/HeatConductionProcess.h b/ProcessLib/HeatConduction/HeatConductionProcess.h
index e81e93a9ab5..4d8d2b33125 100644
--- a/ProcessLib/HeatConduction/HeatConductionProcess.h
+++ b/ProcessLib/HeatConduction/HeatConductionProcess.h
@@ -27,7 +27,7 @@ public:
jacobian_assembler,
std::vector<std::unique_ptr<ParameterBase>> const& parameters,
unsigned const integration_order,
- std::vector<std::reference_wrapper<ProcessVariable>>&&
+ std::vector<std::vector<std::reference_wrapper<ProcessVariable>>>&&
process_variables,
HeatConductionProcessData&& process_data,
SecondaryVariableCollection&& secondary_variables,
diff --git a/ProcessLib/HydroMechanics/HydroMechanicsProcess-impl.h b/ProcessLib/HydroMechanics/HydroMechanicsProcess-impl.h
index 8f6ebb41846..1532deaa1f2 100644
--- a/ProcessLib/HydroMechanics/HydroMechanicsProcess-impl.h
+++ b/ProcessLib/HydroMechanics/HydroMechanicsProcess-impl.h
@@ -28,7 +28,8 @@ HydroMechanicsProcess<DisplacementDim>::HydroMechanicsProcess(
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,
+ std::vector<std::vector<std::reference_wrapper<ProcessVariable>>>&&
+ process_variables,
HydroMechanicsProcessData<DisplacementDim>&& process_data,
SecondaryVariableCollection&& secondary_variables,
NumLib::NamedFunctionCaller&& named_function_caller)
diff --git a/ProcessLib/HydroMechanics/HydroMechanicsProcess.h b/ProcessLib/HydroMechanics/HydroMechanicsProcess.h
index 3197f0524e9..3fe00f95669 100644
--- a/ProcessLib/HydroMechanics/HydroMechanicsProcess.h
+++ b/ProcessLib/HydroMechanics/HydroMechanicsProcess.h
@@ -35,7 +35,7 @@ public:
jacobian_assembler,
std::vector<std::unique_ptr<ParameterBase>> const& parameters,
unsigned const integration_order,
- std::vector<std::reference_wrapper<ProcessVariable>>&&
+ std::vector<std::vector<std::reference_wrapper<ProcessVariable>>>&&
process_variables,
HydroMechanicsProcessData<DisplacementDim>&& process_data,
SecondaryVariableCollection&& secondary_variables,
diff --git a/ProcessLib/LIE/HydroMechanics/HydroMechanicsProcess.cpp b/ProcessLib/LIE/HydroMechanics/HydroMechanicsProcess.cpp
index 10cf6ac5b97..e882f593418 100644
--- a/ProcessLib/LIE/HydroMechanics/HydroMechanicsProcess.cpp
+++ b/ProcessLib/LIE/HydroMechanics/HydroMechanicsProcess.cpp
@@ -38,7 +38,7 @@ HydroMechanicsProcess<GlobalDim>::HydroMechanicsProcess(
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,
+ std::vector<std::vector<std::reference_wrapper<ProcessVariable>>>&& process_variables,
HydroMechanicsProcessData<GlobalDim>&& process_data,
SecondaryVariableCollection&& secondary_variables,
NumLib::NamedFunctionCaller&& named_function_caller)
diff --git a/ProcessLib/LIE/HydroMechanics/HydroMechanicsProcess.h b/ProcessLib/LIE/HydroMechanics/HydroMechanicsProcess.h
index 8296526de0d..6497ea7cf04 100644
--- a/ProcessLib/LIE/HydroMechanics/HydroMechanicsProcess.h
+++ b/ProcessLib/LIE/HydroMechanics/HydroMechanicsProcess.h
@@ -38,7 +38,7 @@ public:
jacobian_assembler,
std::vector<std::unique_ptr<ParameterBase>> const& parameters,
unsigned const integration_order,
- std::vector<std::reference_wrapper<ProcessVariable>>&&
+ std::vector<std::vector<std::reference_wrapper<ProcessVariable>>>&&
process_variables,
HydroMechanicsProcessData<GlobalDim>&& process_data,
SecondaryVariableCollection&& secondary_variables,
diff --git a/ProcessLib/LIE/SmallDeformation/SmallDeformationProcess.cpp b/ProcessLib/LIE/SmallDeformation/SmallDeformationProcess.cpp
index 4a2c7b8cbb2..b84c82b5fba 100644
--- a/ProcessLib/LIE/SmallDeformation/SmallDeformationProcess.cpp
+++ b/ProcessLib/LIE/SmallDeformation/SmallDeformationProcess.cpp
@@ -31,16 +31,20 @@ namespace SmallDeformation
template <int DisplacementDim>
SmallDeformationProcess<DisplacementDim>::SmallDeformationProcess(
MeshLib::Mesh& mesh,
- std::unique_ptr<ProcessLib::AbstractJacobianAssembler>&& jacobian_assembler,
+ 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,
+ std::vector<std::vector<std::reference_wrapper<ProcessVariable>>>&&
+ process_variables,
SmallDeformationProcessData<DisplacementDim>&& process_data,
SecondaryVariableCollection&& secondary_variables,
NumLib::NamedFunctionCaller&& named_function_caller)
: Process(mesh, std::move(jacobian_assembler), parameters,
- integration_order, 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))
{
getFractureMatrixDataInMesh(mesh,
diff --git a/ProcessLib/LIE/SmallDeformation/SmallDeformationProcess.h b/ProcessLib/LIE/SmallDeformation/SmallDeformationProcess.h
index f8b7f076eae..55c2f0ee97b 100644
--- a/ProcessLib/LIE/SmallDeformation/SmallDeformationProcess.h
+++ b/ProcessLib/LIE/SmallDeformation/SmallDeformationProcess.h
@@ -36,7 +36,7 @@ public:
jacobian_assembler,
std::vector<std::unique_ptr<ParameterBase>> const& parameters,
unsigned const integration_order,
- std::vector<std::reference_wrapper<ProcessVariable>>&&
+ std::vector<std::vector<std::reference_wrapper<ProcessVariable>>>&&
process_variables,
SmallDeformationProcessData<DisplacementDim>&& process_data,
SecondaryVariableCollection&& secondary_variables,
diff --git a/ProcessLib/LiquidFlow/LiquidFlowProcess.cpp b/ProcessLib/LiquidFlow/LiquidFlowProcess.cpp
index b2259f5a2d0..f55c2db7b92 100644
--- a/ProcessLib/LiquidFlow/LiquidFlowProcess.cpp
+++ b/ProcessLib/LiquidFlow/LiquidFlowProcess.cpp
@@ -35,7 +35,8 @@ LiquidFlowProcess::LiquidFlowProcess(
std::unique_ptr<AbstractJacobianAssembler>&& jacobian_assembler,
std::vector<std::unique_ptr<ParameterBase>> const& parameters,
unsigned const integration_order,
- std::vector<std::reference_wrapper<ProcessVariable>>&& process_variables,
+ std::vector<std::vector<std::reference_wrapper<ProcessVariable>>>&&
+ process_variables,
SecondaryVariableCollection&& secondary_variables,
NumLib::NamedFunctionCaller&& named_function_caller,
MeshLib::PropertyVector<int> const& material_ids,
diff --git a/ProcessLib/LiquidFlow/LiquidFlowProcess.h b/ProcessLib/LiquidFlow/LiquidFlowProcess.h
index a925468d379..4d4879254fe 100644
--- a/ProcessLib/LiquidFlow/LiquidFlowProcess.h
+++ b/ProcessLib/LiquidFlow/LiquidFlowProcess.h
@@ -62,7 +62,7 @@ public:
std::unique_ptr<AbstractJacobianAssembler>&& jacobian_assembler,
std::vector<std::unique_ptr<ParameterBase>> const& parameters,
unsigned const integration_order,
- std::vector<std::reference_wrapper<ProcessVariable>>&&
+ std::vector<std::vector<std::reference_wrapper<ProcessVariable>>>&&
process_variables,
SecondaryVariableCollection&& secondary_variables,
NumLib::NamedFunctionCaller&& named_function_caller,
diff --git a/ProcessLib/PhaseField/PhaseFieldProcess-impl.h b/ProcessLib/PhaseField/PhaseFieldProcess-impl.h
index bdf2d897645..313a081466b 100644
--- a/ProcessLib/PhaseField/PhaseFieldProcess-impl.h
+++ b/ProcessLib/PhaseField/PhaseFieldProcess-impl.h
@@ -26,7 +26,8 @@ PhaseFieldProcess<DisplacementDim>::PhaseFieldProcess(
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,
+ std::vector<std::vector<std::reference_wrapper<ProcessVariable>>>&&
+ process_variables,
PhaseFieldProcessData<DisplacementDim>&& process_data,
SecondaryVariableCollection&& secondary_variables,
NumLib::NamedFunctionCaller&& named_function_caller)
diff --git a/ProcessLib/PhaseField/PhaseFieldProcess.h b/ProcessLib/PhaseField/PhaseFieldProcess.h
index 3db6e74e9de..9e4e9406d5a 100644
--- a/ProcessLib/PhaseField/PhaseFieldProcess.h
+++ b/ProcessLib/PhaseField/PhaseFieldProcess.h
@@ -57,7 +57,7 @@ public:
jacobian_assembler,
std::vector<std::unique_ptr<ParameterBase>> const& parameters,
unsigned const integration_order,
- std::vector<std::reference_wrapper<ProcessVariable>>&&
+ std::vector<std::vector<std::reference_wrapper<ProcessVariable>>>&&
process_variables,
PhaseFieldProcessData<DisplacementDim>&& process_data,
SecondaryVariableCollection&& secondary_variables,
diff --git a/ProcessLib/RichardsComponentTransport/RichardsComponentTransportProcess.cpp b/ProcessLib/RichardsComponentTransport/RichardsComponentTransportProcess.cpp
index 00f5dcd9e53..fe2b08124d9 100644
--- a/ProcessLib/RichardsComponentTransport/RichardsComponentTransportProcess.cpp
+++ b/ProcessLib/RichardsComponentTransport/RichardsComponentTransportProcess.cpp
@@ -22,7 +22,8 @@ RichardsComponentTransportProcess::RichardsComponentTransportProcess(
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,
+ std::vector<std::vector<std::reference_wrapper<ProcessVariable>>>&&
+ process_variables,
RichardsComponentTransportProcessData&& process_data,
SecondaryVariableCollection&& secondary_variables,
NumLib::NamedFunctionCaller&& named_function_caller)
diff --git a/ProcessLib/RichardsComponentTransport/RichardsComponentTransportProcess.h b/ProcessLib/RichardsComponentTransport/RichardsComponentTransportProcess.h
index 9e81aac5a3b..02f2b662844 100644
--- a/ProcessLib/RichardsComponentTransport/RichardsComponentTransportProcess.h
+++ b/ProcessLib/RichardsComponentTransport/RichardsComponentTransportProcess.h
@@ -107,7 +107,7 @@ public:
jacobian_assembler,
std::vector<std::unique_ptr<ParameterBase>> const& parameters,
unsigned const integration_order,
- std::vector<std::reference_wrapper<ProcessVariable>>&&
+ std::vector<std::vector<std::reference_wrapper<ProcessVariable>>>&&
process_variables,
RichardsComponentTransportProcessData&& process_data,
SecondaryVariableCollection&& secondary_variables,
diff --git a/ProcessLib/RichardsFlow/RichardsFlowProcess.cpp b/ProcessLib/RichardsFlow/RichardsFlowProcess.cpp
index 40740755ae2..f1384625f61 100644
--- a/ProcessLib/RichardsFlow/RichardsFlowProcess.cpp
+++ b/ProcessLib/RichardsFlow/RichardsFlowProcess.cpp
@@ -22,7 +22,8 @@ RichardsFlowProcess::RichardsFlowProcess(
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,
+ std::vector<std::vector<std::reference_wrapper<ProcessVariable>>>&&
+ process_variables,
RichardsFlowProcessData&& process_data,
SecondaryVariableCollection&& secondary_variables,
NumLib::NamedFunctionCaller&& named_function_caller,
diff --git a/ProcessLib/RichardsFlow/RichardsFlowProcess.h b/ProcessLib/RichardsFlow/RichardsFlowProcess.h
index 9f59e799854..d8eda9d9523 100644
--- a/ProcessLib/RichardsFlow/RichardsFlowProcess.h
+++ b/ProcessLib/RichardsFlow/RichardsFlowProcess.h
@@ -30,7 +30,7 @@ public:
jacobian_assembler,
std::vector<std::unique_ptr<ParameterBase>> const& parameters,
unsigned const integration_order,
- std::vector<std::reference_wrapper<ProcessVariable>>&&
+ std::vector<std::vector<std::reference_wrapper<ProcessVariable>>>&&
process_variables,
RichardsFlowProcessData&& process_data,
SecondaryVariableCollection&& secondary_variables,
diff --git a/ProcessLib/SmallDeformation/SmallDeformationProcess-impl.h b/ProcessLib/SmallDeformation/SmallDeformationProcess-impl.h
index a268bd9d3f6..399670070d9 100644
--- a/ProcessLib/SmallDeformation/SmallDeformationProcess-impl.h
+++ b/ProcessLib/SmallDeformation/SmallDeformationProcess-impl.h
@@ -27,7 +27,8 @@ SmallDeformationProcess<DisplacementDim>::SmallDeformationProcess(
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,
+ std::vector<std::vector<std::reference_wrapper<ProcessVariable>>>&&
+ process_variables,
SmallDeformationProcessData<DisplacementDim>&& process_data,
SecondaryVariableCollection&& secondary_variables,
NumLib::NamedFunctionCaller&& named_function_caller)
diff --git a/ProcessLib/SmallDeformation/SmallDeformationProcess.h b/ProcessLib/SmallDeformation/SmallDeformationProcess.h
index 5c95ceb390b..ebf72da22c6 100644
--- a/ProcessLib/SmallDeformation/SmallDeformationProcess.h
+++ b/ProcessLib/SmallDeformation/SmallDeformationProcess.h
@@ -29,7 +29,7 @@ public:
jacobian_assembler,
std::vector<std::unique_ptr<ParameterBase>> const& parameters,
unsigned const integration_order,
- std::vector<std::reference_wrapper<ProcessVariable>>&&
+ std::vector<std::vector<std::reference_wrapper<ProcessVariable>>>&&
process_variables,
SmallDeformationProcessData<DisplacementDim>&& process_data,
SecondaryVariableCollection&& secondary_variables,
diff --git a/ProcessLib/TES/TESProcess.cpp b/ProcessLib/TES/TESProcess.cpp
index 40d96dd594d..790d7849873 100644
--- a/ProcessLib/TES/TESProcess.cpp
+++ b/ProcessLib/TES/TESProcess.cpp
@@ -21,7 +21,8 @@ TESProcess::TESProcess(
std::unique_ptr<AbstractJacobianAssembler>&& jacobian_assembler,
std::vector<std::unique_ptr<ParameterBase>> const& parameters,
unsigned const integration_order,
- std::vector<std::reference_wrapper<ProcessVariable>>&& process_variables,
+ std::vector<std::vector<std::reference_wrapper<ProcessVariable>>>&&
+ process_variables,
SecondaryVariableCollection&& secondary_variables,
NumLib::NamedFunctionCaller&& named_function_caller,
const BaseLib::ConfigTree& config)
diff --git a/ProcessLib/TES/TESProcess.h b/ProcessLib/TES/TESProcess.h
index fb2a8062f5b..309fc1615b9 100644
--- a/ProcessLib/TES/TESProcess.h
+++ b/ProcessLib/TES/TESProcess.h
@@ -34,7 +34,7 @@ public:
std::unique_ptr<AbstractJacobianAssembler>&& jacobian_assembler,
std::vector<std::unique_ptr<ParameterBase>> const& parameters,
unsigned const integration_order,
- std::vector<std::reference_wrapper<ProcessVariable>>&&
+ std::vector<std::vector<std::reference_wrapper<ProcessVariable>>>&&
process_variables,
SecondaryVariableCollection&& secondary_variables,
NumLib::NamedFunctionCaller&& named_function_caller,
diff --git a/ProcessLib/ThermalTwoPhaseFlowWithPP/ThermalTwoPhaseFlowWithPPProcess.cpp b/ProcessLib/ThermalTwoPhaseFlowWithPP/ThermalTwoPhaseFlowWithPPProcess.cpp
index 4acf0cdca1d..fde51a5ae41 100644
--- a/ProcessLib/ThermalTwoPhaseFlowWithPP/ThermalTwoPhaseFlowWithPPProcess.cpp
+++ b/ProcessLib/ThermalTwoPhaseFlowWithPP/ThermalTwoPhaseFlowWithPPProcess.cpp
@@ -29,7 +29,8 @@ ThermalTwoPhaseFlowWithPPProcess::ThermalTwoPhaseFlowWithPPProcess(
std::unique_ptr<AbstractJacobianAssembler>&& jacobian_assembler,
std::vector<std::unique_ptr<ParameterBase>> const& parameters,
unsigned const integration_order,
- std::vector<std::reference_wrapper<ProcessVariable>>&& process_variables,
+ std::vector<std::vector<std::reference_wrapper<ProcessVariable>>>&&
+ process_variables,
ThermalTwoPhaseFlowWithPPProcessData&& process_data,
SecondaryVariableCollection&& secondary_variables,
NumLib::NamedFunctionCaller&& named_function_caller,
diff --git a/ProcessLib/ThermalTwoPhaseFlowWithPP/ThermalTwoPhaseFlowWithPPProcess.h b/ProcessLib/ThermalTwoPhaseFlowWithPP/ThermalTwoPhaseFlowWithPPProcess.h
index 4ede515c524..e58c243c6b7 100644
--- a/ProcessLib/ThermalTwoPhaseFlowWithPP/ThermalTwoPhaseFlowWithPPProcess.h
+++ b/ProcessLib/ThermalTwoPhaseFlowWithPP/ThermalTwoPhaseFlowWithPPProcess.h
@@ -42,7 +42,7 @@ public:
std::unique_ptr<AbstractJacobianAssembler>&& jacobian_assembler,
std::vector<std::unique_ptr<ParameterBase>> const& parameters,
unsigned const integration_order,
- std::vector<std::reference_wrapper<ProcessVariable>>&&
+ std::vector<std::vector<std::reference_wrapper<ProcessVariable>>>&&
process_variables,
ThermalTwoPhaseFlowWithPPProcessData&& process_data,
SecondaryVariableCollection&& secondary_variables,
diff --git a/ProcessLib/ThermoMechanics/ThermoMechanicsProcess-impl.h b/ProcessLib/ThermoMechanics/ThermoMechanicsProcess-impl.h
index 65ccd511029..e5e847e14a9 100644
--- a/ProcessLib/ThermoMechanics/ThermoMechanicsProcess-impl.h
+++ b/ProcessLib/ThermoMechanics/ThermoMechanicsProcess-impl.h
@@ -28,7 +28,8 @@ ThermoMechanicsProcess<DisplacementDim>::ThermoMechanicsProcess(
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,
+ std::vector<std::vector<std::reference_wrapper<ProcessVariable>>>&&
+ process_variables,
ThermoMechanicsProcessData<DisplacementDim>&& process_data,
SecondaryVariableCollection&& secondary_variables,
NumLib::NamedFunctionCaller&& named_function_caller)
diff --git a/ProcessLib/ThermoMechanics/ThermoMechanicsProcess.h b/ProcessLib/ThermoMechanics/ThermoMechanicsProcess.h
index e5a76051375..09822f2f9f9 100644
--- a/ProcessLib/ThermoMechanics/ThermoMechanicsProcess.h
+++ b/ProcessLib/ThermoMechanics/ThermoMechanicsProcess.h
@@ -32,7 +32,7 @@ public:
jacobian_assembler,
std::vector<std::unique_ptr<ParameterBase>> const& parameters,
unsigned const integration_order,
- std::vector<std::reference_wrapper<ProcessVariable>>&&
+ std::vector<std::vector<std::reference_wrapper<ProcessVariable>>>&&
process_variables,
ThermoMechanicsProcessData<DisplacementDim>&& process_data,
SecondaryVariableCollection&& secondary_variables,
diff --git a/ProcessLib/TwoPhaseFlowWithPP/TwoPhaseFlowWithPPProcess.cpp b/ProcessLib/TwoPhaseFlowWithPP/TwoPhaseFlowWithPPProcess.cpp
index ef7cfdfcb05..74cb7936d25 100644
--- a/ProcessLib/TwoPhaseFlowWithPP/TwoPhaseFlowWithPPProcess.cpp
+++ b/ProcessLib/TwoPhaseFlowWithPP/TwoPhaseFlowWithPPProcess.cpp
@@ -28,7 +28,8 @@ TwoPhaseFlowWithPPProcess::TwoPhaseFlowWithPPProcess(
std::unique_ptr<AbstractJacobianAssembler>&& jacobian_assembler,
std::vector<std::unique_ptr<ParameterBase>> const& parameters,
unsigned const integration_order,
- std::vector<std::reference_wrapper<ProcessVariable>>&& process_variables,
+ std::vector<std::vector<std::reference_wrapper<ProcessVariable>>>&&
+ process_variables,
TwoPhaseFlowWithPPProcessData&& process_data,
SecondaryVariableCollection&& secondary_variables,
NumLib::NamedFunctionCaller&& named_function_caller,
diff --git a/ProcessLib/TwoPhaseFlowWithPP/TwoPhaseFlowWithPPProcess.h b/ProcessLib/TwoPhaseFlowWithPP/TwoPhaseFlowWithPPProcess.h
index 3d9c99895e1..b585ecfa3d6 100644
--- a/ProcessLib/TwoPhaseFlowWithPP/TwoPhaseFlowWithPPProcess.h
+++ b/ProcessLib/TwoPhaseFlowWithPP/TwoPhaseFlowWithPPProcess.h
@@ -40,7 +40,7 @@ public:
std::unique_ptr<AbstractJacobianAssembler>&& jacobian_assembler,
std::vector<std::unique_ptr<ParameterBase>> const& parameters,
unsigned const integration_order,
- std::vector<std::reference_wrapper<ProcessVariable>>&&
+ std::vector<std::vector<std::reference_wrapper<ProcessVariable>>>&&
process_variables,
TwoPhaseFlowWithPPProcessData&& process_data,
SecondaryVariableCollection&& secondary_variables,
diff --git a/ProcessLib/TwoPhaseFlowWithPrho/TwoPhaseFlowWithPrhoProcess.cpp b/ProcessLib/TwoPhaseFlowWithPrho/TwoPhaseFlowWithPrhoProcess.cpp
index e0d800de4a3..bcc612704cc 100644
--- a/ProcessLib/TwoPhaseFlowWithPrho/TwoPhaseFlowWithPrhoProcess.cpp
+++ b/ProcessLib/TwoPhaseFlowWithPrho/TwoPhaseFlowWithPrhoProcess.cpp
@@ -28,7 +28,8 @@ TwoPhaseFlowWithPrhoProcess::TwoPhaseFlowWithPrhoProcess(
std::unique_ptr<AbstractJacobianAssembler>&& jacobian_assembler,
std::vector<std::unique_ptr<ParameterBase>> const& parameters,
unsigned const integration_order,
- std::vector<std::reference_wrapper<ProcessVariable>>&& process_variables,
+ std::vector<std::vector<std::reference_wrapper<ProcessVariable>>>&&
+ process_variables,
TwoPhaseFlowWithPrhoProcessData&& process_data,
SecondaryVariableCollection&& secondary_variables,
NumLib::NamedFunctionCaller&& named_function_caller,
diff --git a/ProcessLib/TwoPhaseFlowWithPrho/TwoPhaseFlowWithPrhoProcess.h b/ProcessLib/TwoPhaseFlowWithPrho/TwoPhaseFlowWithPrhoProcess.h
index 6bc0376633d..db524379a5b 100644
--- a/ProcessLib/TwoPhaseFlowWithPrho/TwoPhaseFlowWithPrhoProcess.h
+++ b/ProcessLib/TwoPhaseFlowWithPrho/TwoPhaseFlowWithPrhoProcess.h
@@ -38,7 +38,7 @@ public:
std::unique_ptr<AbstractJacobianAssembler>&& jacobian_assembler,
std::vector<std::unique_ptr<ParameterBase>> const& parameters,
unsigned const integration_order,
- std::vector<std::reference_wrapper<ProcessVariable>>&&
+ std::vector<std::vector<std::reference_wrapper<ProcessVariable>>>&&
process_variables,
TwoPhaseFlowWithPrhoProcessData&& process_data,
SecondaryVariableCollection&& secondary_variables,
--
GitLab