From b86dc2fae0841b6f030da2d65e7bae0dbe16b0d5 Mon Sep 17 00:00:00 2001
From: Johannes Hommel <johannes.hommel@iws.uni-stuttgart.de>
Date: Tue, 3 Mar 2015 12:26:12 +0000
Subject: [PATCH] [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 ++++
test/decoupled/1p/test_1pproblem.hh | 6 ------
test/decoupled/1p/test_diffusion3d.input | 3 +++
test/decoupled/1p/test_diffusion3d_reference.input | 3 +++
test/decoupled/1p/test_diffusionproblem3d.hh | 3 ---
test/decoupled/2p/test_3d2p.input | 3 ++-
test/decoupled/2p/test_3d2pproblem.hh | 3 ---
test/decoupled/2p/test_impes.input | 6 +++++-
test/decoupled/2p/test_impesproblem.hh | 5 -----
test/decoupled/2p/test_transport.input | 5 +++--
test/decoupled/2p/test_transportproblem.hh | 5 -----
test/decoupled/2p2c/test_adaptive2p2c2d.input | 1 -
test/decoupled/2p2c/test_adaptive2p2c2dproblem.hh | 2 --
test/decoupled/2p2c/test_adaptive2p2c3dproblem.hh | 2 --
test/decoupled/2p2c/test_dec2p2cproblem.hh | 3 ---
test/geomechanics/el1p2c/el1p2cproblem.hh | 3 ---
test/geomechanics/el1p2c/test_el1p2c.input | 3 +++
test/geomechanics/el2p/el2pproblem.hh | 9 ---------
test/geomechanics/el2p/test_el2p.input | 3 +++
test/geomechanics/elastic/elasticmatrixproblem.hh | 2 --
test/geomechanics/elastic/test_elastic.input | 3 +++
21 files changed, 29 insertions(+), 48 deletions(-)
create mode 100644 test/geomechanics/el2p/test_el2p.input
diff --git a/test/decoupled/1p/test_1p.input b/test/decoupled/1p/test_1p.input
index 3b20e2108f..fa0ab3033b 100644
--- a/test/decoupled/1p/test_1p.input
+++ b/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
diff --git a/test/decoupled/1p/test_1pproblem.hh b/test/decoupled/1p/test_1pproblem.hh
index da7e0f6be8..33a4afbfef 100644
--- a/test/decoupled/1p/test_1pproblem.hh
+++ b/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);
}
/*!
diff --git a/test/decoupled/1p/test_diffusion3d.input b/test/decoupled/1p/test_diffusion3d.input
index 0d0135bf74..9cd3ef7ea0 100644
--- a/test/decoupled/1p/test_diffusion3d.input
+++ b/test/decoupled/1p/test_diffusion3d.input
@@ -1,3 +1,6 @@
+[Problem]
+EnableGravity = 0 #
+
[Grid]
#File = ./grids/test_diffusion3d_sg.dgf
File = ./grids/test_diffusion3d_ug1.dgf
diff --git a/test/decoupled/1p/test_diffusion3d_reference.input b/test/decoupled/1p/test_diffusion3d_reference.input
index 1c4d1abfb1..573151e3db 100644
--- a/test/decoupled/1p/test_diffusion3d_reference.input
+++ b/test/decoupled/1p/test_diffusion3d_reference.input
@@ -1,3 +1,6 @@
+[Problem]
+EnableGravity = 0 #
+
[Grid]
File = ./grids/test_diffusion3d_ug1.dgf
diff --git a/test/decoupled/1p/test_diffusionproblem3d.hh b/test/decoupled/1p/test_diffusionproblem3d.hh
index 7962f3d8f8..6ce3bb1532 100644
--- a/test/decoupled/1p/test_diffusionproblem3d.hh
+++ b/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
diff --git a/test/decoupled/2p/test_3d2p.input b/test/decoupled/2p/test_3d2p.input
index 7d9e3522f5..3dbfdc1292 100644
--- a/test/decoupled/2p/test_3d2p.input
+++ b/test/decoupled/2p/test_3d2p.input
@@ -15,7 +15,8 @@ EnableSimpleLStencil = true
EnableComplexLStencil =true
[Problem]
-OutputInterval =0
+EnableGravity = 0 #
+OutputInterval = 0
OutputTimeInterval = 1e3
[Impet]
diff --git a/test/decoupled/2p/test_3d2pproblem.hh b/test/decoupled/2p/test_3d2pproblem.hh
index eff8903091..c4ba18fad9 100644
--- a/test/decoupled/2p/test_3d2pproblem.hh
+++ b/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);
diff --git a/test/decoupled/2p/test_impes.input b/test/decoupled/2p/test_impes.input
index a9592a86f6..7ee8095026 100644
--- a/test/decoupled/2p/test_impes.input
+++ b/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
diff --git a/test/decoupled/2p/test_impesproblem.hh b/test/decoupled/2p/test_impesproblem.hh
index 3226590d59..ffa2eb6a31 100644
--- a/test/decoupled/2p/test_impesproblem.hh
+++ b/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
diff --git a/test/decoupled/2p/test_transport.input b/test/decoupled/2p/test_transport.input
index 4bd644bd36..82cc1afabb 100644
--- a/test/decoupled/2p/test_transport.input
+++ b/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]
-
diff --git a/test/decoupled/2p/test_transportproblem.hh b/test/decoupled/2p/test_transportproblem.hh
index 0016dd384b..f9880967dd 100644
--- a/test/decoupled/2p/test_transportproblem.hh
+++ b/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);
}
/*!
diff --git a/test/decoupled/2p2c/test_adaptive2p2c2d.input b/test/decoupled/2p2c/test_adaptive2p2c2d.input
index 5ae3afd625..ff93681a2c 100644
--- a/test/decoupled/2p2c/test_adaptive2p2c2d.input
+++ b/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
diff --git a/test/decoupled/2p2c/test_adaptive2p2c2dproblem.hh b/test/decoupled/2p2c/test_adaptive2p2c2dproblem.hh
index a9eb8e7180..6261ea5595 100644
--- a/test/decoupled/2p2c/test_adaptive2p2c2dproblem.hh
+++ b/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);
diff --git a/test/decoupled/2p2c/test_adaptive2p2c3dproblem.hh b/test/decoupled/2p2c/test_adaptive2p2c3dproblem.hh
index 96d58a42e8..1552698662 100644
--- a/test/decoupled/2p2c/test_adaptive2p2c3dproblem.hh
+++ b/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);
diff --git a/test/decoupled/2p2c/test_dec2p2cproblem.hh b/test/decoupled/2p2c/test_dec2p2cproblem.hh
index 11530eab43..f102ffa3fb 100644
--- a/test/decoupled/2p2c/test_dec2p2cproblem.hh
+++ b/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);
}
/*!
diff --git a/test/geomechanics/el1p2c/el1p2cproblem.hh b/test/geomechanics/el1p2c/el1p2cproblem.hh
index afa41cba2f..7ca1118dbd 100644
--- a/test/geomechanics/el1p2c/el1p2cproblem.hh
+++ b/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);
diff --git a/test/geomechanics/el1p2c/test_el1p2c.input b/test/geomechanics/el1p2c/test_el1p2c.input
index 48fea8b08b..f0ff273c4c 100644
--- a/test/geomechanics/el1p2c/test_el1p2c.input
+++ b/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
diff --git a/test/geomechanics/el2p/el2pproblem.hh b/test/geomechanics/el2p/el2pproblem.hh
index 3828fafb50..017b92a644 100644
--- a/test/geomechanics/el2p/el2pproblem.hh
+++ b/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>);
diff --git a/test/geomechanics/el2p/test_el2p.input b/test/geomechanics/el2p/test_el2p.input
new file mode 100644
index 0000000000..e2c0ae5183
--- /dev/null
+++ b/test/geomechanics/el2p/test_el2p.input
@@ -0,0 +1,3 @@
+[Newton]
+RelTolerance = 1e-5
+
diff --git a/test/geomechanics/elastic/elasticmatrixproblem.hh b/test/geomechanics/elastic/elasticmatrixproblem.hh
index a8487bd6c1..1ccd5c0950 100644
--- a/test/geomechanics/elastic/elasticmatrixproblem.hh
+++ b/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);
}
/*!
diff --git a/test/geomechanics/elastic/test_elastic.input b/test/geomechanics/elastic/test_elastic.input
index 2b46f502d8..37d6ae168f 100644
--- a/test/geomechanics/elastic/test_elastic.input
+++ b/test/geomechanics/elastic/test_elastic.input
@@ -2,6 +2,9 @@
DtInitial = 1 # [s]
TEnd = 1 # [s]
+[Problem]
+EnableGravity = 0
+
[Grid]
File = grids/test_elastic.dgf
--
GitLab