From 2a842470eb723667d92d6e4e687c6b0808af4b70 Mon Sep 17 00:00:00 2001
From: Gabi Seitz <gabriele.seitz@iws.uni-stuttgart.de>
Date: Tue, 3 Mar 2015 13:49:36 +0000
Subject: [PATCH] Runtime params: specified in inputfiles instead of the
 problem files whenever possible. Reviewed by Johannes

git-svn-id: svn://svn.iws.uni-stuttgart.de/DUMUX/dumux/trunk@14320 2fb0f335-1f38-0410-981e-8018bf24f1b0
---
 test/implicit/1p/1pniconductionproblem.hh     |  5 -----
 test/implicit/1p/1pniconvectionproblem.hh     |  5 -----
 test/implicit/1p/1ptestproblem.hh             |  3 ---
 test/implicit/1p/test_box1pniconduction.input |  3 +++
 test/implicit/1p/test_box1pniconvection.input |  3 +++
 test/implicit/1p/test_cc1pniconduction.input  |  3 +++
 test/implicit/1p/test_cc1pniconvection.input  |  3 +++
 test/implicit/1p2c/1p2cniconvectionproblem.hh |  5 -----
 test/implicit/1p2c/test_box1p2c.input         |  3 +++
 .../1p2c/test_box1p2cniconduction.input       |  3 +++
 .../1p2c/test_box1p2cniconvection.input       |  3 +++
 test/implicit/1p2c/test_cc1p2c.input          |  3 +++
 .../1p2c/test_cc1p2cniconduction.input        |  3 +++
 .../1p2c/test_cc1p2cniconvection.input        |  3 +++
 test/implicit/2p/injectionproblem2pni.hh      |  6 ------
 test/implicit/2p/lensproblem.hh               | 18 ----------------
 test/implicit/2p/test_box2p.input             |  3 +++
 test/implicit/2p/test_box2pni.input           |  2 ++
 test/implicit/2p/test_cc2p.input              |  3 +++
 test/implicit/2p/test_cc2pni.input            |  2 ++
 test/implicit/2p2c/injectionproblem.hh        |  6 ------
 test/implicit/2p2c/test_box2p2c.input         |  2 ++
 test/implicit/2p2c/test_cc2p2c.input          |  2 ++
 test/implicit/2p2c/waterairproblem.hh         |  9 --------
 test/implicit/2pdfm/2pdfmtestproblem.hh       | 17 ---------------
 test/implicit/2pdfm/test_2pdfm.input          |  6 ++++++
 test/implicit/3p/3pniconductionproblem.hh     |  6 ------
 test/implicit/3p/3pniconvectionproblem.hh     |  7 -------
 test/implicit/3p/infiltration3pproblem.hh     |  8 -------
 test/implicit/3p/test_box3pniconduction.input |  3 +++
 test/implicit/3p/test_box3pniconvection.input |  3 +++
 test/implicit/3p/test_cc3pniconduction.input  |  3 +++
 test/implicit/3p/test_cc3pniconvection.input  |  3 +++
 test/implicit/3p3c/columnxylolproblem.hh      | 12 -----------
 test/implicit/3p3c/infiltrationproblem.hh     |  5 -----
 test/implicit/3p3c/kuevetteproblem.hh         |  9 --------
 test/implicit/3p3c/test_box3p3c.input         |  3 +++
 .../3p3c/test_box3p3c_reference.input         |  3 +++
 .../3p3c/test_box3p3cnicolumnxylol.input      |  5 +++++
 .../3p3c/test_box3p3cnikuevette.input         |  5 +++++
 test/implicit/3p3c/test_cc3p3c.input          |  3 +++
 .../implicit/3p3c/test_cc3p3c_reference.input |  3 +++
 .../3p3c/test_cc3p3cnicolumnxylol.input       |  5 +++++
 .../implicit/3p3c/test_cc3p3cnikuevette.input |  5 +++++
 test/implicit/mpnc/combustionproblem1c.hh     | 12 -----------
 .../mpnc/evaporationatmosphereproblem.hh      | 19 -----------------
 test/implicit/mpnc/forchheimer1pproblem.hh    | 21 -------------------
 test/implicit/mpnc/forchheimer2pproblem.hh    | 17 ---------------
 test/implicit/mpnc/obstacleproblem.hh         | 15 -------------
 test/implicit/richards/richardslensproblem.hh | 18 ----------------
 .../richards/richardsniconductionproblem.hh   |  6 ------
 .../richards/richardsniconvectionproblem.hh   |  6 ------
 test/implicit/richards/test_boxrichards.input |  6 ++++++
 .../test_boxrichardsniconduction.input        |  3 +++
 .../test_boxrichardsniconvection.input        |  4 ++++
 test/implicit/richards/test_ccrichards.input  |  6 ++++++
 .../test_ccrichardsniconduction.input         |  4 ++++
 .../test_ccrichardsniconvection.input         |  4 ++++
 58 files changed, 121 insertions(+), 235 deletions(-)

diff --git a/test/implicit/1p/1pniconductionproblem.hh b/test/implicit/1p/1pniconductionproblem.hh
index f09cce5e2b..ede80032a6 100644
--- a/test/implicit/1p/1pniconductionproblem.hh
+++ b/test/implicit/1p/1pniconductionproblem.hh
@@ -65,11 +65,6 @@ SET_TYPE_PROP(OnePNIConductionProblem,
               SpatialParams,
               Dumux::OnePNISpatialParams<TypeTag>);
 
-// Enable velocity output
-SET_BOOL_PROP(OnePNIConductionProblem, VtkAddVelocity, true);
-
-// Disable gravity
-SET_BOOL_PROP(OnePNIConductionProblem, ProblemEnableGravity, false);
 }
 
 
diff --git a/test/implicit/1p/1pniconvectionproblem.hh b/test/implicit/1p/1pniconvectionproblem.hh
index ae37529cb0..2eac0b1a95 100644
--- a/test/implicit/1p/1pniconvectionproblem.hh
+++ b/test/implicit/1p/1pniconvectionproblem.hh
@@ -64,11 +64,6 @@ SET_TYPE_PROP(OnePNIConvectionProblem,
               SpatialParams,
               Dumux::OnePNISpatialParams<TypeTag>);
 
-// Enable velocity output
-SET_BOOL_PROP(OnePNIConvectionProblem, VtkAddVelocity, true);
-
-// Disable gravity
-SET_BOOL_PROP(OnePNIConvectionProblem, ProblemEnableGravity, false);
 }
 
 
