Merge pull request #2222 from dr-robertk/PR/ebos-polyhedralgrid2

Make ebos compile with PolyhedralGrid again.

ebos/eclpolyhedralgridvanguard.hh

@@ -28,6 +28,7 @@
 #define EWOMS_ECL_POLYHEDRAL_GRID_VANGUARD_HH
 
 #include "eclbasevanguard.hh"
+#include "ecltransmissibility.hh"
 
 #include <opm/grid/polyhedralgrid.hh>
 
@@ -78,7 +79,8 @@ private:
 
 public:
     EclPolyhedralGridVanguard(Simulator& simulator)
-        : EclBaseVanguard<TypeTag>(simulator)
+        : EclBaseVanguard<TypeTag>(simulator),
+          simulator_( simulator )
     {
         this->callImplementationInit();
     }
@@ -147,6 +149,24 @@ public:
     const CartesianIndexMapper& equilCartesianIndexMapper() const
     { return *cartesianIndexMapper_; }
 
+
+    /*!
+     * \brief Free the memory occupied by the global transmissibility object.
+     *
+     * After writing the initial solution, this array should not be necessary anymore.
+     */
+    void releaseGlobalTransmissibilities()
+    {
+    }
+
+    std::unordered_set<std::string> defunctWellNames() const
+    { return defunctWellNames_; }
+
+    const EclTransmissibility<TypeTag>& globalTransmissibility() const
+    {
+        return simulator_.problem().eclTransmissibilities();
+    }
+
 protected:
     void createGrids_()
     {
@@ -162,8 +182,12 @@ protected:
         // not handling the removal of completions for this type of grid yet.
     }
 
+    Simulator& simulator_;
+
     GridPointer grid_;
     CartesianIndexMapperPointer cartesianIndexMapper_;
+
+    std::unordered_set<std::string> defunctWellNames_;
 };
 
 } // namespace Opm

ebos/eclwriter.hh

@@ -148,6 +148,7 @@ class EclWriter
     typedef typename GET_PROP_TYPE(TypeTag, Vanguard) Vanguard;
     typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
     typedef typename GET_PROP_TYPE(TypeTag, Grid) Grid;
+    typedef typename GET_PROP_TYPE(TypeTag, EquilGrid) EquilGrid;
     typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
     typedef typename GET_PROP_TYPE(TypeTag, ElementContext) ElementContext;
     typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem;
@@ -180,10 +181,8 @@ public:
         , eclOutputModule_(simulator, collectToIORank_)
     {
         if (collectToIORank_.isIORank()) {
-            globalGrid_ = simulator_.vanguard().grid();
-            globalGrid_.switchToGlobalView();
             eclIO_.reset(new Opm::EclipseIO(simulator_.vanguard().eclState(),
-                                            Opm::UgGridHelpers::createEclipseGrid(globalGrid_, simulator_.vanguard().eclState().getInputGrid()),
+                                            Opm::UgGridHelpers::createEclipseGrid(globalGrid(), simulator_.vanguard().eclState().getInputGrid()),
                                             simulator_.vanguard().schedule(),
                                             simulator_.vanguard().summaryConfig()));
         }
@@ -206,14 +205,19 @@ public:
         return *eclIO_;
     }
 
+    const EquilGrid& globalGrid() const
+    {
+        return simulator_.vanguard().equilGrid();
+    }
+
     void writeInit()
     {
         if (collectToIORank_.isIORank()) {
             std::map<std::string, std::vector<int> > integerVectors;
             if (collectToIORank_.isParallel())
                 integerVectors.emplace("MPI_RANK", collectToIORank_.globalRanks());
-            auto cartMap = Opm::cartesianToCompressed(globalGrid_.size(0),
+            auto cartMap = Opm::cartesianToCompressed(globalGrid().size(0),
-                                                      Opm::UgGridHelpers::globalCell(globalGrid_));
+                                                      Opm::UgGridHelpers::globalCell(globalGrid()));
             eclIO_->writeInitial(computeTrans_(cartMap), integerVectors, exportNncStructure_(cartMap));
         }
     }
@@ -476,7 +480,7 @@ private:
 
     Opm::data::Solution computeTrans_(const std::unordered_map<int,int>& cartesianToActive) const
     {
-        const auto& cartMapper = simulator_.vanguard().cartesianIndexMapper();
+        const auto& cartMapper = simulator_.vanguard().equilCartesianIndexMapper();
         const auto& cartDims = cartMapper.cartesianDimensions();
         const int globalSize = cartDims[0]*cartDims[1]*cartDims[2];
 
@@ -490,8 +494,8 @@ private:
             tranz.data[0] = 0.0;
         }
 
-        typedef typename Grid :: LeafGridView  GlobalGridView;
+        typedef typename EquilGrid :: LeafGridView  GlobalGridView;
-        const GlobalGridView& globalGridView = globalGrid_.leafGridView();
+        const GlobalGridView& globalGridView = globalGrid().leafGridView();
 #if DUNE_VERSION_NEWER(DUNE_GRID, 2,6)
         typedef Dune::MultipleCodimMultipleGeomTypeMapper<GlobalGridView> ElementMapper;
         ElementMapper globalElemMapper(globalGridView, Dune::mcmgElementLayout());
@@ -500,7 +504,6 @@ private:
         ElementMapper globalElemMapper(globalGridView);
 #endif
 
-        const auto& cartesianCellIdx = globalGrid_.globalCell();
         const EclTransmissibility<TypeTag>* globalTrans;
 
         if (!collectToIORank_.isParallel())
@@ -538,9 +541,12 @@ private:
                     continue; // we only need to handle each connection once, thank you.
 
                 // Ordering of compressed and uncompressed index should be the same
-                assert(cartesianCellIdx[c1] <= cartesianCellIdx[c2]);
+                const int cartIdx1 = cartMapper.cartesianIndex( c1 );
-                int gc1 = std::min(cartesianCellIdx[c1], cartesianCellIdx[c2]);
+                const int cartIdx2 = cartMapper.cartesianIndex( c2 );
-                int gc2 = std::max(cartesianCellIdx[c1], cartesianCellIdx[c2]);
+                // Ordering of compressed and uncompressed index should be the same
+                assert(cartIdx1 <= cartIdx2);
+                int gc1 = std::min(cartIdx1, cartIdx2);
+                int gc2 = std::max(cartIdx1, cartIdx2);
 
                 if (gc2 - gc1 == 1) {
                     tranx.data[gc1] = globalTrans->transmissibility(c1, c2);
@@ -595,8 +601,8 @@ private:
         // Checked when writing NNC transmissibilities from the simulation.
         std::sort(nncData.begin(), nncData.end(), nncCompare);
 
-        typedef typename Grid :: LeafGridView  GlobalGridView;
+        typedef typename EquilGrid :: LeafGridView  GlobalGridView;
-        const GlobalGridView& globalGridView = globalGrid_.leafGridView();
+        const GlobalGridView& globalGridView = globalGrid().leafGridView();
 #if DUNE_VERSION_NEWER(DUNE_GRID, 2,6)
         typedef Dune::MultipleCodimMultipleGeomTypeMapper<GlobalGridView> ElementMapper;
         ElementMapper globalElemMapper(globalGridView, Dune::mcmgElementLayout());
@@ -621,7 +627,10 @@ private:
             globalTrans = &(simulator_.vanguard().globalTransmissibility());
         }
 
-        auto cartDims = simulator_.vanguard().cartesianIndexMapper().cartesianDimensions();
+        // Cartesian index mapper for the serial I/O grid
+        const auto& equilCartMapper =  simulator_.vanguard().equilCartesianIndexMapper();
+
+        const auto& cartDims = simulator_.vanguard().cartesianIndexMapper().cartesianDimensions();
         auto elemIt = globalGridView.template begin</*codim=*/0>();
         const auto& elemEndIt = globalGridView.template end</*codim=*/0>();
         for (; elemIt != elemEndIt; ++ elemIt) {
@@ -641,11 +650,8 @@ private:
                 if (c1 > c2)
                     continue; // we only need to handle each connection once, thank you.
 
-                // TODO (?): use the cartesian index mapper to make this code work
+                std::size_t cc1 = equilCartMapper.cartesianIndex( c1 ); //globalIOGrid_.globalCell()[c1];
-                // with grids other than Dune::CpGrid. The problem is that we need
+                std::size_t cc2 = equilCartMapper.cartesianIndex( c2 ); //globalIOGrid_.globalCell()[c2];
-                // the a mapper for the sequential grid, not for the distributed one.
-                std::size_t cc1 = globalGrid_.globalCell()[c1];
-                std::size_t cc2 = globalGrid_.globalCell()[c2];
 
                 if ( cc2 < cc1 )
                     std::swap(cc1, cc2);
@@ -733,7 +739,6 @@ private:
     CollectDataToIORankType collectToIORank_;
     EclOutputBlackOilModule<TypeTag> eclOutputModule_;
     std::unique_ptr<Opm::EclipseIO> eclIO_;
-    Grid globalGrid_;
     std::unique_ptr<TaskletRunner> taskletRunner_;
     Scalar restartTimeStepSize_;
 

opm/simulators/linalg/ExtractParallelGridInformationToISTL.hpp

@@ -39,6 +39,11 @@ namespace Opm
 
 void extractParallelGridInformationToISTL(const Dune::CpGrid& grid, boost::any& anyComm);
 
+// Grid is not CpGrid --> do nothing.
+template <class Grid>
+void extractParallelGridInformationToISTL(const Grid&, boost::any&)
+{}
+
 } // end namespace Opm
 #endif //defined(HAVE_OPM_GRID)
 #endif // OPM_EXTRACTPARALLELGRIDINFORMATIONTOISTL_HEADER_INCLUDED

