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

Merge pull request #1090 from atgeirr/convergence-failure-problem-not-error

Browse Source 
Convergence failure is "problem" not "error"
This commit is contained in:
Atgeirr Flø Rasmussen 2016-10-21 12:49:10 +02:00 committed by GitHub
commit a108b0fb72
2 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
opm/core/props/rock/RockCompressibility.cpp
View File

@ -42,7 +42,8 @@ namespace Opm
} }
RockCompressibility::RockCompressibility(const Opm::Deck& deck, RockCompressibility::RockCompressibility(const Opm::Deck& deck,
const Opm::EclipseState& eclipseState) const Opm::EclipseState& eclipseState,
const bool is_io_rank)
: pref_(0.0), : pref_(0.0),
rock_comp_(0.0) rock_comp_(0.0)
{ {
@ -63,14 +64,14 @@ namespace Opm
} else if (deck.hasKeyword("ROCK")) { } else if (deck.hasKeyword("ROCK")) {
const auto& rockKeyword = deck.getKeyword("ROCK"); const auto& rockKeyword = deck.getKeyword("ROCK");
if (rockKeyword.size() != 1) { if (rockKeyword.size() != 1) {
// here it would be better not to use std::cout directly but to add the if (is_io_rank) {
// warning to some "warning list"... OpmLog::warning("Can only handle a single region in ROCK ("
OpmLog::warning("Can only handle a single region in ROCK (" + std::to_string(rockKeyword.size())
+ std::to_string(rockKeyword.size()) + " regions specified)."
+ " regions specified)." + " Ignoring all except for the first.\n"
+ " Ignoring all except for the first.\n" + "In file " + rockKeyword.getFileName()
+ "In file " + rockKeyword.getFileName() + ", line " + std::to_string(rockKeyword.getLineNumber()) + "\n");
+ ", line " + std::to_string(rockKeyword.getLineNumber()) + "\n"); }
} }
pref_ = rockKeyword.getRecord(0).getItem("PREF").getSIDouble(0); pref_ = rockKeyword.getRecord(0).getItem("PREF").getSIDouble(0);

3
opm/core/props/rock/RockCompressibility.hpp
View File

@ -36,7 +36,8 @@ namespace Opm
/// Construct from input deck. /// Construct from input deck.
/// Looks for the keywords ROCK and ROCKTAB. /// Looks for the keywords ROCK and ROCKTAB.
RockCompressibility(const Opm::Deck& deck, RockCompressibility(const Opm::Deck& deck,
const Opm::EclipseState& eclipseState); const Opm::EclipseState& eclipseState,
const bool is_io_rank = true);
/// Construct from parameters. /// Construct from parameters.
/// Accepts the following parameters (with defaults). /// Accepts the following parameters (with defaults).