[Runtime params] for decoupled and geomechanics tests now specified in

the input files whenever possible.
Reviewed by Beatrix


git-svn-id: svn://svn.iws.uni-stuttgart.de/DUMUX/dumux/trunk@14315 2fb0f335-1f38-0410-981e-8018bf24f1b0

test/decoupled/1p/test_1p.input

@@ -4,6 +4,10 @@ TEnd = 0 # [s]
 
 [Problem]
 #Delta = 1e-6 # [-] if this is commented in, it is used
+EnableGravity = 0 #
+
+[LinearSolver]
+Verbosity = 1 # 
 
 [Grid]
 NumberOfCellsX = 1 # [-] resolution in x-direction

test/decoupled/1p/test_1pproblem.hh

@@ -67,14 +67,8 @@ public:
 // Set the spatial parameters
 SET_TYPE_PROP(TestProblemOneP, SpatialParams, Dumux::TestOnePSpatialParams<TypeTag>);
 
-// Enable gravity
-SET_BOOL_PROP(TestProblemOneP, ProblemEnableGravity, false);
-
 //Set the problem
 SET_TYPE_PROP(TestProblemOneP, Problem, Dumux::TestProblemOneP<TypeTag>);
-
-
-SET_INT_PROP(TestProblemOneP, LinearSolverVerbosity, 1);
 }
 
 /*!

test/decoupled/1p/test_diffusion3d.input

+[Problem]
+EnableGravity = 0 #
+
 [Grid]
 #File = ./grids/test_diffusion3d_sg.dgf
 File = ./grids/test_diffusion3d_ug1.dgf

test/decoupled/1p/test_diffusion3d_reference.input

+[Problem]
+EnableGravity = 0 #
+
 [Grid]
 File = ./grids/test_diffusion3d_ug1.dgf
 

test/decoupled/1p/test_diffusionproblem3d.hh

@@ -84,9 +84,6 @@ public:
     typedef Dumux::LiquidPhase<Scalar, Dumux::Unit<Scalar> > type;
 };
 
-// Enable gravity
-SET_BOOL_PROP(DiffusionTestProblem, ProblemEnableGravity, false);
-
 #if HAVE_SUPERLU
 SET_TYPE_PROP(DiffusionTestProblem, LinearSolver, Dumux::SuperLUBackend<TypeTag>);
 #else

test/decoupled/2p/test_3d2p.input

@@ -15,7 +15,8 @@ EnableSimpleLStencil = true
 EnableComplexLStencil =true
 
 [Problem]
-OutputInterval =0
+EnableGravity = 0 #
+OutputInterval = 0
 OutputTimeInterval = 1e3
 
 [Impet]

test/decoupled/2p/test_3d2pproblem.hh

@@ -102,9 +102,6 @@ public:
     typedef Dumux::Test3d2pSpatialParams<TypeTag> type;
 };
 
-// Enable gravity
-SET_BOOL_PROP(ThreeDTwoPTestProblem, ProblemEnableGravity, false);
-
 #if PROBLEM == 1
 SET_TYPE_PROP(ThreeDTwoPTestProblem, EvalCflFluxFunction, Dumux::EvalCflFluxCoats<TypeTag>);
 SET_SCALAR_PROP(ThreeDTwoPTestProblem, ImpetCFLFactor, 1.0);

test/decoupled/2p/test_impes.input

@@ -9,8 +9,12 @@ NumberOfCellsY = 6 # [-] resolution in y-direction
 UpperRightX = 300 # [m] length of the domain
 UpperRightY = 60 # [m] height of the domain
 
+[Impet]
+CFLFactor = 0.95 
+
 [Problem]
 Name = test_impes # name passed to the output routines
+EnableGravity = 0 
 
 [Vtk]
-OutputLevel = 0
\ No newline at end of file
+OutputLevel = 0

test/decoupled/2p/test_impesproblem.hh

@@ -109,13 +109,8 @@ public:
     typedef Dumux::LiquidPhase<Scalar, Dumux::SimpleH2O<Scalar> > type;
 };
 
-// Enable gravity
-SET_BOOL_PROP(IMPESTestProblem, ProblemEnableGravity, false);
-
 SET_TYPE_PROP(IMPESTestProblem, EvalCflFluxFunction, Dumux::EvalCflFluxCoats<TypeTag>);
 
-SET_SCALAR_PROP(IMPESTestProblem, ImpetCFLFactor, 0.95);
-
 // set up an additional problem where the AMG backend is used
 NEW_TYPE_TAG(IMPESTestProblemWithAMG, INHERITS_FROM(IMPESTestProblem));
 // use the AMG backend for the corresponding test

test/decoupled/2p/test_transport.input

@@ -2,8 +2,9 @@
 TEnd = 1e4 # [s]
 DtInitial = 0 # [s]
 
+[Problem]
+EnableGravity = 0 
+
 [Grid]
 File = ./grids/test_transport.dgf
 
-[Vtk]
-

test/decoupled/2p/test_transportproblem.hh

@@ -76,11 +76,6 @@ public:
 
 SET_INT_PROP(TransportTestProblem, VelocityFormulation,
         DecoupledTwoPCommonIndices::velocityTotal);
-
-// Disable gravity
-SET_BOOL_PROP(TransportTestProblem, ProblemEnableGravity, false);
-
-SET_SCALAR_PROP(TransportTestProblem, ImpetCFLFactor, 1.0);
 }
 
 /*!

test/decoupled/2p2c/test_adaptive2p2c2d.input

@@ -13,7 +13,6 @@ EnableMultiPointFluxApproximation = 1
 MaxInteractionVolumes = 2
 
 [Problem]
-
 SimulationName  = test_adaptive2p2c2d     # name of the output files
 OutputInterval = 5
 

test/decoupled/2p2c/test_adaptive2p2c2dproblem.hh

@@ -86,8 +86,6 @@ SET_PROP(Adaptive2p2c2d, Components) : public GET_PROP(TypeTag, DefaultComponent
 // Specify indicator
 SET_TYPE_PROP(Adaptive2p2c2d, AdaptionIndicator, GridAdaptionIndicator2P<TypeTag>);
 
-// Enable gravity
-SET_BOOL_PROP(Adaptive2p2c2d, ProblemEnableGravity, true);
 SET_BOOL_PROP(Adaptive2p2c2d, EnableCapillarity, true);
 SET_INT_PROP(Adaptive2p2c2d, PressureFormulation, GET_PROP_TYPE(TypeTag, Indices)::pressureN);
 

test/decoupled/2p2c/test_adaptive2p2c3dproblem.hh

@@ -85,8 +85,6 @@ SET_PROP(Adaptive2p2c3d, Components) : public GET_PROP(TypeTag, DefaultComponent
 // Specify indicator
 SET_TYPE_PROP(Adaptive2p2c3d, AdaptionIndicator, GridAdaptionIndicator2P<TypeTag>);
 
-// Enable gravity
-SET_BOOL_PROP(Adaptive2p2c3d, ProblemEnableGravity, true);
 SET_BOOL_PROP(Adaptive2p2c3d, EnableCapillarity, true);
 SET_BOOL_PROP(Adaptive2p2c3d, AdaptiveGrid, true);
 SET_INT_PROP(Adaptive2p2c3d, PressureFormulation, GET_PROP_TYPE(TypeTag, Indices)::pressureN);

test/decoupled/2p2c/test_dec2p2cproblem.hh

@@ -79,11 +79,8 @@ SET_PROP(TestDecTwoPTwoCProblem, Components) : public GET_PROP(TypeTag, DefaultC
 
 //SET_TYPE_PROP(TestDecTwoPTwoCProblem, LinearSolver, IMPETBiCGStabILU0Solver<TypeTag> );
 
-// Enable gravity
-SET_BOOL_PROP(TestDecTwoPTwoCProblem, ProblemEnableGravity, true);
 SET_BOOL_PROP(TestDecTwoPTwoCProblem, EnableCapillarity, true);
 SET_INT_PROP(TestDecTwoPTwoCProblem, BoundaryMobility, GET_PROP_TYPE(TypeTag, Indices)::satDependent);
-SET_SCALAR_PROP(TestDecTwoPTwoCProblem, ImpetCFLFactor, 0.8);
 }
 
 /*!

test/geomechanics/el1p2c/el1p2cproblem.hh

@@ -67,9 +67,6 @@ namespace Dumux
     //Define whether mole(true) or mass (false) fractions are used
     SET_BOOL_PROP(El1P2CProblem, UseMoles, false);
 
-    // Disable gravity
-    SET_BOOL_PROP(El1P2CProblem, ProblemEnableGravity, false);
-
     // Include stabilization term to prevent pressure oscillations
     SET_BOOL_PROP(El1P2CProblem, ImplicitWithStabilization, true);
 

test/geomechanics/el1p2c/test_el1p2c.input

@@ -2,6 +2,9 @@
 DtInitial = 10 # [s]
 TEnd = 1e4 # [s]
 
+[Problem]
+EnableGravity = 0
+
 [Grid]
 File = grids/test_el1p2c.dgf
 

test/geomechanics/el2p/el2pproblem.hh

@@ -114,17 +114,8 @@ public:
     typedef Dumux::InitialPressSat<GridView, Scalar> type;
 };
 
-SET_INT_PROP(El2P_TestProblem, LinearSolverVerbosity, 0);
-
 SET_SCALAR_PROP(El2P_TestProblem, NewtonMaxRelativeShift, 1e-5);
 
-// disable jacobian matrix recycling
-SET_BOOL_PROP(El2P_TestProblem, ImplicitEnableJacobianRecycling, false);
-// disable partial reassembling
-SET_BOOL_PROP(El2P_TestProblem, ImplicitEnablePartialReassemble, false);
-// Enable gravity
-SET_BOOL_PROP(El2P_TestProblem, ProblemEnableGravity, true);
-
 // use the algebraic multigrid
 SET_TYPE_PROP(El2P_TestProblem, LinearSolver, Dumux::El2PAMGBackend<TypeTag>);
 

test/geomechanics/el2p/test_el2p.input

+[Newton]
+RelTolerance = 1e-5 
+

test/geomechanics/elastic/elasticmatrixproblem.hh

@@ -47,8 +47,6 @@ SET_TYPE_PROP(ElasticMatrixProblem, Grid, Dune::YaspGrid<3>);
 // Set the problem property
 SET_TYPE_PROP(ElasticMatrixProblem, Problem, Dumux::ElasticMatrixProblem<TypeTag>); 
 
-// Enable gravity
-SET_BOOL_PROP(ElasticMatrixProblem, ProblemEnableGravity, false);
 }
 
 /*!