diff --git a/test/implicit/1p/1ptestproblem.hh b/test/implicit/1p/1ptestproblem.hh
index 68f3563224..b5122861f4 100644
--- a/test/implicit/1p/1ptestproblem.hh
+++ b/test/implicit/1p/1ptestproblem.hh
@@ -77,9 +77,6 @@ SET_TYPE_PROP(OnePTestProblem, SpatialParams, Dumux::OnePTestSpatialParams<TypeT
 
 // Linear solver settings
 SET_TYPE_PROP(OnePTestProblem, LinearSolver, Dumux::BoxBiCGStabILU0Solver<TypeTag> );
-SET_INT_PROP(OnePTestProblem, LinearSolverVerbosity, 0);
-SET_INT_PROP(OnePTestProblem, LinearSolverPreconditionerIterations, 1);
-SET_SCALAR_PROP(OnePTestProblem, LinearSolverPreconditionerRelaxation, 1.0);
 
 NEW_TYPE_TAG(OnePTestBoxProblemWithAMG, INHERITS_FROM(OnePTestBoxProblem));
 NEW_TYPE_TAG(OnePTestCCProblemWithAMG, INHERITS_FROM(OnePTestCCProblem));
diff --git a/test/implicit/1p/test_box1pniconduction.input b/test/implicit/1p/test_box1pniconduction.input
index 1edecc07a4..03c54a6508 100644
--- a/test/implicit/1p/test_box1pniconduction.input
+++ b/test/implicit/1p/test_box1pniconduction.input
@@ -9,4 +9,7 @@ File = ./grids/test_1pniconduction.dgf
 [Problem]
 Name = box1pniconduction # name passed to the output routines
 OutputInterval = 5 # every 5th timestep an output file is written
+EnableGravity = 0 # disable gravity
 
+[Vtk]
+AddVelocity= 1 # enable velocity output
diff --git a/test/implicit/1p/test_box1pniconvection.input b/test/implicit/1p/test_box1pniconvection.input
index 5744f50b84..f8bd23eb1e 100644
--- a/test/implicit/1p/test_box1pniconvection.input
+++ b/test/implicit/1p/test_box1pniconvection.input
@@ -10,4 +10,7 @@ File = ./grids/test_1pniconvection.dgf
 Name = box1pniconvection # name passed to the output routines
 OutputInterval = 5 # every 5th timestep an output file is written
 DarcyVelocity = 1e-4 # [m/s] inflow at the left boundary
+EnableGravity = 0 # Disable gravity
 
+[Vtk]
+AddVelocity = 1 # enable velocity output
diff --git a/test/implicit/1p/test_cc1pniconduction.input b/test/implicit/1p/test_cc1pniconduction.input
index 9ae9929d63..d965cbe814 100644
--- a/test/implicit/1p/test_cc1pniconduction.input
+++ b/test/implicit/1p/test_cc1pniconduction.input
@@ -9,4 +9,7 @@ File = ./grids/test_1pniconduction.dgf
 [Problem]
 Name = cc1pniconduction # name passed to the output routines
 OutputInterval = 5 # every 5th timestep an output file is written
+EnableGravity = 0 # disable gravity
 
+[Vtk]
+AddVelocity= 1 # enable velocity output
diff --git a/test/implicit/1p/test_cc1pniconvection.input b/test/implicit/1p/test_cc1pniconvection.input
index 87d6601d15..8978fe1f7a 100644
--- a/test/implicit/1p/test_cc1pniconvection.input
+++ b/test/implicit/1p/test_cc1pniconvection.input
@@ -10,4 +10,7 @@ File = ./grids/test_1pniconvection.dgf
 Name = cc1pniconvection # name passed to the output routines
 OutputInterval = 5 # every 5th timestep an output file is written
 DarcyVelocity = 1e-4 # [m/s] inflow at the left boundary
+EnableGravity = 0 # Disable gravity
 
+[Vtk]
+AddVelocity = 1 # enable velocity output
diff --git a/test/implicit/1p2c/1p2cniconvectionproblem.hh b/test/implicit/1p2c/1p2cniconvectionproblem.hh
index 101e73f5f1..3ddf018c70 100644
--- a/test/implicit/1p2c/1p2cniconvectionproblem.hh
+++ b/test/implicit/1p2c/1p2cniconvectionproblem.hh
@@ -68,11 +68,6 @@ SET_TYPE_PROP(OnePTwoCNIConvectionProblem,
 // Define whether mole(true) or mass (false) fractions are used
 SET_BOOL_PROP(OnePTwoCNIConvectionProblem, UseMoles, true);
 
-// Enable velocity output
-SET_BOOL_PROP(OnePTwoCNIConvectionProblem, VtkAddVelocity, true);
-
-// Disable gravity
-SET_BOOL_PROP(OnePTwoCNIConvectionProblem, ProblemEnableGravity, false);
 }
 
 
diff --git a/test/implicit/1p2c/test_box1p2c.input b/test/implicit/1p2c/test_box1p2c.input
index 081b7ccab6..5b8a2f8f9e 100644
--- a/test/implicit/1p2c/test_box1p2c.input
+++ b/test/implicit/1p2c/test_box1p2c.input
@@ -7,4 +7,7 @@ File = ./grids/test_1p2c.dgf
 
 [Problem]
 Name = outflowbox # name passed to the output routines
+EnableGravity = 0 # disable gravity
 
+[Vtk]
+AddVelocity = 1 # enable velocity output
diff --git a/test/implicit/1p2c/test_box1p2cniconduction.input b/test/implicit/1p2c/test_box1p2cniconduction.input
index e9e6b43a86..5d67364a7b 100644
--- a/test/implicit/1p2c/test_box1p2cniconduction.input
+++ b/test/implicit/1p2c/test_box1p2cniconduction.input
@@ -9,4 +9,7 @@ File = ./grids/test_1p2cniconduction.dgf
 [Problem]
 Name = box1p2cniconduction # name passed to the output routines
 OutputInterval = 5 # every 5th timestep an output file is written
+EnableGravity = 0 # disable gravity
 
+[Vtk]
+AddVelocity = 1 # Enable velocity output
diff --git a/test/implicit/1p2c/test_box1p2cniconvection.input b/test/implicit/1p2c/test_box1p2cniconvection.input
index 7f53fce805..fdf98dfece 100644
--- a/test/implicit/1p2c/test_box1p2cniconvection.input
+++ b/test/implicit/1p2c/test_box1p2cniconvection.input
@@ -10,4 +10,7 @@ File = ./grids/test_1p2cniconvection.dgf
 Name = box1p2cniconvection # name passed to the output routines
 OutputInterval = 5 # every 5th timestep an output file is written
 DarcyVelocity = 1e-4 # [m/s] inflow at the left boundary
+EnableGravity = 0 # disable gravity
 
+[Vtk]
+AddVelocity = 1 # enable velocity output
diff --git a/test/implicit/1p2c/test_cc1p2c.input b/test/implicit/1p2c/test_cc1p2c.input
index 86addd63f1..50d5b99098 100644
--- a/test/implicit/1p2c/test_cc1p2c.input
+++ b/test/implicit/1p2c/test_cc1p2c.input
@@ -7,4 +7,7 @@ File = ./grids/test_1p2c.dgf
 
 [Problem]
 Name = outflowcc # name passed to the output routines
+EnableGravity = 0 # disable gravity
 
+[Vtk]
+AddVelocity = 1 # enable velocity output
diff --git a/test/implicit/1p2c/test_cc1p2cniconduction.input b/test/implicit/1p2c/test_cc1p2cniconduction.input
index c9ddfcdfa5..7636c68a30 100644
--- a/test/implicit/1p2c/test_cc1p2cniconduction.input
+++ b/test/implicit/1p2c/test_cc1p2cniconduction.input
@@ -9,4 +9,7 @@ File = ./grids/test_1p2cniconduction.dgf
 [Problem]
 Name = cc1p2cniconduction # name passed to the output routines
 OutputInterval = 5 # every 5th timestep an output file is written
+EnableGravity = 0 # disable gravity
 
+[Vtk]
+AddVelocity = 1 # enable velocity output
diff --git a/test/implicit/1p2c/test_cc1p2cniconvection.input b/test/implicit/1p2c/test_cc1p2cniconvection.input
index e39ca088af..eb25b226fd 100644
--- a/test/implicit/1p2c/test_cc1p2cniconvection.input
+++ b/test/implicit/1p2c/test_cc1p2cniconvection.input
@@ -10,4 +10,7 @@ File = ./grids/test_1p2cniconvection.dgf
 Name = cc1p2cniconvection # name passed to the output routines
 OutputInterval = 5 # every 5th timestep an output file is written
 DarcyVelocity = 1e-4 # [m/s] inflow at the left boundary
+EnableGravity = 0 # disable gravity
 
+[Vtk]
+AddVelocity = 1 # enable velocity output
diff --git a/test/implicit/2p/injectionproblem2pni.hh b/test/implicit/2p/injectionproblem2pni.hh
index ed52c635f7..5497d6bb7e 100644
--- a/test/implicit/2p/injectionproblem2pni.hh
+++ b/test/implicit/2p/injectionproblem2pni.hh
@@ -94,12 +94,6 @@ SET_TYPE_PROP(InjectionProblem2PNI,
               Dumux::GasPhase<GET_PROP_TYPE(TypeTag, Scalar) Scalar,
                                  Dumux::N2<GET_PROP_TYPE(TypeTag, Scalar) Scalar> >);
 #endif
-
-// Enable gravity
-SET_BOOL_PROP(InjectionProblem2PNI, ProblemEnableGravity, true);
-
-// write convergence behaviour to disk?
-SET_BOOL_PROP(InjectionProblem2PNI, NewtonWriteConvergence, true);
 }
 
 /*!
diff --git a/test/implicit/2p/lensproblem.hh b/test/implicit/2p/lensproblem.hh
index a18577dff4..97fa3f7dd6 100644
--- a/test/implicit/2p/lensproblem.hh
+++ b/test/implicit/2p/lensproblem.hh
@@ -83,26 +83,8 @@ public:
     typedef Dumux::LiquidPhase<Scalar, Dumux::DNAPL<Scalar> > type;
 };
 
-// Enable partial reassembly of the jacobian matrix?
-SET_BOOL_PROP(LensProblem, ImplicitEnablePartialReassemble, true);
-
-// Enable reuse of jacobian matrices?
-SET_BOOL_PROP(LensProblem, ImplicitEnableJacobianRecycling, true);
-
-// Write the solutions of individual newton iterations?
-SET_BOOL_PROP(LensProblem, NewtonWriteConvergence, false);
-
-// Use forward differences instead of central differences
-SET_INT_PROP(LensProblem, ImplicitNumericDifferenceMethod, +1);
-
 // Linear solver settings
 SET_TYPE_PROP(LensProblem, LinearSolver, Dumux::BoxBiCGStabILU0Solver<TypeTag> );
-SET_INT_PROP(LensProblem, LinearSolverVerbosity, 0);
-SET_INT_PROP(LensProblem, LinearSolverPreconditionerIterations, 1);
-SET_SCALAR_PROP(LensProblem, LinearSolverPreconditionerRelaxation, 1.0);
-
-// Enable gravity
-SET_BOOL_PROP(LensProblem, ProblemEnableGravity, true);
 
 NEW_PROP_TAG(BaseProblem);
 SET_TYPE_PROP(LensBoxProblem, BaseProblem, ImplicitPorousMediaProblem<TypeTag>);
diff --git a/test/implicit/2p/test_box2p.input b/test/implicit/2p/test_box2p.input
index 940a449ac0..2dffa89db1 100644
--- a/test/implicit/2p/test_box2p.input
+++ b/test/implicit/2p/test_box2p.input
@@ -14,3 +14,6 @@ LensUpperRightY = 3.0 # [m] y-coordinate of the upper right lens corner
 [Problem]
 Name = lensbox # name passed to the output routines
 
+[Implicit]
+EnablePartialReassemble = 1 # enable partial reassembly of the jacobian matrix?
+EnableJacobianRecycling = 1 # Enable reuse of jacobian matrices?
diff --git a/test/implicit/2p/test_box2pni.input b/test/implicit/2p/test_box2pni.input
index 769bd34a4f..932fccac03 100644
--- a/test/implicit/2p/test_box2pni.input
+++ b/test/implicit/2p/test_box2pni.input
@@ -12,3 +12,5 @@ UpperRightY = 40 # [m] height of the domain
 [Problem]
 Name = injection2pnibox
 
+[Newton]
+WriteConvergence = 1 # write convergence behaviour to disk?
diff --git a/test/implicit/2p/test_cc2p.input b/test/implicit/2p/test_cc2p.input
index 5338c37a7c..59fbf23e61 100644
--- a/test/implicit/2p/test_cc2p.input
+++ b/test/implicit/2p/test_cc2p.input
@@ -14,3 +14,6 @@ LensUpperRightY = 3.0 # [m] y-coordinate of the upper right lens corner
 [Problem]
 Name = lenscc # name passed to the output routines
 
+[Implicit]
+EnablePartialReassemble = 1 # enable partial reassembly of the jacobian matrix?
+EnableJacobianRecycling = 1 # Enable reuse of jacobian matrices?
diff --git a/test/implicit/2p/test_cc2pni.input b/test/implicit/2p/test_cc2pni.input
index 67824b76cb..3911aa42c4 100644
--- a/test/implicit/2p/test_cc2pni.input
+++ b/test/implicit/2p/test_cc2pni.input
@@ -12,3 +12,5 @@ UpperRightY = 40 # [m] height of the domain
 [Problem]
 Name = injection2pnicc
 
+[Newton]
+WriteConvergence = 1 # write convergence behaviour to disk?
diff --git a/test/implicit/2p2c/injectionproblem.hh b/test/implicit/2p2c/injectionproblem.hh
index 4724bf814d..67fa03f2d9 100644
--- a/test/implicit/2p2c/injectionproblem.hh
+++ b/test/implicit/2p2c/injectionproblem.hh
@@ -55,14 +55,8 @@ SET_TYPE_PROP(InjectionProblem,
               FluidSystem,
               Dumux::FluidSystems::H2ON2<typename GET_PROP_TYPE(TypeTag, Scalar), false /*useComplexRelations*/>);
 
