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

Omit "Unhandled keyword" messages on non-root processes

Browse Source
This commit is contained in:
Markus Blatt 2016-09-15 17:12:09 +02:00
parent d4b818c948
commit 6d0d063413
1 changed files with 29 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
opm/autodiff/SimulatorFullyImplicitBlackoilOutput.hpp
View File

@ -437,7 +437,8 @@ namespace Opm
const Opm::PhaseUsage& phaseUsage, const Opm::PhaseUsage& phaseUsage,
const Model& model, const Model& model,
const RestartConfig& restartConfig, const RestartConfig& restartConfig,
const int reportStepNum) { const int reportStepNum,
const bool output) {
std::vector<data::CellData> simProps; std::vector<data::CellData> simProps;
@ -547,8 +548,11 @@ namespace Opm
std::move(adbToDoubleVector(sd.rq[aqua_idx].kr))}); std::move(adbToDoubleVector(sd.rq[aqua_idx].kr))});
} }
else { else {
Opm::OpmLog::warning("Empty:WATKR", if ( output )
"Not emitting empty Water Rel-Perm"); {
Opm::OpmLog::warning("Empty:WATKR",
"Not emitting empty Water Rel-Perm");
}
} }
} }
if (liquid_active && outKeywords["KRO"] > 0) { if (liquid_active && outKeywords["KRO"] > 0) {
@ -560,8 +564,11 @@ namespace Opm
std::move(adbToDoubleVector(sd.rq[liquid_idx].kr))}); std::move(adbToDoubleVector(sd.rq[liquid_idx].kr))});
} }
else { else {
Opm::OpmLog::warning("Empty:OILKR", if ( output )
"Not emitting empty Oil Rel-Perm"); {
Opm::OpmLog::warning("Empty:OILKR",
"Not emitting empty Oil Rel-Perm");
}
} }
} }
if (vapour_active && outKeywords["KRG"] > 0) { if (vapour_active && outKeywords["KRG"] > 0) {
@ -573,8 +580,11 @@ namespace Opm
std::move(adbToDoubleVector(sd.rq[vapour_idx].kr))}); std::move(adbToDoubleVector(sd.rq[vapour_idx].kr))});
} }
else { else {
Opm::OpmLog::warning("Empty:GASKR", if ( output )
"Not emitting empty Gas Rel-Perm"); {
Opm::OpmLog::warning("Empty:GASKR",
"Not emitting empty Gas Rel-Perm");
}
} }
} }
@ -600,7 +610,8 @@ namespace Opm
/** /**
* Bubble point and dew point pressures * Bubble point and dew point pressures
*/ */
if (vapour_active && liquid_active && outKeywords["PBPD"] > 0) { if (output && vapour_active &&
liquid_active && outKeywords["PBPD"] > 0) {
outKeywords["PBPD"] = 0; outKeywords["PBPD"] = 0;
Opm::OpmLog::warning("Bubble/dew point pressure output unsupported", Opm::OpmLog::warning("Bubble/dew point pressure output unsupported",
"Writing bubble points and dew points (PBPD) to file is unsupported, " "Writing bubble points and dew points (PBPD) to file is unsupported, "
@ -608,12 +619,15 @@ namespace Opm
} }
//Warn for any unhandled keyword //Warn for any unhandled keyword
for (auto& keyValue : outKeywords) { if (output)
if (keyValue.second > 0) { {
std::string logstring = "Keyword '"; for (auto& keyValue : outKeywords) {
logstring.append(keyValue.first); if (keyValue.second > 0) {
logstring.append("' is unhandled for output to file."); std::string logstring = "Keyword '";
Opm::OpmLog::warning("Unhandled output keyword", logstring); logstring.append(keyValue.first);
logstring.append("' is unhandled for output to file.");
Opm::OpmLog::warning("Unhandled output keyword", logstring);
}
} }
} }
@ -636,7 +650,7 @@ namespace Opm
{ {
const RestartConfig& restartConfig = eclipseState_->getRestartConfig(); const RestartConfig& restartConfig = eclipseState_->getRestartConfig();
const int reportStepNum = timer.reportStepNum(); const int reportStepNum = timer.reportStepNum();
std::vector<data::CellData> cellData = detail::getCellData( phaseUsage_, physicalModel, restartConfig, reportStepNum ); std::vector<data::CellData> cellData = detail::getCellData( phaseUsage_, physicalModel, restartConfig, reportStepNum, parallelOutput_->isIORank() );
writeTimeStepWithCellProperties(timer, localState, localWellState, cellData, substep); writeTimeStepWithCellProperties(timer, localState, localWellState, cellData, substep);
} }
} }