--fixed option for edge conformal

OPM · Dec 20, 2024 · 0f1163c · 0f1163c
1 parent 04ee006
commit 0f1163c
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 4 deletions.
diff --git a/opm/simulators/flow/FlowGenericVanguard.cpp b/opm/simulators/flow/FlowGenericVanguard.cpp
@@ -423,6 +423,8 @@ void FlowGenericVanguard::registerParameters_()
 
     Parameters::Register<Parameters::OwnerCellsFirst>
         ("Order cells owned by rank before ghost/overlap cells.");
+    Parameters::Register<Parameters::EdgeConformal>
+        ("Edge conformal cornerpoint processing.");
 #if HAVE_MPI
     Parameters::Register<Parameters::PartitionMethod>
         ("Choose partitioning strategy: 0=simple, 1=Zoltan, 2=METIS.");

diff --git a/opm/simulators/flow/FlowGenericVanguard.hpp b/opm/simulators/flow/FlowGenericVanguard.hpp
@@ -254,9 +254,10 @@ class FlowGenericVanguard {
     bool ownersFirst() const
     { return ownersFirst_; }
 
-#if HAVE_MPI
     bool edgeConformal() const
     { return edgeConformal_; }
+
+#if HAVE_MPI
     /*!
      * \brief Parameter deciding which partition method to use
      */
@@ -351,8 +352,9 @@ class FlowGenericVanguard {
 #endif
 
     bool ownersFirst_;
-#if HAVE_MPI
     bool edgeConformal_;
+
+#if HAVE_MPI
     Dune::PartitionMethod partitionMethod_;
     bool serialPartitioning_;
     double imbalanceTol_;

diff --git a/opm/simulators/flow/FlowProblemBlackoil.hpp b/opm/simulators/flow/FlowProblemBlackoil.hpp
@@ -567,9 +567,10 @@ class FlowProblemBlackoil : public FlowProblem<TypeTag>
 
         using GridType = std::remove_cv_t<std::remove_reference_t<decltype(grid)>>;
         constexpr bool isCpGrid = std::is_same_v<GridType, Dune::CpGrid>;
+
         // Skip - for now -  calculate the initial fip values for CpGrid with LGRs.
         if (!isCpGrid || (grid.maxLevel() == 0)) {
-            if (this->simulator().episodeIndex() == 0) {
+            if ((this->simulator().episodeIndex() == 0) && this->enableEclOutput_) {
                 eclWriter_->writeInitialFIPReport();
             }
         }

diff --git a/opm/simulators/flow/PolyhedralGridVanguard.hpp b/opm/simulators/flow/PolyhedralGridVanguard.hpp
@@ -239,7 +239,7 @@ class PolyhedralGridVanguard : public FlowBaseVanguard<TypeTag>
 protected:
     void createGrids_()
     {
-        grid_ = std::make_unique<Grid>(this->eclState().getInputGrid(), this->eclState().fieldProps().porv(true));
+        grid_ = std::make_unique<Grid>(this->eclState().getInputGrid(), this->eclState().fieldProps().porv(true), this->edgeConformal());
         cartesianIndexMapper_ = std::make_unique<CartesianIndexMapper>(*grid_);
         this->updateGridView_();
         this->updateCartesianToCompressedMapping_();