Merge pull request #926 from totto82/frankenstein_revertChanges

Revert som changes in default values
This commit is contained in:
Andreas Lauser 2016-11-17 13:46:37 +01:00 committed by GitHub
commit b8a0bb6aea
2 changed files with 2 additions and 2 deletions

View File

@ -60,7 +60,7 @@ namespace Opm
void BlackoilModelParameters::reset()
{
// default values for the solver parameters
dp_max_rel_ = 1.0;
dp_max_rel_ = 1.0e9;
ds_max_ = 0.2;
dr_max_rel_ = 1.0e9;
max_residual_allowed_ = 1e7;

View File

@ -248,7 +248,7 @@ namespace Opm
stagnate = (stagnate && !(std::abs((F1[p] - F2[p]) / F2[p]) > 1.0e-3));
}
oscillate = (oscillatePhase > 0);
oscillate = (oscillatePhase > 1);
}