mirror of
https://github.com/OPM/opm-simulators.git
synced 2026-10-24 14:47:44 -05:00
added changes as discussed in PR 4827
This commit is contained in:
1 parent
84d3530fd9
commit
6e4f3bd37e
1 file changed
+7
-5
@@ -329,8 +329,8 @@ private:
|
|||||||
// Reset to false as we cannot use Damaris if there is only one rank.
|
// Reset to false as we cannot use Damaris if there is only one rank.
|
||||||
if ((enableDamarisOutput_ == true) && (EclGenericVanguard::comm().size() == 1)) {
|
if ((enableDamarisOutput_ == true) && (EclGenericVanguard::comm().size() == 1)) {
|
||||||
std::string msg ;
|
std::string msg ;
|
||||||
msg = "\nUse of Damaris (command line argument --enable-damaris-output=true) has been dissabled for run with only one rank.\n" ;
|
msg = "\nUse of Damaris (command line argument --enable-damaris-output=true) has been disabled for run with only one rank.\n" ;
|
||||||
OpmLog::info(msg);
|
OpmLog::warning(msg);
|
||||||
enableDamarisOutput_ = false ;
|
enableDamarisOutput_ = false ;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -342,13 +342,16 @@ private:
|
|||||||
|
|
||||||
// Guard for when the Damaris core(s) return from damaris_start()
|
// Guard for when the Damaris core(s) return from damaris_start()
|
||||||
// which happens when damaris_stop() is called in main simulation
|
// which happens when damaris_stop() is called in main simulation
|
||||||
if (isSimulationRank_) {
|
if (!isSimulationRank_) {
|
||||||
|
exitCode = EXIT_SUCCESS;
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
int mpiRank = EclGenericVanguard::comm().rank();
|
int mpiRank = EclGenericVanguard::comm().rank();
|
||||||
outputCout_ = false;
|
outputCout_ = false;
|
||||||
if (mpiRank == 0)
|
if (mpiRank == 0)
|
||||||
outputCout_ = EWOMS_GET_PARAM(PreTypeTag, bool, EnableTerminalOutput);
|
outputCout_ = EWOMS_GET_PARAM(PreTypeTag, bool, EnableTerminalOutput);
|
||||||
|
|
||||||
|
|
||||||
if (deckFilename.empty()) {
|
if (deckFilename.empty()) {
|
||||||
if (mpiRank == 0) {
|
if (mpiRank == 0) {
|
||||||
std::cerr << "No input case given. Try '--help' for a usage description.\n";
|
std::cerr << "No input case given. Try '--help' for a usage description.\n";
|
||||||
@@ -409,7 +412,6 @@ private:
|
|||||||
exitCode = EXIT_FAILURE;
|
exitCode = EXIT_FAILURE;
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
exitCode = EXIT_SUCCESS;
|
exitCode = EXIT_SUCCESS;
|
||||||
return true;
|
return true;
|
||||||
|
|||||||
Reference in new issue
Block a user