diff --git a/Applications/ApplicationsLib/ProjectData.cpp b/Applications/ApplicationsLib/ProjectData.cpp index a07260e6457b9029a95154af2e18aafbf17246a1..d13446a0f2c7e1b7941c336989289df1c72016f8 100644 --- a/Applications/ApplicationsLib/ProjectData.cpp +++ b/Applications/ApplicationsLib/ProjectData.cpp @@ -1115,7 +1115,7 @@ void ProjectData::parseProcesses( process = ProcessLib::RichardsFlow::createRichardsFlowProcess( name, *_mesh_vec[0], std::move(jacobian_assembler), _process_variables, _parameters, integration_order, - process_config, _curves, _media); + process_config, _media); } else #endif @@ -1200,7 +1200,7 @@ void ProjectData::parseProcesses( ProcessLib::TwoPhaseFlowWithPP::createTwoPhaseFlowWithPPProcess( name, *_mesh_vec[0], std::move(jacobian_assembler), _process_variables, _parameters, integration_order, - process_config, _curves, _media); + process_config, _media); } else #endif @@ -1211,7 +1211,7 @@ void ProjectData::parseProcesses( createTwoPhaseFlowWithPrhoProcess( name, *_mesh_vec[0], std::move(jacobian_assembler), _process_variables, _parameters, integration_order, - process_config, _curves); + process_config); } else #endif @@ -1222,7 +1222,7 @@ void ProjectData::parseProcesses( createThermalTwoPhaseFlowWithPPProcess( name, *_mesh_vec[0], std::move(jacobian_assembler), _process_variables, _parameters, integration_order, - process_config, _curves, _media); + process_config, _media); } else #endif diff --git a/ProcessLib/RichardsFlow/CreateRichardsFlowProcess.cpp b/ProcessLib/RichardsFlow/CreateRichardsFlowProcess.cpp index 9a8b7d070583e62998ceb49a75a865f9a8f4f328..3131d51de1308adaef7a0ec3d33bd89651272f43 100644 --- a/ProcessLib/RichardsFlow/CreateRichardsFlowProcess.cpp +++ b/ProcessLib/RichardsFlow/CreateRichardsFlowProcess.cpp @@ -57,9 +57,6 @@ std::unique_ptr<Process> createRichardsFlowProcess( std::vector<std::unique_ptr<ParameterLib::ParameterBase>> const& parameters, unsigned const integration_order, BaseLib::ConfigTree const& config, - std::map<std::string, - std::unique_ptr<MathLib::PiecewiseLinearInterpolation>> const& - /*curves*/, std::map<int, std::shared_ptr<MaterialPropertyLib::Medium>> const& media) { //! \ogs_file_param{prj__processes__process__type} diff --git a/ProcessLib/RichardsFlow/CreateRichardsFlowProcess.h b/ProcessLib/RichardsFlow/CreateRichardsFlowProcess.h index 7bdbc3b6d11baa50a0e48ce2cb590658a175ca79..db7cd10bc6f3e8ef31feea12bd2526f409ed3d07 100644 --- a/ProcessLib/RichardsFlow/CreateRichardsFlowProcess.h +++ b/ProcessLib/RichardsFlow/CreateRichardsFlowProcess.h @@ -30,9 +30,6 @@ std::unique_ptr<Process> createRichardsFlowProcess( std::vector<std::unique_ptr<ParameterLib::ParameterBase>> const& parameters, unsigned const integration_order, BaseLib::ConfigTree const& config, - std::map<std::string, - std::unique_ptr<MathLib::PiecewiseLinearInterpolation>> const& - curves, std::map<int, std::shared_ptr<MaterialPropertyLib::Medium>> const& media); } // namespace RichardsFlow } // namespace ProcessLib diff --git a/ProcessLib/ThermalTwoPhaseFlowWithPP/CreateThermalTwoPhaseFlowWithPPProcess.cpp b/ProcessLib/ThermalTwoPhaseFlowWithPP/CreateThermalTwoPhaseFlowWithPPProcess.cpp index 953fc6e88f18e2f1f383b32ada42d00d7941d9dc..18d71a470693f9499694e79558199ffccc658463 100644 --- a/ProcessLib/ThermalTwoPhaseFlowWithPP/CreateThermalTwoPhaseFlowWithPPProcess.cpp +++ b/ProcessLib/ThermalTwoPhaseFlowWithPP/CreateThermalTwoPhaseFlowWithPPProcess.cpp @@ -99,9 +99,6 @@ std::unique_ptr<Process> createThermalTwoPhaseFlowWithPPProcess( std::vector<std::unique_ptr<ParameterLib::ParameterBase>> const& parameters, unsigned const integration_order, BaseLib::ConfigTree const& config, - std::map<std::string, - std::unique_ptr<MathLib::PiecewiseLinearInterpolation>> const& - curves, std::map<int, std::shared_ptr<MaterialPropertyLib::Medium>> const& media) { //! \ogs_file_param{prj__processes__process__type} @@ -159,7 +156,7 @@ std::unique_ptr<Process> createThermalTwoPhaseFlowWithPPProcess( return std::make_unique<ThermalTwoPhaseFlowWithPPProcess>( std::move(name), mesh, std::move(jacobian_assembler), parameters, integration_order, std::move(process_variables), - std::move(process_data), std::move(secondary_variables), curves); + std::move(process_data), std::move(secondary_variables)); } } // namespace ThermalTwoPhaseFlowWithPP diff --git a/ProcessLib/ThermalTwoPhaseFlowWithPP/CreateThermalTwoPhaseFlowWithPPProcess.h b/ProcessLib/ThermalTwoPhaseFlowWithPP/CreateThermalTwoPhaseFlowWithPPProcess.h index 964326edab41a08b36c70c0133bc4128f551a057..c6fe276e8eab9b0bf8374fef151504c91e2a6ed5 100644 --- a/ProcessLib/ThermalTwoPhaseFlowWithPP/CreateThermalTwoPhaseFlowWithPPProcess.h +++ b/ProcessLib/ThermalTwoPhaseFlowWithPP/CreateThermalTwoPhaseFlowWithPPProcess.h @@ -27,9 +27,6 @@ std::unique_ptr<Process> createThermalTwoPhaseFlowWithPPProcess( std::vector<std::unique_ptr<ParameterLib::ParameterBase>> const& parameters, unsigned const integration_order, BaseLib::ConfigTree const& config, - std::map<std::string, - std::unique_ptr<MathLib::PiecewiseLinearInterpolation>> const& - curves, std::map<int, std::shared_ptr<MaterialPropertyLib::Medium>> const& media); } // namespace ThermalTwoPhaseFlowWithPP } // namespace ProcessLib diff --git a/ProcessLib/ThermalTwoPhaseFlowWithPP/ThermalTwoPhaseFlowWithPPProcess.cpp b/ProcessLib/ThermalTwoPhaseFlowWithPP/ThermalTwoPhaseFlowWithPPProcess.cpp index cc5fe8a16ba00b45ddb5c5a1dbb825ddd4c5a065..dfd1be03879d4e78152ac5af802cb57d924c8a2c 100644 --- a/ProcessLib/ThermalTwoPhaseFlowWithPP/ThermalTwoPhaseFlowWithPPProcess.cpp +++ b/ProcessLib/ThermalTwoPhaseFlowWithPP/ThermalTwoPhaseFlowWithPPProcess.cpp @@ -32,10 +32,7 @@ ThermalTwoPhaseFlowWithPPProcess::ThermalTwoPhaseFlowWithPPProcess( std::vector<std::vector<std::reference_wrapper<ProcessVariable>>>&& process_variables, ThermalTwoPhaseFlowWithPPProcessData&& process_data, - SecondaryVariableCollection&& secondary_variables, - std::map<std::string, - std::unique_ptr<MathLib::PiecewiseLinearInterpolation>> const& - /*curves*/) + SecondaryVariableCollection&& secondary_variables) : Process(std::move(name), mesh, std::move(jacobian_assembler), parameters, integration_order, std::move(process_variables), std::move(secondary_variables)), diff --git a/ProcessLib/ThermalTwoPhaseFlowWithPP/ThermalTwoPhaseFlowWithPPProcess.h b/ProcessLib/ThermalTwoPhaseFlowWithPP/ThermalTwoPhaseFlowWithPPProcess.h index 1a1bd28621771e6eba190a8e1d5af6954d76a8ac..157cc1fd383fa974bd67b79041502b77d2f84c76 100644 --- a/ProcessLib/ThermalTwoPhaseFlowWithPP/ThermalTwoPhaseFlowWithPPProcess.h +++ b/ProcessLib/ThermalTwoPhaseFlowWithPP/ThermalTwoPhaseFlowWithPPProcess.h @@ -53,10 +53,7 @@ public: std::vector<std::vector<std::reference_wrapper<ProcessVariable>>>&& process_variables, ThermalTwoPhaseFlowWithPPProcessData&& process_data, - SecondaryVariableCollection&& secondary_variables, - std::map<std::string, - std::unique_ptr<MathLib::PiecewiseLinearInterpolation>> const& - curves); + SecondaryVariableCollection&& secondary_variables); bool isLinear() const override { return false; } diff --git a/ProcessLib/TwoPhaseFlowWithPP/CreateTwoPhaseFlowWithPPProcess.cpp b/ProcessLib/TwoPhaseFlowWithPP/CreateTwoPhaseFlowWithPPProcess.cpp index d75f4a6487aefaf855a198bd52cbad9d447dea17..2c9a84a52b7f845c5dc0d00f9e407a2782c48d36 100644 --- a/ProcessLib/TwoPhaseFlowWithPP/CreateTwoPhaseFlowWithPPProcess.cpp +++ b/ProcessLib/TwoPhaseFlowWithPP/CreateTwoPhaseFlowWithPPProcess.cpp @@ -30,9 +30,6 @@ std::unique_ptr<Process> createTwoPhaseFlowWithPPProcess( std::vector<std::unique_ptr<ParameterLib::ParameterBase>> const& parameters, unsigned const integration_order, BaseLib::ConfigTree const& config, - std::map<std::string, - std::unique_ptr<MathLib::PiecewiseLinearInterpolation>> const& - curves, std::map<int, std::shared_ptr<MaterialPropertyLib::Medium>> const& media) { //! \ogs_file_param{prj__processes__process__type} @@ -100,7 +97,7 @@ std::unique_ptr<Process> createTwoPhaseFlowWithPPProcess( return std::make_unique<TwoPhaseFlowWithPPProcess>( std::move(name), mesh, std::move(jacobian_assembler), parameters, integration_order, std::move(process_variables), - std::move(process_data), std::move(secondary_variables), curves); + std::move(process_data), std::move(secondary_variables)); } } // namespace TwoPhaseFlowWithPP diff --git a/ProcessLib/TwoPhaseFlowWithPP/CreateTwoPhaseFlowWithPPProcess.h b/ProcessLib/TwoPhaseFlowWithPP/CreateTwoPhaseFlowWithPPProcess.h index a4f95a985c4922c23a2a93840351b2e86152c373..d81b97565e7f7df97b848affe33f4f11b85824bc 100644 --- a/ProcessLib/TwoPhaseFlowWithPP/CreateTwoPhaseFlowWithPPProcess.h +++ b/ProcessLib/TwoPhaseFlowWithPP/CreateTwoPhaseFlowWithPPProcess.h @@ -60,9 +60,6 @@ std::unique_ptr<Process> createTwoPhaseFlowWithPPProcess( std::vector<std::unique_ptr<ParameterLib::ParameterBase>> const& parameters, unsigned const integration_order, BaseLib::ConfigTree const& config, - std::map<std::string, - std::unique_ptr<MathLib::PiecewiseLinearInterpolation>> const& - curves, std::map<int, std::shared_ptr<MaterialPropertyLib::Medium>> const& media); } // namespace TwoPhaseFlowWithPP } // namespace ProcessLib diff --git a/ProcessLib/TwoPhaseFlowWithPP/TwoPhaseFlowWithPPProcess.cpp b/ProcessLib/TwoPhaseFlowWithPP/TwoPhaseFlowWithPPProcess.cpp index efbaf07e40cddfdc04c99ed78d3d221eb50a75e3..828e68534839d90b431f447a216371bc8ffdf718 100644 --- a/ProcessLib/TwoPhaseFlowWithPP/TwoPhaseFlowWithPPProcess.cpp +++ b/ProcessLib/TwoPhaseFlowWithPP/TwoPhaseFlowWithPPProcess.cpp @@ -26,10 +26,7 @@ TwoPhaseFlowWithPPProcess::TwoPhaseFlowWithPPProcess( std::vector<std::vector<std::reference_wrapper<ProcessVariable>>>&& process_variables, TwoPhaseFlowWithPPProcessData&& process_data, - SecondaryVariableCollection&& secondary_variables, - std::map<std::string, - std::unique_ptr<MathLib::PiecewiseLinearInterpolation>> const& - /*curves*/) + SecondaryVariableCollection&& secondary_variables) : Process(std::move(name), mesh, std::move(jacobian_assembler), parameters, integration_order, std::move(process_variables), std::move(secondary_variables)), diff --git a/ProcessLib/TwoPhaseFlowWithPP/TwoPhaseFlowWithPPProcess.h b/ProcessLib/TwoPhaseFlowWithPP/TwoPhaseFlowWithPPProcess.h index b5983d746a2a1a7c91373570c933020ca18a8019..b8b575ec7e7c4146d0172b73b6d534de74dacce5 100644 --- a/ProcessLib/TwoPhaseFlowWithPP/TwoPhaseFlowWithPPProcess.h +++ b/ProcessLib/TwoPhaseFlowWithPP/TwoPhaseFlowWithPPProcess.h @@ -49,10 +49,7 @@ public: std::vector<std::vector<std::reference_wrapper<ProcessVariable>>>&& process_variables, TwoPhaseFlowWithPPProcessData&& process_data, - SecondaryVariableCollection&& secondary_variables, - std::map<std::string, - std::unique_ptr<MathLib::PiecewiseLinearInterpolation>> const& - curves); + SecondaryVariableCollection&& secondary_variables); bool isLinear() const override { return false; } diff --git a/ProcessLib/TwoPhaseFlowWithPrho/CreateTwoPhaseFlowWithPrhoProcess.cpp b/ProcessLib/TwoPhaseFlowWithPrho/CreateTwoPhaseFlowWithPrhoProcess.cpp index 2bdc6c8a76801b1466093b4b7bd96429a52d5f8a..8054cff4c0da3f1b71e45670d903e24d1cc44687 100644 --- a/ProcessLib/TwoPhaseFlowWithPrho/CreateTwoPhaseFlowWithPrhoProcess.cpp +++ b/ProcessLib/TwoPhaseFlowWithPrho/CreateTwoPhaseFlowWithPrhoProcess.cpp @@ -30,10 +30,7 @@ std::unique_ptr<Process> createTwoPhaseFlowWithPrhoProcess( std::vector<ProcessVariable> const& variables, std::vector<std::unique_ptr<ParameterLib::ParameterBase>> const& parameters, unsigned const integration_order, - BaseLib::ConfigTree const& config, - std::map<std::string, - std::unique_ptr<MathLib::PiecewiseLinearInterpolation>> const& - curves) + BaseLib::ConfigTree const& config) { //! \ogs_file_param{prj__processes__process__type} config.checkConfigParameter("type", "TWOPHASE_FLOW_PRHO"); @@ -112,8 +109,7 @@ std::unique_ptr<Process> createTwoPhaseFlowWithPrhoProcess( return std::make_unique<TwoPhaseFlowWithPrhoProcess>( std::move(name), mesh, std::move(jacobian_assembler), parameters, integration_order, std::move(process_variables), - std::move(process_data), std::move(secondary_variables), mat_config, - curves); + std::move(process_data), std::move(secondary_variables)); } } // namespace TwoPhaseFlowWithPrho diff --git a/ProcessLib/TwoPhaseFlowWithPrho/CreateTwoPhaseFlowWithPrhoProcess.h b/ProcessLib/TwoPhaseFlowWithPrho/CreateTwoPhaseFlowWithPrhoProcess.h index c540d11c7997a5e398cb8b6c0486095fe44e8db7..37f1fea783e7f2c3739c12e4b0ec75ef7788ddc5 100644 --- a/ProcessLib/TwoPhaseFlowWithPrho/CreateTwoPhaseFlowWithPrhoProcess.h +++ b/ProcessLib/TwoPhaseFlowWithPrho/CreateTwoPhaseFlowWithPrhoProcess.h @@ -59,9 +59,6 @@ std::unique_ptr<Process> createTwoPhaseFlowWithPrhoProcess( std::vector<ProcessVariable> const& variables, std::vector<std::unique_ptr<ParameterLib::ParameterBase>> const& parameters, unsigned const integration_order, - BaseLib::ConfigTree const& config, - std::map<std::string, - std::unique_ptr<MathLib::PiecewiseLinearInterpolation>> const& - curves); + BaseLib::ConfigTree const& config); } // namespace TwoPhaseFlowWithPrho } // namespace ProcessLib diff --git a/ProcessLib/TwoPhaseFlowWithPrho/TwoPhaseFlowWithPrhoProcess.cpp b/ProcessLib/TwoPhaseFlowWithPrho/TwoPhaseFlowWithPrhoProcess.cpp index c0c404a4518f47489d8ef66f159e78c40a065155..5b3894836692d2b3d9e8195fa0c0d77d79fe1807 100644 --- a/ProcessLib/TwoPhaseFlowWithPrho/TwoPhaseFlowWithPrhoProcess.cpp +++ b/ProcessLib/TwoPhaseFlowWithPrho/TwoPhaseFlowWithPrhoProcess.cpp @@ -26,11 +26,7 @@ TwoPhaseFlowWithPrhoProcess::TwoPhaseFlowWithPrhoProcess( std::vector<std::vector<std::reference_wrapper<ProcessVariable>>>&& process_variables, TwoPhaseFlowWithPrhoProcessData&& process_data, - SecondaryVariableCollection&& secondary_variables, - BaseLib::ConfigTree const& /*config*/, - std::map<std::string, - std::unique_ptr<MathLib::PiecewiseLinearInterpolation>> const& - /*curves*/) + SecondaryVariableCollection&& secondary_variables) : Process(std::move(name), mesh, std::move(jacobian_assembler), parameters, integration_order, std::move(process_variables), std::move(secondary_variables)), diff --git a/ProcessLib/TwoPhaseFlowWithPrho/TwoPhaseFlowWithPrhoProcess.h b/ProcessLib/TwoPhaseFlowWithPrho/TwoPhaseFlowWithPrhoProcess.h index 27f5388e71d96835cb06f7571bfef1651aa6031c..1acb32277fab75fbf004c15d42c66bceb5e347a4 100644 --- a/ProcessLib/TwoPhaseFlowWithPrho/TwoPhaseFlowWithPrhoProcess.h +++ b/ProcessLib/TwoPhaseFlowWithPrho/TwoPhaseFlowWithPrhoProcess.h @@ -47,11 +47,7 @@ public: std::vector<std::vector<std::reference_wrapper<ProcessVariable>>>&& process_variables, TwoPhaseFlowWithPrhoProcessData&& process_data, - SecondaryVariableCollection&& secondary_variables, - BaseLib::ConfigTree const& config, - std::map<std::string, - std::unique_ptr<MathLib::PiecewiseLinearInterpolation>> const& - curves); + SecondaryVariableCollection&& secondary_variables); bool isLinear() const override { return false; } private: