OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

remove Parameters::noPositionalParameters_

Browse Source 
only used in a test
This commit is contained in:
Arne Morten Kvarving 2024-09-04 18:44:48 +02:00
parent 672de7665d
commit 0cda471821
4 changed files with 21 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
opm/models/utils/parametersystem.cpp
View File

@ -521,18 +521,6 @@ void printUsage(const std::string& helpPreamble,
} }
} }
int noPositionalParameters_(std::function<void(const std::string&, const std::string&)>,
std::set<std::string>&,
std::string& errorMsg,
int,
const char** argv,
int paramIdx,
int)
{
errorMsg = std::string("Illegal parameter \"")+argv[paramIdx]+"\".";
return 0;
}
void parseParameterFile(const std::string& fileName, bool overwrite) void parseParameterFile(const std::string& fileName, bool overwrite)
{ {
std::set<std::string> seenKeys; std::set<std::string> seenKeys;
@ -594,8 +582,8 @@ void parseParameterFile(const std::string& fileName, bool overwrite)
std::string parseCommandLineOptions(int argc, std::string parseCommandLineOptions(int argc,
const char **argv, const char **argv,
const std::string& helpPreamble, const PositionalArgumentCallback& posArgCallback,
const PositionalArgumentCallback& posArgCallback) const std::string& helpPreamble)
{ {
// handle the "--help" parameter // handle the "--help" parameter
if (!helpPreamble.empty()) { if (!helpPreamble.empty()) {

15
opm/models/utils/parametersystem.hpp
View File

@ -191,17 +191,6 @@ void printUsage(const std::string& helpPreamble,
std::ostream& os = std::cerr, std::ostream& os = std::cerr,
const bool showAll = false); const bool showAll = false);
/// \cond 0
int noPositionalParameters_(std::function<void(const std::string&, const std::string&)>,
std::set<std::string>&,
std::string& errorMsg,
int,
const char** argv,
int paramIdx,
int);
/// \endcond
//! \brief Callback function for command line parsing. //! \brief Callback function for command line parsing.
using PositionalArgumentCallback = std::function<int(std::function<void(const std::string&, using PositionalArgumentCallback = std::function<int(std::function<void(const std::string&,
const std::string&)>, const std::string&)>,
@ -230,8 +219,8 @@ using PositionalArgumentCallback = std::function<int(std::function<void(const st
std::string std::string
parseCommandLineOptions(int argc, parseCommandLineOptions(int argc,
const char **argv, const char **argv,
const std::string& helpPreamble = "", const PositionalArgumentCallback& posArgCallback,
const PositionalArgumentCallback& posArgCallback = noPositionalParameters_); const std::string& helpPreamble = "");
/*! /*!
* \ingroup Parameter * \ingroup Parameter

4
opm/models/utils/start.hh
View File

@ -131,8 +131,8 @@ static inline int setupParameters_(int argc,
std::string s = std::string s =
Parameters::parseCommandLineOptions(argc, Parameters::parseCommandLineOptions(argc,
argv, argv,
helpPreamble, positionalParamCallback,
positionalParamCallback); helpPreamble);
if (!s.empty()) if (!s.empty())
{ {
int status = 1; int status = 1;

17
tests/test_parametersystem.cpp
View File

@ -78,8 +78,21 @@ BOOST_FIXTURE_TEST_CASE(GetLists, Fixture)
"--unused-param=foo", "--unused-param=foo",
}; };
Opm::Parameters::parseCommandLineOptions(5, argv, "", auto noPositional = [](std::function<void(const std::string&,
Opm::Parameters::noPositionalParameters_); const std::string&)>,
std::set<std::string>&,
std::string&,
int,
const char**,
int,
int) -> int
{
assert("Should not be here!");
return 0;
};
Opm::Parameters::parseCommandLineOptions(5, argv, noPositional);
BOOST_CHECK_EQUAL(Opm::Parameters::IsSet<Opm::Parameters::SimpleParamBool>(), true); BOOST_CHECK_EQUAL(Opm::Parameters::IsSet<Opm::Parameters::SimpleParamBool>(), true);
BOOST_CHECK_EQUAL(Opm::Parameters::IsSet<Opm::Parameters::SimpleParamFloat>(), true); BOOST_CHECK_EQUAL(Opm::Parameters::IsSet<Opm::Parameters::SimpleParamFloat>(), true);