-// Enable gravity
-SET_BOOL_PROP(InjectionProblem, ProblemEnableGravity, true);
-
 // Define whether mole(true) or mass (false) fractions are used
 SET_BOOL_PROP(InjectionProblem, UseMoles, true);
-
-SET_BOOL_PROP(InjectionProblem, ImplicitEnableJacobianRecycling, true);
-SET_BOOL_PROP(InjectionProblem, VtkAddVelocity, false);
 }
 
 
diff --git a/test/implicit/2p2c/test_box2p2c.input b/test/implicit/2p2c/test_box2p2c.input
index 5d68997cee..0742ff29ee 100644
--- a/test/implicit/2p2c/test_box2p2c.input
+++ b/test/implicit/2p2c/test_box2p2c.input
@@ -18,3 +18,5 @@ PressureHigh = 3e7 # [Pa] upper pressure limit for tabularization
 TemperatureLow = 312.15 # [Pa] lower temperature limit for tabularization
 TemperatureHigh = 314.15 # [Pa] upper temperature limit for tabularization
 
+[Implicit]
+EnableJacobianRecycling = 1 # 
diff --git a/test/implicit/2p2c/test_cc2p2c.input b/test/implicit/2p2c/test_cc2p2c.input
index cf88bfc330..ebfdbff3e2 100644
--- a/test/implicit/2p2c/test_cc2p2c.input
+++ b/test/implicit/2p2c/test_cc2p2c.input
@@ -18,3 +18,5 @@ PressureHigh = 3e7 # [Pa] upper pressure limit for tabularization
 TemperatureLow = 312.15 # [Pa] lower temperature limit for tabularization
 TemperatureHigh = 314.15 # [Pa] upper temperature limit for tabularization
 
