From f1301338e223aa9dda7a359d22f888256b22e262 Mon Sep 17 00:00:00 2001
From: Dmitri Naumov <github@naumov.de>
Date: Tue, 7 Nov 2023 20:22:16 +0100
Subject: [PATCH] [PL] Remove unused ctors' arguments
---
Applications/ApplicationsLib/ProjectData.cpp | 8 ++++----
ProcessLib/RichardsFlow/CreateRichardsFlowProcess.cpp | 3 ---
ProcessLib/RichardsFlow/CreateRichardsFlowProcess.h | 3 ---
.../CreateThermalTwoPhaseFlowWithPPProcess.cpp | 5 +----
.../CreateThermalTwoPhaseFlowWithPPProcess.h | 3 ---
.../ThermalTwoPhaseFlowWithPPProcess.cpp | 5 +----
.../ThermalTwoPhaseFlowWithPPProcess.h | 5 +----
.../CreateTwoPhaseFlowWithPPProcess.cpp | 5 +----
.../TwoPhaseFlowWithPP/CreateTwoPhaseFlowWithPPProcess.h | 3 ---
.../TwoPhaseFlowWithPP/TwoPhaseFlowWithPPProcess.cpp | 5 +----
ProcessLib/TwoPhaseFlowWithPP/TwoPhaseFlowWithPPProcess.h | 5 +----
.../CreateTwoPhaseFlowWithPrhoProcess.cpp | 8 ++------
.../CreateTwoPhaseFlowWithPrhoProcess.h | 5 +----
.../TwoPhaseFlowWithPrho/TwoPhaseFlowWithPrhoProcess.cpp | 6 +-----
.../TwoPhaseFlowWithPrho/TwoPhaseFlowWithPrhoProcess.h | 6 +-----
15 files changed, 15 insertions(+), 60 deletions(-)
diff --git a/Applications/ApplicationsLib/ProjectData.cpp b/Applications/ApplicationsLib/ProjectData.cpp
index a07260e6457..d13446a0f2c 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 9a8b7d07058..3131d51de13 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 7bdbc3b6d11..db7cd10bc6f 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 953fc6e88f1..18d71a47069 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 964326edab4..c6fe276e8ea 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 cc5fe8a16ba..dfd1be03879 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 1a1bd286217..157cc1fd383 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 d75f4a6487a..2c9a84a52b7 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 a4f95a985c4..d81b97565e7 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 efbaf07e40c..828e6853483 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 b5983d746a2..b8b575ec7e7 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 2bdc6c8a768..8054cff4c0d 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 c540d11c799..37f1fea783e 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 c0c404a4518..5b389483669 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 27f5388e71d..1acb32277fa 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:
--
GitLab