[cpgrid] fix grid creator, cleanup fvelementgeometry

The static Opm::Deck variable was handled incorrectly in the
grid creator. Fix the behavior by initializing the variable
directly.

Also perform a cleanup of the FVElementGeometry by removing the
lines associated with local coordinates and removing an unused
local variable.

dumux/implicit/cornerpoint/fvelementgeometry.hh

@@ -64,7 +64,6 @@ class CpFVElementGeometry
 public:
     struct SubControlVolume //! FV intersected with element
     {
-        LocalPosition local; //!< local position
         GlobalPosition global; //!< global position
         Scalar volume; //!< volume of scv
         bool inner;
@@ -86,7 +85,6 @@ public:
 
     typedef SubControlVolumeFace BoundaryFace; //!< compatibility typedef
 
-    LocalPosition elementLocal; //!< local coordinate of element center
     GlobalPosition elementGlobal; //!< global coordinate of element center
     Scalar elementVolume; //!< element volume
     SubControlVolume subContVol[1]; //!< data of the sub control volumes
@@ -104,12 +102,10 @@ public:
 
         elementVolume = geometry.volume();
         elementGlobal = geometry.center();
-        //elementLocal = geometry.local(elementGlobal);
 
         numScv = 1;
         numScvf = 0;
 
-        subContVol[0].local = elementLocal;
         subContVol[0].global = elementGlobal;
         subContVol[0].inner = true;
         subContVol[0].volume = elementVolume;
@@ -125,8 +121,6 @@ public:
     {
         updateInner(element);
 
-        const Geometry geometry = element.geometry();
-
         bool onBoundary = false;
 
         // fill neighbor information and control volume face data:
@@ -147,7 +141,6 @@ public:
                 scvFace.j = scvfIdx + 1;
 
                 scvFace.ipGlobal = isGeometry.center();
-                //scvFace.ipLocal =  geometry.local(scvFace.ipGlobal);
                 scvFace.normal = intersection.centerUnitOuterNormal();
                 auto di = scvFace.ipGlobal;
                 di -= elementGlobal;
@@ -184,7 +177,6 @@ public:
                 SubControlVolumeFace& bFace = boundaryFace[bfIdx];
 
                 bFace.ipGlobal = isGeometry.center();
-                //bFace.ipLocal =  geometry.local(bFace.ipGlobal);
                 bFace.normal = intersection.centerUnitOuterNormal();
                 auto di = bFace.ipGlobal;
                 di -= elementGlobal;

dumux/io/cpgridcreator.hh

@@ -58,9 +58,6 @@ public:
      */
     static void makeGrid()
     {
-        std::string fileName = GET_RUNTIME_PARAM_FROM_GROUP(TypeTag, std::string, Grid, File);
-
-        deck() = Opm::Parser().parseFile(fileName);
         Opm::EclipseGrid ecl_grid(deck());
 
         gridPtr() = std::make_shared<Grid>(*(new Grid()));
@@ -91,7 +88,8 @@ public:
      */
     static Deck &deck()
     {
-        static Deck deck_;
+        static auto fileName = GET_RUNTIME_PARAM_FROM_GROUP(TypeTag, std::string, Grid, File);
+        static auto deck_ = Opm::Parser().parseFile(fileName);
         return deck_;
     }