diff --git a/test/porousmediumflow/2p/implicit/lensspatialparams.hh b/test/porousmediumflow/2p/implicit/lensspatialparams.hh
index 4a622dbfd6c82c92210208e54249cf4bff77db88..7ae91b782815c3917d4d0fc20d662786d1558bde 100644
--- a/test/porousmediumflow/2p/implicit/lensspatialparams.hh
+++ b/test/porousmediumflow/2p/implicit/lensspatialparams.hh
@@ -98,10 +98,10 @@ public:
LensSpatialParams(const GridView& gridView)
: ParentType(gridView)
{
- 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, GlobalPosition, SpatialParams.LensLowerLeft)[0];
+ lensLowerLeft_[1] = GET_RUNTIME_PARAM(TypeTag, GlobalPosition, SpatialParams.LensLowerLeft)[1];
+ lensUpperRight_[0] = GET_RUNTIME_PARAM(TypeTag, GlobalPosition, SpatialParams.LensUpperRight)[0];
+ lensUpperRight_[1] = GET_RUNTIME_PARAM(TypeTag, GlobalPosition, SpatialParams.LensUpperRight)[1];
// residual saturations
lensMaterialParams_.setSwr(0.18);
diff --git a/test/porousmediumflow/2p/implicit/pointsources/test_ccadaptive2ppointsource.cc b/test/porousmediumflow/2p/implicit/pointsources/test_ccadaptive2ppointsource.cc
index a39ae64aa66cd251eda03c87f46c7e5a82cb7652..36c0cd2c97865af6474e8ec70428c49e1004a563 100644
--- a/test/porousmediumflow/2p/implicit/pointsources/test_ccadaptive2ppointsource.cc
+++ b/test/porousmediumflow/2p/implicit/pointsources/test_ccadaptive2ppointsource.cc
@@ -47,10 +47,8 @@ void usage(const char *progName, const std::string &errorMsg)
"\t-TimeManager.DtInitial Initial timestep size [s] \n"
"\t-Grid.File Name of the file containing the grid \n"
"\t definition in DGF format\n"
- "\t-SpatialParams.LensLowerLeftX x-coordinate of the lower left corner of the lens [m] \n"
- "\t-SpatialParams.LensLowerLeftY y-coordinate of the lower left corner of the lens [m] \n"
- "\t-SpatialParams.LensUpperRightX x-coordinate of the upper right corner of the lens [m] \n"
- "\t-SpatialParams.LensUpperRightY y-coordinate of the upper right corner of the lens [m] \n"
+ "\t-SpatialParams.LensLowerLeft coordinates of the lower left corner of the lens [m] \n"
+ "\t-SpatialParams.LensUpperRight coordinates of the upper right corner of the lens [m] \n"
"\t-Problem.Name String for naming of the output files \n"
"\n";
diff --git a/test/porousmediumflow/2p/implicit/pointsources/test_ccadaptive2ppointsource.input b/test/porousmediumflow/2p/implicit/pointsources/test_ccadaptive2ppointsource.input
index ff4b68feb62e05d1811ead8c5d0b077eb5beb873..1047a2871e3b617b29ba6cb62fdd42c8d77b70cf 100644
--- a/test/porousmediumflow/2p/implicit/pointsources/test_ccadaptive2ppointsource.input
+++ b/test/porousmediumflow/2p/implicit/pointsources/test_ccadaptive2ppointsource.input
@@ -8,10 +8,8 @@ UpperRight = 6 4
Cells = 48 32
[SpatialParams]
-LensLowerLeftX = 1.0 # [m] x-coordinate of the lower left lens corner
-LensLowerLeftY = 2.0 # [m] y-coordinate of the lower left lens corner
-LensUpperRightX = 4.0 # [m] x-coordinate of the upper right lens corner
-LensUpperRightY = 3.0 # [m] y-coordinate of the upper right lens corner
+LensLowerLeft = 1.0 2.0 # [m] coordinates of the lower left lens corner
+LensUpperRight = 4.0 3.0 # [m] coordinate of the upper right lens corner
[Problem]
Name = lensccadaptive # name passed to the output routines
diff --git a/test/porousmediumflow/2p/implicit/test_box2p.cc b/test/porousmediumflow/2p/implicit/test_box2p.cc
index bad72c81d5b018f963b96878c751bb2b98b0c1d6..2d6beebc942ecf13afa9e8add9fc9070dd891ab4 100644
--- a/test/porousmediumflow/2p/implicit/test_box2p.cc
+++ b/test/porousmediumflow/2p/implicit/test_box2p.cc
@@ -45,10 +45,8 @@ void usage(const char *progName, const std::string &errorMsg)
"\t-TimeManager.DtInitial Initial timestep size [s] \n"
"\t-Grid.File Name of the file containing the grid \n"
"\t definition in DGF format\n"
- "\t-SpatialParams.LensLowerLeftX x-coordinate of the lower left corner of the lens [m] \n"
- "\t-SpatialParams.LensLowerLeftY y-coordinate of the lower left corner of the lens [m] \n"
- "\t-SpatialParams.LensUpperRightX x-coordinate of the upper right corner of the lens [m] \n"
- "\t-SpatialParams.LensUpperRightY y-coordinate of the upper right corner of the lens [m] \n"
+ "\t-SpatialParams.LensLowerLeft coordinates of the lower left corner of the lens [m] \n"
+ "\t-SpatialParams.LensUpperRight coordinates of the upper right corner of the lens [m] \n"
"\t-Problem.Name String for naming of the output files \n"
"\n";
diff --git a/test/porousmediumflow/2p/implicit/test_box2p.input b/test/porousmediumflow/2p/implicit/test_box2p.input
index fce9353e9eb4dcec9e99e4c466d6fd827ae3efc2..95d7809362ae27f3c7299bd6fcfdffb580ccb081 100644
--- a/test/porousmediumflow/2p/implicit/test_box2p.input
+++ b/test/porousmediumflow/2p/implicit/test_box2p.input
@@ -8,10 +8,8 @@ UpperRight = 6 4
Cells = 48 32
[SpatialParams]
-LensLowerLeftX = 1.0 # [m] x-coordinate of the lower left lens corner
-LensLowerLeftY = 2.0 # [m] y-coordinate of the lower left lens corner
-LensUpperRightX = 4.0 # [m] x-coordinate of the upper right lens corner
-LensUpperRightY = 3.0 # [m] y-coordinate of the upper right lens corner
+LensLowerLeft = 1.0 2.0 # [m] coordinates of the lower left lens corner
+LensUpperRight = 4.0 3.0 # [m] coordinates of the upper right lens corner
[Problem]
Name = lensbox # name passed to the output routines
diff --git a/test/porousmediumflow/2p/implicit/test_box2pni.cc b/test/porousmediumflow/2p/implicit/test_box2pni.cc
index a297ab3394881a76f53cbbf9683a542dd45ba8ec..563babe94a7f92033f09cdff64759c13a6f4bbe6 100644
--- a/test/porousmediumflow/2p/implicit/test_box2pni.cc
+++ b/test/porousmediumflow/2p/implicit/test_box2pni.cc
@@ -44,10 +44,8 @@ void usage(const char *progName, const std::string &errorMsg)
errorMessageOut += "\n\nThe list of mandatory options for this program is:\n"
"\t-TimeManager.TEnd End of the simulation [s] \n"
"\t-TimeManager.DtInitial Initial timestep size [s] \n"
- "\t-Grid.NumberOfCellsX Resolution in x-direction [-]\n"
- "\t-Grid.NumberOfCellsY Resolution in y-direction [-]\n"
- "\t-Grid.UpperRightX Length of the domain [m]\n"
- "\t-Grid.UpperRightY Height of the domain [m]\n";
+ "\t-Grid.Cells Number of cells in respective coordinate directions\n"
+ "\t-Grid.UpperRight Upper right corner coordinates\n";
std::cout << errorMessageOut
<< "\n";
diff --git a/test/porousmediumflow/2p/implicit/test_boxadaptive2p.cc b/test/porousmediumflow/2p/implicit/test_boxadaptive2p.cc
index 50163e9002f53ec83f827cb5f47d80db88fe78fb..d313a67d4e78c662eb57ede667168bb1bf36bf86 100644
--- a/test/porousmediumflow/2p/implicit/test_boxadaptive2p.cc
+++ b/test/porousmediumflow/2p/implicit/test_boxadaptive2p.cc
@@ -45,10 +45,8 @@ void usage(const char *progName, const std::string &errorMsg)
"\t-TimeManager.DtInitial Initial timestep size [s] \n"
"\t-Grid.File Name of the file containing the grid \n"
"\t definition in DGF format\n"
- "\t-SpatialParams.LensLowerLeftX x-coordinate of the lower left corner of the lens [m] \n"
- "\t-SpatialParams.LensLowerLeftY y-coordinate of the lower left corner of the lens [m] \n"
- "\t-SpatialParams.LensUpperRightX x-coordinate of the upper right corner of the lens [m] \n"
- "\t-SpatialParams.LensUpperRightY y-coordinate of the upper right corner of the lens [m] \n"
+ "\t-SpatialParams.LensLowerLeft coordinates of the lower left corner of the lens [m] \n"
+ "\t-SpatialParams.LensUpperRight coordinates of the upper right corner of the lens [m] \n"
"\t-Problem.Name String for naming of the output files \n"
"\n";
diff --git a/test/porousmediumflow/2p/implicit/test_boxadaptive2p.input b/test/porousmediumflow/2p/implicit/test_boxadaptive2p.input
index 0641558f9fcdace6eb2a98c639f14c9768af9f4c..551578754f4b7fe40a3e75d889f83fb206687597 100644
--- a/test/porousmediumflow/2p/implicit/test_boxadaptive2p.input
+++ b/test/porousmediumflow/2p/implicit/test_boxadaptive2p.input
@@ -8,10 +8,8 @@ UpperRight = 6 4
Cells = 48 32
[SpatialParams]
-LensLowerLeftX = 1.0 # [m] x-coordinate of the lower left lens corner
-LensLowerLeftY = 2.0 # [m] y-coordinate of the lower left lens corner
-LensUpperRightX = 4.0 # [m] x-coordinate of the upper right lens corner
-LensUpperRightY = 3.0 # [m] y-coordinate of the upper right lens corner
+LensLowerLeft = 1.0 2.0 # [m] coordinates of the lower left lens corner
+LensUpperRight = 4.0 3.0 # [m] coordinates of the upper right lens corner
[Problem]
Name = lensboxadaptive # name passed to the output routines
diff --git a/test/porousmediumflow/2p/implicit/test_cc2p.cc b/test/porousmediumflow/2p/implicit/test_cc2p.cc
index cb0edbc2c6a73e4f7c4d77b89078afd324d8a536..2cb7906ea8ab6c402b3c81c171819237fa69399e 100644
--- a/test/porousmediumflow/2p/implicit/test_cc2p.cc
+++ b/test/porousmediumflow/2p/implicit/test_cc2p.cc
@@ -45,10 +45,8 @@ void usage(const char *progName, const std::string &errorMsg)
"\t-TimeManager.DtInitial Initial timestep size [s] \n"
"\t-Grid.File Name of the file containing the grid \n"
"\t definition in DGF format\n"
- "\t-SpatialParams.LensLowerLeftX x-coordinate of the lower left corner of the lens [m] \n"
- "\t-SpatialParams.LensLowerLeftY y-coordinate of the lower left corner of the lens [m] \n"
- "\t-SpatialParams.LensUpperRightX x-coordinate of the upper right corner of the lens [m] \n"
- "\t-SpatialParams.LensUpperRightY y-coordinate of the upper right corner of the lens [m] \n"
+ "\t-SpatialParams.LensLowerLeft coordinates of the lower left corner of the lens [m] \n"
+ "\t-SpatialParams.LensUpperRight coordinates of the upper right corner of the lens [m] \n"
"\t-Problem.Name String for naming of the output files \n"
"\n";
diff --git a/test/porousmediumflow/2p/implicit/test_cc2p.input b/test/porousmediumflow/2p/implicit/test_cc2p.input
index e2162947fd7523df56c65269cadf1bd516db18d4..d6385b07db7486af09ca576eddf6d8a6465ba77b 100644
--- a/test/porousmediumflow/2p/implicit/test_cc2p.input
+++ b/test/porousmediumflow/2p/implicit/test_cc2p.input
@@ -8,10 +8,8 @@ UpperRight = 6 4
Cells = 48 32
[SpatialParams]
-LensLowerLeftX = 1.0 # [m] x-coordinate of the lower left lens corner
-LensLowerLeftY = 2.0 # [m] y-coordinate of the lower left lens corner
-LensUpperRightX = 4.0 # [m] x-coordinate of the upper right lens corner
-LensUpperRightY = 3.0 # [m] y-coordinate of the upper right lens corner
+LensLowerLeft = 1.0 2.0 # [m] coordinates of the lower left lens corner
+LensUpperRight = 4.0 3.0 # [m] coordinates of the upper right lens corner
[Problem]
Name = lenscc # name passed to the output routines
diff --git a/test/porousmediumflow/2p/implicit/test_cc2pni.cc b/test/porousmediumflow/2p/implicit/test_cc2pni.cc
index bcc717c5f27ee8d5f4d3b78bbba2751e43a28c64..19f5d3ac3cf542f42010d366ea96dbb479a3b736 100644
--- a/test/porousmediumflow/2p/implicit/test_cc2pni.cc
+++ b/test/porousmediumflow/2p/implicit/test_cc2pni.cc
@@ -44,10 +44,8 @@ void usage(const char *progName, const std::string &errorMsg)
errorMessageOut += "\n\nThe list of mandatory options for this program is:\n"
"\t-TimeManager.TEnd End of the simulation [s] \n"
"\t-TimeManager.DtInitial Initial timestep size [s] \n"
- "\t-Grid.NumberOfCellsX Resolution in x-direction [-]\n"
- "\t-Grid.NumberOfCellsY Resolution in y-direction [-]\n"
- "\t-Grid.UpperRightX Length of the domain [m]\n"
- "\t-Grid.UpperRightY Height of the domain [m]\n";
+ "\t-Grid.Cells Number of cells in respective coordinate directions\n"
+ "\t-Grid.UpperRight Upper right corner coordinates\n";
std::cout << errorMessageOut
<< "\n";
diff --git a/test/porousmediumflow/2p/implicit/test_ccadaptive2p.cc b/test/porousmediumflow/2p/implicit/test_ccadaptive2p.cc
index 8a322845583601e970e6f89a3f3542ab104a2fc2..06912047125e6203dcd05fee13e665cb6a16a95c 100644
--- a/test/porousmediumflow/2p/implicit/test_ccadaptive2p.cc
+++ b/test/porousmediumflow/2p/implicit/test_ccadaptive2p.cc
@@ -45,10 +45,8 @@ void usage(const char *progName, const std::string &errorMsg)
"\t-TimeManager.DtInitial Initial timestep size [s] \n"
"\t-Grid.File Name of the file containing the grid \n"
"\t definition in DGF format\n"
- "\t-SpatialParams.LensLowerLeftX x-coordinate of the lower left corner of the lens [m] \n"
- "\t-SpatialParams.LensLowerLeftY y-coordinate of the lower left corner of the lens [m] \n"
- "\t-SpatialParams.LensUpperRightX x-coordinate of the upper right corner of the lens [m] \n"
- "\t-SpatialParams.LensUpperRightY y-coordinate of the upper right corner of the lens [m] \n"
+ "\t-SpatialParams.LensLowerLeft coordinates of the lower left corner of the lens [m] \n"
+ "\t-SpatialParams.LensUpperRight coordinates of the upper right corner of the lens [m] \n"
"\t-Problem.Name String for naming of the output files \n"
"\n";
diff --git a/test/porousmediumflow/2p/implicit/test_ccadaptive2p.input b/test/porousmediumflow/2p/implicit/test_ccadaptive2p.input
index 4af2290739cfc3d41a88e4dd026df397cb02cbd0..4a3dff50e752ee0faef529cf7dc89079357c2136 100644
--- a/test/porousmediumflow/2p/implicit/test_ccadaptive2p.input
+++ b/test/porousmediumflow/2p/implicit/test_ccadaptive2p.input
@@ -6,10 +6,8 @@ TEnd = 3000 # [s]
File = ./grids/rectangle-domain.msh
[SpatialParams]
-LensLowerLeftX = 1.0 # [m] x-coordinate of the lower left lens corner
-LensLowerLeftY = 2.0 # [m] y-coordinate of the lower left lens corner
-LensUpperRightX = 4.0 # [m] x-coordinate of the upper right lens corner
-LensUpperRightY = 3.0 # [m] y-coordinate of the upper right lens corner
+LensLowerLeft = 1.0 2.0 # [m] coordinates of the lower left lens corner
+LensUpperRight = 4.0 3.0 # [m] coordinates of the upper right lens corner
[Problem]
Name = lensccadaptive # name passed to the output routines
diff --git a/test/porousmediumflow/2p/implicit/test_generalizeddirichlet.cc b/test/porousmediumflow/2p/implicit/test_generalizeddirichlet.cc
index e493b3cfbffc8fd444531068ae3e2dfe9d3fd8e8..0a822952bd87b9e04254cb03065d2b5508a69e94 100644
--- a/test/porousmediumflow/2p/implicit/test_generalizeddirichlet.cc
+++ b/test/porousmediumflow/2p/implicit/test_generalizeddirichlet.cc
@@ -31,8 +31,8 @@ void usage(const char *progName, const std::string &errorMsg)
<< "The list of mandatory arguments for this program is:\n"
<< "\t-TEnd The end of the simulation [s]\n"
<< "\t-DtInitial The initial timestep size [s]\n"
- << "\t-Grid.UpperRightX The coordinate of the right corner [m]\n"
- << "\t-Grid.NumberOfCellsX The grid's resolution\n"
+ << "\t-Grid.UpperRight Upper right corner coordinates\n"
+ << "\t-Grid.Cells Number of cells in respective coordinate directions\n"
<< "\n";
}