Always use the reduction of the maximum of the weighted residual as convergence criterion

This should make things a much more robust, partially because now the
linear and the non-linear solvers use the same convergence criterion.

Also, this patch includes some collateral indentation improvements.

examples/co2injection_flash_ecfv.cpp

@@ -55,7 +55,7 @@ SET_TYPE_PROP(
 #if HAVE_QUAD
 SET_TYPE_PROP(Co2InjectionFlashEcfvProblem, Scalar, quad);
 #else
-SET_SCALAR_PROP(Co2InjectionFlashEcfvProblem, NewtonRelativeTolerance, 1e-5);
+SET_SCALAR_PROP(Co2InjectionFlashEcfvProblem, NewtonTolerance, 1e-5);
 #endif
 } // namespace Properties
 } // namespace Opm

examples/co2injection_flash_ni_ecfv.cpp

@@ -54,7 +54,7 @@ SET_TYPE_PROP(
 #if HAVE_QUAD
 SET_TYPE_PROP(Co2InjectionFlashNiEcfvProblem, Scalar, quad);
 #else
-SET_SCALAR_PROP(Co2InjectionFlashNiEcfvProblem, NewtonRelativeTolerance, 1e-5);
+SET_SCALAR_PROP(Co2InjectionFlashNiEcfvProblem, NewtonTolerance, 1e-5);
 #endif
 }
 }

examples/co2injection_flash_ni_vcfv.cpp

@@ -54,7 +54,7 @@ SET_TYPE_PROP(
 #if HAVE_QUAD
 SET_TYPE_PROP(Co2InjectionFlashNiVcfvProblem, Scalar, quad);
 #else
-SET_SCALAR_PROP(Co2InjectionFlashNiVcfvProblem, NewtonRelativeTolerance, 1e-5);
+SET_SCALAR_PROP(Co2InjectionFlashNiVcfvProblem, NewtonTolerance, 1e-5);
 #endif
 }
 }

examples/co2injection_flash_vcfv.cpp

@@ -55,7 +55,7 @@ SET_TYPE_PROP(
 #if HAVE_QUAD
 SET_TYPE_PROP(Co2InjectionFlashVcfvProblem, Scalar, quad);
 #else
-SET_SCALAR_PROP(Co2InjectionFlashVcfvProblem, NewtonRelativeTolerance, 1e-5);
+SET_SCALAR_PROP(Co2InjectionFlashVcfvProblem, NewtonTolerance, 1e-5);
 #endif
 } // namespace Properties
 } // namespace Opm

examples/co2injection_pvs_ecfv.cpp

@@ -19,8 +19,8 @@
 /*!
  * \file
  *
- * \brief Test for the isothermal primary variable switching VCVF
- *discretization.
+ * \brief Test for the isothermal primary variable switching model
+ *        using the ECVF discretization.
  */
 #include "config.h"
 

examples/co2injection_pvs_ni_ecfv.cpp

@@ -20,7 +20,7 @@
  * \file
  *
  * \brief Test for the non-isothermal primary variable switching VCVF
- *discretization.
+ *        discretization.
  */
 #include "config.h"
 

examples/co2injection_pvs_ni_vcfv.cpp

@@ -19,8 +19,8 @@
 /*!
  * \file
  *
- * \brief Test for the non-isothermal primary variable switching VCVF
- *discretization.
+ * \brief Test for the non-isothermal primary variable switching model
+ *        using the VCVF discretization.
  */
 #include "config.h"
 

examples/co2injection_pvs_vcfv.cpp

@@ -19,8 +19,8 @@
 /*!
  * \file
  *
- * \brief Test for the isothermal primary variable switching VCVF
- *discretization.
+ * \brief Test for the isothermal primary variable switching model using the VCVF
+ *        discretization.
  */
 #include "config.h"
 

examples/obstacle_pvs.cpp

@@ -20,8 +20,8 @@
 /*
  * \file
  *
- * \brief Test for the isothermal primary variable switching VCVF
- *discretization.
+ * \brief Test for the isothermal primary variable switching model
+ *        using "obstacle" problem and the VCVF discretization.
  */
 #include "config.h"
 

examples/problems/co2injectionproblem.hh

@@ -239,16 +239,13 @@ public:
     {
         eps_ = 1e-6;
 
-        temperatureLow_
-            = EWOMS_GET_PARAM(TypeTag, Scalar, FluidSystemTemperatureLow);
-        temperatureHigh_
-            = EWOMS_GET_PARAM(TypeTag, Scalar, FluidSystemTemperatureHigh);
+        temperatureLow_ = EWOMS_GET_PARAM(TypeTag, Scalar, FluidSystemTemperatureLow);
+        temperatureHigh_ = EWOMS_GET_PARAM(TypeTag, Scalar, FluidSystemTemperatureHigh);
         nTemperature_ = EWOMS_GET_PARAM(TypeTag, int, FluidSystemNumTemperature);
 
         nPressure_ = EWOMS_GET_PARAM(TypeTag, int, FluidSystemNumPressure);
         pressureLow_ = EWOMS_GET_PARAM(TypeTag, Scalar, FluidSystemPressureLow);
-        pressureHigh_
-            = EWOMS_GET_PARAM(TypeTag, Scalar, FluidSystemPressureHigh);
+        pressureHigh_ = EWOMS_GET_PARAM(TypeTag, Scalar, FluidSystemPressureHigh);
 
         maxDepth_ = EWOMS_GET_PARAM(TypeTag, Scalar, MaxDepth);
         temperature_ = EWOMS_GET_PARAM(TypeTag, Scalar, Temperature);

examples/problems/infiltrationproblem.hh

@@ -68,8 +68,8 @@ SET_BOOL_PROP(InfiltrationBaseProblem, EnableGravity, true);
 // Write newton convergence?
 SET_BOOL_PROP(InfiltrationBaseProblem, NewtonWriteConvergence, false);
 
-// Maximum tolerated relative error in the Newton method
-SET_SCALAR_PROP(InfiltrationBaseProblem, NewtonRelativeTolerance, 1e-8);
+// Maximum tolerated error in the Newton method
+SET_SCALAR_PROP(InfiltrationBaseProblem, NewtonTolerance, 1e-8);
 
 // -1 backward differences, 0: central differences, +1: forward differences
 SET_INT_PROP(InfiltrationBaseProblem, NumericDifferenceMethod, 1);

examples/problems/stokesnitestproblem.hh

@@ -70,6 +70,9 @@ SET_SCALAR_PROP(StokesNiTestProblem, EndTime, 3.0);
 // Default initial time step size [s]
 SET_SCALAR_PROP(StokesNiTestProblem, InitialTimeStepSize, 0.1);
 
+// Default tolerance of the Newton-Raphson method
+SET_SCALAR_PROP(StokesNiTestProblem, NewtonTolerance, 1e-4);
+
 // Default grid file to load
 SET_STRING_PROP(StokesNiTestProblem, GridFile, "grids/test_stokes2cni.dgf");
 } // namespace Properties