From fd48a6e004406876d7c650ace3dcf9c592618405 Mon Sep 17 00:00:00 2001 From: Tor Harald Sandve Date: Thu, 3 Sep 2015 12:38:03 +0200 Subject: [PATCH] Change defaults Use the more stable interleaved solver instead of CPR as default Solve well equation initially as default --- examples/flow.cpp | 4 ++-- examples/flow_solvent.cpp | 4 ++-- opm/autodiff/BlackoilModelParameters.cpp | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/examples/flow.cpp b/examples/flow.cpp index 337bce827..1a2906cc5 100644 --- a/examples/flow.cpp +++ b/examples/flow.cpp @@ -356,9 +356,9 @@ try // Solver for Newton iterations. std::unique_ptr 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)); diff --git a/examples/flow_solvent.cpp b/examples/flow_solvent.cpp index d4be75298..ad5081e78 100644 --- a/examples/flow_solvent.cpp +++ b/examples/flow_solvent.cpp @@ -366,9 +366,9 @@ try // Solver for Newton iterations. std::unique_ptr 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)); diff --git a/opm/autodiff/BlackoilModelParameters.cpp b/opm/autodiff/BlackoilModelParameters.cpp index 5c5530d78..eb5927455 100644 --- a/opm/autodiff/BlackoilModelParameters.cpp +++ b/opm/autodiff/BlackoilModelParameters.cpp @@ -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; }