opm/simulators/linalg/ISTLSolverEbos.hpp

@@ -240,7 +240,7 @@ protected:
         {
             parameters_.template init<TypeTag>();
             extractParallelGridInformationToISTL(simulator_.vanguard().grid(), parallelInformation_);
-            auto gridForConn = simulator_.vanguard().grid();
+            const auto& gridForConn = simulator_.vanguard().grid();
             const auto wellsForConn = simulator_.vanguard().schedule().getWellsatEnd();
             const bool useWellConn = EWOMS_GET_PARAM(TypeTag, bool, MatrixAddWellContributions);
 
@@ -648,15 +648,15 @@ protected:
         /// Create sparsity pattern of matrix without off-diagonal ghost entries.
         void noGhostAdjacency()
         {
-            auto grid = simulator_.vanguard().grid();
+            const auto& grid = simulator_.vanguard().grid();
             typedef typename Matrix::size_type size_type;
-            size_type numCells = grid.numCells();
+            size_type numCells = grid.size( 0 );
             noGhostMat_.reset(new Matrix(numCells, numCells, Matrix::random));
 
             std::vector<std::set<size_type>> pattern;
-            pattern.resize(grid.numCells());
+            pattern.resize(numCells);
 
-            auto lid = grid.localIdSet();   
+            const auto& lid = grid.localIdSet();
             const auto& gridView = grid.leafGridView();
             auto elemIt = gridView.template begin<0>();
             const auto& elemEndIt = gridView.template end<0>();

opm/simulators/linalg/findOverlapRowsAndColumns.hpp

@@ -43,15 +43,17 @@ namespace detail
     {
         if ( grid.comm().size() > 1)
         {
-            wellGraph.resize(grid.numCells());
+            Dune::CartesianIndexMapper< Grid > cartMapper( grid );
+            const int numCells = cartMapper.compressedSize(); // grid.numCells()
+            wellGraph.resize(numCells);
 
             if (useWellConn) {
-                const auto& cpgdim = grid.logicalCartesianSize();
+                const auto& cpgdim = cartMapper.cartesianDimensions();
 
                 std::vector<int> cart(cpgdim[0]*cpgdim[1]*cpgdim[2], -1);
 
-                for( int i=0; i < grid.numCells(); ++i )
+                for( int i=0; i < numCells; ++i )
-                    cart[grid.globalCell()[i]] = i;
+                    cart[ cartMapper.cartesianIndex( i ) ] = i;
 
                 Dune::cpgrid::WellConnections well_indices;
                 well_indices.init(wells, cpgdim, cart);
@@ -88,7 +90,7 @@ namespace detail
         if ( grid.comm().size() > 1)
         {
             //Numbering of cells
-            auto lid = grid.localIdSet();
+            const auto& lid = grid.localIdSet();
 
             const auto& gridView = grid.leafGridView();
             auto elemIt = gridView.template begin<0>();

opm/simulators/wells/BlackoilWellModel_impl.hpp

@@ -1508,8 +1508,7 @@ namespace Opm {
 
         depth_.resize(numCells);
         for (unsigned cellIdx = 0; cellIdx < numCells; ++cellIdx) {
-            depth_[cellIdx] =
+            depth_[cellIdx] = Opm::UgGridHelpers::cellCenterDepth( grid, cellIdx );
-                grid.cellCenterDepth(cellIdx);
         }
     }