+[Implicit]
+EnableJacobianRecycling = 1 # 
diff --git a/test/implicit/2p2c/waterairproblem.hh b/test/implicit/2p2c/waterairproblem.hh
index 18904fdbce..dcfd8058fd 100644
--- a/test/implicit/2p2c/waterairproblem.hh
+++ b/test/implicit/2p2c/waterairproblem.hh
@@ -56,15 +56,6 @@ SET_TYPE_PROP(WaterAirProblem, Problem, Dumux::WaterAirProblem<TypeTag>);
 // Set the wetting phase
 SET_TYPE_PROP(WaterAirProblem, FluidSystem, Dumux::FluidSystems::H2ON2<typename GET_PROP_TYPE(TypeTag, Scalar), false>);
 
-// Enable gravity
-SET_BOOL_PROP(WaterAirProblem, ProblemEnableGravity, true);
-
-// Use forward differences instead of central differences
-SET_INT_PROP(WaterAirProblem, ImplicitNumericDifferenceMethod, +1);
-
-// Write newton convergence
-SET_BOOL_PROP(WaterAirProblem, NewtonWriteConvergence, false);
-
 // Define whether mole(true) or mass (false) fractions are used
 SET_BOOL_PROP(WaterAirProblem, UseMoles, true);
 }
diff --git a/test/implicit/2pdfm/2pdfmtestproblem.hh b/test/implicit/2pdfm/2pdfmtestproblem.hh
index 9f2302f24a..e47fa52526 100644
--- a/test/implicit/2pdfm/2pdfmtestproblem.hh
+++ b/test/implicit/2pdfm/2pdfmtestproblem.hh
@@ -81,26 +81,9 @@ public:
     typedef Dumux::LiquidPhase<Scalar, Dumux::DNAPL<Scalar> > type;
 };
 
-// Enable partial reassembly of the jacobian matrix?
-SET_BOOL_PROP(TwoPDFMTestProblem, ImplicitEnablePartialReassemble, true);
-
-// Enable reuse of jacobian matrices?
-SET_BOOL_PROP(TwoPDFMTestProblem, ImplicitEnableJacobianRecycling, true);
-
-// Write the solutions of individual newton iterations?
-SET_BOOL_PROP(TwoPDFMTestProblem, NewtonWriteConvergence, false);
-
-// Use forward differences instead of central differences
-SET_INT_PROP(TwoPDFMTestProblem, ImplicitNumericDifferenceMethod, +1);
-
 // Linear solver settings
 SET_TYPE_PROP(TwoPDFMTestProblem, LinearSolver, Dumux::BoxBiCGStabILU0Solver<TypeTag>);
-SET_INT_PROP(TwoPDFMTestProblem, LinearSolverVerbosity, 0);
-SET_INT_PROP(TwoPDFMTestProblem, LinearSolverPreconditionerIterations, 1);
-SET_SCALAR_PROP(TwoPDFMTestProblem, LinearSolverPreconditionerRelaxation, 1.0);
 
