From e60b02b815c964f2ec25509b62e07e266d362cdc Mon Sep 17 00:00:00 2001 From: Dmitri Naumov <github@naumov.de> Date: Sun, 3 Nov 2019 16:44:26 +0100 Subject: [PATCH] [PL] Remove named_function_caller from sec.vars. --- .../CreateComponentTransportProcess.cpp | 3 +-- .../GroundwaterFlow/CreateGroundwaterFlowProcess.cpp | 3 +-- ProcessLib/HT/CreateHTProcess.cpp | 3 +-- .../HeatConduction/CreateHeatConductionProcess.cpp | 3 +-- .../HeatTransportBHE/CreateHeatTransportBHEProcess.cpp | 3 +-- .../HydroMechanics/CreateHydroMechanicsProcess.cpp | 3 +-- .../LIE/HydroMechanics/CreateHydroMechanicsProcess.cpp | 3 +-- .../SmallDeformation/CreateSmallDeformationProcess.cpp | 3 +-- ProcessLib/LiquidFlow/CreateLiquidFlowProcess.cpp | 3 +-- ProcessLib/Output/CreateSecondaryVariables.cpp | 8 ++------ ProcessLib/Output/CreateSecondaryVariables.h | 10 ++-------- ProcessLib/PhaseField/CreatePhaseFieldProcess.cpp | 3 +-- .../CreateRichardsComponentTransportProcess.cpp | 3 +-- ProcessLib/RichardsFlow/CreateRichardsFlowProcess.cpp | 3 +-- .../CreateRichardsMechanicsProcess.cpp | 3 +-- .../SmallDeformation/CreateSmallDeformationProcess.cpp | 3 +-- .../CreateSmallDeformationNonlocalProcess.cpp | 3 +-- ProcessLib/TES/CreateTESProcess.cpp | 3 +-- .../CreateThermalTwoPhaseFlowWithPPProcess.cpp | 3 +-- .../CreateThermoHydroMechanicsProcess.cpp | 3 +-- .../CreateThermoMechanicalPhaseFieldProcess.cpp | 3 +-- .../ThermoMechanics/CreateThermoMechanicsProcess.cpp | 3 +-- .../CreateTwoPhaseFlowWithPPProcess.cpp | 3 +-- .../CreateTwoPhaseFlowWithPrhoProcess.cpp | 3 +-- 24 files changed, 26 insertions(+), 58 deletions(-) diff --git a/ProcessLib/ComponentTransport/CreateComponentTransportProcess.cpp b/ProcessLib/ComponentTransport/CreateComponentTransportProcess.cpp index 8163ec2ae6d..94ac9ac2cb1 100644 --- a/ProcessLib/ComponentTransport/CreateComponentTransportProcess.cpp +++ b/ProcessLib/ComponentTransport/CreateComponentTransportProcess.cpp @@ -145,8 +145,7 @@ std::unique_ptr<Process> createComponentTransportProcess( NumLib::NamedFunctionCaller named_function_caller( {"ComponentTransport_concentration_pressure"}); - ProcessLib::createSecondaryVariables(config, secondary_variables, - named_function_caller); + ProcessLib::createSecondaryVariables(config, secondary_variables); std::unique_ptr<ProcessLib::SurfaceFluxData> surfaceflux; auto surfaceflux_config = diff --git a/ProcessLib/GroundwaterFlow/CreateGroundwaterFlowProcess.cpp b/ProcessLib/GroundwaterFlow/CreateGroundwaterFlowProcess.cpp index 3be7f098f7b..33b0bcd82a7 100644 --- a/ProcessLib/GroundwaterFlow/CreateGroundwaterFlowProcess.cpp +++ b/ProcessLib/GroundwaterFlow/CreateGroundwaterFlowProcess.cpp @@ -67,8 +67,7 @@ std::unique_ptr<Process> createGroundwaterFlowProcess( NumLib::NamedFunctionCaller named_function_caller({"GWFlow_pressure"}); - ProcessLib::createSecondaryVariables(config, secondary_variables, - named_function_caller); + ProcessLib::createSecondaryVariables(config, secondary_variables); std::unique_ptr<ProcessLib::SurfaceFluxData> surfaceflux; auto calculatesurfaceflux_config = diff --git a/ProcessLib/HT/CreateHTProcess.cpp b/ProcessLib/HT/CreateHTProcess.cpp index 0199c0b4136..47e1d791dd9 100644 --- a/ProcessLib/HT/CreateHTProcess.cpp +++ b/ProcessLib/HT/CreateHTProcess.cpp @@ -150,8 +150,7 @@ std::unique_ptr<Process> createHTProcess( NumLib::NamedFunctionCaller named_function_caller( {"HT_temperature_pressure"}); - ProcessLib::createSecondaryVariables(config, secondary_variables, - named_function_caller); + ProcessLib::createSecondaryVariables(config, secondary_variables); return std::make_unique<HTProcess>( std::move(name), mesh, std::move(jacobian_assembler), parameters, diff --git a/ProcessLib/HeatConduction/CreateHeatConductionProcess.cpp b/ProcessLib/HeatConduction/CreateHeatConductionProcess.cpp index 3d03005086b..5d24da1afa3 100644 --- a/ProcessLib/HeatConduction/CreateHeatConductionProcess.cpp +++ b/ProcessLib/HeatConduction/CreateHeatConductionProcess.cpp @@ -80,8 +80,7 @@ std::unique_ptr<Process> createHeatConductionProcess( NumLib::NamedFunctionCaller named_function_caller( {"HeatConduction_temperature"}); - ProcessLib::createSecondaryVariables(config, secondary_variables, - named_function_caller); + ProcessLib::createSecondaryVariables(config, secondary_variables); return std::make_unique<HeatConductionProcess>( std::move(name), mesh, std::move(jacobian_assembler), parameters, diff --git a/ProcessLib/HeatTransportBHE/CreateHeatTransportBHEProcess.cpp b/ProcessLib/HeatTransportBHE/CreateHeatTransportBHEProcess.cpp index 3cce3247670..a9588ddf810 100644 --- a/ProcessLib/HeatTransportBHE/CreateHeatTransportBHEProcess.cpp +++ b/ProcessLib/HeatTransportBHE/CreateHeatTransportBHEProcess.cpp @@ -147,8 +147,7 @@ std::unique_ptr<Process> createHeatTransportBHEProcess( NumLib::NamedFunctionCaller named_function_caller( {"HeatTransportBHE_Temperature"}); - ProcessLib::createSecondaryVariables(config, secondary_variables, - named_function_caller); + ProcessLib::createSecondaryVariables(config, secondary_variables); return std::make_unique<HeatTransportBHEProcess>( std::move(name), mesh, std::move(jacobian_assembler), parameters, diff --git a/ProcessLib/HydroMechanics/CreateHydroMechanicsProcess.cpp b/ProcessLib/HydroMechanics/CreateHydroMechanicsProcess.cpp index 1ae25cf8275..30bce02542b 100644 --- a/ProcessLib/HydroMechanics/CreateHydroMechanicsProcess.cpp +++ b/ProcessLib/HydroMechanics/CreateHydroMechanicsProcess.cpp @@ -230,8 +230,7 @@ std::unique_ptr<Process> createHydroMechanicsProcess( NumLib::NamedFunctionCaller named_function_caller( {"HydroMechanics_displacement"}); - ProcessLib::createSecondaryVariables(config, secondary_variables, - named_function_caller); + ProcessLib::createSecondaryVariables(config, secondary_variables); return std::make_unique<HydroMechanicsProcess<DisplacementDim>>( std::move(name), mesh, std::move(jacobian_assembler), parameters, diff --git a/ProcessLib/LIE/HydroMechanics/CreateHydroMechanicsProcess.cpp b/ProcessLib/LIE/HydroMechanics/CreateHydroMechanicsProcess.cpp index 3cd0eee445e..02785985161 100644 --- a/ProcessLib/LIE/HydroMechanics/CreateHydroMechanicsProcess.cpp +++ b/ProcessLib/LIE/HydroMechanics/CreateHydroMechanicsProcess.cpp @@ -350,8 +350,7 @@ std::unique_ptr<Process> createHydroMechanicsProcess( NumLib::NamedFunctionCaller named_function_caller( {"HydroMechanics_displacement"}); - ProcessLib::createSecondaryVariables(config, secondary_variables, - named_function_caller); + ProcessLib::createSecondaryVariables(config, secondary_variables); return std::make_unique<HydroMechanicsProcess<GlobalDim>>( std::move(name), mesh, std::move(jacobian_assembler), parameters, diff --git a/ProcessLib/LIE/SmallDeformation/CreateSmallDeformationProcess.cpp b/ProcessLib/LIE/SmallDeformation/CreateSmallDeformationProcess.cpp index 225f1cc2e32..c1813fadb68 100644 --- a/ProcessLib/LIE/SmallDeformation/CreateSmallDeformationProcess.cpp +++ b/ProcessLib/LIE/SmallDeformation/CreateSmallDeformationProcess.cpp @@ -191,8 +191,7 @@ std::unique_ptr<Process> createSmallDeformationProcess( NumLib::NamedFunctionCaller named_function_caller( {"SmallDeformation_displacement"}); - ProcessLib::createSecondaryVariables(config, secondary_variables, - named_function_caller); + ProcessLib::createSecondaryVariables(config, secondary_variables); return std::make_unique<SmallDeformationProcess<DisplacementDim>>( std::move(name), mesh, std::move(jacobian_assembler), parameters, diff --git a/ProcessLib/LiquidFlow/CreateLiquidFlowProcess.cpp b/ProcessLib/LiquidFlow/CreateLiquidFlowProcess.cpp index 7435ef5d6bd..8cdbece170a 100644 --- a/ProcessLib/LiquidFlow/CreateLiquidFlowProcess.cpp +++ b/ProcessLib/LiquidFlow/CreateLiquidFlowProcess.cpp @@ -56,8 +56,7 @@ std::unique_ptr<Process> createLiquidFlowProcess( NumLib::NamedFunctionCaller named_function_caller({"LiquidFlow_pressure"}); - ProcessLib::createSecondaryVariables(config, secondary_variables, - named_function_caller); + ProcessLib::createSecondaryVariables(config, secondary_variables); // Get the gravity vector for the Darcy velocity //! \ogs_file_param{prj__processes__process__LIQUID_FLOW__darcy_gravity} diff --git a/ProcessLib/Output/CreateSecondaryVariables.cpp b/ProcessLib/Output/CreateSecondaryVariables.cpp index d42b78733ae..0044e131303 100644 --- a/ProcessLib/Output/CreateSecondaryVariables.cpp +++ b/ProcessLib/Output/CreateSecondaryVariables.cpp @@ -11,16 +11,12 @@ #include "CreateSecondaryVariables.h" #include "BaseLib/ConfigTree.h" -#include "NumLib/NamedFunctionCaller.h" - #include "SecondaryVariable.h" namespace ProcessLib { -void createSecondaryVariables( - BaseLib::ConfigTree const& config, - SecondaryVariableCollection& secondary_variables, - NumLib::NamedFunctionCaller& /*named_function_caller*/) +void createSecondaryVariables(BaseLib::ConfigTree const& config, + SecondaryVariableCollection& secondary_variables) { auto sec_vars_config = //! \ogs_file_param{prj__processes__process__secondary_variables} diff --git a/ProcessLib/Output/CreateSecondaryVariables.h b/ProcessLib/Output/CreateSecondaryVariables.h index 80d504ba39f..961580cb53f 100644 --- a/ProcessLib/Output/CreateSecondaryVariables.h +++ b/ProcessLib/Output/CreateSecondaryVariables.h @@ -18,16 +18,10 @@ namespace ProcessLib { class SecondaryVariableCollection; } -namespace NumLib -{ -class NamedFunctionCaller; -} namespace ProcessLib { -void createSecondaryVariables( - BaseLib::ConfigTree const& config, - SecondaryVariableCollection& secondary_variables, - NumLib::NamedFunctionCaller& named_function_caller); +void createSecondaryVariables(BaseLib::ConfigTree const& config, + SecondaryVariableCollection& secondary_variables); } // namespace ProcessLib diff --git a/ProcessLib/PhaseField/CreatePhaseFieldProcess.cpp b/ProcessLib/PhaseField/CreatePhaseFieldProcess.cpp index 4fd1c8daebe..c3aeef76514 100644 --- a/ProcessLib/PhaseField/CreatePhaseFieldProcess.cpp +++ b/ProcessLib/PhaseField/CreatePhaseFieldProcess.cpp @@ -202,8 +202,7 @@ std::unique_ptr<Process> createPhaseFieldProcess( NumLib::NamedFunctionCaller named_function_caller( {"PhaseField_displacement"}); - ProcessLib::createSecondaryVariables(config, secondary_variables, - named_function_caller); + ProcessLib::createSecondaryVariables(config, secondary_variables); return std::make_unique<PhaseFieldProcess<DisplacementDim>>( std::move(name), mesh, std::move(jacobian_assembler), parameters, diff --git a/ProcessLib/RichardsComponentTransport/CreateRichardsComponentTransportProcess.cpp b/ProcessLib/RichardsComponentTransport/CreateRichardsComponentTransportProcess.cpp index 0e7736a7042..a9a22b51036 100644 --- a/ProcessLib/RichardsComponentTransport/CreateRichardsComponentTransportProcess.cpp +++ b/ProcessLib/RichardsComponentTransport/CreateRichardsComponentTransportProcess.cpp @@ -169,8 +169,7 @@ std::unique_ptr<Process> createRichardsComponentTransportProcess( NumLib::NamedFunctionCaller named_function_caller( {"RichardsComponentTransport_concentration_pressure"}); - ProcessLib::createSecondaryVariables(config, secondary_variables, - named_function_caller); + ProcessLib::createSecondaryVariables(config, secondary_variables); return std::make_unique<RichardsComponentTransportProcess>( std::move(name), mesh, std::move(jacobian_assembler), parameters, diff --git a/ProcessLib/RichardsFlow/CreateRichardsFlowProcess.cpp b/ProcessLib/RichardsFlow/CreateRichardsFlowProcess.cpp index d7d89a93729..55dc5131b3c 100644 --- a/ProcessLib/RichardsFlow/CreateRichardsFlowProcess.cpp +++ b/ProcessLib/RichardsFlow/CreateRichardsFlowProcess.cpp @@ -58,8 +58,7 @@ std::unique_ptr<Process> createRichardsFlowProcess( NumLib::NamedFunctionCaller named_function_caller( {"RichardsFlow_pressure"}); - ProcessLib::createSecondaryVariables(config, secondary_variables, - named_function_caller); + ProcessLib::createSecondaryVariables(config, secondary_variables); // Specific body force std::vector<double> const b = diff --git a/ProcessLib/RichardsMechanics/CreateRichardsMechanicsProcess.cpp b/ProcessLib/RichardsMechanics/CreateRichardsMechanicsProcess.cpp index d061f2588b9..6c03f7b64fe 100644 --- a/ProcessLib/RichardsMechanics/CreateRichardsMechanicsProcess.cpp +++ b/ProcessLib/RichardsMechanics/CreateRichardsMechanicsProcess.cpp @@ -219,8 +219,7 @@ std::unique_ptr<Process> createRichardsMechanicsProcess( NumLib::NamedFunctionCaller named_function_caller( {"RichardsMechanics_displacement"}); - ProcessLib::createSecondaryVariables(config, secondary_variables, - named_function_caller); + ProcessLib::createSecondaryVariables(config, secondary_variables); return std::make_unique<RichardsMechanicsProcess<DisplacementDim>>( std::move(name), mesh, std::move(jacobian_assembler), parameters, diff --git a/ProcessLib/SmallDeformation/CreateSmallDeformationProcess.cpp b/ProcessLib/SmallDeformation/CreateSmallDeformationProcess.cpp index c06e53e7f5b..61fca564748 100644 --- a/ProcessLib/SmallDeformation/CreateSmallDeformationProcess.cpp +++ b/ProcessLib/SmallDeformation/CreateSmallDeformationProcess.cpp @@ -121,8 +121,7 @@ std::unique_ptr<Process> createSmallDeformationProcess( NumLib::NamedFunctionCaller named_function_caller( {"SmallDeformation_displacement"}); - ProcessLib::createSecondaryVariables(config, secondary_variables, - named_function_caller); + ProcessLib::createSecondaryVariables(config, secondary_variables); return std::make_unique<SmallDeformationProcess<DisplacementDim>>( std::move(name), mesh, std::move(jacobian_assembler), parameters, diff --git a/ProcessLib/SmallDeformationNonlocal/CreateSmallDeformationNonlocalProcess.cpp b/ProcessLib/SmallDeformationNonlocal/CreateSmallDeformationNonlocalProcess.cpp index 01e6bd81108..8a112044373 100644 --- a/ProcessLib/SmallDeformationNonlocal/CreateSmallDeformationNonlocalProcess.cpp +++ b/ProcessLib/SmallDeformationNonlocal/CreateSmallDeformationNonlocalProcess.cpp @@ -117,8 +117,7 @@ std::unique_ptr<Process> createSmallDeformationNonlocalProcess( NumLib::NamedFunctionCaller named_function_caller( {"SmallDeformationNonlocal_displacement"}); - ProcessLib::createSecondaryVariables(config, secondary_variables, - named_function_caller); + ProcessLib::createSecondaryVariables(config, secondary_variables); return std::make_unique<SmallDeformationNonlocalProcess<DisplacementDim>>( std::move(name), mesh, std::move(jacobian_assembler), parameters, diff --git a/ProcessLib/TES/CreateTESProcess.cpp b/ProcessLib/TES/CreateTESProcess.cpp index 20c1d57c1ae..fccde3455dd 100644 --- a/ProcessLib/TES/CreateTESProcess.cpp +++ b/ProcessLib/TES/CreateTESProcess.cpp @@ -52,8 +52,7 @@ std::unique_ptr<Process> createTESProcess( NumLib::NamedFunctionCaller named_function_caller( {"TES_pressure", "TES_temperature", "TES_vapour_mass_fraction"}); - ProcessLib::createSecondaryVariables(config, secondary_variables, - named_function_caller); + ProcessLib::createSecondaryVariables(config, secondary_variables); return std::make_unique<TESProcess>( std::move(name), mesh, std::move(jacobian_assembler), parameters, diff --git a/ProcessLib/ThermalTwoPhaseFlowWithPP/CreateThermalTwoPhaseFlowWithPPProcess.cpp b/ProcessLib/ThermalTwoPhaseFlowWithPP/CreateThermalTwoPhaseFlowWithPPProcess.cpp index 6659bc1ff0f..cf7fd41a756 100644 --- a/ProcessLib/ThermalTwoPhaseFlowWithPP/CreateThermalTwoPhaseFlowWithPPProcess.cpp +++ b/ProcessLib/ThermalTwoPhaseFlowWithPP/CreateThermalTwoPhaseFlowWithPPProcess.cpp @@ -63,8 +63,7 @@ std::unique_ptr<Process> createThermalTwoPhaseFlowWithPPProcess( NumLib::NamedFunctionCaller named_function_caller( {"TwoPhaseFlow_pressure"}); - ProcessLib::createSecondaryVariables(config, secondary_variables, - named_function_caller); + ProcessLib::createSecondaryVariables(config, secondary_variables); // Specific body force std::vector<double> const b = //! \ogs_file_param{prj__processes__process__TWOPHASE_FLOW_THERMAL__specific_body_force} diff --git a/ProcessLib/ThermoHydroMechanics/CreateThermoHydroMechanicsProcess.cpp b/ProcessLib/ThermoHydroMechanics/CreateThermoHydroMechanicsProcess.cpp index ddd4c8a8d29..bd8771f0171 100644 --- a/ProcessLib/ThermoHydroMechanics/CreateThermoHydroMechanicsProcess.cpp +++ b/ProcessLib/ThermoHydroMechanics/CreateThermoHydroMechanicsProcess.cpp @@ -170,8 +170,7 @@ std::unique_ptr<Process> createThermoHydroMechanicsProcess( NumLib::NamedFunctionCaller named_function_caller( {"ThermoHydroMechanics_displacement"}); - ProcessLib::createSecondaryVariables(config, secondary_variables, - named_function_caller); + ProcessLib::createSecondaryVariables(config, secondary_variables); return std::make_unique<ThermoHydroMechanicsProcess<DisplacementDim>>( std::move(name), mesh, std::move(jacobian_assembler), parameters, diff --git a/ProcessLib/ThermoMechanicalPhaseField/CreateThermoMechanicalPhaseFieldProcess.cpp b/ProcessLib/ThermoMechanicalPhaseField/CreateThermoMechanicalPhaseFieldProcess.cpp index b7c9d91163c..7713641ae44 100644 --- a/ProcessLib/ThermoMechanicalPhaseField/CreateThermoMechanicalPhaseFieldProcess.cpp +++ b/ProcessLib/ThermoMechanicalPhaseField/CreateThermoMechanicalPhaseFieldProcess.cpp @@ -236,8 +236,7 @@ std::unique_ptr<Process> createThermoMechanicalPhaseFieldProcess( NumLib::NamedFunctionCaller named_function_caller( {"temperature_phasefield_displacement"}); - ProcessLib::createSecondaryVariables(config, secondary_variables, - named_function_caller); + ProcessLib::createSecondaryVariables(config, secondary_variables); return std::make_unique<ThermoMechanicalPhaseFieldProcess<DisplacementDim>>( std::move(name), mesh, std::move(jacobian_assembler), parameters, diff --git a/ProcessLib/ThermoMechanics/CreateThermoMechanicsProcess.cpp b/ProcessLib/ThermoMechanics/CreateThermoMechanicsProcess.cpp index 8f17c4a2a3a..939c73f288a 100644 --- a/ProcessLib/ThermoMechanics/CreateThermoMechanicsProcess.cpp +++ b/ProcessLib/ThermoMechanics/CreateThermoMechanicsProcess.cpp @@ -193,8 +193,7 @@ std::unique_ptr<Process> createThermoMechanicsProcess( NumLib::NamedFunctionCaller named_function_caller( {"ThermoMechanics_temperature_displacement"}); - ProcessLib::createSecondaryVariables(config, secondary_variables, - named_function_caller); + ProcessLib::createSecondaryVariables(config, secondary_variables); return std::make_unique<ThermoMechanicsProcess<DisplacementDim>>( std::move(name), mesh, std::move(jacobian_assembler), parameters, diff --git a/ProcessLib/TwoPhaseFlowWithPP/CreateTwoPhaseFlowWithPPProcess.cpp b/ProcessLib/TwoPhaseFlowWithPP/CreateTwoPhaseFlowWithPPProcess.cpp index d9feaf9c028..de1b03a9731 100644 --- a/ProcessLib/TwoPhaseFlowWithPP/CreateTwoPhaseFlowWithPPProcess.cpp +++ b/ProcessLib/TwoPhaseFlowWithPP/CreateTwoPhaseFlowWithPPProcess.cpp @@ -60,8 +60,7 @@ std::unique_ptr<Process> createTwoPhaseFlowWithPPProcess( NumLib::NamedFunctionCaller named_function_caller( {"TwoPhaseFlow_pressure"}); - ProcessLib::createSecondaryVariables(config, secondary_variables, - named_function_caller); + ProcessLib::createSecondaryVariables(config, secondary_variables); // Specific body force std::vector<double> const b = //! \ogs_file_param{prj__processes__process__TWOPHASE_FLOW_PP__specific_body_force} diff --git a/ProcessLib/TwoPhaseFlowWithPrho/CreateTwoPhaseFlowWithPrhoProcess.cpp b/ProcessLib/TwoPhaseFlowWithPrho/CreateTwoPhaseFlowWithPrhoProcess.cpp index a317ef6d478..98e40a70b31 100644 --- a/ProcessLib/TwoPhaseFlowWithPrho/CreateTwoPhaseFlowWithPrhoProcess.cpp +++ b/ProcessLib/TwoPhaseFlowWithPrho/CreateTwoPhaseFlowWithPrhoProcess.cpp @@ -58,8 +58,7 @@ std::unique_ptr<Process> createTwoPhaseFlowWithPrhoProcess( NumLib::NamedFunctionCaller named_function_caller( {"TwoPhaseFlow_pressure"}); - ProcessLib::createSecondaryVariables(config, secondary_variables, - named_function_caller); + ProcessLib::createSecondaryVariables(config, secondary_variables); // Specific body force std::vector<double> const b = //! \ogs_file_param{prj__processes__process__TWOPHASE_FLOW_PRHO__specific_body_force} -- GitLab