Pass optional variable allow_deactive_cells=true to grid constructor

OPM · Oct 4, 2019 · 89d76dd · 89d76dd
1 parent b629ae7
commit 89d76dd
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/opm/porsol/common/setupGridAndProps.hpp b/opm/porsol/common/setupGridAndProps.hpp
@@ -91,7 +91,7 @@ namespace Opm
             bool turn_normals = param.getDefault<bool>("turn_normals", false);
             {
                 Opm::EclipseGrid inputGrid(deck);
-                grid.processEclipseFormat(inputGrid, periodic_extension, turn_normals, clip_z);
+                grid.processEclipseFormat(inputGrid, periodic_extension, turn_normals, clip_z, {}, {}, true);
             }
             // Save EGRID file in case we are writing ECL output.
             if (param.getDefault("output_ecl", false)) {
@@ -161,7 +161,7 @@ namespace Opm
     {
         Opm::EclipseGrid eg(deck);
         const std::string* rl_ptr = (rock_list == "no_list") ? 0 : &rock_list;
-        grid.processEclipseFormat(eg, periodic_extension, turn_normals, clip_z);
+        grid.processEclipseFormat(eg, periodic_extension, turn_normals, clip_z, {}, {}, true);
         res_prop.init(deck, grid.globalCell(), perm_threshold, rl_ptr, use_jfunction_scaling, sigma, theta);
         if (unique_bids) {
             grid.setUniqueBoundaryIds(true);

diff --git a/opm/upscaling/initCPGrid.cpp b/opm/upscaling/initCPGrid.cpp
@@ -61,7 +61,13 @@ void Opm::initCPGrid(Dune::CpGrid& grid, const Opm::ParameterGroup& param) {
         Opm::Parser parser;
         auto deck = parser.parseFile(filename);
         Opm::EclipseGrid inputGrid(deck);
-        grid.processEclipseFormat(inputGrid, periodic_extension , turn_normals );
+        grid.processEclipseFormat(inputGrid,
+                                  periodic_extension,
+                                  turn_normals,
+                                  false, // clip_z
+                                  {},    // porevolume
+                                  {},    // NNCFace
+                                  true);
     } else if (fileformat == "cartesian") {
         std::array<int, 3> dims = {{ param.getDefault<int>("nx", 1),
                                      param.getDefault<int>("ny", 1),