From f36680bf3aade0aeb7e0de704ef945b8d9b518d9 Mon Sep 17 00:00:00 2001 From: Andreas Lauser Date: Fri, 1 Mar 2019 10:48:06 +0100 Subject: [PATCH] EclProblem: Rename NewtonRawTolerance to NewtonTolerance this property is not used by `flow` because `flow` implements its own Newton method, but it not renaming the property prevents `flow` from building. --- ebos/eclproblem.hh | 2 +- opm/autodiff/FlowMainEbos.hpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ebos/eclproblem.hh b/ebos/eclproblem.hh index 7c494a66c..72365a2f9 100644 --- a/ebos/eclproblem.hh +++ b/ebos/eclproblem.hh @@ -240,7 +240,7 @@ SET_SCALAR_PROP(EclBaseProblem, EndTime, 1e100); SET_SCALAR_PROP(EclBaseProblem, InitialTimeStepSize, 3600*24); // the default for the allowed volumetric error for oil per second -SET_SCALAR_PROP(EclBaseProblem, NewtonRawTolerance, 1e-2); +SET_SCALAR_PROP(EclBaseProblem, NewtonTolerance, 1e-2); // the tolerated amount of "incorrect" amount of oil per time step for the complete // reservoir. this is scaled by the pore volume of the reservoir, i.e., larger reservoirs diff --git a/opm/autodiff/FlowMainEbos.hpp b/opm/autodiff/FlowMainEbos.hpp index 849d42393..eb4d20bad 100755 --- a/opm/autodiff/FlowMainEbos.hpp +++ b/opm/autodiff/FlowMainEbos.hpp @@ -147,7 +147,7 @@ namespace Opm // flow also does not use the eWoms Newton method EWOMS_HIDE_PARAM(TypeTag, NewtonMaxError); EWOMS_HIDE_PARAM(TypeTag, NewtonMaxIterations); - EWOMS_HIDE_PARAM(TypeTag, NewtonRawTolerance); + EWOMS_HIDE_PARAM(TypeTag, NewtonTolerance); EWOMS_HIDE_PARAM(TypeTag, NewtonTargetIterations); EWOMS_HIDE_PARAM(TypeTag, NewtonVerbose); EWOMS_HIDE_PARAM(TypeTag, NewtonWriteConvergence);