Merge pull request #1741 from andlaus/NewtonRawTolerance_to_NewtonTolerance

EclProblem: Rename NewtonRawTolerance to NewtonTolerance
This commit is contained in:
Tor Harald Sandve 2019-03-04 13:13:04 +01:00 committed by GitHub
commit 40f4a2656f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions

View File

@ -240,7 +240,7 @@ SET_SCALAR_PROP(EclBaseProblem, EndTime, 1e100);
SET_SCALAR_PROP(EclBaseProblem, InitialTimeStepSize, 3600*24); SET_SCALAR_PROP(EclBaseProblem, InitialTimeStepSize, 3600*24);
// the default for the allowed volumetric error for oil per second // 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 // 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 // reservoir. this is scaled by the pore volume of the reservoir, i.e., larger reservoirs

View File

@ -147,7 +147,7 @@ namespace Opm
// flow also does not use the eWoms Newton method // flow also does not use the eWoms Newton method
EWOMS_HIDE_PARAM(TypeTag, NewtonMaxError); EWOMS_HIDE_PARAM(TypeTag, NewtonMaxError);
EWOMS_HIDE_PARAM(TypeTag, NewtonMaxIterations); EWOMS_HIDE_PARAM(TypeTag, NewtonMaxIterations);
EWOMS_HIDE_PARAM(TypeTag, NewtonRawTolerance); EWOMS_HIDE_PARAM(TypeTag, NewtonTolerance);
EWOMS_HIDE_PARAM(TypeTag, NewtonTargetIterations); EWOMS_HIDE_PARAM(TypeTag, NewtonTargetIterations);
EWOMS_HIDE_PARAM(TypeTag, NewtonVerbose); EWOMS_HIDE_PARAM(TypeTag, NewtonVerbose);
EWOMS_HIDE_PARAM(TypeTag, NewtonWriteConvergence); EWOMS_HIDE_PARAM(TypeTag, NewtonWriteConvergence);