From 8ad8c83af629bf5b5db7874b12af7ed7d564cb1e Mon Sep 17 00:00:00 2001 From: Dmitri Naumov <dmitri.naumov@ufz.de> Date: Fri, 21 Jun 2019 14:44:38 +0200 Subject: [PATCH] [PL] Pass process' name through create*Process(). --- .../ComponentTransportProcess.cpp | 3 ++- .../ComponentTransport/ComponentTransportProcess.h | 1 + .../CreateComponentTransportProcess.cpp | 11 ++++++----- .../CreateComponentTransportProcess.h | 1 + .../CreateGroundwaterFlowProcess.cpp | 9 +++++---- .../GroundwaterFlow/CreateGroundwaterFlowProcess.h | 1 + .../GroundwaterFlow/GroundwaterFlowProcess.cpp | 3 ++- ProcessLib/GroundwaterFlow/GroundwaterFlowProcess.h | 1 + ProcessLib/HT/CreateHTProcess.cpp | 12 +++++++----- ProcessLib/HT/CreateHTProcess.h | 1 + ProcessLib/HT/HTProcess.cpp | 3 ++- ProcessLib/HT/HTProcess.h | 1 + .../HeatConduction/CreateHeatConductionProcess.cpp | 8 +++++--- .../HeatConduction/CreateHeatConductionProcess.h | 1 + ProcessLib/HeatConduction/HeatConductionProcess.cpp | 3 ++- ProcessLib/HeatConduction/HeatConductionProcess.h | 1 + .../CreateHeatTransportBHEProcess.cpp | 8 +++++--- .../CreateHeatTransportBHEProcess.h | 1 + .../HeatTransportBHE/HeatTransportBHEProcess.cpp | 3 ++- .../HeatTransportBHE/HeatTransportBHEProcess.h | 1 + .../HydroMechanics/CreateHydroMechanicsProcess.cpp | 11 +++++++---- .../HydroMechanics/CreateHydroMechanicsProcess.h | 3 +++ ProcessLib/HydroMechanics/HydroMechanicsProcess.cpp | 3 ++- ProcessLib/HydroMechanics/HydroMechanicsProcess.h | 1 + .../HydroMechanics/CreateHydroMechanicsProcess.cpp | 11 +++++++---- .../HydroMechanics/CreateHydroMechanicsProcess.h | 1 + .../LIE/HydroMechanics/HydroMechanicsProcess.cpp | 3 ++- .../LIE/HydroMechanics/HydroMechanicsProcess.h | 1 + .../CreateSmallDeformationProcess.cpp | 10 +++++++--- .../CreateSmallDeformationProcess.h | 1 + .../SmallDeformation/SmallDeformationProcess.cpp | 3 ++- .../LIE/SmallDeformation/SmallDeformationProcess.h | 1 + ProcessLib/LiquidFlow/CreateLiquidFlowProcess.cpp | 11 ++++++----- ProcessLib/LiquidFlow/CreateLiquidFlowProcess.h | 1 + ProcessLib/LiquidFlow/LiquidFlowProcess.cpp | 3 ++- ProcessLib/LiquidFlow/LiquidFlowProcess.h | 1 + ProcessLib/PhaseField/CreatePhaseFieldProcess.cpp | 11 +++++++---- ProcessLib/PhaseField/CreatePhaseFieldProcess.h | 3 +++ ProcessLib/PhaseField/PhaseFieldProcess.cpp | 3 ++- ProcessLib/PhaseField/PhaseFieldProcess.h | 1 + ProcessLib/Process.h | 3 ++- .../CreateRichardsComponentTransportProcess.cpp | 9 +++++---- .../CreateRichardsComponentTransportProcess.h | 1 + .../RichardsComponentTransportProcess.cpp | 3 ++- .../RichardsComponentTransportProcess.h | 1 + .../RichardsFlow/CreateRichardsFlowProcess.cpp | 9 +++++---- ProcessLib/RichardsFlow/CreateRichardsFlowProcess.h | 1 + ProcessLib/RichardsFlow/RichardsFlowProcess.cpp | 3 ++- ProcessLib/RichardsFlow/RichardsFlowProcess.h | 1 + .../CreateRichardsMechanicsProcess.cpp | 11 +++++++---- .../CreateRichardsMechanicsProcess.h | 3 +++ .../RichardsMechanics/RichardsMechanicsProcess.cpp | 3 ++- .../RichardsMechanics/RichardsMechanicsProcess.h | 1 + .../CreateSmallDeformationProcess.cpp | 10 +++++++--- .../CreateSmallDeformationProcess.h | 3 +++ .../SmallDeformation/SmallDeformationProcess.cpp | 3 ++- .../SmallDeformation/SmallDeformationProcess.h | 1 + .../CreateSmallDeformationNonlocalProcess.cpp | 10 +++++++--- .../CreateSmallDeformationNonlocalProcess.h | 3 +++ .../SmallDeformationNonlocalProcess.cpp | 3 ++- .../SmallDeformationNonlocalProcess.h | 1 + ProcessLib/TES/CreateTESProcess.cpp | 8 +++++--- ProcessLib/TES/CreateTESProcess.h | 1 + ProcessLib/TES/TESProcess.cpp | 3 ++- ProcessLib/TES/TESProcess.h | 1 + .../CreateThermalTwoPhaseFlowWithPPProcess.cpp | 9 +++++---- .../CreateThermalTwoPhaseFlowWithPPProcess.h | 1 + .../ThermalTwoPhaseFlowWithPPProcess.cpp | 3 ++- .../ThermalTwoPhaseFlowWithPPProcess.h | 1 + .../CreateThermoHydroMechanicsProcess.cpp | 11 +++++++---- .../CreateThermoHydroMechanicsProcess.h | 3 +++ .../ThermoHydroMechanicsProcess.cpp | 3 ++- .../ThermoHydroMechanicsProcess.h | 1 + .../CreateThermoMechanicalPhaseFieldProcess.cpp | 13 ++++++++----- .../CreateThermoMechanicalPhaseFieldProcess.h | 3 +++ .../ThermoMechanicalPhaseFieldProcess-impl.h | 3 ++- .../ThermoMechanicalPhaseFieldProcess.h | 1 + .../CreateThermoMechanicsProcess.cpp | 11 +++++++---- .../ThermoMechanics/CreateThermoMechanicsProcess.h | 3 +++ .../ThermoMechanics/ThermoMechanicsProcess.cpp | 3 ++- ProcessLib/ThermoMechanics/ThermoMechanicsProcess.h | 1 + .../CreateTwoPhaseFlowWithPPProcess.cpp | 9 +++++---- .../CreateTwoPhaseFlowWithPPProcess.h | 1 + .../TwoPhaseFlowWithPPProcess.cpp | 3 ++- .../TwoPhaseFlowWithPP/TwoPhaseFlowWithPPProcess.h | 1 + .../CreateTwoPhaseFlowWithPrhoProcess.cpp | 9 +++++---- .../CreateTwoPhaseFlowWithPrhoProcess.h | 1 + .../TwoPhaseFlowWithPrhoProcess.cpp | 3 ++- .../TwoPhaseFlowWithPrhoProcess.h | 1 + 89 files changed, 241 insertions(+), 109 deletions(-) diff --git a/ProcessLib/ComponentTransport/ComponentTransportProcess.cpp b/ProcessLib/ComponentTransport/ComponentTransportProcess.cpp index fe54ae8b9c3..238e76fef24 100644 --- a/ProcessLib/ComponentTransport/ComponentTransportProcess.cpp +++ b/ProcessLib/ComponentTransport/ComponentTransportProcess.cpp @@ -20,6 +20,7 @@ namespace ProcessLib namespace ComponentTransport { ComponentTransportProcess::ComponentTransportProcess( + std::string name, MeshLib::Mesh& mesh, std::unique_ptr<ProcessLib::AbstractJacobianAssembler>&& jacobian_assembler, std::vector<std::unique_ptr<ParameterLib::ParameterBase>> const& parameters, @@ -32,7 +33,7 @@ ComponentTransportProcess::ComponentTransportProcess( bool const use_monolithic_scheme, std::unique_ptr<ProcessLib::SurfaceFluxData>&& surfaceflux, std::vector<std::pair<int, std::string>>&& process_id_to_component_name_map) - : Process(mesh, std::move(jacobian_assembler), parameters, + : Process(std::move(name), mesh, std::move(jacobian_assembler), parameters, integration_order, std::move(process_variables), std::move(secondary_variables), std::move(named_function_caller), use_monolithic_scheme), diff --git a/ProcessLib/ComponentTransport/ComponentTransportProcess.h b/ProcessLib/ComponentTransport/ComponentTransportProcess.h index 1166ff5334b..d65e9b7c90a 100644 --- a/ProcessLib/ComponentTransport/ComponentTransportProcess.h +++ b/ProcessLib/ComponentTransport/ComponentTransportProcess.h @@ -89,6 +89,7 @@ class ComponentTransportProcess final : public Process { public: ComponentTransportProcess( + std::string name, MeshLib::Mesh& mesh, std::unique_ptr<ProcessLib::AbstractJacobianAssembler>&& jacobian_assembler, diff --git a/ProcessLib/ComponentTransport/CreateComponentTransportProcess.cpp b/ProcessLib/ComponentTransport/CreateComponentTransportProcess.cpp index 576a0cc5642..28b84824a19 100644 --- a/ProcessLib/ComponentTransport/CreateComponentTransportProcess.cpp +++ b/ProcessLib/ComponentTransport/CreateComponentTransportProcess.cpp @@ -26,6 +26,7 @@ namespace ProcessLib namespace ComponentTransport { std::unique_ptr<Process> createComponentTransportProcess( + std::string name, MeshLib::Mesh& mesh, std::unique_ptr<ProcessLib::AbstractJacobianAssembler>&& jacobian_assembler, std::vector<ProcessVariable> const& variables, @@ -196,11 +197,11 @@ std::unique_ptr<Process> createComponentTransportProcess( } return std::make_unique<ComponentTransportProcess>( - 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), - use_monolithic_scheme, std::move(surfaceflux), - std::move(process_id_to_component_name_map)); + std::move(name), 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), use_monolithic_scheme, + std::move(surfaceflux), std::move(process_id_to_component_name_map)); } } // namespace ComponentTransport diff --git a/ProcessLib/ComponentTransport/CreateComponentTransportProcess.h b/ProcessLib/ComponentTransport/CreateComponentTransportProcess.h index 7f85498bdfb..af270e61903 100644 --- a/ProcessLib/ComponentTransport/CreateComponentTransportProcess.h +++ b/ProcessLib/ComponentTransport/CreateComponentTransportProcess.h @@ -22,6 +22,7 @@ namespace ProcessLib namespace ComponentTransport { std::unique_ptr<Process> createComponentTransportProcess( + std::string name, MeshLib::Mesh& mesh, std::unique_ptr<ProcessLib::AbstractJacobianAssembler>&& jacobian_assembler, std::vector<ProcessVariable> const& variables, diff --git a/ProcessLib/GroundwaterFlow/CreateGroundwaterFlowProcess.cpp b/ProcessLib/GroundwaterFlow/CreateGroundwaterFlowProcess.cpp index 816bd67db4c..9e508590709 100644 --- a/ProcessLib/GroundwaterFlow/CreateGroundwaterFlowProcess.cpp +++ b/ProcessLib/GroundwaterFlow/CreateGroundwaterFlowProcess.cpp @@ -22,6 +22,7 @@ namespace ProcessLib namespace GroundwaterFlow { std::unique_ptr<Process> createGroundwaterFlowProcess( + std::string name, MeshLib::Mesh& mesh, std::unique_ptr<ProcessLib::AbstractJacobianAssembler>&& jacobian_assembler, std::vector<ProcessVariable> const& variables, @@ -79,10 +80,10 @@ std::unique_ptr<Process> createGroundwaterFlowProcess( } return std::make_unique<GroundwaterFlowProcess>( - 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), - std::move(surfaceflux)); + std::move(name), 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), std::move(surfaceflux)); } } // namespace GroundwaterFlow diff --git a/ProcessLib/GroundwaterFlow/CreateGroundwaterFlowProcess.h b/ProcessLib/GroundwaterFlow/CreateGroundwaterFlowProcess.h index 009fc803627..94bf1ce7b1d 100644 --- a/ProcessLib/GroundwaterFlow/CreateGroundwaterFlowProcess.h +++ b/ProcessLib/GroundwaterFlow/CreateGroundwaterFlowProcess.h @@ -18,6 +18,7 @@ namespace ProcessLib namespace GroundwaterFlow { std::unique_ptr<Process> createGroundwaterFlowProcess( + std::string name, MeshLib::Mesh& mesh, std::unique_ptr<ProcessLib::AbstractJacobianAssembler>&& jacobian_assembler, std::vector<ProcessVariable> const& variables, diff --git a/ProcessLib/GroundwaterFlow/GroundwaterFlowProcess.cpp b/ProcessLib/GroundwaterFlow/GroundwaterFlowProcess.cpp index e25befb3081..a4609498f41 100644 --- a/ProcessLib/GroundwaterFlow/GroundwaterFlowProcess.cpp +++ b/ProcessLib/GroundwaterFlow/GroundwaterFlowProcess.cpp @@ -18,6 +18,7 @@ namespace ProcessLib namespace GroundwaterFlow { GroundwaterFlowProcess::GroundwaterFlowProcess( + std::string name, MeshLib::Mesh& mesh, std::unique_ptr<ProcessLib::AbstractJacobianAssembler>&& jacobian_assembler, std::vector<std::unique_ptr<ParameterLib::ParameterBase>> const& parameters, @@ -28,7 +29,7 @@ GroundwaterFlowProcess::GroundwaterFlowProcess( SecondaryVariableCollection&& secondary_variables, NumLib::NamedFunctionCaller&& named_function_caller, std::unique_ptr<ProcessLib::SurfaceFluxData>&& surfaceflux) - : Process(mesh, std::move(jacobian_assembler), parameters, + : Process(std::move(name), mesh, std::move(jacobian_assembler), parameters, 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/GroundwaterFlow/GroundwaterFlowProcess.h b/ProcessLib/GroundwaterFlow/GroundwaterFlowProcess.h index c25f2dba7c6..9fd04fd81f8 100644 --- a/ProcessLib/GroundwaterFlow/GroundwaterFlowProcess.h +++ b/ProcessLib/GroundwaterFlow/GroundwaterFlowProcess.h @@ -26,6 +26,7 @@ class GroundwaterFlowProcess final : public Process { public: GroundwaterFlowProcess( + std::string name, MeshLib::Mesh& mesh, std::unique_ptr<ProcessLib::AbstractJacobianAssembler>&& jacobian_assembler, diff --git a/ProcessLib/HT/CreateHTProcess.cpp b/ProcessLib/HT/CreateHTProcess.cpp index 78b8117c712..0eb565cd3bb 100644 --- a/ProcessLib/HT/CreateHTProcess.cpp +++ b/ProcessLib/HT/CreateHTProcess.cpp @@ -26,6 +26,7 @@ namespace ProcessLib namespace HT { std::unique_ptr<Process> createHTProcess( + std::string name, MeshLib::Mesh& mesh, std::unique_ptr<ProcessLib::AbstractJacobianAssembler>&& jacobian_assembler, std::vector<ProcessVariable> const& variables, @@ -156,11 +157,12 @@ std::unique_ptr<Process> createHTProcess( named_function_caller); return std::make_unique<HTProcess>( - mesh, std::move(jacobian_assembler), parameters, integration_order, - std::move(process_variables), std::move(material_properties), - std::move(secondary_variables), std::move(named_function_caller), - use_monolithic_scheme, std::move(surfaceflux), - _heat_transport_process_id, _hydraulic_process_id); + std::move(name), mesh, std::move(jacobian_assembler), parameters, + integration_order, std::move(process_variables), + std::move(material_properties), std::move(secondary_variables), + std::move(named_function_caller), use_monolithic_scheme, + std::move(surfaceflux), _heat_transport_process_id, + _hydraulic_process_id); } } // namespace HT diff --git a/ProcessLib/HT/CreateHTProcess.h b/ProcessLib/HT/CreateHTProcess.h index 4ac2b63871c..de78735ab32 100644 --- a/ProcessLib/HT/CreateHTProcess.h +++ b/ProcessLib/HT/CreateHTProcess.h @@ -23,6 +23,7 @@ namespace ProcessLib namespace HT { std::unique_ptr<Process> createHTProcess( + std::string name, MeshLib::Mesh& mesh, std::unique_ptr<ProcessLib::AbstractJacobianAssembler>&& jacobian_assembler, std::vector<ProcessVariable> const& variables, diff --git a/ProcessLib/HT/HTProcess.cpp b/ProcessLib/HT/HTProcess.cpp index 300725dd1fc..9616152224c 100644 --- a/ProcessLib/HT/HTProcess.cpp +++ b/ProcessLib/HT/HTProcess.cpp @@ -25,6 +25,7 @@ namespace ProcessLib namespace HT { HTProcess::HTProcess( + std::string name, MeshLib::Mesh& mesh, std::unique_ptr<ProcessLib::AbstractJacobianAssembler>&& jacobian_assembler, std::vector<std::unique_ptr<ParameterLib::ParameterBase>> const& parameters, @@ -38,7 +39,7 @@ HTProcess::HTProcess( std::unique_ptr<ProcessLib::SurfaceFluxData>&& surfaceflux, const int heat_transport_process_id, const int hydraulic_process_id) - : Process(mesh, std::move(jacobian_assembler), parameters, + : Process(std::move(name), mesh, std::move(jacobian_assembler), parameters, integration_order, std::move(process_variables), std::move(secondary_variables), std::move(named_function_caller), use_monolithic_scheme), diff --git a/ProcessLib/HT/HTProcess.h b/ProcessLib/HT/HTProcess.h index d5f03eb344e..1d59a7bc4ed 100644 --- a/ProcessLib/HT/HTProcess.h +++ b/ProcessLib/HT/HTProcess.h @@ -50,6 +50,7 @@ class HTProcess final : public Process { public: HTProcess( + std::string name, MeshLib::Mesh& mesh, std::unique_ptr<ProcessLib::AbstractJacobianAssembler>&& jacobian_assembler, diff --git a/ProcessLib/HeatConduction/CreateHeatConductionProcess.cpp b/ProcessLib/HeatConduction/CreateHeatConductionProcess.cpp index 94c7520a31d..9be788ad2fa 100644 --- a/ProcessLib/HeatConduction/CreateHeatConductionProcess.cpp +++ b/ProcessLib/HeatConduction/CreateHeatConductionProcess.cpp @@ -20,6 +20,7 @@ namespace ProcessLib namespace HeatConduction { std::unique_ptr<Process> createHeatConductionProcess( + std::string name, MeshLib::Mesh& mesh, std::unique_ptr<ProcessLib::AbstractJacobianAssembler>&& jacobian_assembler, std::vector<ProcessVariable> const& variables, @@ -82,9 +83,10 @@ std::unique_ptr<Process> createHeatConductionProcess( named_function_caller); return std::make_unique<HeatConductionProcess>( - 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)); + std::move(name), 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)); } } // namespace HeatConduction diff --git a/ProcessLib/HeatConduction/CreateHeatConductionProcess.h b/ProcessLib/HeatConduction/CreateHeatConductionProcess.h index 5c9481568bc..bcfaf823516 100644 --- a/ProcessLib/HeatConduction/CreateHeatConductionProcess.h +++ b/ProcessLib/HeatConduction/CreateHeatConductionProcess.h @@ -17,6 +17,7 @@ namespace ProcessLib namespace HeatConduction { std::unique_ptr<Process> createHeatConductionProcess( + std::string name, MeshLib::Mesh& mesh, std::unique_ptr<ProcessLib::AbstractJacobianAssembler>&& jacobian_assembler, std::vector<ProcessVariable> const& variables, diff --git a/ProcessLib/HeatConduction/HeatConductionProcess.cpp b/ProcessLib/HeatConduction/HeatConductionProcess.cpp index 2e0f2c37fb1..d77a6e178d6 100644 --- a/ProcessLib/HeatConduction/HeatConductionProcess.cpp +++ b/ProcessLib/HeatConduction/HeatConductionProcess.cpp @@ -18,6 +18,7 @@ namespace ProcessLib namespace HeatConduction { HeatConductionProcess::HeatConductionProcess( + std::string name, MeshLib::Mesh& mesh, std::unique_ptr<ProcessLib::AbstractJacobianAssembler>&& jacobian_assembler, std::vector<std::unique_ptr<ParameterLib::ParameterBase>> const& parameters, @@ -27,7 +28,7 @@ HeatConductionProcess::HeatConductionProcess( HeatConductionProcessData&& process_data, SecondaryVariableCollection&& secondary_variables, NumLib::NamedFunctionCaller&& named_function_caller) - : Process(mesh, std::move(jacobian_assembler), parameters, + : Process(std::move(name), mesh, std::move(jacobian_assembler), parameters, 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 b073add6204..17868151b94 100644 --- a/ProcessLib/HeatConduction/HeatConductionProcess.h +++ b/ProcessLib/HeatConduction/HeatConductionProcess.h @@ -22,6 +22,7 @@ class HeatConductionProcess final : public Process public: HeatConductionProcess( + std::string name, MeshLib::Mesh& mesh, std::unique_ptr<ProcessLib::AbstractJacobianAssembler>&& jacobian_assembler, diff --git a/ProcessLib/HeatTransportBHE/CreateHeatTransportBHEProcess.cpp b/ProcessLib/HeatTransportBHE/CreateHeatTransportBHEProcess.cpp index fddb992557b..ea51b6a168c 100644 --- a/ProcessLib/HeatTransportBHE/CreateHeatTransportBHEProcess.cpp +++ b/ProcessLib/HeatTransportBHE/CreateHeatTransportBHEProcess.cpp @@ -25,6 +25,7 @@ namespace ProcessLib namespace HeatTransportBHE { std::unique_ptr<Process> createHeatTransportBHEProcess( + std::string name, MeshLib::Mesh& mesh, std::unique_ptr<ProcessLib::AbstractJacobianAssembler>&& jacobian_assembler, std::vector<ProcessVariable> const& variables, @@ -225,9 +226,10 @@ std::unique_ptr<Process> createHeatTransportBHEProcess( named_function_caller); return std::make_unique<HeatTransportBHEProcess>( - 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)); + std::move(name), 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)); } } // namespace HeatTransportBHE } // namespace ProcessLib diff --git a/ProcessLib/HeatTransportBHE/CreateHeatTransportBHEProcess.h b/ProcessLib/HeatTransportBHE/CreateHeatTransportBHEProcess.h index 12571971481..fe0f26efbc4 100644 --- a/ProcessLib/HeatTransportBHE/CreateHeatTransportBHEProcess.h +++ b/ProcessLib/HeatTransportBHE/CreateHeatTransportBHEProcess.h @@ -17,6 +17,7 @@ namespace ProcessLib namespace HeatTransportBHE { std::unique_ptr<Process> createHeatTransportBHEProcess( + std::string name, MeshLib::Mesh& mesh, std::unique_ptr<ProcessLib::AbstractJacobianAssembler>&& jacobian_assembler, std::vector<ProcessVariable> const& variables, diff --git a/ProcessLib/HeatTransportBHE/HeatTransportBHEProcess.cpp b/ProcessLib/HeatTransportBHE/HeatTransportBHEProcess.cpp index c5ec1b9ef0e..ae15fcca42f 100644 --- a/ProcessLib/HeatTransportBHE/HeatTransportBHEProcess.cpp +++ b/ProcessLib/HeatTransportBHE/HeatTransportBHEProcess.cpp @@ -24,6 +24,7 @@ namespace ProcessLib namespace HeatTransportBHE { HeatTransportBHEProcess::HeatTransportBHEProcess( + std::string name, MeshLib::Mesh& mesh, std::unique_ptr<ProcessLib::AbstractJacobianAssembler>&& jacobian_assembler, std::vector<std::unique_ptr<ParameterLib::ParameterBase>> const& parameters, @@ -33,7 +34,7 @@ HeatTransportBHEProcess::HeatTransportBHEProcess( HeatTransportBHEProcessData&& process_data, SecondaryVariableCollection&& secondary_variables, NumLib::NamedFunctionCaller&& named_function_caller) - : Process(mesh, std::move(jacobian_assembler), parameters, + : Process(std::move(name), mesh, std::move(jacobian_assembler), parameters, 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/HeatTransportBHE/HeatTransportBHEProcess.h b/ProcessLib/HeatTransportBHE/HeatTransportBHEProcess.h index 11ce3d4d902..1054795e89c 100644 --- a/ProcessLib/HeatTransportBHE/HeatTransportBHEProcess.h +++ b/ProcessLib/HeatTransportBHE/HeatTransportBHEProcess.h @@ -24,6 +24,7 @@ class HeatTransportBHEProcess final : public Process { public: HeatTransportBHEProcess( + std::string name, MeshLib::Mesh& mesh, std::unique_ptr<ProcessLib::AbstractJacobianAssembler>&& jacobian_assembler, diff --git a/ProcessLib/HydroMechanics/CreateHydroMechanicsProcess.cpp b/ProcessLib/HydroMechanics/CreateHydroMechanicsProcess.cpp index ee0c9f538c9..80b00d24701 100644 --- a/ProcessLib/HydroMechanics/CreateHydroMechanicsProcess.cpp +++ b/ProcessLib/HydroMechanics/CreateHydroMechanicsProcess.cpp @@ -26,6 +26,7 @@ namespace HydroMechanics { template <int DisplacementDim> std::unique_ptr<Process> createHydroMechanicsProcess( + std::string name, MeshLib::Mesh& mesh, std::unique_ptr<ProcessLib::AbstractJacobianAssembler>&& jacobian_assembler, std::vector<ProcessVariable> const& variables, @@ -204,13 +205,14 @@ std::unique_ptr<Process> createHydroMechanicsProcess( named_function_caller); return std::make_unique<HydroMechanicsProcess<DisplacementDim>>( - 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), - use_monolithic_scheme); + std::move(name), 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), use_monolithic_scheme); } template std::unique_ptr<Process> createHydroMechanicsProcess<2>( + std::string name, MeshLib::Mesh& mesh, std::unique_ptr<ProcessLib::AbstractJacobianAssembler>&& jacobian_assembler, std::vector<ProcessVariable> const& variables, @@ -221,6 +223,7 @@ template std::unique_ptr<Process> createHydroMechanicsProcess<2>( BaseLib::ConfigTree const& config); template std::unique_ptr<Process> createHydroMechanicsProcess<3>( + std::string name, MeshLib::Mesh& mesh, std::unique_ptr<ProcessLib::AbstractJacobianAssembler>&& jacobian_assembler, std::vector<ProcessVariable> const& variables, diff --git a/ProcessLib/HydroMechanics/CreateHydroMechanicsProcess.h b/ProcessLib/HydroMechanics/CreateHydroMechanicsProcess.h index ddead7b6591..fda7a217733 100644 --- a/ProcessLib/HydroMechanics/CreateHydroMechanicsProcess.h +++ b/ProcessLib/HydroMechanics/CreateHydroMechanicsProcess.h @@ -39,6 +39,7 @@ namespace HydroMechanics { template <int DisplacementDim> std::unique_ptr<Process> createHydroMechanicsProcess( + std::string name, MeshLib::Mesh& mesh, std::unique_ptr<ProcessLib::AbstractJacobianAssembler>&& jacobian_assembler, std::vector<ProcessVariable> const& variables, @@ -49,6 +50,7 @@ std::unique_ptr<Process> createHydroMechanicsProcess( BaseLib::ConfigTree const& config); extern template std::unique_ptr<Process> createHydroMechanicsProcess<2>( + std::string name, MeshLib::Mesh& mesh, std::unique_ptr<ProcessLib::AbstractJacobianAssembler>&& jacobian_assembler, std::vector<ProcessVariable> const& variables, @@ -59,6 +61,7 @@ extern template std::unique_ptr<Process> createHydroMechanicsProcess<2>( BaseLib::ConfigTree const& config); extern template std::unique_ptr<Process> createHydroMechanicsProcess<3>( + std::string name, MeshLib::Mesh& mesh, std::unique_ptr<ProcessLib::AbstractJacobianAssembler>&& jacobian_assembler, std::vector<ProcessVariable> const& variables, diff --git a/ProcessLib/HydroMechanics/HydroMechanicsProcess.cpp b/ProcessLib/HydroMechanics/HydroMechanicsProcess.cpp index 3ed900d0a0b..0ceeb1c0237 100644 --- a/ProcessLib/HydroMechanics/HydroMechanicsProcess.cpp +++ b/ProcessLib/HydroMechanics/HydroMechanicsProcess.cpp @@ -25,6 +25,7 @@ namespace HydroMechanics { template <int DisplacementDim> HydroMechanicsProcess<DisplacementDim>::HydroMechanicsProcess( + std::string name, MeshLib::Mesh& mesh, std::unique_ptr<ProcessLib::AbstractJacobianAssembler>&& jacobian_assembler, std::vector<std::unique_ptr<ParameterLib::ParameterBase>> const& parameters, @@ -35,7 +36,7 @@ HydroMechanicsProcess<DisplacementDim>::HydroMechanicsProcess( SecondaryVariableCollection&& secondary_variables, NumLib::NamedFunctionCaller&& named_function_caller, bool const use_monolithic_scheme) - : Process(mesh, std::move(jacobian_assembler), parameters, + : Process(std::move(name), mesh, std::move(jacobian_assembler), parameters, integration_order, std::move(process_variables), std::move(secondary_variables), std::move(named_function_caller), use_monolithic_scheme), diff --git a/ProcessLib/HydroMechanics/HydroMechanicsProcess.h b/ProcessLib/HydroMechanics/HydroMechanicsProcess.h index ece83764fa4..97393ce655e 100644 --- a/ProcessLib/HydroMechanics/HydroMechanicsProcess.h +++ b/ProcessLib/HydroMechanics/HydroMechanicsProcess.h @@ -28,6 +28,7 @@ class HydroMechanicsProcess final : public Process { public: HydroMechanicsProcess( + std::string name, MeshLib::Mesh& mesh, std::unique_ptr<ProcessLib::AbstractJacobianAssembler>&& jacobian_assembler, diff --git a/ProcessLib/LIE/HydroMechanics/CreateHydroMechanicsProcess.cpp b/ProcessLib/LIE/HydroMechanics/CreateHydroMechanicsProcess.cpp index 68d6e22a4ed..d15fa4f1b73 100644 --- a/ProcessLib/LIE/HydroMechanics/CreateHydroMechanicsProcess.cpp +++ b/ProcessLib/LIE/HydroMechanics/CreateHydroMechanicsProcess.cpp @@ -29,6 +29,7 @@ namespace HydroMechanics { template <unsigned GlobalDim> std::unique_ptr<Process> createHydroMechanicsProcess( + std::string name, MeshLib::Mesh& mesh, std::unique_ptr<ProcessLib::AbstractJacobianAssembler>&& jacobian_assembler, std::vector<ProcessVariable> const& variables, @@ -344,13 +345,14 @@ std::unique_ptr<Process> createHydroMechanicsProcess( named_function_caller); return std::make_unique<HydroMechanicsProcess<GlobalDim>>( - 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), - use_monolithic_scheme); + std::move(name), 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), use_monolithic_scheme); } template std::unique_ptr<Process> createHydroMechanicsProcess<2>( + std::string name, MeshLib::Mesh& mesh, std::unique_ptr<ProcessLib::AbstractJacobianAssembler>&& jacobian_assembler, std::vector<ProcessVariable> const& variables, @@ -360,6 +362,7 @@ template std::unique_ptr<Process> createHydroMechanicsProcess<2>( unsigned const integration_order, BaseLib::ConfigTree const& config); template std::unique_ptr<Process> createHydroMechanicsProcess<3>( + std::string name, MeshLib::Mesh& mesh, std::unique_ptr<ProcessLib::AbstractJacobianAssembler>&& jacobian_assembler, std::vector<ProcessVariable> const& variables, diff --git a/ProcessLib/LIE/HydroMechanics/CreateHydroMechanicsProcess.h b/ProcessLib/LIE/HydroMechanics/CreateHydroMechanicsProcess.h index aefd54066dd..d4121c9b9e0 100644 --- a/ProcessLib/LIE/HydroMechanics/CreateHydroMechanicsProcess.h +++ b/ProcessLib/LIE/HydroMechanics/CreateHydroMechanicsProcess.h @@ -41,6 +41,7 @@ namespace HydroMechanics { template <unsigned GlobalDim> std::unique_ptr<Process> createHydroMechanicsProcess( + std::string name, MeshLib::Mesh& mesh, std::unique_ptr<ProcessLib::AbstractJacobianAssembler>&& jacobian_assembler, std::vector<ProcessVariable> const& variables, diff --git a/ProcessLib/LIE/HydroMechanics/HydroMechanicsProcess.cpp b/ProcessLib/LIE/HydroMechanics/HydroMechanicsProcess.cpp index 70b5336a859..7aaf7e23fc5 100644 --- a/ProcessLib/LIE/HydroMechanics/HydroMechanicsProcess.cpp +++ b/ProcessLib/LIE/HydroMechanics/HydroMechanicsProcess.cpp @@ -37,6 +37,7 @@ namespace HydroMechanics { template <int GlobalDim> HydroMechanicsProcess<GlobalDim>::HydroMechanicsProcess( + std::string name, MeshLib::Mesh& mesh, std::unique_ptr<ProcessLib::AbstractJacobianAssembler>&& jacobian_assembler, std::vector<std::unique_ptr<ParameterLib::ParameterBase>> const& parameters, @@ -47,7 +48,7 @@ HydroMechanicsProcess<GlobalDim>::HydroMechanicsProcess( SecondaryVariableCollection&& secondary_variables, NumLib::NamedFunctionCaller&& named_function_caller, bool const use_monolithic_scheme) - : Process(mesh, std::move(jacobian_assembler), parameters, + : Process(std::move(name), mesh, std::move(jacobian_assembler), parameters, integration_order, std::move(process_variables), std::move(secondary_variables), std::move(named_function_caller), use_monolithic_scheme), diff --git a/ProcessLib/LIE/HydroMechanics/HydroMechanicsProcess.h b/ProcessLib/LIE/HydroMechanics/HydroMechanicsProcess.h index cff95684784..a0e172f49ac 100644 --- a/ProcessLib/LIE/HydroMechanics/HydroMechanicsProcess.h +++ b/ProcessLib/LIE/HydroMechanics/HydroMechanicsProcess.h @@ -31,6 +31,7 @@ class HydroMechanicsProcess final : public Process public: HydroMechanicsProcess( + std::string name, MeshLib::Mesh& mesh, std::unique_ptr<ProcessLib::AbstractJacobianAssembler>&& jacobian_assembler, diff --git a/ProcessLib/LIE/SmallDeformation/CreateSmallDeformationProcess.cpp b/ProcessLib/LIE/SmallDeformation/CreateSmallDeformationProcess.cpp index b8dff71f015..ddcf601cba3 100644 --- a/ProcessLib/LIE/SmallDeformation/CreateSmallDeformationProcess.cpp +++ b/ProcessLib/LIE/SmallDeformation/CreateSmallDeformationProcess.cpp @@ -29,6 +29,7 @@ namespace SmallDeformation { template <int DisplacementDim> std::unique_ptr<Process> createSmallDeformationProcess( + std::string name, MeshLib::Mesh& mesh, std::unique_ptr<ProcessLib::AbstractJacobianAssembler>&& jacobian_assembler, std::vector<ProcessVariable> const& variables, @@ -193,12 +194,14 @@ std::unique_ptr<Process> createSmallDeformationProcess( named_function_caller); return std::make_unique<SmallDeformationProcess<DisplacementDim>>( - 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)); + std::move(name), 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)); } template std::unique_ptr<Process> createSmallDeformationProcess<2>( + std::string name, MeshLib::Mesh& mesh, std::unique_ptr<ProcessLib::AbstractJacobianAssembler>&& jacobian_assembler, std::vector<ProcessVariable> const& variables, @@ -209,6 +212,7 @@ template std::unique_ptr<Process> createSmallDeformationProcess<2>( BaseLib::ConfigTree const& config); template std::unique_ptr<Process> createSmallDeformationProcess<3>( + std::string name, MeshLib::Mesh& mesh, std::unique_ptr<ProcessLib::AbstractJacobianAssembler>&& jacobian_assembler, std::vector<ProcessVariable> const& variables, diff --git a/ProcessLib/LIE/SmallDeformation/CreateSmallDeformationProcess.h b/ProcessLib/LIE/SmallDeformation/CreateSmallDeformationProcess.h index 556023140e1..aaa20f5f36e 100644 --- a/ProcessLib/LIE/SmallDeformation/CreateSmallDeformationProcess.h +++ b/ProcessLib/LIE/SmallDeformation/CreateSmallDeformationProcess.h @@ -41,6 +41,7 @@ namespace SmallDeformation { template <int DisplacementDim> std::unique_ptr<Process> createSmallDeformationProcess( + std::string name, MeshLib::Mesh& mesh, std::unique_ptr<ProcessLib::AbstractJacobianAssembler>&& jacobian_assembler, std::vector<ProcessVariable> const& variables, diff --git a/ProcessLib/LIE/SmallDeformation/SmallDeformationProcess.cpp b/ProcessLib/LIE/SmallDeformation/SmallDeformationProcess.cpp index 416501e73c5..0aa37b2f53d 100644 --- a/ProcessLib/LIE/SmallDeformation/SmallDeformationProcess.cpp +++ b/ProcessLib/LIE/SmallDeformation/SmallDeformationProcess.cpp @@ -30,6 +30,7 @@ namespace SmallDeformation { template <int DisplacementDim> SmallDeformationProcess<DisplacementDim>::SmallDeformationProcess( + std::string name, MeshLib::Mesh& mesh, std::unique_ptr<ProcessLib::AbstractJacobianAssembler>&& jacobian_assembler, std::vector<std::unique_ptr<ParameterLib::ParameterBase>> const& parameters, @@ -39,7 +40,7 @@ SmallDeformationProcess<DisplacementDim>::SmallDeformationProcess( SmallDeformationProcessData<DisplacementDim>&& process_data, SecondaryVariableCollection&& secondary_variables, NumLib::NamedFunctionCaller&& named_function_caller) - : Process(mesh, std::move(jacobian_assembler), parameters, + : Process(std::move(name), mesh, std::move(jacobian_assembler), parameters, 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/LIE/SmallDeformation/SmallDeformationProcess.h b/ProcessLib/LIE/SmallDeformation/SmallDeformationProcess.h index 706f198d43f..088c5d606b9 100644 --- a/ProcessLib/LIE/SmallDeformation/SmallDeformationProcess.h +++ b/ProcessLib/LIE/SmallDeformation/SmallDeformationProcess.h @@ -28,6 +28,7 @@ class SmallDeformationProcess final : public Process public: SmallDeformationProcess( + std::string name, MeshLib::Mesh& mesh, std::unique_ptr<ProcessLib::AbstractJacobianAssembler>&& jacobian_assembler, diff --git a/ProcessLib/LiquidFlow/CreateLiquidFlowProcess.cpp b/ProcessLib/LiquidFlow/CreateLiquidFlowProcess.cpp index 17ad2706f14..6e1d55e36a4 100644 --- a/ProcessLib/LiquidFlow/CreateLiquidFlowProcess.cpp +++ b/ProcessLib/LiquidFlow/CreateLiquidFlowProcess.cpp @@ -26,6 +26,7 @@ namespace ProcessLib namespace LiquidFlow { std::unique_ptr<Process> createLiquidFlowProcess( + std::string name, MeshLib::Mesh& mesh, std::unique_ptr<ProcessLib::AbstractJacobianAssembler>&& jacobian_assembler, std::vector<ProcessVariable> const& variables, @@ -101,11 +102,11 @@ std::unique_ptr<Process> createLiquidFlowProcess( INFO("The liquid flow is in homogeneous porous media."); } - return std::unique_ptr<Process>{new LiquidFlowProcess{ - mesh, std::move(jacobian_assembler), parameters, integration_order, - std::move(process_variables), std::move(secondary_variables), - std::move(named_function_caller), material_ids, gravity_axis_id, g, - reference_temperature, mat_config}}; + return std::make_unique<LiquidFlowProcess>( + std::move(name), mesh, std::move(jacobian_assembler), parameters, + integration_order, std::move(process_variables), + std::move(secondary_variables), std::move(named_function_caller), + material_ids, gravity_axis_id, g, reference_temperature, mat_config); } } // namespace LiquidFlow diff --git a/ProcessLib/LiquidFlow/CreateLiquidFlowProcess.h b/ProcessLib/LiquidFlow/CreateLiquidFlowProcess.h index b333fe18186..b92aac81a48 100644 --- a/ProcessLib/LiquidFlow/CreateLiquidFlowProcess.h +++ b/ProcessLib/LiquidFlow/CreateLiquidFlowProcess.h @@ -20,6 +20,7 @@ namespace ProcessLib namespace LiquidFlow { std::unique_ptr<Process> createLiquidFlowProcess( + std::string name, MeshLib::Mesh& mesh, std::unique_ptr<ProcessLib::AbstractJacobianAssembler>&& jacobian_assembler, std::vector<ProcessVariable> const& variables, diff --git a/ProcessLib/LiquidFlow/LiquidFlowProcess.cpp b/ProcessLib/LiquidFlow/LiquidFlowProcess.cpp index c477aa1f423..64be0d697ea 100644 --- a/ProcessLib/LiquidFlow/LiquidFlowProcess.cpp +++ b/ProcessLib/LiquidFlow/LiquidFlowProcess.cpp @@ -31,6 +31,7 @@ namespace ProcessLib namespace LiquidFlow { LiquidFlowProcess::LiquidFlowProcess( + std::string name, MeshLib::Mesh& mesh, std::unique_ptr<AbstractJacobianAssembler>&& jacobian_assembler, std::vector<std::unique_ptr<ParameterLib::ParameterBase>> const& parameters, @@ -44,7 +45,7 @@ LiquidFlowProcess::LiquidFlowProcess( double const gravitational_acceleration, double const reference_temperature, BaseLib::ConfigTree const& config) - : Process(mesh, std::move(jacobian_assembler), parameters, + : Process(std::move(name), mesh, std::move(jacobian_assembler), parameters, integration_order, std::move(process_variables), std::move(secondary_variables), std::move(named_function_caller)), _gravitational_axis_id(gravitational_axis_id), diff --git a/ProcessLib/LiquidFlow/LiquidFlowProcess.h b/ProcessLib/LiquidFlow/LiquidFlowProcess.h index 6e839dcbb15..bbaec93f45a 100644 --- a/ProcessLib/LiquidFlow/LiquidFlowProcess.h +++ b/ProcessLib/LiquidFlow/LiquidFlowProcess.h @@ -58,6 +58,7 @@ class LiquidFlowProcess final : public Process { public: LiquidFlowProcess( + std::string name, MeshLib::Mesh& mesh, std::unique_ptr<AbstractJacobianAssembler>&& jacobian_assembler, std::vector<std::unique_ptr<ParameterLib::ParameterBase>> const& diff --git a/ProcessLib/PhaseField/CreatePhaseFieldProcess.cpp b/ProcessLib/PhaseField/CreatePhaseFieldProcess.cpp index 82068b53d71..a102299db5c 100644 --- a/ProcessLib/PhaseField/CreatePhaseFieldProcess.cpp +++ b/ProcessLib/PhaseField/CreatePhaseFieldProcess.cpp @@ -26,6 +26,7 @@ namespace PhaseField { template <int DisplacementDim> std::unique_ptr<Process> createPhaseFieldProcess( + std::string name, MeshLib::Mesh& mesh, std::unique_ptr<ProcessLib::AbstractJacobianAssembler>&& jacobian_assembler, std::vector<ProcessVariable> const& variables, @@ -204,13 +205,14 @@ std::unique_ptr<Process> createPhaseFieldProcess( named_function_caller); return std::make_unique<PhaseFieldProcess<DisplacementDim>>( - 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), - use_monolithic_scheme); + std::move(name), 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), use_monolithic_scheme); } template std::unique_ptr<Process> createPhaseFieldProcess<2>( + std::string name, MeshLib::Mesh& mesh, std::unique_ptr<ProcessLib::AbstractJacobianAssembler>&& jacobian_assembler, std::vector<ProcessVariable> const& variables, @@ -221,6 +223,7 @@ template std::unique_ptr<Process> createPhaseFieldProcess<2>( BaseLib::ConfigTree const& config); template std::unique_ptr<Process> createPhaseFieldProcess<3>( + std::string name, MeshLib::Mesh& mesh, std::unique_ptr<ProcessLib::AbstractJacobianAssembler>&& jacobian_assembler, std::vector<ProcessVariable> const& variables, diff --git a/ProcessLib/PhaseField/CreatePhaseFieldProcess.h b/ProcessLib/PhaseField/CreatePhaseFieldProcess.h index d7c8d2afc93..8e12f1d3cfb 100644 --- a/ProcessLib/PhaseField/CreatePhaseFieldProcess.h +++ b/ProcessLib/PhaseField/CreatePhaseFieldProcess.h @@ -39,6 +39,7 @@ namespace PhaseField { template <int DisplacementDim> std::unique_ptr<Process> createPhaseFieldProcess( + std::string name, MeshLib::Mesh& mesh, std::unique_ptr<ProcessLib::AbstractJacobianAssembler>&& jacobian_assembler, std::vector<ProcessVariable> const& variables, @@ -49,6 +50,7 @@ std::unique_ptr<Process> createPhaseFieldProcess( BaseLib::ConfigTree const& config); extern template std::unique_ptr<Process> createPhaseFieldProcess<2>( + std::string name, MeshLib::Mesh& mesh, std::unique_ptr<ProcessLib::AbstractJacobianAssembler>&& jacobian_assembler, std::vector<ProcessVariable> const& variables, @@ -59,6 +61,7 @@ extern template std::unique_ptr<Process> createPhaseFieldProcess<2>( BaseLib::ConfigTree const& config); extern template std::unique_ptr<Process> createPhaseFieldProcess<3>( + std::string name, MeshLib::Mesh& mesh, std::unique_ptr<ProcessLib::AbstractJacobianAssembler>&& jacobian_assembler, std::vector<ProcessVariable> const& variables, diff --git a/ProcessLib/PhaseField/PhaseFieldProcess.cpp b/ProcessLib/PhaseField/PhaseFieldProcess.cpp index f33ba34db09..897b11e8fe8 100644 --- a/ProcessLib/PhaseField/PhaseFieldProcess.cpp +++ b/ProcessLib/PhaseField/PhaseFieldProcess.cpp @@ -26,6 +26,7 @@ namespace PhaseField { template <int DisplacementDim> PhaseFieldProcess<DisplacementDim>::PhaseFieldProcess( + std::string name, MeshLib::Mesh& mesh, std::unique_ptr<ProcessLib::AbstractJacobianAssembler>&& jacobian_assembler, std::vector<std::unique_ptr<ParameterLib::ParameterBase>> const& parameters, @@ -36,7 +37,7 @@ PhaseFieldProcess<DisplacementDim>::PhaseFieldProcess( SecondaryVariableCollection&& secondary_variables, NumLib::NamedFunctionCaller&& named_function_caller, bool const use_monolithic_scheme) - : Process(mesh, std::move(jacobian_assembler), parameters, + : Process(std::move(name), mesh, std::move(jacobian_assembler), parameters, integration_order, std::move(process_variables), std::move(secondary_variables), std::move(named_function_caller), use_monolithic_scheme), diff --git a/ProcessLib/PhaseField/PhaseFieldProcess.h b/ProcessLib/PhaseField/PhaseFieldProcess.h index d552a483864..dc2fe463950 100644 --- a/ProcessLib/PhaseField/PhaseFieldProcess.h +++ b/ProcessLib/PhaseField/PhaseFieldProcess.h @@ -49,6 +49,7 @@ class PhaseFieldProcess final : public Process { public: PhaseFieldProcess( + std::string name, MeshLib::Mesh& mesh, std::unique_ptr<ProcessLib::AbstractJacobianAssembler>&& jacobian_assembler, diff --git a/ProcessLib/Process.h b/ProcessLib/Process.h index c604a17bf51..5aaa5c52344 100644 --- a/ProcessLib/Process.h +++ b/ProcessLib/Process.h @@ -45,7 +45,8 @@ public: using NonlinearSolver = NumLib::NonlinearSolverBase; using TimeDiscretization = NumLib::TimeDiscretization; - Process(MeshLib::Mesh& mesh, + Process(std::string name_, + MeshLib::Mesh& mesh, std::unique_ptr<AbstractJacobianAssembler>&& jacobian_assembler, std::vector<std::unique_ptr<ParameterLib::ParameterBase>> const& parameters, diff --git a/ProcessLib/RichardsComponentTransport/CreateRichardsComponentTransportProcess.cpp b/ProcessLib/RichardsComponentTransport/CreateRichardsComponentTransportProcess.cpp index 716a63eba49..102f2a73eb2 100644 --- a/ProcessLib/RichardsComponentTransport/CreateRichardsComponentTransportProcess.cpp +++ b/ProcessLib/RichardsComponentTransport/CreateRichardsComponentTransportProcess.cpp @@ -24,6 +24,7 @@ namespace ProcessLib namespace RichardsComponentTransport { std::unique_ptr<Process> createRichardsComponentTransportProcess( + std::string name, MeshLib::Mesh& mesh, std::unique_ptr<ProcessLib::AbstractJacobianAssembler>&& jacobian_assembler, std::vector<ProcessVariable> const& variables, @@ -171,10 +172,10 @@ std::unique_ptr<Process> createRichardsComponentTransportProcess( named_function_caller); return std::make_unique<RichardsComponentTransportProcess>( - 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), - use_monolithic_scheme); + std::move(name), 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), use_monolithic_scheme); } } // namespace RichardsComponentTransport diff --git a/ProcessLib/RichardsComponentTransport/CreateRichardsComponentTransportProcess.h b/ProcessLib/RichardsComponentTransport/CreateRichardsComponentTransportProcess.h index 6ab1ff83b09..4402b005e50 100644 --- a/ProcessLib/RichardsComponentTransport/CreateRichardsComponentTransportProcess.h +++ b/ProcessLib/RichardsComponentTransport/CreateRichardsComponentTransportProcess.h @@ -17,6 +17,7 @@ namespace ProcessLib namespace RichardsComponentTransport { std::unique_ptr<Process> createRichardsComponentTransportProcess( + std::string name, MeshLib::Mesh& mesh, std::unique_ptr<ProcessLib::AbstractJacobianAssembler>&& jacobian_assembler, std::vector<ProcessVariable> const& variables, diff --git a/ProcessLib/RichardsComponentTransport/RichardsComponentTransportProcess.cpp b/ProcessLib/RichardsComponentTransport/RichardsComponentTransportProcess.cpp index db26bbd754e..3c4cbc2f275 100644 --- a/ProcessLib/RichardsComponentTransport/RichardsComponentTransportProcess.cpp +++ b/ProcessLib/RichardsComponentTransport/RichardsComponentTransportProcess.cpp @@ -18,6 +18,7 @@ namespace ProcessLib namespace RichardsComponentTransport { RichardsComponentTransportProcess::RichardsComponentTransportProcess( + std::string name, MeshLib::Mesh& mesh, std::unique_ptr<ProcessLib::AbstractJacobianAssembler>&& jacobian_assembler, std::vector<std::unique_ptr<ParameterLib::ParameterBase>> const& parameters, @@ -28,7 +29,7 @@ RichardsComponentTransportProcess::RichardsComponentTransportProcess( SecondaryVariableCollection&& secondary_variables, NumLib::NamedFunctionCaller&& named_function_caller, bool const use_monolithic_scheme) - : Process(mesh, std::move(jacobian_assembler), parameters, + : Process(std::move(name), mesh, std::move(jacobian_assembler), parameters, integration_order, std::move(process_variables), std::move(secondary_variables), std::move(named_function_caller), use_monolithic_scheme), diff --git a/ProcessLib/RichardsComponentTransport/RichardsComponentTransportProcess.h b/ProcessLib/RichardsComponentTransport/RichardsComponentTransportProcess.h index dda41a7185b..3e30588146c 100644 --- a/ProcessLib/RichardsComponentTransport/RichardsComponentTransportProcess.h +++ b/ProcessLib/RichardsComponentTransport/RichardsComponentTransportProcess.h @@ -102,6 +102,7 @@ class RichardsComponentTransportProcess final : public Process { public: RichardsComponentTransportProcess( + std::string name, MeshLib::Mesh& mesh, std::unique_ptr<ProcessLib::AbstractJacobianAssembler>&& jacobian_assembler, diff --git a/ProcessLib/RichardsFlow/CreateRichardsFlowProcess.cpp b/ProcessLib/RichardsFlow/CreateRichardsFlowProcess.cpp index 2c5fb72c9f5..69ae467085d 100644 --- a/ProcessLib/RichardsFlow/CreateRichardsFlowProcess.cpp +++ b/ProcessLib/RichardsFlow/CreateRichardsFlowProcess.cpp @@ -23,6 +23,7 @@ namespace ProcessLib namespace RichardsFlow { std::unique_ptr<Process> createRichardsFlowProcess( + std::string name, MeshLib::Mesh& mesh, std::unique_ptr<ProcessLib::AbstractJacobianAssembler>&& jacobian_assembler, std::vector<ProcessVariable> const& variables, @@ -100,10 +101,10 @@ std::unique_ptr<Process> createRichardsFlowProcess( mass_lumping, temperature}; return std::make_unique<RichardsFlowProcess>( - 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), - mat_config, curves); + std::move(name), 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), mat_config, curves); } } // namespace RichardsFlow diff --git a/ProcessLib/RichardsFlow/CreateRichardsFlowProcess.h b/ProcessLib/RichardsFlow/CreateRichardsFlowProcess.h index 3e1c3d9024e..9b909c3c10e 100644 --- a/ProcessLib/RichardsFlow/CreateRichardsFlowProcess.h +++ b/ProcessLib/RichardsFlow/CreateRichardsFlowProcess.h @@ -17,6 +17,7 @@ namespace ProcessLib namespace RichardsFlow { std::unique_ptr<Process> createRichardsFlowProcess( + std::string name, MeshLib::Mesh& mesh, std::unique_ptr<ProcessLib::AbstractJacobianAssembler>&& jacobian_assembler, std::vector<ProcessVariable> const& variables, diff --git a/ProcessLib/RichardsFlow/RichardsFlowProcess.cpp b/ProcessLib/RichardsFlow/RichardsFlowProcess.cpp index 5700226b402..a20c66f88f3 100644 --- a/ProcessLib/RichardsFlow/RichardsFlowProcess.cpp +++ b/ProcessLib/RichardsFlow/RichardsFlowProcess.cpp @@ -18,6 +18,7 @@ namespace ProcessLib namespace RichardsFlow { RichardsFlowProcess::RichardsFlowProcess( + std::string name, MeshLib::Mesh& mesh, std::unique_ptr<ProcessLib::AbstractJacobianAssembler>&& jacobian_assembler, std::vector<std::unique_ptr<ParameterLib::ParameterBase>> const& parameters, @@ -31,7 +32,7 @@ RichardsFlowProcess::RichardsFlowProcess( std::map<std::string, std::unique_ptr<MathLib::PiecewiseLinearInterpolation>> const& /*curves*/) - : Process(mesh, std::move(jacobian_assembler), parameters, + : Process(std::move(name), mesh, std::move(jacobian_assembler), parameters, 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/RichardsFlow/RichardsFlowProcess.h b/ProcessLib/RichardsFlow/RichardsFlowProcess.h index 9569cc38334..333baacf707 100644 --- a/ProcessLib/RichardsFlow/RichardsFlowProcess.h +++ b/ProcessLib/RichardsFlow/RichardsFlowProcess.h @@ -23,6 +23,7 @@ class RichardsFlowProcess final : public Process { public: RichardsFlowProcess( + std::string name, MeshLib::Mesh& mesh, std::unique_ptr<ProcessLib::AbstractJacobianAssembler>&& jacobian_assembler, diff --git a/ProcessLib/RichardsMechanics/CreateRichardsMechanicsProcess.cpp b/ProcessLib/RichardsMechanics/CreateRichardsMechanicsProcess.cpp index 32602b0bc4f..72edbee59de 100644 --- a/ProcessLib/RichardsMechanics/CreateRichardsMechanicsProcess.cpp +++ b/ProcessLib/RichardsMechanics/CreateRichardsMechanicsProcess.cpp @@ -27,6 +27,7 @@ namespace RichardsMechanics { template <int DisplacementDim> std::unique_ptr<Process> createRichardsMechanicsProcess( + std::string name, MeshLib::Mesh& mesh, std::unique_ptr<ProcessLib::AbstractJacobianAssembler>&& jacobian_assembler, std::vector<ProcessVariable> const& variables, @@ -207,13 +208,14 @@ std::unique_ptr<Process> createRichardsMechanicsProcess( named_function_caller); return std::make_unique<RichardsMechanicsProcess<DisplacementDim>>( - 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), - use_monolithic_scheme); + std::move(name), 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), use_monolithic_scheme); } template std::unique_ptr<Process> createRichardsMechanicsProcess<2>( + std::string name, MeshLib::Mesh& mesh, std::unique_ptr<ProcessLib::AbstractJacobianAssembler>&& jacobian_assembler, std::vector<ProcessVariable> const& variables, @@ -224,6 +226,7 @@ template std::unique_ptr<Process> createRichardsMechanicsProcess<2>( BaseLib::ConfigTree const& config); template std::unique_ptr<Process> createRichardsMechanicsProcess<3>( + std::string name, MeshLib::Mesh& mesh, std::unique_ptr<ProcessLib::AbstractJacobianAssembler>&& jacobian_assembler, std::vector<ProcessVariable> const& variables, diff --git a/ProcessLib/RichardsMechanics/CreateRichardsMechanicsProcess.h b/ProcessLib/RichardsMechanics/CreateRichardsMechanicsProcess.h index 3460009ad5e..3d60778d13a 100644 --- a/ProcessLib/RichardsMechanics/CreateRichardsMechanicsProcess.h +++ b/ProcessLib/RichardsMechanics/CreateRichardsMechanicsProcess.h @@ -44,6 +44,7 @@ namespace RichardsMechanics { template <int DisplacementDim> std::unique_ptr<Process> createRichardsMechanicsProcess( + std::string name, MeshLib::Mesh& mesh, std::unique_ptr<ProcessLib::AbstractJacobianAssembler>&& jacobian_assembler, std::vector<ProcessVariable> const& variables, @@ -54,6 +55,7 @@ std::unique_ptr<Process> createRichardsMechanicsProcess( BaseLib::ConfigTree const& config); extern template std::unique_ptr<Process> createRichardsMechanicsProcess<2>( + std::string name, MeshLib::Mesh& mesh, std::unique_ptr<ProcessLib::AbstractJacobianAssembler>&& jacobian_assembler, std::vector<ProcessVariable> const& variables, @@ -64,6 +66,7 @@ extern template std::unique_ptr<Process> createRichardsMechanicsProcess<2>( BaseLib::ConfigTree const& config); extern template std::unique_ptr<Process> createRichardsMechanicsProcess<3>( + std::string name, MeshLib::Mesh& mesh, std::unique_ptr<ProcessLib::AbstractJacobianAssembler>&& jacobian_assembler, std::vector<ProcessVariable> const& variables, diff --git a/ProcessLib/RichardsMechanics/RichardsMechanicsProcess.cpp b/ProcessLib/RichardsMechanics/RichardsMechanicsProcess.cpp index e769eb695aa..e637303488b 100644 --- a/ProcessLib/RichardsMechanics/RichardsMechanicsProcess.cpp +++ b/ProcessLib/RichardsMechanics/RichardsMechanicsProcess.cpp @@ -25,6 +25,7 @@ namespace RichardsMechanics { template <int DisplacementDim> RichardsMechanicsProcess<DisplacementDim>::RichardsMechanicsProcess( + std::string name, MeshLib::Mesh& mesh, std::unique_ptr<ProcessLib::AbstractJacobianAssembler>&& jacobian_assembler, std::vector<std::unique_ptr<ParameterLib::ParameterBase>> const& parameters, @@ -35,7 +36,7 @@ RichardsMechanicsProcess<DisplacementDim>::RichardsMechanicsProcess( SecondaryVariableCollection&& secondary_variables, NumLib::NamedFunctionCaller&& named_function_caller, bool const use_monolithic_scheme) - : Process(mesh, std::move(jacobian_assembler), parameters, + : Process(std::move(name), mesh, std::move(jacobian_assembler), parameters, integration_order, std::move(process_variables), std::move(secondary_variables), std::move(named_function_caller), use_monolithic_scheme), diff --git a/ProcessLib/RichardsMechanics/RichardsMechanicsProcess.h b/ProcessLib/RichardsMechanics/RichardsMechanicsProcess.h index 42abbab1fdb..de7dc832efd 100644 --- a/ProcessLib/RichardsMechanics/RichardsMechanicsProcess.h +++ b/ProcessLib/RichardsMechanics/RichardsMechanicsProcess.h @@ -28,6 +28,7 @@ class RichardsMechanicsProcess final : public Process { public: RichardsMechanicsProcess( + std::string name, MeshLib::Mesh& mesh, std::unique_ptr<ProcessLib::AbstractJacobianAssembler>&& jacobian_assembler, diff --git a/ProcessLib/SmallDeformation/CreateSmallDeformationProcess.cpp b/ProcessLib/SmallDeformation/CreateSmallDeformationProcess.cpp index 4dc667f6762..363001b2f25 100644 --- a/ProcessLib/SmallDeformation/CreateSmallDeformationProcess.cpp +++ b/ProcessLib/SmallDeformation/CreateSmallDeformationProcess.cpp @@ -25,6 +25,7 @@ namespace SmallDeformation { template <int DisplacementDim> std::unique_ptr<Process> createSmallDeformationProcess( + std::string name, MeshLib::Mesh& mesh, std::unique_ptr<ProcessLib::AbstractJacobianAssembler>&& jacobian_assembler, std::vector<ProcessVariable> const& variables, @@ -130,12 +131,14 @@ std::unique_ptr<Process> createSmallDeformationProcess( named_function_caller); return std::make_unique<SmallDeformationProcess<DisplacementDim>>( - 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)); + std::move(name), 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)); } template std::unique_ptr<Process> createSmallDeformationProcess<2>( + std::string name, MeshLib::Mesh& mesh, std::unique_ptr<ProcessLib::AbstractJacobianAssembler>&& jacobian_assembler, std::vector<ProcessVariable> const& variables, @@ -146,6 +149,7 @@ template std::unique_ptr<Process> createSmallDeformationProcess<2>( BaseLib::ConfigTree const& config); template std::unique_ptr<Process> createSmallDeformationProcess<3>( + std::string name, MeshLib::Mesh& mesh, std::unique_ptr<ProcessLib::AbstractJacobianAssembler>&& jacobian_assembler, std::vector<ProcessVariable> const& variables, diff --git a/ProcessLib/SmallDeformation/CreateSmallDeformationProcess.h b/ProcessLib/SmallDeformation/CreateSmallDeformationProcess.h index 2f65e1df4a6..67cfb3f9710 100644 --- a/ProcessLib/SmallDeformation/CreateSmallDeformationProcess.h +++ b/ProcessLib/SmallDeformation/CreateSmallDeformationProcess.h @@ -39,6 +39,7 @@ namespace SmallDeformation { template <int DisplacementDim> std::unique_ptr<Process> createSmallDeformationProcess( + std::string name, MeshLib::Mesh& mesh, std::unique_ptr<ProcessLib::AbstractJacobianAssembler>&& jacobian_assembler, std::vector<ProcessVariable> const& variables, @@ -49,6 +50,7 @@ std::unique_ptr<Process> createSmallDeformationProcess( BaseLib::ConfigTree const& config); extern template std::unique_ptr<Process> createSmallDeformationProcess<2>( + std::string name, MeshLib::Mesh& mesh, std::unique_ptr<ProcessLib::AbstractJacobianAssembler>&& jacobian_assembler, std::vector<ProcessVariable> const& variables, @@ -59,6 +61,7 @@ extern template std::unique_ptr<Process> createSmallDeformationProcess<2>( BaseLib::ConfigTree const& config); extern template std::unique_ptr<Process> createSmallDeformationProcess<3>( + std::string name, MeshLib::Mesh& mesh, std::unique_ptr<ProcessLib::AbstractJacobianAssembler>&& jacobian_assembler, std::vector<ProcessVariable> const& variables, diff --git a/ProcessLib/SmallDeformation/SmallDeformationProcess.cpp b/ProcessLib/SmallDeformation/SmallDeformationProcess.cpp index 15e5712f487..9dd1e09bbd7 100644 --- a/ProcessLib/SmallDeformation/SmallDeformationProcess.cpp +++ b/ProcessLib/SmallDeformation/SmallDeformationProcess.cpp @@ -24,6 +24,7 @@ namespace SmallDeformation { template <int DisplacementDim> SmallDeformationProcess<DisplacementDim>::SmallDeformationProcess( + std::string name, MeshLib::Mesh& mesh, std::unique_ptr<ProcessLib::AbstractJacobianAssembler>&& jacobian_assembler, std::vector<std::unique_ptr<ParameterLib::ParameterBase>> const& parameters, @@ -33,7 +34,7 @@ SmallDeformationProcess<DisplacementDim>::SmallDeformationProcess( SmallDeformationProcessData<DisplacementDim>&& process_data, SecondaryVariableCollection&& secondary_variables, NumLib::NamedFunctionCaller&& named_function_caller) - : Process(mesh, std::move(jacobian_assembler), parameters, + : Process(std::move(name), mesh, std::move(jacobian_assembler), parameters, 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/SmallDeformation/SmallDeformationProcess.h b/ProcessLib/SmallDeformation/SmallDeformationProcess.h index 43b781fd77d..f2fea57c394 100644 --- a/ProcessLib/SmallDeformation/SmallDeformationProcess.h +++ b/ProcessLib/SmallDeformation/SmallDeformationProcess.h @@ -57,6 +57,7 @@ class SmallDeformationProcess final : public Process { public: SmallDeformationProcess( + std::string name, MeshLib::Mesh& mesh, std::unique_ptr<ProcessLib::AbstractJacobianAssembler>&& jacobian_assembler, diff --git a/ProcessLib/SmallDeformationNonlocal/CreateSmallDeformationNonlocalProcess.cpp b/ProcessLib/SmallDeformationNonlocal/CreateSmallDeformationNonlocalProcess.cpp index 23e7b42a171..6f80ecc93fb 100644 --- a/ProcessLib/SmallDeformationNonlocal/CreateSmallDeformationNonlocalProcess.cpp +++ b/ProcessLib/SmallDeformationNonlocal/CreateSmallDeformationNonlocalProcess.cpp @@ -27,6 +27,7 @@ namespace SmallDeformationNonlocal { template <int DisplacementDim> std::unique_ptr<Process> createSmallDeformationNonlocalProcess( + std::string name, MeshLib::Mesh& mesh, std::unique_ptr<ProcessLib::AbstractJacobianAssembler>&& jacobian_assembler, std::vector<ProcessVariable> const& variables, @@ -121,12 +122,14 @@ std::unique_ptr<Process> createSmallDeformationNonlocalProcess( named_function_caller); return std::make_unique<SmallDeformationNonlocalProcess<DisplacementDim>>( - 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)); + std::move(name), 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)); } template std::unique_ptr<Process> createSmallDeformationNonlocalProcess<2>( + std::string name, MeshLib::Mesh& mesh, std::unique_ptr<ProcessLib::AbstractJacobianAssembler>&& jacobian_assembler, std::vector<ProcessVariable> const& variables, @@ -137,6 +140,7 @@ template std::unique_ptr<Process> createSmallDeformationNonlocalProcess<2>( BaseLib::ConfigTree const& config); template std::unique_ptr<Process> createSmallDeformationNonlocalProcess<3>( + std::string name, MeshLib::Mesh& mesh, std::unique_ptr<ProcessLib::AbstractJacobianAssembler>&& jacobian_assembler, std::vector<ProcessVariable> const& variables, diff --git a/ProcessLib/SmallDeformationNonlocal/CreateSmallDeformationNonlocalProcess.h b/ProcessLib/SmallDeformationNonlocal/CreateSmallDeformationNonlocalProcess.h index 35ad5af8c76..0296e5a17da 100644 --- a/ProcessLib/SmallDeformationNonlocal/CreateSmallDeformationNonlocalProcess.h +++ b/ProcessLib/SmallDeformationNonlocal/CreateSmallDeformationNonlocalProcess.h @@ -41,6 +41,7 @@ namespace SmallDeformationNonlocal { template <int DisplacementDim> std::unique_ptr<Process> createSmallDeformationNonlocalProcess( + std::string name, MeshLib::Mesh& mesh, std::unique_ptr<ProcessLib::AbstractJacobianAssembler>&& jacobian_assembler, std::vector<ProcessVariable> const& variables, @@ -52,6 +53,7 @@ std::unique_ptr<Process> createSmallDeformationNonlocalProcess( extern template std::unique_ptr<Process> createSmallDeformationNonlocalProcess<2>( + std::string name, MeshLib::Mesh& mesh, std::unique_ptr<ProcessLib::AbstractJacobianAssembler>&& jacobian_assembler, std::vector<ProcessVariable> const& variables, @@ -63,6 +65,7 @@ createSmallDeformationNonlocalProcess<2>( extern template std::unique_ptr<Process> createSmallDeformationNonlocalProcess<3>( + std::string name, MeshLib::Mesh& mesh, std::unique_ptr<ProcessLib::AbstractJacobianAssembler>&& jacobian_assembler, std::vector<ProcessVariable> const& variables, diff --git a/ProcessLib/SmallDeformationNonlocal/SmallDeformationNonlocalProcess.cpp b/ProcessLib/SmallDeformationNonlocal/SmallDeformationNonlocalProcess.cpp index bb57a0f0812..a519165e138 100644 --- a/ProcessLib/SmallDeformationNonlocal/SmallDeformationNonlocalProcess.cpp +++ b/ProcessLib/SmallDeformationNonlocal/SmallDeformationNonlocalProcess.cpp @@ -24,6 +24,7 @@ namespace SmallDeformationNonlocal template <int DisplacementDim> SmallDeformationNonlocalProcess<DisplacementDim>:: SmallDeformationNonlocalProcess( + std::string name, MeshLib::Mesh& mesh, std::unique_ptr<ProcessLib::AbstractJacobianAssembler>&& jacobian_assembler, @@ -35,7 +36,7 @@ SmallDeformationNonlocalProcess<DisplacementDim>:: SmallDeformationNonlocalProcessData<DisplacementDim>&& process_data, SecondaryVariableCollection&& secondary_variables, NumLib::NamedFunctionCaller&& named_function_caller) - : Process(mesh, std::move(jacobian_assembler), parameters, + : Process(std::move(name), mesh, std::move(jacobian_assembler), parameters, 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/SmallDeformationNonlocal/SmallDeformationNonlocalProcess.h b/ProcessLib/SmallDeformationNonlocal/SmallDeformationNonlocalProcess.h index 0aa405f9fa5..8cc5e6646d3 100644 --- a/ProcessLib/SmallDeformationNonlocal/SmallDeformationNonlocalProcess.h +++ b/ProcessLib/SmallDeformationNonlocal/SmallDeformationNonlocalProcess.h @@ -30,6 +30,7 @@ class SmallDeformationNonlocalProcess final : public Process { public: SmallDeformationNonlocalProcess( + std::string name, MeshLib::Mesh& mesh, std::unique_ptr<ProcessLib::AbstractJacobianAssembler>&& jacobian_assembler, diff --git a/ProcessLib/TES/CreateTESProcess.cpp b/ProcessLib/TES/CreateTESProcess.cpp index 18529dad88f..249c38ffaea 100644 --- a/ProcessLib/TES/CreateTESProcess.cpp +++ b/ProcessLib/TES/CreateTESProcess.cpp @@ -17,6 +17,7 @@ namespace ProcessLib namespace TES { std::unique_ptr<Process> createTESProcess( + std::string name, MeshLib::Mesh& mesh, std::unique_ptr<ProcessLib::AbstractJacobianAssembler>&& jacobian_assembler, std::vector<ProcessVariable> const& variables, @@ -54,9 +55,10 @@ std::unique_ptr<Process> createTESProcess( named_function_caller); return std::make_unique<TESProcess>( - mesh, std::move(jacobian_assembler), parameters, integration_order, - std::move(process_variables), std::move(secondary_variables), - std::move(named_function_caller), config); + std::move(name), mesh, std::move(jacobian_assembler), parameters, + integration_order, std::move(process_variables), + std::move(secondary_variables), std::move(named_function_caller), + config); } } // namespace TES diff --git a/ProcessLib/TES/CreateTESProcess.h b/ProcessLib/TES/CreateTESProcess.h index 19ab317d38b..2c2f7702847 100644 --- a/ProcessLib/TES/CreateTESProcess.h +++ b/ProcessLib/TES/CreateTESProcess.h @@ -17,6 +17,7 @@ namespace ProcessLib namespace TES { std::unique_ptr<Process> createTESProcess( + std::string name, MeshLib::Mesh& mesh, std::unique_ptr<ProcessLib::AbstractJacobianAssembler>&& jacobian_assembler, std::vector<ProcessVariable> const& variables, diff --git a/ProcessLib/TES/TESProcess.cpp b/ProcessLib/TES/TESProcess.cpp index fff9197d14f..28daf999742 100644 --- a/ProcessLib/TES/TESProcess.cpp +++ b/ProcessLib/TES/TESProcess.cpp @@ -17,6 +17,7 @@ namespace ProcessLib namespace TES { TESProcess::TESProcess( + std::string name, MeshLib::Mesh& mesh, std::unique_ptr<AbstractJacobianAssembler>&& jacobian_assembler, std::vector<std::unique_ptr<ParameterLib::ParameterBase>> const& parameters, @@ -26,7 +27,7 @@ TESProcess::TESProcess( SecondaryVariableCollection&& secondary_variables, NumLib::NamedFunctionCaller&& named_function_caller, const BaseLib::ConfigTree& config) - : Process(mesh, std::move(jacobian_assembler), parameters, + : Process(std::move(name), mesh, std::move(jacobian_assembler), parameters, integration_order, std::move(process_variables), std::move(secondary_variables), std::move(named_function_caller)) { diff --git a/ProcessLib/TES/TESProcess.h b/ProcessLib/TES/TESProcess.h index 9779b635272..86ba0a1ea73 100644 --- a/ProcessLib/TES/TESProcess.h +++ b/ProcessLib/TES/TESProcess.h @@ -31,6 +31,7 @@ class TESProcess final : public Process { public: TESProcess( + std::string name, MeshLib::Mesh& mesh, std::unique_ptr<AbstractJacobianAssembler>&& jacobian_assembler, std::vector<std::unique_ptr<ParameterLib::ParameterBase>> const& diff --git a/ProcessLib/ThermalTwoPhaseFlowWithPP/CreateThermalTwoPhaseFlowWithPPProcess.cpp b/ProcessLib/ThermalTwoPhaseFlowWithPP/CreateThermalTwoPhaseFlowWithPPProcess.cpp index dca8ef51229..2ecc9baa56a 100644 --- a/ProcessLib/ThermalTwoPhaseFlowWithPP/CreateThermalTwoPhaseFlowWithPPProcess.cpp +++ b/ProcessLib/ThermalTwoPhaseFlowWithPP/CreateThermalTwoPhaseFlowWithPPProcess.cpp @@ -27,6 +27,7 @@ namespace ProcessLib namespace ThermalTwoPhaseFlowWithPP { std::unique_ptr<Process> createThermalTwoPhaseFlowWithPPProcess( + std::string name, MeshLib::Mesh& mesh, std::unique_ptr<ProcessLib::AbstractJacobianAssembler>&& jacobian_assembler, std::vector<ProcessVariable> const& variables, @@ -138,10 +139,10 @@ std::unique_ptr<Process> createThermalTwoPhaseFlowWithPPProcess( std::move(material)}; return std::make_unique<ThermalTwoPhaseFlowWithPPProcess>( - 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), - mat_config, curves); + std::move(name), 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), mat_config, curves); } } // namespace ThermalTwoPhaseFlowWithPP diff --git a/ProcessLib/ThermalTwoPhaseFlowWithPP/CreateThermalTwoPhaseFlowWithPPProcess.h b/ProcessLib/ThermalTwoPhaseFlowWithPP/CreateThermalTwoPhaseFlowWithPPProcess.h index 450dcb2ffaa..f5319316190 100644 --- a/ProcessLib/ThermalTwoPhaseFlowWithPP/CreateThermalTwoPhaseFlowWithPPProcess.h +++ b/ProcessLib/ThermalTwoPhaseFlowWithPP/CreateThermalTwoPhaseFlowWithPPProcess.h @@ -18,6 +18,7 @@ namespace ProcessLib namespace ThermalTwoPhaseFlowWithPP { std::unique_ptr<Process> createThermalTwoPhaseFlowWithPPProcess( + std::string name, MeshLib::Mesh& mesh, std::unique_ptr<ProcessLib::AbstractJacobianAssembler>&& jacobian_assembler, std::vector<ProcessVariable> const& variables, diff --git a/ProcessLib/ThermalTwoPhaseFlowWithPP/ThermalTwoPhaseFlowWithPPProcess.cpp b/ProcessLib/ThermalTwoPhaseFlowWithPP/ThermalTwoPhaseFlowWithPPProcess.cpp index a448deb0305..85ce16e56e2 100644 --- a/ProcessLib/ThermalTwoPhaseFlowWithPP/ThermalTwoPhaseFlowWithPPProcess.cpp +++ b/ProcessLib/ThermalTwoPhaseFlowWithPP/ThermalTwoPhaseFlowWithPPProcess.cpp @@ -25,6 +25,7 @@ namespace ProcessLib namespace ThermalTwoPhaseFlowWithPP { ThermalTwoPhaseFlowWithPPProcess::ThermalTwoPhaseFlowWithPPProcess( + std::string name, MeshLib::Mesh& mesh, std::unique_ptr<AbstractJacobianAssembler>&& jacobian_assembler, std::vector<std::unique_ptr<ParameterLib::ParameterBase>> const& parameters, @@ -38,7 +39,7 @@ ThermalTwoPhaseFlowWithPPProcess::ThermalTwoPhaseFlowWithPPProcess( std::map<std::string, std::unique_ptr<MathLib::PiecewiseLinearInterpolation>> const& /*curves*/) - : Process(mesh, std::move(jacobian_assembler), parameters, + : Process(std::move(name), mesh, std::move(jacobian_assembler), parameters, 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/ThermalTwoPhaseFlowWithPP/ThermalTwoPhaseFlowWithPPProcess.h b/ProcessLib/ThermalTwoPhaseFlowWithPP/ThermalTwoPhaseFlowWithPPProcess.h index 5cac5af027f..4426073f98f 100644 --- a/ProcessLib/ThermalTwoPhaseFlowWithPP/ThermalTwoPhaseFlowWithPPProcess.h +++ b/ProcessLib/ThermalTwoPhaseFlowWithPP/ThermalTwoPhaseFlowWithPPProcess.h @@ -38,6 +38,7 @@ class ThermalTwoPhaseFlowWithPPProcess final : public Process { public: ThermalTwoPhaseFlowWithPPProcess( + std::string name, MeshLib::Mesh& mesh, std::unique_ptr<AbstractJacobianAssembler>&& jacobian_assembler, std::vector<std::unique_ptr<ParameterLib::ParameterBase>> const& diff --git a/ProcessLib/ThermoHydroMechanics/CreateThermoHydroMechanicsProcess.cpp b/ProcessLib/ThermoHydroMechanics/CreateThermoHydroMechanicsProcess.cpp index 2b30d9659f4..443f72b20c6 100644 --- a/ProcessLib/ThermoHydroMechanics/CreateThermoHydroMechanicsProcess.cpp +++ b/ProcessLib/ThermoHydroMechanics/CreateThermoHydroMechanicsProcess.cpp @@ -27,6 +27,7 @@ namespace ThermoHydroMechanics { template <int DisplacementDim> std::unique_ptr<Process> createThermoHydroMechanicsProcess( + std::string name, MeshLib::Mesh& mesh, std::unique_ptr<ProcessLib::AbstractJacobianAssembler>&& jacobian_assembler, std::vector<ProcessVariable> const& variables, @@ -289,13 +290,14 @@ std::unique_ptr<Process> createThermoHydroMechanicsProcess( named_function_caller); return std::make_unique<ThermoHydroMechanicsProcess<DisplacementDim>>( - 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), - use_monolithic_scheme); + std::move(name), 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), use_monolithic_scheme); } template std::unique_ptr<Process> createThermoHydroMechanicsProcess<2>( + std::string name, MeshLib::Mesh& mesh, std::unique_ptr<ProcessLib::AbstractJacobianAssembler>&& jacobian_assembler, std::vector<ProcessVariable> const& variables, @@ -306,6 +308,7 @@ template std::unique_ptr<Process> createThermoHydroMechanicsProcess<2>( BaseLib::ConfigTree const& config); template std::unique_ptr<Process> createThermoHydroMechanicsProcess<3>( + std::string name, MeshLib::Mesh& mesh, std::unique_ptr<ProcessLib::AbstractJacobianAssembler>&& jacobian_assembler, std::vector<ProcessVariable> const& variables, diff --git a/ProcessLib/ThermoHydroMechanics/CreateThermoHydroMechanicsProcess.h b/ProcessLib/ThermoHydroMechanics/CreateThermoHydroMechanicsProcess.h index aab4795f238..99641a62eb6 100644 --- a/ProcessLib/ThermoHydroMechanics/CreateThermoHydroMechanicsProcess.h +++ b/ProcessLib/ThermoHydroMechanics/CreateThermoHydroMechanicsProcess.h @@ -40,6 +40,7 @@ namespace ThermoHydroMechanics { template <int DisplacementDim> std::unique_ptr<Process> createThermoHydroMechanicsProcess( + std::string name, MeshLib::Mesh& mesh, std::unique_ptr<ProcessLib::AbstractJacobianAssembler>&& jacobian_assembler, std::vector<ProcessVariable> const& variables, @@ -50,6 +51,7 @@ std::unique_ptr<Process> createThermoHydroMechanicsProcess( BaseLib::ConfigTree const& config); extern template std::unique_ptr<Process> createThermoHydroMechanicsProcess<2>( + std::string name, MeshLib::Mesh& mesh, std::unique_ptr<ProcessLib::AbstractJacobianAssembler>&& jacobian_assembler, std::vector<ProcessVariable> const& variables, @@ -60,6 +62,7 @@ extern template std::unique_ptr<Process> createThermoHydroMechanicsProcess<2>( BaseLib::ConfigTree const& config); extern template std::unique_ptr<Process> createThermoHydroMechanicsProcess<3>( + std::string name, MeshLib::Mesh& mesh, std::unique_ptr<ProcessLib::AbstractJacobianAssembler>&& jacobian_assembler, std::vector<ProcessVariable> const& variables, diff --git a/ProcessLib/ThermoHydroMechanics/ThermoHydroMechanicsProcess.cpp b/ProcessLib/ThermoHydroMechanics/ThermoHydroMechanicsProcess.cpp index bf7ba62e719..9f6cef0bb3c 100644 --- a/ProcessLib/ThermoHydroMechanics/ThermoHydroMechanicsProcess.cpp +++ b/ProcessLib/ThermoHydroMechanics/ThermoHydroMechanicsProcess.cpp @@ -26,6 +26,7 @@ namespace ThermoHydroMechanics { template <int DisplacementDim> ThermoHydroMechanicsProcess<DisplacementDim>::ThermoHydroMechanicsProcess( + std::string name, MeshLib::Mesh& mesh, std::unique_ptr<ProcessLib::AbstractJacobianAssembler>&& jacobian_assembler, std::vector<std::unique_ptr<ParameterLib::ParameterBase>> const& parameters, @@ -36,7 +37,7 @@ ThermoHydroMechanicsProcess<DisplacementDim>::ThermoHydroMechanicsProcess( SecondaryVariableCollection&& secondary_variables, NumLib::NamedFunctionCaller&& named_function_caller, bool const use_monolithic_scheme) - : Process(mesh, std::move(jacobian_assembler), parameters, + : Process(std::move(name), mesh, std::move(jacobian_assembler), parameters, integration_order, std::move(process_variables), std::move(secondary_variables), std::move(named_function_caller), use_monolithic_scheme), diff --git a/ProcessLib/ThermoHydroMechanics/ThermoHydroMechanicsProcess.h b/ProcessLib/ThermoHydroMechanics/ThermoHydroMechanicsProcess.h index 06e715747b0..20b7e766061 100644 --- a/ProcessLib/ThermoHydroMechanics/ThermoHydroMechanicsProcess.h +++ b/ProcessLib/ThermoHydroMechanics/ThermoHydroMechanicsProcess.h @@ -30,6 +30,7 @@ class ThermoHydroMechanicsProcess final : public Process { public: ThermoHydroMechanicsProcess( + std::string name, MeshLib::Mesh& mesh, std::unique_ptr<ProcessLib::AbstractJacobianAssembler>&& jacobian_assembler, diff --git a/ProcessLib/ThermoMechanicalPhaseField/CreateThermoMechanicalPhaseFieldProcess.cpp b/ProcessLib/ThermoMechanicalPhaseField/CreateThermoMechanicalPhaseFieldProcess.cpp index ab90b585a1c..12c118bcde6 100644 --- a/ProcessLib/ThermoMechanicalPhaseField/CreateThermoMechanicalPhaseFieldProcess.cpp +++ b/ProcessLib/ThermoMechanicalPhaseField/CreateThermoMechanicalPhaseFieldProcess.cpp @@ -26,6 +26,7 @@ namespace ThermoMechanicalPhaseField { template <int DisplacementDim> std::unique_ptr<Process> createThermoMechanicalPhaseFieldProcess( + std::string name, MeshLib::Mesh& mesh, std::unique_ptr<ProcessLib::AbstractJacobianAssembler>&& jacobian_assembler, std::vector<ProcessVariable> const& variables, @@ -238,14 +239,15 @@ std::unique_ptr<Process> createThermoMechanicalPhaseFieldProcess( named_function_caller); return std::make_unique<ThermoMechanicalPhaseFieldProcess<DisplacementDim>>( - 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), - mechanics_related_process_id, phase_field_process_id, - heat_conduction_process_id); + std::move(name), 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), mechanics_related_process_id, + phase_field_process_id, heat_conduction_process_id); } template std::unique_ptr<Process> createThermoMechanicalPhaseFieldProcess<2>( + std::string name, MeshLib::Mesh& mesh, std::unique_ptr<ProcessLib::AbstractJacobianAssembler>&& jacobian_assembler, std::vector<ProcessVariable> const& variables, @@ -256,6 +258,7 @@ template std::unique_ptr<Process> createThermoMechanicalPhaseFieldProcess<2>( BaseLib::ConfigTree const& config); template std::unique_ptr<Process> createThermoMechanicalPhaseFieldProcess<3>( + std::string name, MeshLib::Mesh& mesh, std::unique_ptr<ProcessLib::AbstractJacobianAssembler>&& jacobian_assembler, std::vector<ProcessVariable> const& variables, diff --git a/ProcessLib/ThermoMechanicalPhaseField/CreateThermoMechanicalPhaseFieldProcess.h b/ProcessLib/ThermoMechanicalPhaseField/CreateThermoMechanicalPhaseFieldProcess.h index 6c67907b3b1..df35d6d353b 100644 --- a/ProcessLib/ThermoMechanicalPhaseField/CreateThermoMechanicalPhaseFieldProcess.h +++ b/ProcessLib/ThermoMechanicalPhaseField/CreateThermoMechanicalPhaseFieldProcess.h @@ -39,6 +39,7 @@ namespace ThermoMechanicalPhaseField { template <int DisplacementDim> std::unique_ptr<Process> createThermoMechanicalPhaseFieldProcess( + std::string name, MeshLib::Mesh& mesh, std::unique_ptr<ProcessLib::AbstractJacobianAssembler>&& jacobian_assembler, std::vector<ProcessVariable> const& variables, @@ -50,6 +51,7 @@ std::unique_ptr<Process> createThermoMechanicalPhaseFieldProcess( extern template std::unique_ptr<Process> createThermoMechanicalPhaseFieldProcess<2>( + std::string name, MeshLib::Mesh& mesh, std::unique_ptr<ProcessLib::AbstractJacobianAssembler>&& jacobian_assembler, std::vector<ProcessVariable> const& variables, @@ -61,6 +63,7 @@ createThermoMechanicalPhaseFieldProcess<2>( extern template std::unique_ptr<Process> createThermoMechanicalPhaseFieldProcess<3>( + std::string name, MeshLib::Mesh& mesh, std::unique_ptr<ProcessLib::AbstractJacobianAssembler>&& jacobian_assembler, std::vector<ProcessVariable> const& variables, diff --git a/ProcessLib/ThermoMechanicalPhaseField/ThermoMechanicalPhaseFieldProcess-impl.h b/ProcessLib/ThermoMechanicalPhaseField/ThermoMechanicalPhaseFieldProcess-impl.h index d8f13f88c7e..70bb459ec37 100644 --- a/ProcessLib/ThermoMechanicalPhaseField/ThermoMechanicalPhaseFieldProcess-impl.h +++ b/ProcessLib/ThermoMechanicalPhaseField/ThermoMechanicalPhaseFieldProcess-impl.h @@ -26,6 +26,7 @@ namespace ThermoMechanicalPhaseField template <int DisplacementDim> ThermoMechanicalPhaseFieldProcess<DisplacementDim>:: ThermoMechanicalPhaseFieldProcess( + std::string name, MeshLib::Mesh& mesh, std::unique_ptr<ProcessLib::AbstractJacobianAssembler>&& jacobian_assembler, @@ -40,7 +41,7 @@ ThermoMechanicalPhaseFieldProcess<DisplacementDim>:: int const mechanics_related_process_id, int const phase_field_process_id, int const heat_conduction_process_id) - : Process(mesh, std::move(jacobian_assembler), parameters, + : Process(std::move(name), mesh, std::move(jacobian_assembler), parameters, integration_order, std::move(process_variables), std::move(secondary_variables), std::move(named_function_caller), false), diff --git a/ProcessLib/ThermoMechanicalPhaseField/ThermoMechanicalPhaseFieldProcess.h b/ProcessLib/ThermoMechanicalPhaseField/ThermoMechanicalPhaseFieldProcess.h index 96b06ef12c2..b1da0669b74 100644 --- a/ProcessLib/ThermoMechanicalPhaseField/ThermoMechanicalPhaseFieldProcess.h +++ b/ProcessLib/ThermoMechanicalPhaseField/ThermoMechanicalPhaseFieldProcess.h @@ -54,6 +54,7 @@ class ThermoMechanicalPhaseFieldProcess final : public Process { public: ThermoMechanicalPhaseFieldProcess( + std::string name, MeshLib::Mesh& mesh, std::unique_ptr<ProcessLib::AbstractJacobianAssembler>&& jacobian_assembler, diff --git a/ProcessLib/ThermoMechanics/CreateThermoMechanicsProcess.cpp b/ProcessLib/ThermoMechanics/CreateThermoMechanicsProcess.cpp index 28125527442..405f850269f 100644 --- a/ProcessLib/ThermoMechanics/CreateThermoMechanicsProcess.cpp +++ b/ProcessLib/ThermoMechanics/CreateThermoMechanicsProcess.cpp @@ -26,6 +26,7 @@ namespace ThermoMechanics { template <int DisplacementDim> std::unique_ptr<Process> createThermoMechanicsProcess( + std::string name, MeshLib::Mesh& mesh, std::unique_ptr<ProcessLib::AbstractJacobianAssembler>&& jacobian_assembler, std::vector<ProcessVariable> const& variables, @@ -174,13 +175,14 @@ std::unique_ptr<Process> createThermoMechanicsProcess( named_function_caller); return std::make_unique<ThermoMechanicsProcess<DisplacementDim>>( - 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), - use_monolithic_scheme); + std::move(name), 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), use_monolithic_scheme); } template std::unique_ptr<Process> createThermoMechanicsProcess<2>( + std::string name, MeshLib::Mesh& mesh, std::unique_ptr<ProcessLib::AbstractJacobianAssembler>&& jacobian_assembler, std::vector<ProcessVariable> const& variables, @@ -191,6 +193,7 @@ template std::unique_ptr<Process> createThermoMechanicsProcess<2>( BaseLib::ConfigTree const& config); template std::unique_ptr<Process> createThermoMechanicsProcess<3>( + std::string name, MeshLib::Mesh& mesh, std::unique_ptr<ProcessLib::AbstractJacobianAssembler>&& jacobian_assembler, std::vector<ProcessVariable> const& variables, diff --git a/ProcessLib/ThermoMechanics/CreateThermoMechanicsProcess.h b/ProcessLib/ThermoMechanics/CreateThermoMechanicsProcess.h index 33fa996ebb5..2c8e328f2a6 100644 --- a/ProcessLib/ThermoMechanics/CreateThermoMechanicsProcess.h +++ b/ProcessLib/ThermoMechanics/CreateThermoMechanicsProcess.h @@ -39,6 +39,7 @@ namespace ThermoMechanics { template <int DisplacementDim> std::unique_ptr<Process> createThermoMechanicsProcess( + std::string name, MeshLib::Mesh& mesh, std::unique_ptr<ProcessLib::AbstractJacobianAssembler>&& jacobian_assembler, std::vector<ProcessVariable> const& variables, @@ -49,6 +50,7 @@ std::unique_ptr<Process> createThermoMechanicsProcess( BaseLib::ConfigTree const& config); extern template std::unique_ptr<Process> createThermoMechanicsProcess<2>( + std::string name, MeshLib::Mesh& mesh, std::unique_ptr<ProcessLib::AbstractJacobianAssembler>&& jacobian_assembler, std::vector<ProcessVariable> const& variables, @@ -59,6 +61,7 @@ extern template std::unique_ptr<Process> createThermoMechanicsProcess<2>( BaseLib::ConfigTree const& config); extern template std::unique_ptr<Process> createThermoMechanicsProcess<3>( + std::string name, MeshLib::Mesh& mesh, std::unique_ptr<ProcessLib::AbstractJacobianAssembler>&& jacobian_assembler, std::vector<ProcessVariable> const& variables, diff --git a/ProcessLib/ThermoMechanics/ThermoMechanicsProcess.cpp b/ProcessLib/ThermoMechanics/ThermoMechanicsProcess.cpp index 1c6ffa06823..5df40fcff52 100644 --- a/ProcessLib/ThermoMechanics/ThermoMechanicsProcess.cpp +++ b/ProcessLib/ThermoMechanics/ThermoMechanicsProcess.cpp @@ -23,6 +23,7 @@ namespace ThermoMechanics { template <int DisplacementDim> ThermoMechanicsProcess<DisplacementDim>::ThermoMechanicsProcess( + std::string name, MeshLib::Mesh& mesh, std::unique_ptr<ProcessLib::AbstractJacobianAssembler>&& jacobian_assembler, std::vector<std::unique_ptr<ParameterLib::ParameterBase>> const& parameters, @@ -33,7 +34,7 @@ ThermoMechanicsProcess<DisplacementDim>::ThermoMechanicsProcess( SecondaryVariableCollection&& secondary_variables, NumLib::NamedFunctionCaller&& named_function_caller, bool const use_monolithic_scheme) - : Process(mesh, std::move(jacobian_assembler), parameters, + : Process(std::move(name), mesh, std::move(jacobian_assembler), parameters, integration_order, std::move(process_variables), std::move(secondary_variables), std::move(named_function_caller), use_monolithic_scheme), diff --git a/ProcessLib/ThermoMechanics/ThermoMechanicsProcess.h b/ProcessLib/ThermoMechanics/ThermoMechanicsProcess.h index 8acc1fc037f..67f7cdb91e8 100644 --- a/ProcessLib/ThermoMechanics/ThermoMechanicsProcess.h +++ b/ProcessLib/ThermoMechanics/ThermoMechanicsProcess.h @@ -63,6 +63,7 @@ class ThermoMechanicsProcess final : public Process { public: ThermoMechanicsProcess( + std::string name, MeshLib::Mesh& mesh, std::unique_ptr<ProcessLib::AbstractJacobianAssembler>&& jacobian_assembler, diff --git a/ProcessLib/TwoPhaseFlowWithPP/CreateTwoPhaseFlowWithPPProcess.cpp b/ProcessLib/TwoPhaseFlowWithPP/CreateTwoPhaseFlowWithPPProcess.cpp index bf80c7a301a..aae871671ca 100644 --- a/ProcessLib/TwoPhaseFlowWithPP/CreateTwoPhaseFlowWithPPProcess.cpp +++ b/ProcessLib/TwoPhaseFlowWithPP/CreateTwoPhaseFlowWithPPProcess.cpp @@ -24,6 +24,7 @@ namespace ProcessLib namespace TwoPhaseFlowWithPP { std::unique_ptr<Process> createTwoPhaseFlowWithPPProcess( + std::string name, MeshLib::Mesh& mesh, std::unique_ptr<ProcessLib::AbstractJacobianAssembler>&& jacobian_assembler, std::vector<ProcessVariable> const& variables, @@ -98,10 +99,10 @@ std::unique_ptr<Process> createTwoPhaseFlowWithPPProcess( specific_body_force, has_gravity, mass_lumping, temperature, std::move(material)}; return std::make_unique<TwoPhaseFlowWithPPProcess>( - 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), - mat_config, curves); + std::move(name), 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), mat_config, curves); } } // namespace TwoPhaseFlowWithPP diff --git a/ProcessLib/TwoPhaseFlowWithPP/CreateTwoPhaseFlowWithPPProcess.h b/ProcessLib/TwoPhaseFlowWithPP/CreateTwoPhaseFlowWithPPProcess.h index f73dd488d1d..94701d90625 100644 --- a/ProcessLib/TwoPhaseFlowWithPP/CreateTwoPhaseFlowWithPPProcess.h +++ b/ProcessLib/TwoPhaseFlowWithPP/CreateTwoPhaseFlowWithPPProcess.h @@ -17,6 +17,7 @@ namespace ProcessLib namespace TwoPhaseFlowWithPP { std::unique_ptr<Process> createTwoPhaseFlowWithPPProcess( + std::string name, MeshLib::Mesh& mesh, std::unique_ptr<ProcessLib::AbstractJacobianAssembler>&& jacobian_assembler, std::vector<ProcessVariable> const& variables, diff --git a/ProcessLib/TwoPhaseFlowWithPP/TwoPhaseFlowWithPPProcess.cpp b/ProcessLib/TwoPhaseFlowWithPP/TwoPhaseFlowWithPPProcess.cpp index 4c5152c1de0..c7558a51789 100644 --- a/ProcessLib/TwoPhaseFlowWithPP/TwoPhaseFlowWithPPProcess.cpp +++ b/ProcessLib/TwoPhaseFlowWithPP/TwoPhaseFlowWithPPProcess.cpp @@ -24,6 +24,7 @@ namespace ProcessLib namespace TwoPhaseFlowWithPP { TwoPhaseFlowWithPPProcess::TwoPhaseFlowWithPPProcess( + std::string name, MeshLib::Mesh& mesh, std::unique_ptr<AbstractJacobianAssembler>&& jacobian_assembler, std::vector<std::unique_ptr<ParameterLib::ParameterBase>> const& parameters, @@ -37,7 +38,7 @@ TwoPhaseFlowWithPPProcess::TwoPhaseFlowWithPPProcess( std::map<std::string, std::unique_ptr<MathLib::PiecewiseLinearInterpolation>> const& /*curves*/) - : Process(mesh, std::move(jacobian_assembler), parameters, + : Process(std::move(name), mesh, std::move(jacobian_assembler), parameters, 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/TwoPhaseFlowWithPP/TwoPhaseFlowWithPPProcess.h b/ProcessLib/TwoPhaseFlowWithPP/TwoPhaseFlowWithPPProcess.h index 849abea0464..0c1678a95b2 100644 --- a/ProcessLib/TwoPhaseFlowWithPP/TwoPhaseFlowWithPPProcess.h +++ b/ProcessLib/TwoPhaseFlowWithPP/TwoPhaseFlowWithPPProcess.h @@ -36,6 +36,7 @@ class TwoPhaseFlowWithPPProcess final : public Process { public: TwoPhaseFlowWithPPProcess( + std::string name, MeshLib::Mesh& mesh, std::unique_ptr<AbstractJacobianAssembler>&& jacobian_assembler, std::vector<std::unique_ptr<ParameterLib::ParameterBase>> const& diff --git a/ProcessLib/TwoPhaseFlowWithPrho/CreateTwoPhaseFlowWithPrhoProcess.cpp b/ProcessLib/TwoPhaseFlowWithPrho/CreateTwoPhaseFlowWithPrhoProcess.cpp index 104272d7d46..5bc45f50a8b 100644 --- a/ProcessLib/TwoPhaseFlowWithPrho/CreateTwoPhaseFlowWithPrhoProcess.cpp +++ b/ProcessLib/TwoPhaseFlowWithPrho/CreateTwoPhaseFlowWithPrhoProcess.cpp @@ -24,6 +24,7 @@ namespace ProcessLib namespace TwoPhaseFlowWithPrho { std::unique_ptr<Process> createTwoPhaseFlowWithPrhoProcess( + std::string name, MeshLib::Mesh& mesh, std::unique_ptr<ProcessLib::AbstractJacobianAssembler>&& jacobian_assembler, std::vector<ProcessVariable> const& variables, @@ -111,10 +112,10 @@ std::unique_ptr<Process> createTwoPhaseFlowWithPrhoProcess( diff_coeff_a, temperature, std::move(material)}; return std::make_unique<TwoPhaseFlowWithPrhoProcess>( - 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), - mat_config, curves); + std::move(name), 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), mat_config, curves); } } // namespace TwoPhaseFlowWithPrho diff --git a/ProcessLib/TwoPhaseFlowWithPrho/CreateTwoPhaseFlowWithPrhoProcess.h b/ProcessLib/TwoPhaseFlowWithPrho/CreateTwoPhaseFlowWithPrhoProcess.h index 38b796e9920..f11b2d3f320 100644 --- a/ProcessLib/TwoPhaseFlowWithPrho/CreateTwoPhaseFlowWithPrhoProcess.h +++ b/ProcessLib/TwoPhaseFlowWithPrho/CreateTwoPhaseFlowWithPrhoProcess.h @@ -17,6 +17,7 @@ namespace ProcessLib namespace TwoPhaseFlowWithPrho { std::unique_ptr<Process> createTwoPhaseFlowWithPrhoProcess( + std::string name, MeshLib::Mesh& mesh, std::unique_ptr<ProcessLib::AbstractJacobianAssembler>&& jacobian_assembler, std::vector<ProcessVariable> const& variables, diff --git a/ProcessLib/TwoPhaseFlowWithPrho/TwoPhaseFlowWithPrhoProcess.cpp b/ProcessLib/TwoPhaseFlowWithPrho/TwoPhaseFlowWithPrhoProcess.cpp index ad4e4c122bc..71d4c3d1d5a 100644 --- a/ProcessLib/TwoPhaseFlowWithPrho/TwoPhaseFlowWithPrhoProcess.cpp +++ b/ProcessLib/TwoPhaseFlowWithPrho/TwoPhaseFlowWithPrhoProcess.cpp @@ -24,6 +24,7 @@ namespace ProcessLib namespace TwoPhaseFlowWithPrho { TwoPhaseFlowWithPrhoProcess::TwoPhaseFlowWithPrhoProcess( + std::string name, MeshLib::Mesh& mesh, std::unique_ptr<AbstractJacobianAssembler>&& jacobian_assembler, std::vector<std::unique_ptr<ParameterLib::ParameterBase>> const& parameters, @@ -37,7 +38,7 @@ TwoPhaseFlowWithPrhoProcess::TwoPhaseFlowWithPrhoProcess( std::map<std::string, std::unique_ptr<MathLib::PiecewiseLinearInterpolation>> const& /*curves*/) - : Process(mesh, std::move(jacobian_assembler), parameters, + : Process(std::move(name), mesh, std::move(jacobian_assembler), parameters, 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/TwoPhaseFlowWithPrho/TwoPhaseFlowWithPrhoProcess.h b/ProcessLib/TwoPhaseFlowWithPrho/TwoPhaseFlowWithPrhoProcess.h index 9e622a4389b..80f6272651c 100644 --- a/ProcessLib/TwoPhaseFlowWithPrho/TwoPhaseFlowWithPrhoProcess.h +++ b/ProcessLib/TwoPhaseFlowWithPrho/TwoPhaseFlowWithPrhoProcess.h @@ -34,6 +34,7 @@ class TwoPhaseFlowWithPrhoProcess final : public Process { public: TwoPhaseFlowWithPrhoProcess( + std::string name, MeshLib::Mesh& mesh, std::unique_ptr<AbstractJacobianAssembler>&& jacobian_assembler, std::vector<std::unique_ptr<ParameterLib::ParameterBase>> const& -- GitLab