Read DISGAS and VAPOIL from deck and pass them to the simulator

examples/sim_fibo_ad.cpp

@@ -218,7 +218,10 @@ try
                                                  rock_comp->isActive() ? rock_comp.get() : 0,
                                                  wells,
                                                  *fis_solver,
-                                                 grav);
+                                                 grav,
+                                                 deck->hasKeyword("DISGAS"),
+                                                 deck->hasKeyword("VAPOIL") );
+
         SimulatorReport episodeReport = simulator.run(simtimer, state, well_state);
 
         ++simtimer;

examples/test_implicit_ad.cpp

@@ -104,7 +104,7 @@ try
 
     Opm::NewtonIterationBlackoilSimple fis_solver(param);
 
-    Opm::FullyImplicitBlackoilSolver<UnstructuredGrid> solver(param, *g, props, geo, 0, *wells, fis_solver);
+    Opm::FullyImplicitBlackoilSolver<UnstructuredGrid> solver(param, *g, props, geo, 0, *wells, fis_solver, /*hasDisgas*/ true, /*hasVapoil=*/false);
 
     Opm::BlackoilState state;
     initStateBasic(*g, props0, param, 0.0, state);

opm/autodiff/BlackoilPropsAdFromDeck.cpp

@@ -94,6 +94,8 @@ namespace Opm
 
         phase_usage_ = phaseUsageFromDeck(deck);
 
+
+
         // Surface densities. Accounting for different orders in eclipse and our code.
         Opm::DeckKeywordConstPtr densityKeyword = deck->getKeyword("DENSITY");
         int numRegions = densityKeyword->size();

opm/autodiff/BlackoilPropsAdFromDeck.hpp

@@ -360,6 +360,8 @@ namespace Opm
         std::unique_ptr<SaturationPropsInterface> satprops_;
 
         PhaseUsage phase_usage_;
+        bool has_vapoil_;
+        bool has_disgas_;
 
         // The PVT region which is to be used for each cell
         std::vector<int> cellPvtRegionIdx_;

opm/autodiff/FullyImplicitBlackoilSolver.hpp

@@ -70,7 +70,9 @@ namespace Opm {
                                     const DerivedGeology&           geo  ,
                                     const RockCompressibility*      rock_comp_props,
                                     const Wells&                    wells,
-                                    const NewtonIterationBlackoilInterface& linsolver);
+                                    const NewtonIterationBlackoilInterface& linsolver,
+                                    const bool has_disgas,
+                                    const bool has_vapoil );
 
         /// Take a single forward step, modifiying
         ///   state.pressure()
@@ -144,6 +146,8 @@ namespace Opm {
         HelperOps                       ops_;
         const WellOps                   wops_;
         const M                         grav_;
+        const bool has_disgas_;
+        const bool has_vapoil_;
         double                          dp_max_rel_;
         double                          ds_max_;
         double                          drs_max_rel_;

opm/autodiff/FullyImplicitBlackoilSolver_impl.hpp

@@ -219,7 +219,9 @@ namespace {
                                 const DerivedGeology&           geo  ,
                                 const RockCompressibility*      rock_comp_props,
                                 const Wells&                    wells,
-                                const NewtonIterationBlackoilInterface&    linsolver)
+                                const NewtonIterationBlackoilInterface&    linsolver,
+                                const bool has_disgas,
+                                const bool has_vapoil)
         : grid_  (grid)
         , fluid_ (fluid)
         , geo_   (geo)
@@ -232,6 +234,8 @@ namespace {
         , ops_   (grid)
         , wops_  (wells)
         , grav_  (gravityOperator(grid_, ops_, geo_))
+        , has_disgas_(has_disgas)
+        , has_vapoil_(has_vapoil)
         , dp_max_rel_ (1.0e9)
         , ds_max_ (0.2)
         , drs_max_rel_ (1.0e9)

opm/autodiff/SimulatorFullyImplicitBlackoil.hpp

@@ -74,7 +74,9 @@ namespace Opm
                                        const RockCompressibility* rock_comp_props,
                                        WellsManager& wells_manager,
                                        NewtonIterationBlackoilInterface& linsolver,
-                                       const double* gravity);
+                                       const double* gravity,
+                                       const bool disgas,
+                                       const bool vapoil );
 
         /// Run the simulation.
         /// This will run succesive timesteps until timer.done() is true. It will

opm/autodiff/SimulatorFullyImplicitBlackoil_impl.hpp

@@ -66,7 +66,9 @@ namespace Opm
              const RockCompressibility* rock_comp_props,
              WellsManager& wells_manager,
              NewtonIterationBlackoilInterface& linsolver,
-             const double* gravity);
+             const double* gravity,
+             bool has_disgas,
+             bool has_vapoil );
 
         SimulatorReport run(SimulatorTimer& timer,
                             BlackoilState& state,
@@ -107,10 +109,12 @@ namespace Opm
                                                                    const RockCompressibility* rock_comp_props,
                                                                    WellsManager& wells_manager,
                                                                    NewtonIterationBlackoilInterface& linsolver,
-                                                                   const double* gravity)
+                                                                   const double* gravity,
+                                                                   const bool has_disgas,
+                                                                   const bool has_vapoil )
 
     {
-        pimpl_.reset(new Impl(param, grid, props, rock_comp_props, wells_manager, linsolver, gravity));
+        pimpl_.reset(new Impl(param, grid, props, rock_comp_props, wells_manager, linsolver, gravity, has_disgas, has_vapoil));
     }
 
 
@@ -192,7 +196,9 @@ namespace Opm
                                                const RockCompressibility* rock_comp_props,
                                                WellsManager& wells_manager,
                                                NewtonIterationBlackoilInterface& linsolver,
-                                               const double* gravity)
+                                               const double* gravity,
+                                               const bool has_disgas,
+                                               const bool has_vapoil)
         : grid_(grid),
           props_(props),
           rock_comp_props_(rock_comp_props),
@@ -200,7 +206,7 @@ namespace Opm
           wells_(wells_manager.c_wells()),
           gravity_(gravity),
           geo_(grid_, props_, gravity_),
-          solver_(param, grid_, props_, geo_, rock_comp_props, *wells_manager.c_wells(), linsolver)
+          solver_(param, grid_, props_, geo_, rock_comp_props, *wells_manager.c_wells(), linsolver, has_disgas, has_vapoil)
           /*                   param.getDefault("nl_pressure_residual_tolerance", 0.0),
                                param.getDefault("nl_pressure_change_tolerance", 1.0),
                                param.getDefault("nl_pressure_maxiter", 10),