diff --git a/test/boxmodels/1p/1ptestspatialparams.hh b/test/boxmodels/1p/1ptestspatialparams.hh
index 5839398891ad383b9b79d4c752843328aa2a6671..a4adda708b34a0e9ec6b76eff8a6483a3cefa982 100644
--- a/test/boxmodels/1p/1ptestspatialparams.hh
+++ b/test/boxmodels/1p/1ptestspatialparams.hh
@@ -63,20 +63,20 @@ public:
{
try
{
- lensLowerLeft_[0] = GET_RUNTIME_PARAM(TypeTag, Scalar, SpatialParams.lensLowerLeftX);
+ lensLowerLeft_[0] = GET_RUNTIME_PARAM(TypeTag, Scalar, SpatialParams.LensLowerLeftX);
if (dim > 1)
- lensLowerLeft_[1] = GET_RUNTIME_PARAM(TypeTag, Scalar, SpatialParams.lensLowerLeftY);
+ lensLowerLeft_[1] = GET_RUNTIME_PARAM(TypeTag, Scalar, SpatialParams.LensLowerLeftY);
if (dim > 2)
- lensLowerLeft_[2] = GET_RUNTIME_PARAM(TypeTag, Scalar, SpatialParams.lensLowerLeftZ);
+ lensLowerLeft_[2] = GET_RUNTIME_PARAM(TypeTag, Scalar, SpatialParams.LensLowerLeftZ);
- lensUpperRight_[0] = GET_RUNTIME_PARAM(TypeTag, Scalar, SpatialParams.lensUpperRightX);
+ lensUpperRight_[0] = GET_RUNTIME_PARAM(TypeTag, Scalar, SpatialParams.LensUpperRightX);
if (dim > 1)
- lensUpperRight_[1] = GET_RUNTIME_PARAM(TypeTag, Scalar, SpatialParams.lensUpperRightY);
+ lensUpperRight_[1] = GET_RUNTIME_PARAM(TypeTag, Scalar, SpatialParams.LensUpperRightY);
if (dim > 2)
- lensUpperRight_[2] = GET_RUNTIME_PARAM(TypeTag, Scalar, SpatialParams.lensUpperRightZ);
+ lensUpperRight_[2] = GET_RUNTIME_PARAM(TypeTag, Scalar, SpatialParams.LensUpperRightZ);
- permeability_ = GET_RUNTIME_PARAM(TypeTag, Scalar, SpatialParams.permeability);
- permeabilityLens_=GET_RUNTIME_PARAM(TypeTag, Scalar, SpatialParams.permeabilityLens);
+ permeability_ = GET_RUNTIME_PARAM(TypeTag, Scalar, SpatialParams.Permeability);
+ permeabilityLens_=GET_RUNTIME_PARAM(TypeTag, Scalar, SpatialParams.PermeabilityLens);
}
catch (Dumux::ParameterException &e) {
std::cerr << e << ". Abort!\n";
diff --git a/test/boxmodels/1p/test_1p.input b/test/boxmodels/1p/test_1p.input
index 8eb7b0dc1f5f1c4f3292c637453515417d5e3627..136d4c6c570c370bb210eace1731b7442b81a9bc 100644
--- a/test/boxmodels/1p/test_1p.input
+++ b/test/boxmodels/1p/test_1p.input
@@ -8,9 +8,13 @@
############################################################
# Mandatory arguments
############################################################
-TimeManager.DtInitial = 1 # seconds
-TimeManager.TEnd = 1 # seconds
-Grid.File = ./grids/test_1p_2d.dgf
+[TimeManager]
+DtInitial = 1 # seconds
+TEnd = 1 # seconds
+
+#############################################################
+[Grid]
+File = ./grids/test_1p_2d.dgf
#########################################################################
# Simulation restart
@@ -23,18 +27,16 @@ Grid.File = ./grids/test_1p_2d.dgf
#########################################################################
# Restart = ...
-####################################################################
-# SpatialParams
####################################################################
[SpatialParams]
#lens from (0.25|0.25) to (0.75|0.75) box-wise definition of permability
-lensLowerLeftX = 0.25
-lensLowerLeftY = 0.25
-lensLowerLeftZ = 0.25
-lensUpperRightX = 0.75
-lensUpperRightY = 0.75
-lensUpperRightZ = 0.75
+LensLowerLeftX = 0.25
+LensLowerLeftY = 0.25
+LensLowerLeftZ = 0.25
+LensUpperRightX = 0.75
+LensUpperRightY = 0.75
+LensUpperRightZ = 0.75
#permeabilities
-permeability = 1e-10
-permeabilityLens = 1e-12
+Permeability = 1e-10
+PermeabilityLens = 1e-12
diff --git a/test/boxmodels/1p2c/outflow-reference.vtu b/test/boxmodels/1p2c/outflow-reference.vtu
index a126b9ecfda8444b298ff5cd98c82b1f39f511ce..c8add271ff05be8542d4f15fc2b80b2cc798be46 100644
--- a/test/boxmodels/1p2c/outflow-reference.vtu
+++ b/test/boxmodels/1p2c/outflow-reference.vtu
@@ -28,11 +28,11 @@
0.00997054 0.00997056 0.00997057
</DataArray>
<DataArray type="Float32" Name="Vy" NumberOfComponents="1" format="ascii">
- 2.9018e-18 -7.25448e-19 -7.2545e-19 -7.25448e-19 6.52903e-18 3.62724e-18 2.90178e-18 1.81362e-18 -5.07812e-18 7.25445e-19 7.25444e-19 3.62722e-19
- -7.25443e-19 -3.62721e-18 0 0 0 0 -7.25439e-19 -7.25439e-19 1.45088e-18 1.45088e-18 0 3.62719e-19
- 1.45087e-18 4.35262e-18 7.25435e-19 9.06794e-19 -1.08815e-18 -1.81358e-19 -3.62716e-19 7.25433e-19 -3.62716e-18 1.45086e-18 3.62715e-19 3.62715e-19
- -1.81357e-18 -1.81357e-18 0 0 0 0 -4.3527e-18 -7.25448e-19 7.25447e-19 7.25446e-19 6.52901e-18 0
- -6.52898e-18 0 0 -7.25439e-19 1.45088e-18 7.25437e-19 7.25436e-18 1.08815e-18 7.25434e-19 1.81358e-18 6.52888e-18 3.62715e-19
+ 2.9018e-18 -1.4509e-18 -7.2545e-19 -1.08817e-18 -5.07813e-18 -3.62724e-19 -5.80357e-18 1.81362e-18 -7.97989e-18 1.08817e-18 7.25444e-19 7.25444e-19
+ 5.0781e-18 2.90177e-18 0 0 0 -3.6272e-19 5.07808e-18 -7.25439e-19 7.25438e-19 1.08816e-18 -2.90175e-18 3.62719e-19
+ 0 3.62718e-18 7.25435e-19 1.08815e-18 3.62717e-19 1.99494e-18 0 9.06791e-19 7.25432e-19 2.17629e-18 3.62715e-19 3.62715e-19
+ -1.81357e-18 -1.81357e-18 0 0 0 0 -4.3527e-18 -7.25448e-19 4.35268e-18 9.4308e-18 1.01562e-17 7.25444e-19
+ 7.25443e-19 0 -7.2544e-19 -6.52895e-18 1.45088e-18 3.62719e-18 7.25436e-18 1.45087e-18 3.62717e-18 1.81358e-18 3.62716e-18 3.62715e-19
-1.81357e-18 0 0
</DataArray>
<DataArray type="Float32" Name="x_H2O" NumberOfComponents="1" format="ascii">
diff --git a/test/boxmodels/1p2c/test_1p2c.input b/test/boxmodels/1p2c/test_1p2c.input
index 0fc1bd54da8e056856062348fc1e9a25af6eed77..7934d28727782b564ff567227a3d98d1b7ebac14 100644
--- a/test/boxmodels/1p2c/test_1p2c.input
+++ b/test/boxmodels/1p2c/test_1p2c.input
@@ -8,9 +8,14 @@
############################################################
# Mandatory arguments
############################################################
-TimeManager.DtInitial = 1 # seconds
-TimeManager.TEnd = 100 # seconds
-Grid.File = ./grids/test_1p2c.dgf
+###########################################################
+[TimeManager]
+DtInitial = 1 # seconds
+TEnd = 100 # seconds
+
+###########################################################
+[Grid]
+File = ./grids/test_1p2c.dgf
#########################################################################
# Simulation restart
@@ -21,4 +26,4 @@ Grid.File = ./grids/test_1p2c.dgf
# name_time = 27184.1_rank = 0.drs
# Please comment in the below value, if restart is desired.
#########################################################################
-# restart = ...
\ No newline at end of file
+# restart = ...
diff --git a/test/boxmodels/2p/lens-reference.vtu b/test/boxmodels/2p/lens-reference.vtu
index 64d3843971eeb6668b73f822a3e664286a983266..f7e96f7667968ffb63b35bcac27a38827746af83 100644
--- a/test/boxmodels/2p/lens-reference.vtu
+++ b/test/boxmodels/2p/lens-reference.vtu
@@ -15,15 +15,15 @@
0 0 0 0 0 0 0 0 0 0 0 0
0 0 0 0 0 0 0 0 0 0 0 0
0 0 0 0 0 0 0 0 0 0 0 0
- -2.14889e-34 3.7355e-31 2.26973e-33 0 0 0 0 0 0 0 0 0
+ -2.15166e-34 3.7355e-31 2.26973e-33 0 0 0 0 0 0 0 0 0
0 0 0 0 0 0 0 0 0 0 0 0
0 0 0 0 0 0 0 0 0 0 0 0
0 0 0 0 0 0 0 0 0 0 0 0
- 9.7628e-35 -8.86131e-27 8.79892e-24 4.17794e-26 1.98382e-32 0 0 0 0 0 0 0
+ 9.76728e-35 -8.86296e-27 8.79892e-24 4.17794e-26 1.98382e-32 0 0 0 0 0 0 0
0 0 0 0 0 0 0 0 0 0 0 0
0 0 0 0 0 0 0 0 0 0 0 0
0 0 0 0 0 0 0 0 0 0 0 0
- 0 -8.69001e-33 9.18373e-20 3.31765e-16 8.64853e-19 3.52213e-25 2.89656e-32 0 0 0 0 0
+ 0 -8.6816e-33 9.18373e-20 3.31765e-16 8.64853e-19 3.52213e-25 2.89656e-32 0 0 0 0 0
0 0 0 0 0 0 0 0 0 0 0 0
0 0 0 0 0 0 0 0 0 0 0 0
0 0 0 0 0 0 0 0 0 0 0 0
@@ -52,92 +52,92 @@
0 0 0 0 0 0 0 0 0 0 0 0
0 0 0 0 0 0 0 0 0 0 0 0
0 0 0 0 0 0 0 0 0.00683319 0.0137761 0.0160993 0.0125535
- 0.00600924 0.00137172 5.49409e-05 9.44293e-08 4.7968e-13 6.48873e-23 -6.79905e-29 -2.08845e-36 0 0 0 0
+ 0.00600924 0.00137172 5.49409e-05 9.44293e-08 4.7968e-13 6.489e-23 -6.79904e-29 -2.08845e-36 0 0 0 0
0 0 0 0 0 0 0 0 0 0 0 0
0 0 0 0 0 0 0 0 0 0 0 0
0 0 0 0 0 0 0 0 0 0.0124913 0.021178 0.023147
- 0.0178921 0.00887678 0.00251185 0.000182063 9.18178e-07 3.57691e-11 1.34639e-19 -1.11697e-27 -5.73138e-36 0 0 0
+ 0.0178921 0.00887678 0.00251185 0.000182063 9.18178e-07 3.57691e-11 1.34639e-19 -1.11699e-27 -5.73232e-36 0 0 0
0 0 0 0 0 0 0 0 0 0 0 0
0 0 0 0 0 0 0 0 0 0 0 0
0 0 0 0 0 0 0 0 0 0 0.0196595 0.0296516
- 0.0305044 0.022782 0.0112386 0.00337674 0.000320167 2.64629e-06 2.60393e-10 5.74724e-18 -2.50917e-30 -1.4564e-34 0 0
+ 0.0305044 0.022782 0.0112386 0.00337674 0.000320167 2.64629e-06 2.60393e-10 5.74724e-18 -2.50902e-30 -1.4564e-34 0 0
0 0 0 0 0 0 0 0 0 0 0 0
0 0 0 0 0 0 0 0 0 0 0 0
0 0 0 0 0 0 0 0 0 0 0 0.0285395
- 0.0393059 0.0378231 0.0266121 0.0125274 0.00368874 0.000366068 3.28912e-06 3.77985e-10 1.12504e-17 -1.23502e-29 2.53522e-36 0
+ 0.0393059 0.0378231 0.0266121 0.0125274 0.00368874 0.000366068 3.28912e-06 3.77985e-10 1.12504e-17 -1.23388e-29 2.5345e-36 0
0 0 0 0 0 0 0 0 0 0 0 0
0 0 0 0 0 0 0 0 0 0 0 0
0 0 0 0 0 0 0 0 0 0 0 0
- 0.04099 0.0507409 0.0444327 0.0286259 0.0123833 0.0033749 0.000290108 1.98022e-06 1.36465e-10 1.53909e-18 -4.07727e-30 2.55696e-37
+ 0.04099 0.0507409 0.0444327 0.0286259 0.0123833 0.0033749 0.000290108 1.98022e-06 1.36465e-10 1.53909e-18 -4.07708e-30 2.55703e-37
0 0 0 0 0 0 0 0 0 0 0 0
0 0 0 0 0 0 0 0 0 0 0 0
0 0 0 0 0 0 0 0 0 0 0 0
- -1.76832e-35 0.0688677 0.0638335 0.0487819 0.0281265 0.0108723 0.00259609 0.000159456 5.81855e-07 1.2448e-11 1.51762e-20 -3.34917e-31
- 2.86823e-38 0 0 0 0 0 0 0 0 0 0 0
+ -1.77492e-35 0.0688677 0.0638335 0.0487819 0.0281265 0.0108723 0.00259609 0.000159456 5.81855e-07 1.2448e-11 1.51762e-20 -3.34896e-31
+ 2.86815e-38 0 0 0 0 0 0 0 0 0 0 0
0 0 0 0 0 0 0 0 0 0 0 0
0 0 0 0 0 0 0 0 0 0 0 0
- 0 9.32635e-30 0.0831149 0.0703766 0.0489472 0.0253522 0.00868719 0.00170917 6.27196e-05 8.98357e-08 3.31155e-13 1.42086e-23
- -6.84914e-33 0 0 0 0 0 0 0 0 0 0 0
+ 0 9.32637e-30 0.0831149 0.0703766 0.0489472 0.0253522 0.00868719 0.00170917 6.27196e-05 8.98357e-08 3.31155e-13 1.42086e-23
+ -6.84916e-33 0 0 0 0 0 0 0 0 0 0 0
0 0 0 0 0 0 0 0 0 0 0 0
0 0 0 0 0 0 0 0 0 0 0 0
0 0 4.59623e-18 0.0931147 0.0737216 0.0472178 0.022024 0.00676313 0.00103803 2.08281e-05 1.00953e-08 4.79986e-15
- 4.15635e-27 -4.62621e-35 0 0 0 0 0 0 0 0 0 0
+ 4.15633e-27 -4.62612e-35 0 0 0 0 0 0 0 0 0 0
0 0 0 0 0 0 0 0 0 0 0 0
0 0 0 0 0 0 0 0 0 0 0 0
0 0 0 4.06396e-09 0.101129 0.075362 0.0447589 0.0189375 0.00528476 0.000611093 6.57573e-06 1.03769e-09
- 5.87713e-17 5.78017e-31 8.06964e-38 0 0 0 0 0 0 0 0 0
+ 5.87713e-17 5.7975e-31 8.07233e-38 0 0 0 0 0 0 0 0 0
0 0 0 0 0 0 0 0 0 0 0 0
- 0 -1.37551e-38 0 -1.3977e-37 -1.34843e-37 -1.88549e-37 -1.11402e-36 1.81606e-37 -4.62515e-36 3.803e-37 -6.49724e-37 -3.53827e-35
- -6.47802e-37 1.20315e-37 -1.88637e-36 -1.17516e-36 7.69563e-05 0.107779 0.0758156 0.041891 0.0162136 0.00414555 0.000353848 2.05436e-06
- 1.05393e-10 7.06103e-19 -7.33349e-33 0 0 0 0 0 0 0 0 0
- 0 0 0 0 0 0 0 0 0 0 0 7.45937e-32
+ 0 -1.3719e-38 0 -1.3983e-37 -1.3486e-37 -1.88519e-37 -1.11415e-36 1.8361e-37 -4.63296e-36 3.84661e-37 -6.4696e-37 -3.53865e-35
+ -6.4332e-37 1.25688e-37 -1.87396e-36 -1.26892e-36 7.69563e-05 0.107779 0.0758156 0.041891 0.0162136 0.00414555 0.000353848 2.05436e-06
+ 1.05393e-10 7.06103e-19 -7.30632e-33 0 0 0 0 0 0 0 0 0
+ 0 0 0 0 0 0 0 0 0 0 0 7.45952e-32
5.19563e-24 1.75383e-21 1.55293e-20 5.07499e-20 1.23401e-19 2.56403e-19 4.90322e-19 8.81157e-19 1.46872e-18 2.13145e-18 2.6564e-18 3.32001e-18
4.53259e-18 6.21039e-18 7.99669e-18 1.1645e-17 2.05981e-17 0.00015695 0.114178 0.0751801 0.0385908 0.0137516 0.00322233 0.000198968
- 6.22484e-07 1.01999e-11 7.78648e-21 -5.48228e-34 0 0 0 0 0 0 0 0
+ 6.22484e-07 1.01999e-11 7.78648e-21 -5.47667e-34 0 0 0 0 0 0 0 0
0 0 0 0 0 0 0 0 0 0 0 6.65109e-26
1.49539e-15 8.9534e-12 1.31306e-10 3.46194e-10 5.83155e-10 8.58574e-10 1.17791e-09 1.55751e-09 2.00322e-09 2.49015e-09 2.90626e-09 3.16427e-09
3.44674e-09 3.9049e-09 4.43153e-09 4.89979e-09 5.72245e-09 7.29537e-09 0.00023035 0.120424 0.0732053 0.0346953 0.0114267 0.00242736
- 0.000104713 1.70733e-07 8.26256e-13 6.16574e-23 -2.23136e-35 0 0 0 0 0 0 0
+ 0.000104713 1.70733e-07 8.26256e-13 6.16574e-23 -2.2264e-35 0 0 0 0 0 0 0
0 0 0 0 0 0 0 0 0 0 0 0
1.35439e-12 1.2534e-07 6.85356e-06 2.00796e-05 2.84724e-05 3.4533e-05 3.97832e-05 4.46321e-05 4.93771e-05 5.40449e-05 5.83675e-05 6.15318e-05
6.31725e-05 6.47666e-05 6.7271e-05 6.99387e-05 7.23668e-05 7.63177e-05 8.34887e-05 0.000312591 0.126568 0.0693742 0.0299756 0.00914616
- 0.00170258 4.77604e-05 3.65782e-08 4.23229e-14 2.05271e-25 -9.02416e-37 0 0 0 0 0 0
+ 0.00170258 4.77604e-05 3.65782e-08 4.23229e-14 2.05271e-25 -9.00581e-37 0 0 0 0 0 0
0 0 0 0 0 0 0 0 0 0 0 0
0 3.52695e-06 0.000511327 0.00188951 0.00220624 0.00231898 0.00244319 0.00254955 0.00264732 0.00273965 0.00282718 0.00290857
0.00298224 0.00304906 0.00311214 0.00317514 0.00324102 0.00333924 0.00344267 0.00355726 0.0050311 0.120676 0.0627362 0.0240924
- 0.0067904 0.00100473 1.54786e-05 4.1821e-09 6.62462e-16 6.86972e-29 -7.60957e-37 0 0 0 0 0
+ 0.0067904 0.00100473 1.54786e-05 4.1821e-09 6.62462e-16 6.87025e-29 -7.6083e-37 0 0 0 0 0
0 0 0 0 0 0 0 0 0 0 0 0
0 0 0.00114679 0.0130597 0.0355583 0.116118 0.190795 0.251348 0.302671 0.346587 0.383914 0.414963
0.439647 0.457407 0.467461 0.469252 0.463223 0.450678 0.442037 0.428423 0.406594 0.266515 0.150362 0.0536286
- 0.0163768 0.00398102 0.000339398 1.71436e-06 6.27805e-11 2.17668e-19 -3.03784e-32 1.46736e-38 0 0 0 0
+ 0.0163768 0.00398102 0.000339398 1.71436e-06 6.27805e-11 2.17668e-19 -3.03879e-32 1.4674e-38 0 0 0 0
0 0 0 0 0 0 0 0 0 0 0 0
0 0 0 0 0.000318438 0.0056216 0.0333844 0.0508799 0.0603306 0.0655356 0.0686231 0.0706861
0.0721247 0.0721927 0.0661881 0.0521537 0.0348108 0.0189458 0.00773221 0.0018123 6.98515e-05 8.9352e-08 2.58416e-13 6.24787e-24
- 7.88017e-38 0 0 0 0 0 0 0 0 0 0 0
+ 8.09265e-38 0 0 0 0 0 0 0 0 0 0 0
0 0 0 0 0 0 0 0 0 0 0 0
0 0 0 0 0 0.000468481 0.00570677 0.0329503 0.0491404 0.0562581 0.0591861 0.0603113
0.0607231 0.0607915 0.0598083 0.0526182 0.0382707 0.0232089 0.0113253 0.00417378 0.000592126 7.05846e-06 1.06056e-09 4.87251e-17
- -5.32612e-32 6.87435e-38 0 0 0 0 0 0 0 0 0 0
+ -5.29881e-32 6.87419e-38 0 0 0 0 0 0 0 0 0 0
0 0 0 0 0 0 0 0 0 0 0 0
0 0 0 0 0 0 0.000643101 0.00598706 0.0343803 0.0509071 0.0572153 0.0594755
0.0602223 0.0604484 0.0604386 0.0594194 0.0510361 0.0349269 0.019747 0.00906874 0.00310498 0.000317461 1.95289e-06 8.98219e-11
- 4.30654e-19 -5.69989e-33 0 0 0 0 0 0 0 0 0 0
+ 4.30654e-19 -5.69926e-33 0 0 0 0 0 0 0 0 0 0
0 0 0 0 0 0 0 0 0 0 0 0
0 0 0 0 0 0 0 0.000819559 0.00619366 0.0358822 0.0528581 0.0582493
0.0598956 0.0603645 0.0604878 0.06046 0.0594846 0.0496351 0.0313433 0.0162402 0.00705188 0.00211818 0.000138901 3.80172e-07
- 3.91502e-12 1.08268e-21 -2.79952e-34 0 0 0 0 0 0 0 0 0
+ 3.91502e-12 1.08268e-21 -2.79955e-34 0 0 0 0 0 0 0 0 0
0 0 0 0 0 0 0 0 0 0 0 0
0 0 0 0 0 0 0 0 0.000916558 0.00630482 0.0373992 0.0548914
0.0591561 0.0602103 0.0604605 0.0605166 0.0604882 0.0596315 0.047976 0.0269631 0.0124769 0.00508076 0.00120297 4.08096e-05
- 3.5222e-08 4.14736e-14 1.8497e-25 -2.03604e-36 0 0 0 0 0 0 0 0
+ 3.5222e-08 4.14736e-14 1.8497e-25 -2.03563e-36 0 0 0 0 0 0 0 0
0 0 0 0 0 0 0 0 0 0 0 0
0 0 0 0 0 0 0 0 0 0.000828005 0.00607819 0.0389966
0.0570211 0.0598915 0.0604145 0.0605123 0.0605304 0.0605116 0.0598773 0.0459761 0.0212558 0.00843926 0.00306053 0.000447601
- 5.14745e-06 6.57377e-10 2.06286e-17 -4.55803e-33 2.43242e-38 0 0 0 0 0 0 0
+ 5.14745e-06 6.57377e-10 2.06286e-17 -4.52634e-33 2.4319e-38 0 0 0 0 0 0 0
0 0 0 0 0 0 0 0 0 0 0 0
0 0 0 0 0 0 0 0 0 0 0.000424356 0.00462003
0.0408584 0.0592676 0.0604026 0.0605185 0.0605333 0.0605354 0.0605286 0.0602634 0.0435838 0.0125218 0.00365905 0.000829847
- 3.077e-05 2.70402e-08 2.86244e-14 9.78997e-26 6.8118e-38 0 0 0 0 0 0 0
+ 3.077e-05 2.70402e-08 2.86244e-14 9.78997e-26 6.81459e-38 0 0 0 0 0 0 0
0 0 0 0 0 0 0 0 0
</DataArray>
<DataArray type="Float32" Name="Sw" NumberOfComponents="1" format="ascii">
diff --git a/test/boxmodels/2p/lensproblem.hh b/test/boxmodels/2p/lensproblem.hh
index 4f425e1a7ceb66ba29fc1832fa12defae7bbebeb..e1541bc5e13afe062d2f31a18fe2c538df4616fe 100644
--- a/test/boxmodels/2p/lensproblem.hh
+++ b/test/boxmodels/2p/lensproblem.hh
@@ -64,7 +64,7 @@ NEW_TYPE_TAG(LensProblem, INHERITS_FROM(BoxTwoP, LensSpatialParams));
#if HAVE_UG
SET_TYPE_PROP(LensProblem, Grid, Dune::UGGrid<2>);
#else
-SET_TYPE_PROP(LensProblem, Grid, Dune::YaspGrid<2>);
+SET_TYPE_PROP(LensProblem, Grid, Dune::SGrid<2,2>);
#endif
// Set the problem property
diff --git a/test/boxmodels/2p/lensspatialparams.hh b/test/boxmodels/2p/lensspatialparams.hh
index d0501d7ff44d0698b4021b583f0d56389c2ada17..7220d3a9f8babd7f68bc06488b02a55915af1906 100644
--- a/test/boxmodels/2p/lensspatialparams.hh
+++ b/test/boxmodels/2p/lensspatialparams.hh
@@ -101,10 +101,10 @@ public:
{
try
{
- lensLowerLeft_[0] = GET_RUNTIME_PARAM(TypeTag, Scalar, SpatialParams.lensLowerLeftX);
- lensLowerLeft_[1] = GET_RUNTIME_PARAM(TypeTag, Scalar, SpatialParams.lensLowerLeftY);
- lensUpperRight_[0] = GET_RUNTIME_PARAM(TypeTag, Scalar, SpatialParams.lensUpperRightX);
- lensUpperRight_[1] = GET_RUNTIME_PARAM(TypeTag, Scalar, SpatialParams.lensUpperRightY);
+ lensLowerLeft_[0] = GET_RUNTIME_PARAM(TypeTag, Scalar, SpatialParams.LensLowerLeftX);
+ lensLowerLeft_[1] = GET_RUNTIME_PARAM(TypeTag, Scalar, SpatialParams.LensLowerLeftY);
+ lensUpperRight_[0] = GET_RUNTIME_PARAM(TypeTag, Scalar, SpatialParams.LensUpperRightX);
+ lensUpperRight_[1] = GET_RUNTIME_PARAM(TypeTag, Scalar, SpatialParams.LensUpperRightY);
}
catch (Dumux::ParameterException &e) {
std::cerr << e << ". Abort!\n";
diff --git a/test/boxmodels/2p/test_2p.input b/test/boxmodels/2p/test_2p.input
index 5a2f32aa54a7fe0587b6da48ed3105ef7728588a..a5701f2f64b73b53122c7fbad44fd08a44d5702f 100644
--- a/test/boxmodels/2p/test_2p.input
+++ b/test/boxmodels/2p/test_2p.input
@@ -8,15 +8,22 @@
############################################################
# Mandatory arguments
############################################################
-TimeManager.DtInitial = 250# [s]
-TimeManager.TEnd = 1000# [s]
-Grid.File = ./grids/test_2p.dgf
+[TimeManager]
+DtInitial = 250# [s]
+TEnd = 3000# [s]
+############################################################
+[Grid]
+File = ./grids/test_2p.dgf
+
+############################################################
+# Mandatory arguments
+############################################################
[SpatialParams]
-lensLowerLeftX = 1.0 # [m] dimension of the lens (different properties therin)
-lensLowerLeftY = 2.0 # [m] dimension of the lens (different properties therin)
-lensUpperRightX = 4.0 # [m] dimension of the lens (different properties therin)
-lensUpperRightY = 3.0 # [m] dimension of the lens (different properties therin)
+LensLowerLeftX = 1.0 # [m] dimension of the lens (different properties therin)
+LensLowerLeftY = 2.0 # [m] dimension of the lens (different properties therin)
+LensUpperRightX = 4.0 # [m] dimension of the lens (different properties therin)
+LensUpperRightY = 3.0 # [m] dimension of the lens (different properties therin)
####################################################################
# Simulation restart
diff --git a/test/boxmodels/2p2c/injectionproblem.hh b/test/boxmodels/2p2c/injectionproblem.hh
index b1f2f76d110fc5167da25e0721163818e21bcf6b..ec8ad760c7dd73c8edc4c0559b53f63c3a050b9d 100644
--- a/test/boxmodels/2p2c/injectionproblem.hh
+++ b/test/boxmodels/2p2c/injectionproblem.hh
@@ -149,15 +149,15 @@ public:
{
try
{
- nTemperature_ = GET_RUNTIME_PARAM(TypeTag, int, FluidSystem.nTemperature);
- nPressure_ = GET_RUNTIME_PARAM(TypeTag, int, FluidSystem.nPressure);
- pressureLow_ = GET_RUNTIME_PARAM(TypeTag, Scalar, FluidSystem.pressureLow);
- pressureHigh_ = GET_RUNTIME_PARAM(TypeTag, Scalar, FluidSystem.pressureHigh);
- temperatureLow_ = GET_RUNTIME_PARAM(TypeTag, Scalar, FluidSystem.temperatureLow);
- temperatureHigh_ = GET_RUNTIME_PARAM(TypeTag, Scalar, FluidSystem.temperatureHigh);
- temperature_ = GET_RUNTIME_PARAM(TypeTag, Scalar, InitialConditions.temperature);
- depthBOR_ = GET_RUNTIME_PARAM(TypeTag, Scalar, InitialConditions.depthBOR);
- name_ = GET_RUNTIME_PARAM(TypeTag, std::string, SimulationControl.name);
+ nTemperature_ = GET_RUNTIME_PARAM(TypeTag, int, FluidSystem.NTemperature);
+ nPressure_ = GET_RUNTIME_PARAM(TypeTag, int, FluidSystem.NPressure);
+ pressureLow_ = GET_RUNTIME_PARAM(TypeTag, Scalar, FluidSystem.PressureLow);
+ pressureHigh_ = GET_RUNTIME_PARAM(TypeTag, Scalar, FluidSystem.PressureHigh);
+ temperatureLow_ = GET_RUNTIME_PARAM(TypeTag, Scalar, FluidSystem.TemperatureLow);
+ temperatureHigh_ = GET_RUNTIME_PARAM(TypeTag, Scalar, FluidSystem.TemperatureHigh);
+ temperature_ = GET_RUNTIME_PARAM(TypeTag, Scalar, InitialConditions.Temperature);
+ depthBOR_ = GET_RUNTIME_PARAM(TypeTag, Scalar, InitialConditions.DepthBOR);
+ name_ = GET_RUNTIME_PARAM(TypeTag, std::string, SimulationControl.Name);
}
catch (Dumux::ParameterException &e) {
std::cerr << e << ". Abort!\n";
diff --git a/test/boxmodels/2p2c/test_2p2c.input b/test/boxmodels/2p2c/test_2p2c.input
index 802147de81ae1b3398a953e732bb5601387c61dc..ec2b0512fc73a9f4a7cd32b0477110469871ed01 100644
--- a/test/boxmodels/2p2c/test_2p2c.input
+++ b/test/boxmodels/2p2c/test_2p2c.input
@@ -8,24 +8,31 @@
####################################################################
# Mandatory arguments
####################################################################
-TimeManager.DtInitial = 250# [s]
-TimeManager.TEnd = 1e4# [s]
-Grid.File = ./grids/test_2p2c.dgf # relative path to the grid file
+[TimeManager]
+DtInitial = 250# [s]
+TEnd = 1e4# [s]
+####################################################################
+[Grid]
+File = ./grids/test_2p2c.dgf # relative path to the grid file
+
+####################################################################
[FluidSystem]
-nTemperature = 3# [-] number of tabularization entries
-nPressure = 200# [-] number of tabularization entries
-pressureLow = 1e5# [Pa] low end for tabularization of fluid properties
-pressureHigh = 3e7# [Pa] high end for tabularization of fluid properties
-temperatureLow = 312.15 # [Pa] low end for tabularization of fluid properties
-temperatureHigh = 314.15 # [Pa] high end for tabularization of fluid properties
+NTemperature = 3# [-] number of tabularization entries
+NPressure = 200# [-] number of tabularization entries
+PressureLow = 1e5# [Pa] low end for tabularization of fluid properties
+PressureHigh = 3e7# [Pa] high end for tabularization of fluid properties
+TemperatureLow = 312.15 # [Pa] low end for tabularization of fluid properties
+TemperatureHigh = 314.15 # [Pa] high end for tabularization of fluid properties
+####################################################################
[SimulationControl]
-name = injection# [-] the name of the output files
+Name = injection# [-] the name of the output files
+####################################################################
[InitialConditions]
-temperature = 313.15 # [K] initial temperature in the reservoir 273.15 + 40
-depthBOR = 2700# [m] depth below ground surface
+Temperature = 313.15 # [K] initial temperature in the reservoir 273.15 + 40
+DepthBOR = 2700# [m] depth below ground surface
####################################################################
# Simulation restart
diff --git a/test/boxmodels/2p2cni/test_2p2cni.input b/test/boxmodels/2p2cni/test_2p2cni.input
index 4e3d1a6521b4516b4fdae65116df4e2af386ab9a..70e6b1ae3e1a55bcd569291e86971088d93ad28c 100644
--- a/test/boxmodels/2p2cni/test_2p2cni.input
+++ b/test/boxmodels/2p2cni/test_2p2cni.input
@@ -8,9 +8,13 @@
############################################################
# Mandatory arguments
############################################################
-TimeManager.DtInitial = 250 # seconds
-TimeManager.TEnd = 1e4 # seconds
-Grid.File = ./grids/test_2p2cni.dgf
+[TimeManager]
+DtInitial = 250 # seconds
+TEnd = 1e4 # seconds
+
+############################################################
+[Grid]
+File = ./grids/test_2p2cni.dgf
####################################################################
# Simulation restart
diff --git a/test/boxmodels/2p2cni/waterairproblem.hh b/test/boxmodels/2p2cni/waterairproblem.hh
index e0c55d2259998d78c4fceefac8c78173562d4be0..4afdd41041cf44677f70dda6e711898de070e0d6 100644
--- a/test/boxmodels/2p2cni/waterairproblem.hh
+++ b/test/boxmodels/2p2cni/waterairproblem.hh
@@ -54,7 +54,7 @@ NEW_TYPE_TAG(WaterAirProblem, INHERITS_FROM(BoxTwoPTwoCNI, WaterAirSpatialParams
// Set the grid type
SET_PROP(WaterAirProblem, Grid)
{
- typedef Dune::YaspGrid<2> type;
+ typedef Dune::SGrid<2,2> type;
};
// Set the problem property
diff --git a/test/boxmodels/2pni/injectionproblem2pni.hh b/test/boxmodels/2pni/injectionproblem2pni.hh
index c82775b9aa4f3becbe51acf834703e003640cd7b..b039d64a573a4b720c34dc8479ab856238de93bc 100644
--- a/test/boxmodels/2pni/injectionproblem2pni.hh
+++ b/test/boxmodels/2pni/injectionproblem2pni.hh
@@ -35,7 +35,6 @@
#include <dune/grid/io/file/dgfparser/dgfug.hh>
#endif
#include <dune/grid/io/file/dgfparser/dgfs.hh>
-#include <dune/grid/io/file/dgfparser/dgfyasp.hh>
#include <dumux/common/simplexgridcreator.hh>
#include <dumux/common/cubegridcreator.hh>
@@ -79,7 +78,7 @@ SET_PROP(InjectionProblem2PNI, Grid)
#if HAVE_UG
typedef Dune::UGGrid<2> type;
#else
- typedef Dune::YaspGrid<2> type;
+ typedef Dune::SGrid<2,2> type;
#endif
};
diff --git a/test/boxmodels/2pni/test_2pni.input b/test/boxmodels/2pni/test_2pni.input
index c2eb1a6cbcf9d4bbf934e23dba7c3750eaf66c31..558fc635ddc6456b6b6ec1f8d8e0aa7faa01f4df 100644
--- a/test/boxmodels/2pni/test_2pni.input
+++ b/test/boxmodels/2pni/test_2pni.input
@@ -8,9 +8,11 @@
############################################################
# Mandatory arguments
############################################################
-TimeManager.DtInitial = 250# [s]
-TimeManager.TEnd = 1e4# [s]
+[TimeManager]
+DtInitial = 250# [s]
+TEnd = 1e4# [s]
+############################################################
[Grid]
NumberOfCellsX = 24# [-] resolution in x-direction
NumberOfCellsY = 16# [-] resolution in y-direction
diff --git a/test/boxmodels/3p3c/infiltrationproblem.hh b/test/boxmodels/3p3c/infiltrationproblem.hh
index ccb206e86150700aa9e99ec90108bb957211dade..94fb3c75a5d4c4e7d91dbac600ee593f7620c0b2 100644
--- a/test/boxmodels/3p3c/infiltrationproblem.hh
+++ b/test/boxmodels/3p3c/infiltrationproblem.hh
@@ -49,7 +49,7 @@ namespace Properties
NEW_TYPE_TAG(InfiltrationProblem, INHERITS_FROM(BoxThreePThreeC, InfiltrationSpatialParams));
// Set the grid type
-SET_TYPE_PROP(InfiltrationProblem, Grid, Dune::YaspGrid<2>);
+SET_TYPE_PROP(InfiltrationProblem, Grid, Dune::SGrid<2,2>);
// Set the problem property
SET_TYPE_PROP(InfiltrationProblem, Problem, Dumux::InfiltrationProblem<TypeTag>);
diff --git a/test/boxmodels/3p3c/test_3p3c.input b/test/boxmodels/3p3c/test_3p3c.input
index e6054f3c98f683f0d3f239aa3e838d56e6bb87a8..bffc804456a3b3a6d05757c1635995ae44a676f5 100644
--- a/test/boxmodels/3p3c/test_3p3c.input
+++ b/test/boxmodels/3p3c/test_3p3c.input
@@ -8,9 +8,13 @@
############################################################
# Mandatory arguments
############################################################
-TimeManager.DtInitial = 60# [s]
-TimeManager.TEnd = 864000# [s]
-Grid.File = ./grids/test_3p3c.dgf
+[TimeManager]
+DtInitial = 60# [s]
+TEnd = 864000# [s]
+
+############################################################
+[Grid]
+File = ./grids/test_3p3c.dgf
####################################################################
# Simulation restart
diff --git a/test/boxmodels/3p3cni/columnxylolproblem.hh b/test/boxmodels/3p3cni/columnxylolproblem.hh
index 80047050ba2855b9cd3d43d1b18658c177d322ee..6b33cafdebf24f806817c4867ef6312c0305079d 100644
--- a/test/boxmodels/3p3cni/columnxylolproblem.hh
+++ b/test/boxmodels/3p3cni/columnxylolproblem.hh
@@ -54,7 +54,7 @@ NEW_TYPE_TAG(ColumnProblem, INHERITS_FROM(BoxThreePThreeCNI, ColumnSpatialParams
// Set the grid type
SET_PROP(ColumnProblem, Grid)
{
- typedef Dune::YaspGrid<2> type;
+ typedef Dune::SGrid<2,2> type;
};
// Set the problem property
diff --git a/test/boxmodels/3p3cni/kuevetteproblem.hh b/test/boxmodels/3p3cni/kuevetteproblem.hh
index 0ae9249f5eb4e38f3a75563a518fc16701bdaf3c..8cfc833d4c552e94c373df928d040b6fb1060b4d 100644
--- a/test/boxmodels/3p3cni/kuevetteproblem.hh
+++ b/test/boxmodels/3p3cni/kuevetteproblem.hh
@@ -54,7 +54,7 @@ NEW_TYPE_TAG(KuevetteProblem, INHERITS_FROM(BoxThreePThreeCNI, KuevetteSpatialPa
// Set the grid type
SET_PROP(KuevetteProblem, Grid)
{
- typedef Dune::YaspGrid<2> type;
+ typedef Dune::SGrid<2,2> type;
};
diff --git a/test/boxmodels/3p3cni/test_3p3cni.input b/test/boxmodels/3p3cni/test_3p3cni.input
index bd052dfcf707da2b2ab0c58f129b8c937ba8b739..8d0d4e066587e037ae78cddb37e3bef050e89a78 100644
--- a/test/boxmodels/3p3cni/test_3p3cni.input
+++ b/test/boxmodels/3p3cni/test_3p3cni.input
@@ -8,9 +8,13 @@
############################################################
# Mandatory arguments
############################################################
-TimeManager.DtInitial = 1# [s]
-TimeManager.TEnd = 1800# [s]
-Grid.File = ./grids/kuev_2p2cni.dgf
+[TimeManager]
+DtInitial = 1# [s]
+TEnd = 1800# [s]
+
+############################################################
+[Grid]
+File = ./grids/kuev_2p2cni.dgf
####################################################################
# Simulation restart
diff --git a/test/boxmodels/mpnc/obstacleproblem.hh b/test/boxmodels/mpnc/obstacleproblem.hh
index 53edb504f65ca1ca2865be83622ffc4244a70ad0..f69d7405c19651701d7f9064a251bc14d1d3c872 100644
--- a/test/boxmodels/mpnc/obstacleproblem.hh
+++ b/test/boxmodels/mpnc/obstacleproblem.hh
@@ -57,7 +57,7 @@ namespace Properties
NEW_TYPE_TAG(ObstacleProblem, INHERITS_FROM(BoxMPNC, ObstacleSpatialParams));
// Set the grid type
-SET_TYPE_PROP(ObstacleProblem, Grid, Dune::YaspGrid<2>);
+SET_TYPE_PROP(ObstacleProblem, Grid, Dune::SGrid<2,2>);
// Set the problem property
SET_TYPE_PROP(ObstacleProblem,
diff --git a/test/boxmodels/mpnc/test_mpnc.input b/test/boxmodels/mpnc/test_mpnc.input
index 14325d5c0977ca021a03f371cb0e523276934b26..694bd488305d91decb697eef111da74d8beadb1b 100644
--- a/test/boxmodels/mpnc/test_mpnc.input
+++ b/test/boxmodels/mpnc/test_mpnc.input
@@ -8,10 +8,15 @@
############################################################
# Mandatory arguments
############################################################
-TimeManager.DtInitial = 250 # seconds
-TimeManager.TEnd = 1e4 # seconds
-Grid.File = ./grids/obstacle_24x16.dgf
+[TimeManager]
+DtInitial = 250 # seconds
+TEnd = 1e4 # seconds
+############################################################
+[Grid]
+File = ./grids/obstacle_24x16.dgf
+
+############################################################
[ LinearSolver ]
ResidualReduction = 1e-12
diff --git a/test/boxmodels/richards/richardslensproblem.hh b/test/boxmodels/richards/richardslensproblem.hh
index 8ca5f62ba4d0c83635dd08d56598093d333d08db..c974ba17202d5281bc95ec286afde7fe4cdfb534 100644
--- a/test/boxmodels/richards/richardslensproblem.hh
+++ b/test/boxmodels/richards/richardslensproblem.hh
@@ -52,7 +52,7 @@ namespace Properties
NEW_TYPE_TAG(RichardsLensProblem, INHERITS_FROM(BoxRichards, RichardsLensSpatialParams));
// Use 2d YaspGrid
-SET_TYPE_PROP(RichardsLensProblem, Grid, Dune::YaspGrid<2>);
+SET_TYPE_PROP(RichardsLensProblem, Grid, Dune::SGrid<2,2>);
// Set the physical problem to be solved
SET_PROP(RichardsLensProblem, Problem)
diff --git a/test/boxmodels/richards/test_richards.input b/test/boxmodels/richards/test_richards.input
index d53d81c8990bebfc9dc1ae5dc84ee98872343e83..c6f118fa7886dbb695fea5ea582bde6861ea0b5a 100644
--- a/test/boxmodels/richards/test_richards.input
+++ b/test/boxmodels/richards/test_richards.input
@@ -8,9 +8,13 @@
############################################################
# Mandatory arguments
############################################################
-TimeManager.DtInitial = 100 # seconds
-TimeManager.TEnd = 3000 # seconds
-Grid.File = ./grids/richardslens-24x16.dgf
+[TimeManager]
+DtInitial = 100 # seconds
+TEnd = 3000 # seconds
+
+############################################################
+[Grid]
+File = ./grids/richardslens-24x16.dgf
####################################################################
# Simulation restart
diff --git a/test/freeflow/navierstokes/test_navierstokes.input b/test/freeflow/navierstokes/test_navierstokes.input
index e976552d3fead0724cb6aab8c4cb89764e3078f9..3a4b6728f4d624b81b448356bc72b9f657e95e97 100644
--- a/test/freeflow/navierstokes/test_navierstokes.input
+++ b/test/freeflow/navierstokes/test_navierstokes.input
@@ -13,6 +13,7 @@ DtInitial = 1.0 # seconds
MaxTimeStepSize = 10.0 # seconds
TEnd = 30.0 # seconds
+############################################################
[Grid]
File = ./grids/test_navierstokes.dgf
diff --git a/test/freeflow/stokes/test_stokes.input b/test/freeflow/stokes/test_stokes.input
index f130d190d78c6aca4fe6f7311dbda730c02e6ab9..83c5f6c0ab9a0f02b8cb34e0bc823ecc839d6750 100644
--- a/test/freeflow/stokes/test_stokes.input
+++ b/test/freeflow/stokes/test_stokes.input
@@ -12,6 +12,7 @@
DtInitial = 10 # seconds
TEnd = 6e3 # seconds
+############################################################
[Grid]
File = ./grids/test_stokes.dgf
diff --git a/test/freeflow/stokes2c/test_stokes2c.input b/test/freeflow/stokes2c/test_stokes2c.input
index 1219abd8c8e4da4cefdf279037cb5f45143d773b..db502622f8b50866cfa0bdb1ce46be981d8055cb 100644
--- a/test/freeflow/stokes2c/test_stokes2c.input
+++ b/test/freeflow/stokes2c/test_stokes2c.input
@@ -12,6 +12,7 @@
DtInitial = 0.1 # seconds
TEnd = 2 # seconds
+############################################################
[Grid]
File = ./grids/test_stokes2c.dgf
diff --git a/test/freeflow/stokes2cni/test_stokes2cni.input b/test/freeflow/stokes2cni/test_stokes2cni.input
index c988b87d8f4ec6cc77cf997ac4e27c76b1a90cda..6986a695990cf9cbe6a065d70936f679d3940b31 100644
--- a/test/freeflow/stokes2cni/test_stokes2cni.input
+++ b/test/freeflow/stokes2cni/test_stokes2cni.input
@@ -11,6 +11,8 @@
[TimeManager]
DtInitial = 0.1 # seconds
TEnd = 3 # seconds
+
+############################################################
[Grid]
File = ./grids/test_stokes2cni.dgf