-// Enable gravity
-SET_BOOL_PROP(TwoPDFMTestProblem, ProblemEnableGravity, false);
 }
 
 /*!
diff --git a/test/implicit/2pdfm/test_2pdfm.input b/test/implicit/2pdfm/test_2pdfm.input
index a9f8b4da95..a6cba2aea3 100644
--- a/test/implicit/2pdfm/test_2pdfm.input
+++ b/test/implicit/2pdfm/test_2pdfm.input
@@ -5,3 +5,9 @@ TEnd = 20 # [s]
 [Grid]
 File = ./grids/2pdfmartmesh.net
 
+[Implicit]
+EnablePartialReassemble = 1 # enable partial reassembly of the jacobian matrix?
+EnableJacobianRecycling = 1 # enable reuse of jacobian matrices?
+
+[Problem]
+ ProblemEnableGravity = 0 # enable gravity
diff --git a/test/implicit/3p/3pniconductionproblem.hh b/test/implicit/3p/3pniconductionproblem.hh
index e66a6816fc..86b822a8fe 100644
--- a/test/implicit/3p/3pniconductionproblem.hh
+++ b/test/implicit/3p/3pniconductionproblem.hh
@@ -67,12 +67,6 @@ SET_TYPE_PROP(ThreePNIConductionProblem,
               SpatialParams,
               Dumux::ThreePNISpatialParams<TypeTag>);
 
-
-// Enable velocity output
-SET_BOOL_PROP(ThreePNIConductionProblem, VtkAddVelocity, true);
-
-// Disable gravity
-SET_BOOL_PROP(ThreePNIConductionProblem, ProblemEnableGravity, false);
 }
 
 
diff --git a/test/implicit/3p/3pniconvectionproblem.hh b/test/implicit/3p/3pniconvectionproblem.hh
index 2898c4f264..44f59a3bf5 100644
--- a/test/implicit/3p/3pniconvectionproblem.hh
+++ b/test/implicit/3p/3pniconvectionproblem.hh
@@ -65,13 +65,6 @@ SET_TYPE_PROP(ThreePNIConvectionProblem,
 SET_TYPE_PROP(ThreePNIConvectionProblem,
               SpatialParams,
               Dumux::ThreePNISpatialParams<TypeTag>);
-
-
-// Enable velocity output
-SET_BOOL_PROP(ThreePNIConvectionProblem, VtkAddVelocity, true);
-
-// Disable gravity
-SET_BOOL_PROP(ThreePNIConvectionProblem, ProblemEnableGravity, false);
 }
 
 
diff --git a/test/implicit/3p/infiltration3pproblem.hh b/test/implicit/3p/infiltration3pproblem.hh
index 377c20617f..15740d3ee4 100644
--- a/test/implicit/3p/infiltration3pproblem.hh
+++ b/test/implicit/3p/infiltration3pproblem.hh
@@ -56,17 +56,9 @@ SET_TYPE_PROP(InfiltrationThreePProblem,
               FluidSystem,
               Dumux::FluidSystems::H2OAirMesitylene<typename GET_PROP_TYPE(TypeTag, Scalar)>);
 
-// Enable gravity?
-SET_BOOL_PROP(InfiltrationThreePProblem, ProblemEnableGravity, true);
-
-// Write newton convergence?
-SET_BOOL_PROP(InfiltrationThreePProblem, NewtonWriteConvergence, false);
 
 // Maximum tolerated relative error in the Newton method
 SET_SCALAR_PROP(InfiltrationThreePProblem, NewtonMaxRelativeShift, 1e-4);
-
-// -1 backward differences, 0: central differences, +1: forward differences
-SET_INT_PROP(InfiltrationThreePProblem, ImplicitNumericDifferenceMethod, 1);
 }
 
 /*!
diff --git a/test/implicit/3p/test_box3pniconduction.input b/test/implicit/3p/test_box3pniconduction.input
index a5760cadf3..d0cf675dc5 100644
--- a/test/implicit/3p/test_box3pniconduction.input
+++ b/test/implicit/3p/test_box3pniconduction.input
@@ -9,4 +9,7 @@ File = ./grids/test_3pniconduction.dgf
 [Problem]
 Name = test_box3pniconduction # name passed to the output routines
 OutputInterval = 5 # every 5th timestep an output file is written
+EnableGravity = 0 # disable gravity
 
+[Vtk]
+AddVelocity = 1 #Enable velocity output
diff --git a/test/implicit/3p/test_box3pniconvection.input b/test/implicit/3p/test_box3pniconvection.input
index 5443d70459..736f1effda 100644
--- a/test/implicit/3p/test_box3pniconvection.input
+++ b/test/implicit/3p/test_box3pniconvection.input
@@ -10,4 +10,7 @@ File = ./grids/test_3pniconvection.dgf
 Name = test_box3pniconvection # name passed to the output routines
 OutputInterval = 5 # every 5th timestep an output file is written
 DarcyVelocity = 1e-4 # [m/s] inflow at the left boundary
+EnableGravity = 0 # disable gravity
 
+[Vtk]
+AddVelocity = 1 #Enable velocity output
diff --git a/test/implicit/3p/test_cc3pniconduction.input b/test/implicit/3p/test_cc3pniconduction.input
index 4a3ef029d4..8112e4317a 100644
--- a/test/implicit/3p/test_cc3pniconduction.input
+++ b/test/implicit/3p/test_cc3pniconduction.input
@@ -9,4 +9,7 @@ File = ./grids/test_3pniconduction.dgf
 [Problem]
 Name = test_cc3pniconduction # name passed to the output routines
 OutputInterval = 5 # every 5th timestep an output file is written
+EnableGravity = 0 # disable gravity
 
+[Vtk]
+AddVelocity = 1 #Enable velocity output
diff --git a/test/implicit/3p/test_cc3pniconvection.input b/test/implicit/3p/test_cc3pniconvection.input
index 5a3274450c..67f8a7067e 100644
--- a/test/implicit/3p/test_cc3pniconvection.input
+++ b/test/implicit/3p/test_cc3pniconvection.input
@@ -10,4 +10,7 @@ File = ./grids/test_3pniconvection.dgf
 Name = test_cc3pniconvection # name passed to the output routines
 OutputInterval = 5 # every 5th timestep an output file is written
 DarcyVelocity = 1e-4 # [m/s] inflow at the left boundary
+EnableGravity = 0 # disable gravity
 
+[Vtk]
+AddVelocity = 1 #Enable velocity output
diff --git a/test/implicit/3p3c/columnxylolproblem.hh b/test/implicit/3p3c/columnxylolproblem.hh
index 76a370c1bf..1b785172a6 100644
--- a/test/implicit/3p3c/columnxylolproblem.hh
+++ b/test/implicit/3p3c/columnxylolproblem.hh
@@ -58,18 +58,6 @@ SET_TYPE_PROP(ColumnProblem, Problem, Dumux::ColumnProblem<TypeTag>);
 SET_TYPE_PROP(ColumnProblem,
               FluidSystem,
               Dumux::FluidSystems::H2OAirXylene<typename GET_PROP_TYPE(TypeTag, Scalar)>);
-
-// Enable gravity
-SET_BOOL_PROP(ColumnProblem, ProblemEnableGravity, true);
-
-// Use forward differences instead of central differences
-SET_INT_PROP(ColumnProblem, ImplicitNumericDifferenceMethod, 0);
-
-// Write newton convergence
-SET_BOOL_PROP(ColumnProblem, NewtonWriteConvergence, false);
-
-// Set the maximum time step
-SET_SCALAR_PROP(ColumnProblem, TimeManagerMaxTimeStepSize, 4.);
 }
 
 
diff --git a/test/implicit/3p3c/infiltrationproblem.hh b/test/implicit/3p3c/infiltrationproblem.hh
index 3244d3cc63..a9d8925d86 100644
--- a/test/implicit/3p3c/infiltrationproblem.hh
+++ b/test/implicit/3p3c/infiltrationproblem.hh
@@ -57,11 +57,6 @@ SET_TYPE_PROP(InfiltrationProblem,
               FluidSystem,
               Dumux::FluidSystems::H2OAirMesitylene<typename GET_PROP_TYPE(TypeTag, Scalar)>);
 
-// Enable gravity?
-SET_BOOL_PROP(InfiltrationProblem, ProblemEnableGravity, true);
-
-// Write newton convergence?
-SET_BOOL_PROP(InfiltrationProblem, NewtonWriteConvergence, false);
 
 // Maximum tolerated relative error in the Newton method
 SET_SCALAR_PROP(InfiltrationProblem, NewtonMaxRelativeShift, 1e-8);
diff --git a/test/implicit/3p3c/kuevetteproblem.hh b/test/implicit/3p3c/kuevetteproblem.hh
index 8de78f404a..e1a8872377 100644
--- a/test/implicit/3p3c/kuevetteproblem.hh
+++ b/test/implicit/3p3c/kuevetteproblem.hh
@@ -60,15 +60,6 @@ SET_TYPE_PROP(KuevetteProblem,
               FluidSystem,
               Dumux::FluidSystems::H2OAirMesitylene<typename GET_PROP_TYPE(TypeTag, Scalar)>);
 
-// Enable gravity
-SET_BOOL_PROP(KuevetteProblem, ProblemEnableGravity, true);
-
-// Use central differences (backward -1, forward +1)
-SET_INT_PROP(KuevetteProblem, ImplicitNumericDifferenceMethod, 0);
-
-// Set the maximum time step
-SET_SCALAR_PROP(KuevetteProblem, TimeManagerMaxTimeStepSize, 60.);
-
 // set newton relative tolerance
 SET_SCALAR_PROP(KuevetteProblem, NewtonMaxRelativeShift, 1e-6);
 }
diff --git a/test/implicit/3p3c/test_box3p3c.input b/test/implicit/3p3c/test_box3p3c.input
index 03b8005c3b..5bc35023d2 100644
--- a/test/implicit/3p3c/test_box3p3c.input
+++ b/test/implicit/3p3c/test_box3p3c.input
@@ -8,3 +8,6 @@ File = ./grids/test_3p3c.dgf
 [Problem]
 Name = infiltrationbox
 
+[Implicit]
+NumericDifferenceMethod = 0 # -1 backward differences, 0: central differences, +1: forward differences
+
diff --git a/test/implicit/3p3c/test_box3p3c_reference.input b/test/implicit/3p3c/test_box3p3c_reference.input
index 0f9acfdb64..c31a525356 100644
--- a/test/implicit/3p3c/test_box3p3c_reference.input
+++ b/test/implicit/3p3c/test_box3p3c_reference.input
@@ -8,3 +8,6 @@ File = ./grids/test_3p3c_coarse.dgf
 [Problem]
 Name = box3p3c
 
+[Implicit]
+NumericDifferenceMethod = 0 # -1 backward differences, 0: central differences, +1: forward differences
+
diff --git a/test/implicit/3p3c/test_box3p3cnicolumnxylol.input b/test/implicit/3p3c/test_box3p3cnicolumnxylol.input
index 2c2dbcf7bb..8c6853ac47 100644
--- a/test/implicit/3p3c/test_box3p3cnicolumnxylol.input
+++ b/test/implicit/3p3c/test_box3p3cnicolumnxylol.input
@@ -8,3 +8,8 @@ File = ./grids/column.dgf
 [Problem]
 Name = columnxylolbox # name passed to the output routines
 
+[Implicit]
+NumericDifferenceMethod = 0 # -1 backward differences, 0: central differences, +1: forward differences
+
+[TimeManager]
+MaxTimeStepSize= 4. # Set the maximum time step
diff --git a/test/implicit/3p3c/test_box3p3cnikuevette.input b/test/implicit/3p3c/test_box3p3cnikuevette.input
index 35de8ffc9f..80f709f658 100644
--- a/test/implicit/3p3c/test_box3p3cnikuevette.input
+++ b/test/implicit/3p3c/test_box3p3cnikuevette.input
@@ -8,3 +8,8 @@ File = ./grids/column.dgf
 [Problem]
 Name = kuevettebox # name passed to the output routines
 
+[Implicit]
+NumericDifferenceMethod = 0 # use central differences (backward -1, forward +1)
+
+[TimeManager]
+MaxTimeStepSize = 60. # set the maximum time step
diff --git a/test/implicit/3p3c/test_cc3p3c.input b/test/implicit/3p3c/test_cc3p3c.input
index 0af272dfb0..07c896f8bc 100644
--- a/test/implicit/3p3c/test_cc3p3c.input
+++ b/test/implicit/3p3c/test_cc3p3c.input
@@ -8,3 +8,6 @@ File = ./grids/test_3p3c.dgf
 [Problem]
 Name = infiltrationcc
 
+[Implicit]
+NumericDifferenceMethod = 0 # -1 backward differences, 0: central differences, +1: forward differences
+
diff --git a/test/implicit/3p3c/test_cc3p3c_reference.input b/test/implicit/3p3c/test_cc3p3c_reference.input
index eff8dbd324..7dd8695209 100644
--- a/test/implicit/3p3c/test_cc3p3c_reference.input
+++ b/test/implicit/3p3c/test_cc3p3c_reference.input
@@ -8,3 +8,6 @@ File = ./grids/test_3p3c_coarse.dgf
 [Problem]
 Name = cc3p3c
 
+[Implicit]
+NumericDifferenceMethod = 0 # -1 backward differences, 0: central differences, +1: forward differences
+
diff --git a/test/implicit/3p3c/test_cc3p3cnicolumnxylol.input b/test/implicit/3p3c/test_cc3p3cnicolumnxylol.input
index eaa4c17d87..c85cf38d3c 100644
--- a/test/implicit/3p3c/test_cc3p3cnicolumnxylol.input
+++ b/test/implicit/3p3c/test_cc3p3cnicolumnxylol.input
@@ -8,3 +8,8 @@ File = ./grids/column.dgf
 [Problem]
 Name = columnxylolcc # name passed to the output routines
 
+[Implicit]
+NumericDifferenceMethod = 0 # -1 backward differences, 0: central differences, +1: forward differences
+
+[TimeManager]
+MaxTimeStepSize= 4. # Set the maximum time step
diff --git a/test/implicit/3p3c/test_cc3p3cnikuevette.input b/test/implicit/3p3c/test_cc3p3cnikuevette.input
index 0edd470eb6..23832a586b 100644
--- a/test/implicit/3p3c/test_cc3p3cnikuevette.input
+++ b/test/implicit/3p3c/test_cc3p3cnikuevette.input
@@ -8,3 +8,8 @@ File = ./grids/column.dgf
 [Problem]
 Name = kuevettecc # name passed to the output routines
 
+[Implicit]
+NumericDifferenceMethod = 0 # use central differences (backward -1, forward +1)
+
+[TimeManager]
+MaxTimeStepSize = 60. # set the maximum time step
diff --git a/test/implicit/mpnc/combustionproblem1c.hh b/test/implicit/mpnc/combustionproblem1c.hh
index c738e9f47d..8309fb09b4 100644
--- a/test/implicit/mpnc/combustionproblem1c.hh
+++ b/test/implicit/mpnc/combustionproblem1c.hh
@@ -100,24 +100,12 @@ SET_INT_PROP(CombustionProblemOneComponent,
 SET_TYPE_PROP(CombustionProblemOneComponent, Scalar, double );
 // quad / double
 
-// Enable gravity
-SET_BOOL_PROP(CombustionProblemOneComponent, ProblemEnableGravity, true);
-
 // Specify whether diffusion is enabled
 SET_BOOL_PROP(CombustionProblemOneComponent, EnableDiffusion, false);
 
-// do not use smooth upwinding
-SET_BOOL_PROP(CombustionProblemOneComponent, ImplicitEnableSmoothUpwinding, false);
-
 // do not use a chopped newton method in the beginning
 SET_BOOL_PROP(CombustionProblemOneComponent, NewtonEnableChop, false);
 
-// use forward differences instead of central ones
-SET_INT_PROP(CombustionProblemOneComponent, ImplicitNumericDifferenceMethod, +1);
-
-// disable partial jacobian matrix reassembly
-SET_BOOL_PROP(CombustionProblemOneComponent, ImplicitEnablePartialReassemble, false);
-
 // Enable the re-use of the jacobian matrix whenever possible?
 SET_BOOL_PROP(CombustionProblemOneComponent, ImplicitEnableJacobianRecycling, true);
 
diff --git a/test/implicit/mpnc/evaporationatmosphereproblem.hh b/test/implicit/mpnc/evaporationatmosphereproblem.hh
index cae13aa452..491b201ae2 100644
--- a/test/implicit/mpnc/evaporationatmosphereproblem.hh
+++ b/test/implicit/mpnc/evaporationatmosphereproblem.hh
@@ -120,35 +120,16 @@ SET_INT_PROP(EvaporationAtmosphereProblem,
 // Set the type used for scalar values
 SET_TYPE_PROP(EvaporationAtmosphereProblem, Scalar, double);
 
-// Enable gravity
-SET_BOOL_PROP(EvaporationAtmosphereProblem, ProblemEnableGravity, true);
 
 // Specify whether diffusion is enabled
 SET_BOOL_PROP(EvaporationAtmosphereProblem, EnableDiffusion, true);
 
-// do not use smooth upwinding
-SET_BOOL_PROP(EvaporationAtmosphereProblem, ImplicitEnableSmoothUpwinding, false);
-
 // do not use a chopped newton method in the beginning
 SET_BOOL_PROP(EvaporationAtmosphereProblem, NewtonEnableChop, false);
 
-// use forward differences instead of central ones
-SET_INT_PROP(EvaporationAtmosphereProblem, ImplicitNumericDifferenceMethod, +1 );
-
-// disable partial jacobian matrix reassembly
-SET_BOOL_PROP(EvaporationAtmosphereProblem, ImplicitEnablePartialReassemble, false);
-
-
-SET_SCALAR_PROP(EvaporationAtmosphereProblem,ImplicitMassUpwindWeight, 1);
-SET_SCALAR_PROP(EvaporationAtmosphereProblem,ImplicitMobilityUpwindWeight, 1);
-
 // Enable the re-use of the jacobian matrix whenever possible?
 SET_BOOL_PROP(EvaporationAtmosphereProblem, ImplicitEnableJacobianRecycling, true);
 
-// Specify whether the convergence rate ought to be written out by the
-// newton method
-SET_BOOL_PROP(EvaporationAtmosphereProblem, NewtonWriteConvergence, false);
-
 //#################
 // Which Code to compile
 // Specify whether there is any energy equation
diff --git a/test/implicit/mpnc/forchheimer1pproblem.hh b/test/implicit/mpnc/forchheimer1pproblem.hh
index 04ba9a5f3b..c315059f1b 100644
--- a/test/implicit/mpnc/forchheimer1pproblem.hh
+++ b/test/implicit/mpnc/forchheimer1pproblem.hh
@@ -65,33 +65,12 @@ public:
     typedef Dumux::FluidSystems::H2OAir<Scalar, Dumux::SimpleH2O<Scalar>, /*useComplexRelations=*/false> type;
 };
 
