Change defaults

Use the more stable interleaved solver instead of CPR as default
Solve well equation initially as default
This commit is contained in:
Tor Harald Sandve 2015-09-03 12:38:03 +02:00
parent 59fccb2f86
commit fd48a6e004
3 changed files with 5 additions and 5 deletions

View File

@ -356,9 +356,9 @@ try
// Solver for Newton iterations.
std::unique_ptr<NewtonIterationBlackoilInterface> fis_solver;
if (param.getDefault("use_interleaved", false)) {
if (param.getDefault("use_interleaved", true)) {
fis_solver.reset(new NewtonIterationBlackoilInterleaved(param, parallel_information));
} else if (param.getDefault("use_cpr", true)) {
} else if (param.getDefault("use_cpr", false)) {
fis_solver.reset(new NewtonIterationBlackoilCPR(param, parallel_information));
} else {
fis_solver.reset(new NewtonIterationBlackoilSimple(param, parallel_information));

View File

@ -366,9 +366,9 @@ try
// Solver for Newton iterations.
std::unique_ptr<NewtonIterationBlackoilInterface> fis_solver;
if (param.getDefault("use_interleaved", false)) {
if (param.getDefault("use_interleaved", true)) {
fis_solver.reset(new NewtonIterationBlackoilInterleaved(param));
} else if (param.getDefault("use_cpr", true)) {
} else if (param.getDefault("use_cpr", false)) {
fis_solver.reset(new NewtonIterationBlackoilCPR(param));
} else {
fis_solver.reset(new NewtonIterationBlackoilSimple(param, parallel_information));

View File

@ -62,7 +62,7 @@ namespace Opm
tolerance_mb_ = 1.0e-5;
tolerance_cnv_ = 1.0e-2;
tolerance_wells_ = 1.0e-3;
solve_welleq_initially_ = false;
solve_welleq_initially_ = true;
}