Merge pull request #2912 from totto82/polyhedrealgrid

Make a flow version that uses the polyhedreal grid

ebos/eclpolyhedralgridvanguard.hh

@@ -183,10 +183,7 @@ public:
 protected:
     void createGrids_()
     {
-        const auto& gridProps = this->eclState().get3DProperties();
-        const std::vector<double>& porv = gridProps.getDoubleGridProperty("PORV").getData();
-
-        grid_ = new Grid(this->deck(), porv);
+        grid_ = new Grid(this->eclState().getInputGrid(), this->eclState().fieldProps().porv(true));
         cartesianIndexMapper_ = new CartesianIndexMapper(*grid_);
     }
 

ebos/eclproblem.hh

@@ -47,10 +47,12 @@
 
 #if EBOS_USE_ALUGRID
 #include "eclalugridvanguard.hh"
+#elif USE_POLYHEDRALGRID
+#include "eclpolyhedralgridvanguard.hh"
 #else
-//#include "eclpolyhedralgridvanguard.hh"
 #include "eclcpgridvanguard.hh"
 #endif
+
 #include "eclwellmanager.hh"
 #include "eclequilinitializer.hh"
 #include "eclwriter.hh"
@@ -124,13 +126,14 @@ namespace TTag {
 struct EclBaseProblem {
   using InheritstFrom = std::tuple<VtkEclTracer, EclOutputBlackOil, EclAluGridVanguard>;
 };
+#elif USE_POLYHEDRALGRID
+struct EclBaseProblem {
+  using InheritsFrom = std::tuple<VtkEclTracer, EclOutputBlackOil, EclPolyhedralGridVanguard>;
+};
 #else
 struct EclBaseProblem {
   using InheritsFrom = std::tuple<VtkEclTracer, EclOutputBlackOil, EclCpGridVanguard>;
 };
-//struct EclBaseProblem {
-//    using InheritsFrom = std::tuple<VtkEclTracer, EclOutputBlackOil, EclPolyhedralGridVanguard>;
-//};
 #endif
 }
 

ebos/eclwriter.hh

@@ -425,7 +425,6 @@ public:
             Opm::Action::State& actionState = simulator_.vanguard().actionState();
             auto restartValues = loadParallelRestart(eclIO_.get(), actionState, summaryState, solutionKeys, extraKeys,
                                                      gridView.grid().comm());
-
             for (unsigned elemIdx = 0; elemIdx < numElements; ++elemIdx) {
                 unsigned globalIdx = collectToIORank_.localIdxToGlobalIdx(elemIdx);
                 eclOutputModule_.setRestart(restartValues.solution, elemIdx, globalIdx);