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

Merge pull request #1135 from nairr/terminal_output_mod

Browse Source 
Minor terminal output modifications
This commit is contained in:
Atgeirr Flø Rasmussen 2017-04-11 11:39:27 +02:00 committed by GitHub
commit 2dff8ef141
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
opm/autodiff/BlackoilModelBase_impl.hpp
View File

@ -1821,7 +1821,7 @@ typedef Eigen::Array<double,
|| (idx < np && std::isnan(well_flux_residual[idx]))) { || (idx < np && std::isnan(well_flux_residual[idx]))) {
const auto msg = std::string("NaN residual for phase ") + materialName(idx); const auto msg = std::string("NaN residual for phase ") + materialName(idx);
if (terminal_output_) { if (terminal_output_) {
OpmLog::problem(msg); OpmLog::bug(msg);
} }
OPM_THROW_NOLOG(Opm::NumericalProblem, msg); OPM_THROW_NOLOG(Opm::NumericalProblem, msg);
} }
@ -1900,7 +1900,7 @@ typedef Eigen::Array<double,
if (std::isnan(well_flux_residual[idx])) { if (std::isnan(well_flux_residual[idx])) {
const auto msg = std::string("NaN residual for phase ") + materialName(idx); const auto msg = std::string("NaN residual for phase ") + materialName(idx);
if (terminal_output_) { if (terminal_output_) {
OpmLog::problem(msg); OpmLog::bug(msg);
} }
OPM_THROW_NOLOG(Opm::NumericalProblem, msg); OPM_THROW_NOLOG(Opm::NumericalProblem, msg);
} }

6
opm/autodiff/BlackoilModelEbos.hpp
View File

@ -1392,7 +1392,7 @@ namespace Opm {
const size_t max_num_cells_faillog = 20; const size_t max_num_cells_faillog = 20;
if (failed_cells_pb.size() > 0) { if (failed_cells_pb.size() > 0) {
std::stringstream errlog; std::stringstream errlog;
errlog << "Finding the dew point pressure failed for " << failed_cells_pb.size() << " cells ["; errlog << "Finding the bubble point pressure failed for " << failed_cells_pb.size() << " cells [";
errlog << failed_cells_pb[0]; errlog << failed_cells_pb[0];
const int max_elems = std::min(max_num_cells_faillog, failed_cells_pb.size()); const int max_elems = std::min(max_num_cells_faillog, failed_cells_pb.size());
for (int i = 1; i < max_elems; ++i) { for (int i = 1; i < max_elems; ++i) {
@ -1402,7 +1402,7 @@ namespace Opm {
errlog << ", ..."; errlog << ", ...";
} }
errlog << "]"; errlog << "]";
OpmLog::problem("pb numerical problem", errlog.str()); OpmLog::warning("Bubble point numerical problem", errlog.str());
} }
if (failed_cells_pd.size() > 0) { if (failed_cells_pd.size() > 0) {
std::stringstream errlog; std::stringstream errlog;
@ -1416,7 +1416,7 @@ namespace Opm {
errlog << ", ..."; errlog << ", ...";
} }
errlog << "]"; errlog << "]";
OpmLog::problem("pd numerical problem", errlog.str()); OpmLog::warning("Dew point numerical problem", errlog.str());
} }
return simData; return simData;