[test][generalproblem] Use vector for lens

test/common/generalproblem/generallensspatialparams.hh

@@ -91,10 +91,8 @@ public:
     GeneralLensSpatialParams(const GridView& gridView)
         : ParentType(gridView), eps_(3e-6)
     {
-        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_   = GET_RUNTIME_PARAM(TypeTag, GlobalPosition, SpatialParams.LensLowerLeft);
+        lensUpperRight_  = GET_RUNTIME_PARAM(TypeTag, GlobalPosition, SpatialParams.LensUpperRight);
 
         // residual saturations
         lensMaterialParams_.setSwr(0.18);
@@ -109,10 +107,12 @@ public:
         outerMaterialParams_.setVgAlpha(0.0037);
         outerMaterialParams_.setVgn(4.7);
 
+        // initialize with zero
+        lensK_ = 0.0; outerK_ = 0.0;
         for (int i=0; i < dim; i++)
         {
-        lensK_[i][i] = 9.05e-12;
-        outerK_[i][i] = 4.6e-10;
+            lensK_[i][i] = 9.05e-12;
+            outerK_[i][i] = 4.6e-10;
         }
     }
 

test/common/generalproblem/test_generalproblem2p.input

@@ -7,10 +7,8 @@ UpperRight = 6 4 # upper right corner coordinates [m]
 Cells = 48 32    # number of cells in (x, y)-direction [-]
 
 [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  # coordinates of the lower left lens corner [m]
+LensUpperRight = 4.0 3.0 # coordinates of the upper right lens corner [m]
 
 [Vtk]
 OutputLevel = 1

test/common/generalproblem/test_generalproblem2p_reference.input

@@ -7,10 +7,8 @@ UpperRight = 6 4 # upper right corner coordinates [m]
 Cells = 48 32    # number of cells in (x, y)-direction [-]
 
 [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  # coordinates of the lower left lens corner [m]
+LensUpperRight = 4.0 3.0 # coordinates of the upper right lens corner [m]
 
 [Vtk]
 OutputLevel = 1