-// Enable smooth upwinding?
-SET_BOOL_PROP(Forchheimer1pProblem, ImplicitEnableSmoothUpwinding, false);
-
 // Enable molecular diffusion of the components?
 SET_BOOL_PROP(Forchheimer1pProblem, EnableDiffusion, false);
 
-// Use the chopped Newton method?
-SET_BOOL_PROP(Forchheimer1pProblem, NewtonEnableChop, true);
-
 // Enable gravity
 SET_BOOL_PROP(Forchheimer1pProblem, ProblemEnableGravity, false);
 
-// Write Newton convergence to disk?
-SET_BOOL_PROP(Forchheimer1pProblem, NewtonWriteConvergence, false);
-
-// Use the line search strategy for the Newton update?
-SET_BOOL_PROP(Forchheimer1pProblem, NewtonUseLineSearch, false);
-
-// Enable the re-use of the jacobian matrix whenever possible?
-SET_BOOL_PROP(Forchheimer1pProblem, ImplicitEnableJacobianRecycling, true);
-
-// Reassemble the jacobian matrix only where it changed?
-SET_BOOL_PROP(Forchheimer1pProblem, ImplicitEnablePartialReassemble, false);
-
-// use forward diffferences to approximate the partial derivatives
-SET_INT_PROP(Forchheimer1pProblem, ImplicitNumericDifferenceMethod, +1);
-
 // decide which type to use for floating values (double / quad)
 SET_TYPE_PROP(Forchheimer1pProblem, Scalar, double);
 
