diff --git a/ProcessLib/ComponentTransport/CreateComponentTransportProcess.cpp b/ProcessLib/ComponentTransport/CreateComponentTransportProcess.cpp index 8163ec2ae6dd4f37e914cd26583a0998da687cba..94ac9ac2cb13bcbc6c7d3162ee3e0810b58ee748 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 3be7f098f7b631bb4205dd3a769799a8730e2675..33b0bcd82a7dcbc4f977d53575d6356c23ed42e7 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 0199c0b4136cd77b24f1f6bdad65bdef6324f47c..47e1d791dd99479c4c916bff6e7b66e161b40eee 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 3d03005086bfde5d4301cc253d0375f0a5bef041..5d24da1afa359ff26a5ea3ab177c50506219dd9d 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 3cce324767026882ad052bb018b8312065f87dd0..a9588ddf8105b24b1b0293d46f12d555d4840c1e 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 1ae25cf82758d341b07c7b7bb590222dc4e9d3b0..30bce02542b76ad8bfa85c601c2664044702b51c 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 3cd0eee445ee4efca9f577d98d963d81558faf47..02785985161783fcf82c67139ce741b7f5ef2ec4 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 225f1cc2e32f88210fd12096054d8b05760a4d3f..c1813fadb6879996a325b3f0e9922d73ffdb6a1a 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 7435ef5d6bdb178b612eb6c4ebe21fe45b27fba8..8cdbece170a6699db79757680b8d76f14446dd95 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 d42b78733aea7dc2cad2a4548dd5d0b3d280b6e2..0044e13130347b8994c33048779fcf7b4ad4c996 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 80d504ba39f64c0aa04a81377b7fca7b967e28b3..961580cb53f660ba6cdb17d6e58d6c6828d981df 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 4fd1c8daebee7d4d9acd1cf308f2929f7a7294e7..c3aeef76514a333fadb8de9372f67625fb31265b 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 0e7736a704236e4e312ab4f1172b74f133683bc1..a9a22b5103658a0e422a36f143a792f809eb0fbd 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 d7d89a93729eda4a1b7646de83e1416f93ae8828..55dc5131b3c96b65b64963daba34330207f914f8 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 d061f2588b917742ae7fa293b29ea0c7115dadcc..6c03f7b64fe6999bbc76400685b471ef126fdcb0 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 c06e53e7f5b25062cc0aa4327e9e4f21f1024350..61fca5647488277b982a38c2a3ad12f49815a3c0 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 01e6bd811086653db74f06315b9aa5f1592801f8..8a112044373cc095ff9fc4e5d44f63b4490ca7ba 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 20c1d57c1ae31a19f04542792442964074385c6c..fccde3455dd49effc1407a664424d3fe112728bb 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 6659bc1ff0f6349e67a191438d8b3ea902237968..cf7fd41a75649a763adfb7ceed0456bf91554f80 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 ddd4c8a8d29db681e967e37e0081eada6e5b0afc..bd8771f01717e2f26be3892ef3d666b0dc589f92 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 b7c9d91163c9cccec47baa8d0e9a1b2f60902573..7713641ae4426cc1a2e62b3a46813867da5aa2c7 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 8f17c4a2a3a599a2a525ae71fa46b6dc3515b033..939c73f288a8a562bb3262ab9a4cab2d08e57eab 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 d9feaf9c0284f1c276d9dcfd9dc56d35be996e1b..de1b03a97310d1322b6b327f701346959196ab5c 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 a317ef6d47823331762b6dd04083a470dda6bf8b..98e40a70b31d697a1ad800b37d1d57b9089dfeb2 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}