OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2024-12-28 02:00:59 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #615 from blattms/return-negative-status-for-help

Browse Source 
Use negative status to indicate --help, --print-properties, --print-parameters
This commit is contained in:
Markus Blatt 2020-06-04 12:24:39 +02:00 committed by GitHub
commit 2e13e846ff
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -104,6 +104,8 @@ static inline void registerAllParameters_(bool finalizeRegistration = true)
*
* \param argc The number of command line arguments
* \param argv Array with the command line argument strings
* \return A negative value if --help or --print-properties was provided,
* a positive value for errors or 0 for success.
*/
template <class TypeTag>
static inline int setupParameters_(int argc,
@ -129,7 +131,7 @@ static inline int setupParameters_(int argc,
// fill the parameter tree with the options from the command line
const auto& positionalParamCallback = Problem::handlePositionalParameter;
std::string helpPreamble = "";
std::string helpPreamble = ""; // print help if non-empty!
if (myRank == 0 && handleHelp)
helpPreamble = Problem::helpPreamble(argc, argv);
std::string s =
@ -138,7 +140,16 @@ static inline int setupParameters_(int argc,
helpPreamble,
positionalParamCallback);
if (!s.empty())
return /*status=*/1;
{
int status = 1, globalStatus = 1;
if (s == "Help called") // only on master process
status = globalStatus = -1; // Use negative values to indicate --help argument
#if HAVE_MPI
// Force -1 if the master process has that.
MPI_Allreduce(&status, &globalStatus, 1, MPI_INT, MPI_MIN, MPI_COMM_WORLD);
#endif
return globalStatus;
}
std::string paramFileName = EWOMS_GET_PARAM_(TypeTag, std::string, ParameterFile);
if (paramFileName != "") {