diff --git a/test/implicit/mpnc/forchheimer2pproblem.hh b/test/implicit/mpnc/forchheimer2pproblem.hh
index 29475d8b26..e770a9e12c 100644
--- a/test/implicit/mpnc/forchheimer2pproblem.hh
+++ b/test/implicit/mpnc/forchheimer2pproblem.hh
@@ -63,33 +63,16 @@ public:
     typedef Dumux::FluidSystems::H2ON2<Scalar, /*useComplexRelations=*/false> type;
 };
 
-// Enable smooth upwinding?
-SET_BOOL_PROP(Forchheimer2pProblem, ImplicitEnableSmoothUpwinding, false);
 
 // Enable molecular diffusion of the components?
 SET_BOOL_PROP(Forchheimer2pProblem, EnableDiffusion, false);
 
-// Use the chopped Newton method?
-SET_BOOL_PROP(Forchheimer2pProblem, NewtonEnableChop, true);
-
 // Enable gravity
 SET_BOOL_PROP(Forchheimer2pProblem, ProblemEnableGravity, true);
 
-// Write Newton convergence to disk?
-SET_BOOL_PROP(Forchheimer2pProblem, NewtonWriteConvergence, false);
-
-// Use the line search strategy for the Newton update?
-SET_BOOL_PROP(Forchheimer2pProblem, NewtonUseLineSearch, false);
-
 // Enable the re-use of the jacobian matrix whenever possible?
 SET_BOOL_PROP(Forchheimer2pProblem, ImplicitEnableJacobianRecycling, true);
 
-// Reassemble the jacobian matrix only where it changed?
-SET_BOOL_PROP(Forchheimer2pProblem, ImplicitEnablePartialReassemble, false);
-
-// use forward diffferences to approximate the partial derivatives
-SET_INT_PROP(Forchheimer2pProblem, ImplicitNumericDifferenceMethod, +1);
-
 // decide which type to use for floating values (double / quad)
 SET_TYPE_PROP(Forchheimer2pProblem, Scalar, double);
 
diff --git a/test/implicit/mpnc/obstacleproblem.hh b/test/implicit/mpnc/obstacleproblem.hh
index 28ae7571e0..8c4bc9626c 100644
--- a/test/implicit/mpnc/obstacleproblem.hh
+++ b/test/implicit/mpnc/obstacleproblem.hh
@@ -72,27 +72,12 @@ SET_BOOL_PROP(ObstacleProblem, ImplicitEnableSmoothUpwinding, true);
 // Enable molecular diffusion of the components?
 SET_BOOL_PROP(ObstacleProblem, EnableDiffusion, true);
 
-// Use the chopped Newton method?
-SET_BOOL_PROP(ObstacleProblem, NewtonEnableChop, true);
-
-// Enable gravity
-SET_BOOL_PROP(ObstacleProblem, ProblemEnableGravity, true);
-
-// Write Newton convergence to disk?
-SET_BOOL_PROP(ObstacleProblem, NewtonWriteConvergence, false);
-
-// Use the line search strategy for the Newton update?
-SET_BOOL_PROP(ObstacleProblem, NewtonUseLineSearch, false);
-
 // Enable the re-use of the jacobian matrix whenever possible?
 SET_BOOL_PROP(ObstacleProblem, ImplicitEnableJacobianRecycling, true);
 
 // Reassemble the jacobian matrix only where it changed?
 SET_BOOL_PROP(ObstacleProblem, ImplicitEnablePartialReassemble, true);
 
-// use forward diffferences to approximate the partial derivatives
-SET_INT_PROP(ObstacleProblem, ImplicitNumericDifferenceMethod, +1);
-
 // decide which type to use for floating values (double / quad)
 SET_TYPE_PROP(ObstacleProblem, Scalar, double);
 }
diff --git a/test/implicit/richards/richardslensproblem.hh b/test/implicit/richards/richardslensproblem.hh
index f691edfdd6..e6e24b436d 100644
--- a/test/implicit/richards/richardslensproblem.hh
+++ b/test/implicit/richards/richardslensproblem.hh
@@ -63,26 +63,8 @@ public:
     typedef Dumux::LiquidPhase<Scalar, Dumux::SimpleH2O<Scalar> > type;
 };
 
