diff --git a/ProcessLib/ComponentTransport/ComponentTransportProcess.cpp b/ProcessLib/ComponentTransport/ComponentTransportProcess.cpp index 68bd1a4a59d5b7874d81a377eb451bf0a5e6ea2d..342f6e3409dbc89e7a1d7589f6cfe70f6e3d6c5d 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 20f7dc87c0b1b6f74bb2c9c06ff01f9cd36d08a4..95cf302a4a5e0e198bfb441c3b71b8529e04c885 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 68d90027557df7a5fcf1cc383236f7df361cddd4..90c27d71016c381c329297cb0428fdcae09895ca 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 dad280e941880b27694d9debec5e15c105632440..b63029f0bf87dbf63c6429e0c1d0fe536a3ac82d 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 98e305be1df611797368ba8e2e78adc0d379955e..21ff4a0dfc9c8cf0f2498418ff38ada0e14bf3b3 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 0d5672d187a6c46d294e4fde9f2524b4ffd86292..661782095f46368638658913610ca76410803dca 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 4644395a05f9e9092b31c9815db9da91bd5ba4cc..cf2e4bc68b2db86afef0049eac0f28e861b053c2 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 e81e93a9ab5946f453548b50bc1aab994a9e1212..4d8d2b331250c0614610ee5af703bbf9d5b89ec7 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 8f6ebb41846ef000230db7cde3a0198ed787ecb8..1532deaa1f235c186f09459e40676577c50020cd 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 3197f0524e9a8307102ac7b5304bff70e23428a9..3fe00f956693cc58d8865b0c01d8c6361ed4c0a7 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 10cf6ac5b974aa6b68da0b62656a8e21a94de4bb..e882f5934187de91a1707591748e4abc02761dd6 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 8296526de0de829f4654494986b6f6736d527b08..6497ea7cf04b0e86fda08bcb372d4b47825d02fb 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 4a2c7b8cbb2a32f844cffb896820cac2b590e851..b84c82b5fba2c26726dd718a27ba00072b0a39ad 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 f8b7f076eae1a3b5e106ad4c5f81640704744add..55c2f0ee97bda6a1f0629db00835d680c2f881ca 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 b2259f5a2d0dc069d2a93d998456e180d6eb1e22..f55c2db7b92ee15bc661d3b1f40689f9db692360 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 a925468d379cf22c7f0b3af421b5c59cd3ab0a25..4d4879254fecd37df5adef922754ce74c61c0c66 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 bdf2d897645d34c4e0d3a9f34dec27116055ab64..313a081466b7a9d00dd389999720088a2041d00f 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 3db6e74e9de300625080d94aa8e920ea93fdcbc4..9e4e9406d5aaf817270afda86ce15169e275d698 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 00f5dcd9e537722832a40c0b6d2a96de8bf5390e..fe2b08124d9b2236baeb265b98cadbbe9d123125 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 9e81aac5a3bbd297314d6e95e0fd3a22521cb878..02f2b6628449e60561a5228a13c9045efde9261b 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 40740755ae204fc050115efb4b9d6695b0000cc8..f1384625f61c59cd2d2cc3541cf7717da232543c 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 9f59e799854d7c6554c2704a0c578571ee788070..d8eda9d95230f722c5c8eb88afded761775ed766 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 a268bd9d3f6e38ae9e3277fdb86692e5e98b6ed5..399670070d9ad2498f39bda39d1ccbb646db2bfd 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 5c95ceb390b963699d6522cb0bfd60b00cc70443..ebf72da22c61de3d2ee5cb8e6e8aeb4f568f1c86 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 40d96dd594d8a218ac69e0c90483ebfe7f8f6fdd..790d784987306e277fdd49d5df86f41788951e44 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 fb2a8062f5bfb46886f33dfa4137acd3d2611d27..309fc1615b9f1fc583333a8f3d1575cdbad9fbb2 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 4acf0cdca1d03c7c5ac26e7c01c5f86dd0dca445..fde51a5ae41394fac4bacfb92d179f656ae5fbf1 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 4ede515c524b283a1bff1dfbad348d9cdab28b69..e58c243c6b741c9b6cd0b2054f9da7f18580f18b 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 65ccd511029e28062939c8881b1ba3d7a2f245d2..e5e847e14a93972ccc8a7bc07f704d8be970df2e 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 e5a76051375259743b07ce49e8e8c237de02e7e5..09822f2f9f905958d674a7827cc6027bdda36eeb 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 ef7cfdfcb05c83e7de1b821599cd9fa684645056..74cb7936d2508c206836cb9f55d2cbe6cd4a3f85 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 3d9c99895e1f44701df787f6a3ee504d3b0ec5e1..b585ecfa3d66cd1ab6b87c440b566bcee79ab7aa 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 e0d800de4a30da3311b76e3c32ee9283f340e40f..bcc612704cc489a991ebd4c0a1096c64b1633742 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 6bc0376633dcf2ebcbf9bf3247e03d53c1c25959..db524379a5bf3bb79b9b02fe024b782db88b03ad 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,