-// Enable gravity
-SET_BOOL_PROP(RichardsLensProblem, ProblemEnableGravity, true);
-
-// Enable partial reassembly of the Jacobian matrix
-SET_BOOL_PROP(RichardsLensProblem, ImplicitEnablePartialReassemble, true);
-
-// Enable re-use of the Jacobian matrix for the first iteration of a time step
-SET_BOOL_PROP(RichardsLensProblem, ImplicitEnableJacobianRecycling, true);
-
-// Use forward differences to approximate the Jacobian matrix
-SET_INT_PROP(RichardsLensProblem, ImplicitNumericDifferenceMethod, +1);
-
 // Set the maximum number of newton iterations of a time step
 SET_INT_PROP(RichardsLensProblem, NewtonMaxSteps, 28);
-
-// Set the "desireable" number of newton iterations of a time step
-SET_INT_PROP(RichardsLensProblem, NewtonTargetSteps, 18);
-
-// Do not write the intermediate results of the newton method
-SET_BOOL_PROP(RichardsLensProblem, NewtonWriteConvergence, false);
 }
 
 /*!
diff --git a/test/implicit/richards/richardsniconductionproblem.hh b/test/implicit/richards/richardsniconductionproblem.hh
index 7d2f50e951..1f22e6a126 100644
--- a/test/implicit/richards/richardsniconductionproblem.hh
+++ b/test/implicit/richards/richardsniconductionproblem.hh
@@ -62,12 +62,6 @@ SET_TYPE_PROP(RichardsNIConductionProblem, FluidSystem, FluidSystems::H2ON2<type
 SET_TYPE_PROP(RichardsNIConductionProblem,
               SpatialParams,
               Dumux::RichardsNISpatialParams<TypeTag>);
-
-// Enable velocity output
-SET_BOOL_PROP(RichardsNIConductionProblem, VtkAddVelocity, true);
-
-// Disable gravity
-SET_BOOL_PROP(RichardsNIConductionProblem, ProblemEnableGravity, false);
 }
 
 /*!
diff --git a/test/implicit/richards/richardsniconvectionproblem.hh b/test/implicit/richards/richardsniconvectionproblem.hh
index 36717bfc29..094697ba5d 100644
--- a/test/implicit/richards/richardsniconvectionproblem.hh
+++ b/test/implicit/richards/richardsniconvectionproblem.hh
@@ -63,12 +63,6 @@ SET_TYPE_PROP(RichardsNIConvectionProblem, FluidSystem, FluidSystems::H2ON2<type
 SET_TYPE_PROP(RichardsNIConvectionProblem,
               SpatialParams,
               Dumux::RichardsNISpatialParams<TypeTag>);
-
-// Enable velocity output
-SET_BOOL_PROP(RichardsNIConvectionProblem, VtkAddVelocity, true);
-
-// Disable gravity
-SET_BOOL_PROP(RichardsNIConvectionProblem, ProblemEnableGravity, false);
 }
 
 
diff --git a/test/implicit/richards/test_boxrichards.input b/test/implicit/richards/test_boxrichards.input
index e908c30cf9..75e7ee9e4d 100644
--- a/test/implicit/richards/test_boxrichards.input
+++ b/test/implicit/richards/test_boxrichards.input
@@ -8,3 +8,9 @@ File = ./grids/richardslens-24x16.dgf
 [Problem]
 Name = richardslensbox
 
+[Implicit]
+EnablePartialReassemble = 1 # enable partial reassembly of the Jacobian matrix
+EnableJacobianRecycling = 1 # 
+
+[Newton]
+TargetSteps = 18 # set the "desireable" number of newton iterations of a time step
diff --git a/test/implicit/richards/test_boxrichardsniconduction.input b/test/implicit/richards/test_boxrichardsniconduction.input
index 72b6557d8a..da1e6086d3 100644
--- a/test/implicit/richards/test_boxrichardsniconduction.input
+++ b/test/implicit/richards/test_boxrichardsniconduction.input
@@ -9,4 +9,7 @@ File = ./grids/test_richardsniconduction.dgf
 [Problem]
 Name = test_boxrichardsniconduction # name passed to the output routines
 OutputInterval = 5 # every 5th timestep an output file is written
+EnableGravity= 0 # disable gravity
 
+[Vtk]
+AddVelocity = 1 # enable velocity output
diff --git a/test/implicit/richards/test_boxrichardsniconvection.input b/test/implicit/richards/test_boxrichardsniconvection.input
index 47aa414db3..e7a20189f8 100644
--- a/test/implicit/richards/test_boxrichardsniconvection.input
+++ b/test/implicit/richards/test_boxrichardsniconvection.input
@@ -10,3 +10,7 @@ File = ./grids/test_richardsniconvection.dgf
 Name = test_boxrichardsniconvection # name passed to the output routines
 OutputInterval = 5 # every 5th timestep an output file is written
 DarcyVelocity = 1e-4 # [m/s] inflow at the left boundary
+EnableGravity = 0 # disable gravity
+
+[Vtk]
+AddVelocity = 1 # enable velocity output
diff --git a/test/implicit/richards/test_ccrichards.input b/test/implicit/richards/test_ccrichards.input
index 5f4435d826..3eba8d7392 100644
--- a/test/implicit/richards/test_ccrichards.input
+++ b/test/implicit/richards/test_ccrichards.input
@@ -8,3 +8,9 @@ File = ./grids/richardslens-24x16.dgf
 [Problem]
 Name = richardslenscc
 
+[Implicit]
+EnablePartialReassemble = 1 # enable partial reassembly of the Jacobian matrix
+EnableJacobianRecycling = 1 # 
+
+[Newton]
+TargetSteps = 18 # set the "desireable" number of newton iterations of a time step
diff --git a/test/implicit/richards/test_ccrichardsniconduction.input b/test/implicit/richards/test_ccrichardsniconduction.input
index 096dc3a559..77fc39cc96 100644
--- a/test/implicit/richards/test_ccrichardsniconduction.input
+++ b/test/implicit/richards/test_ccrichardsniconduction.input
@@ -9,3 +9,7 @@ File = ./grids/test_richardsniconduction.dgf
 [Problem]
 Name = test_ccrichardsniconduction # name passed to the output routines
 OutputInterval = 5 # every 5th timestep an output file is written
+EnableGravity= 0 # disable gravity
+
+[Vtk]
+AddVelocity = 1 # enable velocity output
diff --git a/test/implicit/richards/test_ccrichardsniconvection.input b/test/implicit/richards/test_ccrichardsniconvection.input
index 0bed72d600..c7e7eec25d 100644
--- a/test/implicit/richards/test_ccrichardsniconvection.input
+++ b/test/implicit/richards/test_ccrichardsniconvection.input
@@ -10,3 +10,7 @@ File = ./grids/test_richardsniconvection.dgf
 Name = test_ccrichardsniconvection # name passed to the output routines
 OutputInterval = 5 # every 5th timestep an output file is written
 DarcyVelocity = 1e-4 # [m/s] inflow at the left boundary
+EnableGravity = 0 # disable gravity
+
+[Vtk]
+AddVelocity = 1 # enable velocity output
-- 
GitLab