remove the BlackoilPropsAdInterface abstraction layer

instead, directly use BlackoilPropsAdFromDeck.

CMakeLists_files.cmake

@@ -26,7 +26,6 @@
 # originally generated with the command:
 # find opm -name '*.c*' -printf '\t%p\n' | sort
 list (APPEND MAIN_SOURCE_FILES
-  opm/autodiff/BlackoilPropsAdInterface.cpp
   opm/autodiff/ExtractParallelGridInformationToISTL.cpp
   opm/autodiff/NewtonIterationBlackoilCPR.cpp
   opm/autodiff/NewtonIterationBlackoilInterleaved.cpp
@@ -156,7 +155,6 @@ list (APPEND PUBLIC_HEADER_FILES
   opm/autodiff/BlackoilPressureModel.hpp
   opm/autodiff/BlackoilPropsAdFromDeck.hpp
   opm/autodiff/SolventPropsAdFromDeck.hpp
-  opm/autodiff/BlackoilPropsAdInterface.hpp
   opm/autodiff/Compat.hpp
   opm/autodiff/CPRPreconditioner.hpp
   opm/autodiff/createGlobalCellArray.hpp

examples/opm_init_check.cpp

@@ -44,7 +44,7 @@
 
 #include <opm/autodiff/GeoProps.hpp>
 #include <opm/autodiff/SimulatorFullyImplicitBlackoil.hpp>
-#include <opm/autodiff/BlackoilPropsAdInterface.hpp>
+#include <opm/autodiff/BlackoilPropsAdFromDeck.hpp>
 #include <opm/autodiff/BlackoilPropsAdFromDeck.hpp>
 
 
@@ -211,7 +211,7 @@ void initOPMTrans(TransGraph& opmTrans, const Deck& deck, const EclipseState& ec
     std::shared_ptr<GridManager> grid = std::make_shared<GridManager>( eclipseState.getInputGrid(),
             eclipseState.get3DProperties().getDoubleGridProperty( "PORV" ).getData() );
     const struct UnstructuredGrid * cGrid = grid->c_grid();
-    std::shared_ptr<BlackoilPropsAdInterface> props;
+    std::shared_ptr<BlackoilPropsAdFromDeck> props;
 
     props.reset(new BlackoilPropsAdFromDeck(deck, eclipseState, *grid->c_grid()));
     DerivedGeology geology(*grid->c_grid() , *props, eclipseState, false);

examples/sim_poly_fi2p_comp_ad.cpp

@@ -57,7 +57,7 @@
 #include <opm/polymer/PolymerState.hpp>
 
 #include <opm/autodiff/BlackoilPropsAdFromDeck.hpp>
-#include <opm/autodiff/BlackoilPropsAdInterface.hpp>
+#include <opm/autodiff/BlackoilPropsAdFromDeck.hpp>
 #include <opm/autodiff/GeoProps.hpp>
 #include <opm/autodiff/GridHelpers.hpp>
 
@@ -113,7 +113,7 @@ try
     }
     std::shared_ptr<GridManager> grid;
     std::shared_ptr<BlackoilPropertiesInterface> props;
-    std::shared_ptr<BlackoilPropsAdInterface> new_props;
+    std::shared_ptr<BlackoilPropsAdFromDeck> new_props;
     std::shared_ptr<RockCompressibility> rock_comp;
     std::unique_ptr<PolymerBlackoilState> state;
     // bool check_well_controls = false;

opm/autodiff/BlackoilModel.hpp

@@ -62,7 +62,7 @@ namespace Opm {
         /// \param[in] terminal_output  request output to cout/cerr
         BlackoilModel(const typename Base::ModelParameters&   param,
                       const Grid&                             grid,
-                      const BlackoilPropsAdInterface&         fluid,
+                      const BlackoilPropsAdFromDeck&          fluid,
                       const DerivedGeology&                   geo,
                       const RockCompressibility*              rock_comp_props,
                       const StandardWells&                    std_wells,

opm/autodiff/BlackoilModelBase.hpp

@@ -27,7 +27,7 @@
 
 #include <opm/autodiff/AutoDiffBlock.hpp>
 #include <opm/autodiff/AutoDiffHelpers.hpp>
-#include <opm/autodiff/BlackoilPropsAdInterface.hpp>
+#include <opm/autodiff/BlackoilPropsAdFromDeck.hpp>
 #include <opm/autodiff/LinearisedBlackoilResidual.hpp>
 #include <opm/autodiff/NewtonIterationBlackoilInterface.hpp>
 #include <opm/autodiff/BlackoilModelEnums.hpp>
@@ -117,7 +117,7 @@ namespace Opm {
 
         // For the conversion between the surface volume rate and resrevoir voidage rate
         using RateConverterType = RateConverter::
-                                  SurfaceToReservoirVoidage<BlackoilPropsAdInterface, std::vector<int> >;
+                                  SurfaceToReservoirVoidage<BlackoilPropsAdFromDeck, std::vector<int> >;
 
         // ---------  Public methods  ---------
 
@@ -138,7 +138,7 @@ namespace Opm {
         /// \param[in] terminal_output  request output to cout/cerr
         BlackoilModelBase(const ModelParameters&          param,
                           const Grid&                     grid ,
-                          const BlackoilPropsAdInterface& fluid,
+                          const BlackoilPropsAdFromDeck&  fluid,
                           const DerivedGeology&           geo  ,
                           const RockCompressibility*      rock_comp_props,
                           const WellModel&                well_model,
@@ -297,7 +297,7 @@ namespace Opm {
         // ---------  Data members  ---------
 
         const Grid&         grid_;
-        const BlackoilPropsAdInterface& fluid_;
+        const BlackoilPropsAdFromDeck& fluid_;
         const DerivedGeology&           geo_;
         const RockCompressibility*      rock_comp_props_;
         VFPProperties                   vfp_properties_;

opm/autodiff/BlackoilModelBase_impl.hpp

@@ -32,7 +32,7 @@
 #include <opm/autodiff/AutoDiffHelpers.hpp>
 #include <opm/autodiff/GridHelpers.hpp>
 #include <opm/autodiff/WellHelpers.hpp>
-#include <opm/autodiff/BlackoilPropsAdInterface.hpp>
+#include <opm/autodiff/BlackoilPropsAdFromDeck.hpp>
 #include <opm/autodiff/GeoProps.hpp>
 #include <opm/autodiff/WellDensitySegmented.hpp>
 #include <opm/autodiff/VFPProperties.hpp>
@@ -101,7 +101,7 @@ typedef Eigen::Array<double,
     BlackoilModelBase<Grid, WellModel, Implementation>::
     BlackoilModelBase(const ModelParameters&          param,
                   const Grid&                     grid ,
-                  const BlackoilPropsAdInterface& fluid,
+                  const BlackoilPropsAdFromDeck& fluid,
                   const DerivedGeology&           geo  ,
                   const RockCompressibility*      rock_comp_props,
                   const WellModel&                well_model,

opm/autodiff/BlackoilModelEbos.hpp

@@ -33,7 +33,7 @@
 #include <opm/autodiff/AutoDiffHelpers.hpp>
 #include <opm/autodiff/GridHelpers.hpp>
 #include <opm/autodiff/WellHelpers.hpp>
-#include <opm/autodiff/BlackoilPropsAdInterface.hpp>
+#include <opm/autodiff/BlackoilPropsAdFromDeck.hpp>
 #include <opm/autodiff/GeoProps.hpp>
 #include <opm/autodiff/WellDensitySegmented.hpp>
 #include <opm/autodiff/VFPProperties.hpp>
@@ -169,7 +169,7 @@ namespace Opm {
         /// \param[in] terminal_output  request output to cout/cerr
         BlackoilModelEbos(Simulator& ebosSimulator,
                           const ModelParameters&          param,
-                          const BlackoilPropsAdInterface& fluid,
+                          const BlackoilPropsAdFromDeck& fluid,
                           const DerivedGeology&           geo  ,
                           const StandardWellsDense<FluidSystem, BlackoilIndices>& well_model,
                           const NewtonIterationBlackoilInterface& linsolver,
@@ -1209,7 +1209,7 @@ namespace Opm {
         Simulator& ebosSimulator_;
         const Grid&            grid_;
         const ISTLSolverType*  istlSolver_;
-        const BlackoilPropsAdInterface& fluid_;
+        const BlackoilPropsAdFromDeck& fluid_;
         const DerivedGeology&           geo_;
         VFPProperties                   vfp_properties_;
         // For each canonical phase -> true if active

opm/autodiff/BlackoilMultiSegmentModel.hpp

@@ -83,7 +83,7 @@ namespace Opm {
         /// \param[in] wells_multisegment a vector of multisegment wells
         BlackoilMultiSegmentModel(const typename Base::ModelParameters&  param,
                           const Grid&                     grid ,
-                          const BlackoilPropsAdInterface& fluid,
+                          const BlackoilPropsAdFromDeck& fluid,
                           const DerivedGeology&           geo  ,
                           const RockCompressibility*      rock_comp_props,
                           const MultisegmentWells&        well_model,

opm/autodiff/BlackoilMultiSegmentModel_impl.hpp

@@ -25,7 +25,7 @@
 #include <opm/autodiff/AutoDiffBlock.hpp>
 #include <opm/autodiff/AutoDiffHelpers.hpp>
 #include <opm/autodiff/GridHelpers.hpp>
-#include <opm/autodiff/BlackoilPropsAdInterface.hpp>
+#include <opm/autodiff/BlackoilPropsAdFromDeck.hpp>
 #include <opm/autodiff/GeoProps.hpp>
 #include <opm/autodiff/WellDensitySegmented.hpp>
 #include <opm/autodiff/VFPProperties.hpp>
@@ -59,7 +59,7 @@ namespace Opm {
     BlackoilMultiSegmentModel<Grid>::
     BlackoilMultiSegmentModel(const typename Base::ModelParameters&  param,
                   const Grid&                     grid ,
-                  const BlackoilPropsAdInterface& fluid,
+                  const BlackoilPropsAdFromDeck& fluid,
                   const DerivedGeology&           geo  ,
                   const RockCompressibility*      rock_comp_props,
                   const MultisegmentWells&        well_model,

opm/autodiff/BlackoilPressureModel.hpp

@@ -66,7 +66,7 @@ namespace Opm {
         /// \param[in] terminal_output  request output to cout/cerr
         BlackoilPressureModel(const typename Base::ModelParameters&   param,
                               const Grid&                             grid,
-                              const BlackoilPropsAdInterface&         fluid,
+                              const BlackoilPropsAdFromDeck&         fluid,
                               const DerivedGeology&                   geo,
                               const RockCompressibility*              rock_comp_props,
                               const StandardWells&                    std_wells,

opm/autodiff/BlackoilPropsAdFromDeck.hpp

@@ -22,16 +22,13 @@
 #ifndef OPM_BLACKOILPROPSADFROMDECK_HEADER_INCLUDED
 #define OPM_BLACKOILPROPSADFROMDECK_HEADER_INCLUDED
 
-#include <opm/autodiff/BlackoilPropsAdInterface.hpp>
 #include <opm/autodiff/AutoDiffBlock.hpp>
 #include <opm/autodiff/BlackoilModelEnums.hpp>
 
 #include <opm/core/props/satfunc/SaturationPropsFromDeck.hpp>
 #include <opm/core/props/rock/RockFromDeck.hpp>
 
-#include <opm/material/fluidsystems/blackoilpvt/GasPvtMultiplexer.hpp>
+#include <opm/material/fluidsystems/BlackOilFluidSystem.hpp>
-#include <opm/material/fluidsystems/blackoilpvt/OilPvtMultiplexer.hpp>
-#include <opm/material/fluidsystems/blackoilpvt/WaterPvtMultiplexer.hpp>
 #include <opm/material/densead/Math.hpp>
 #include <opm/material/densead/Evaluation.hpp>
 
@@ -61,7 +58,7 @@ namespace Opm
     /// taking an AD type and returning the same. Derivatives are not
     /// returned separately by any method, only implicitly with the AD
     /// version of the methods.
-    class BlackoilPropsAdFromDeck : public BlackoilPropsAdInterface
+    class BlackoilPropsAdFromDeck
     {
         friend class BlackoilPropsDataHandle;
     public:

opm/autodiff/BlackoilPropsAdInterface.cpp

@@ -1,26 +0,0 @@
-/*
-  Copyright 2013 SINTEF ICT, Applied Mathematics.
-
-  This file is part of the Open Porous Media project (OPM).
-
-  OPM is free software: you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation, either version 3 of the License, or
-  (at your option) any later version.
-
-  OPM is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with OPM.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "config.h"
-
-#include <opm/autodiff/BlackoilPropsAdInterface.hpp>
-
-Opm::BlackoilPropsAdInterface::~BlackoilPropsAdInterface()
-{
-}

opm/autodiff/BlackoilPropsAdInterface.hpp

@@ -1,263 +0,0 @@
-/*
-  Copyright 2013 SINTEF ICT, Applied Mathematics.
-
-  This file is part of the Open Porous Media project (OPM).
-
-  OPM is free software: you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation, either version 3 of the License, or
-  (at your option) any later version.
-
-  OPM is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with OPM.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef OPM_BLACKOILPROPSADINTERFACE_HEADER_INCLUDED
-#define OPM_BLACKOILPROPSADINTERFACE_HEADER_INCLUDED
-
-#include <opm/autodiff/AutoDiffBlock.hpp>
-#include <opm/autodiff/BlackoilModelEnums.hpp>
-
-namespace Opm
-{
-
-    /// This class is intended to present a fluid interface for
-    /// three-phase black-oil that is easy to use with the AD-using
-    /// simulators.
-    ///
-    /// Most methods are available in two overloaded versions, one
-    /// taking a constant vector and returning the same, and one
-    /// taking an AD type and returning the same. Derivatives are not
-    /// returned separately by any method, only implicitly with the AD
-    /// version of the methods.
-    class BlackoilPropsAdInterface
-    {
-    public:
-        /// Virtual destructor for inheritance.
-        virtual ~BlackoilPropsAdInterface();
-
-        ////////////////////////////
-        //      Rock interface    //
-        ////////////////////////////
-
-        /// \return   D, the number of spatial dimensions.
-        virtual int numDimensions() const = 0;
-
-        /// \return   N, the number of cells.
-        virtual int numCells() const = 0;
-
-        /// \return   Array of N porosity values.
-        virtual const double* porosity() const = 0;
-
-        /// \return   Array of ND^2 permeability values.
-        ///           The D^2 permeability values for a cell are organized as a matrix,
-        ///           which is symmetric (so ordering does not matter).
-        virtual const double* permeability() const = 0;
-
-
-        ////////////////////////////
-        //      Fluid interface   //
-        ////////////////////////////
-
-        typedef AutoDiffBlock<double> ADB;
-        typedef ADB::V V;
-        typedef ADB::M M;
-        typedef std::vector<int> Cells;
-
-        /// \return   Number of active phases (also the number of components).
-        virtual int numPhases() const = 0;
-
-        /// \return   Object describing the active phases.
-        virtual PhaseUsage phaseUsage() const = 0;
-
-        // ------ Density ------
-
-        /// Densities of stock components at surface conditions.
-        /// \param[in] phaseIdx
-        /// \param[in] cells  Array of n cell indices to be associated with the pressure values.
-        /// \return Array of n density values for phase given by phaseIdx.
-        virtual V surfaceDensity(const int PhaseIdx, const Cells& cells) const = 0;
-
-
-        // ------ Viscosity ------
-
-        /// Water viscosity.
-        /// \param[in]  pw     Array of n water pressure values.
-        /// \param[in]  T      Array of n temperature values.
-        /// \param[in]  cells  Array of n cell indices to be associated with the pressure values.
-        /// \return            Array of n viscosity values.
-        virtual
-        ADB muWat(const ADB& pw,
-                  const ADB& T,
-                  const Cells& cells) const = 0;
-
-        /// Oil viscosity.
-        /// \param[in]  po     Array of n oil pressure values.
-        /// \param[in]  T      Array of n temperature values.
-        /// \param[in]  rs     Array of n gas solution factor values.
-        /// \param[in]  cond   Array of n objects, each specifying which phases are present with non-zero saturation in a cell.
-        /// \param[in]  cells  Array of n cell indices to be associated with the pressure values.
-        /// \return            Array of n viscosity values.
-        virtual
-        ADB muOil(const ADB& po,
-                  const ADB& T,
-                  const ADB& rs,
-                  const std::vector<PhasePresence>& cond,
-                  const Cells& cells) const = 0;
-
-        /// Gas viscosity.
-        /// \param[in]  pg     Array of n gas pressure values.
-        /// \param[in]  T      Array of n temperature values.
-        /// \param[in]  rv     Array of n vapor oil/gas ratios.
-        /// \param[in]  cond   Array of n objects, each specifying which phases are present with non-zero saturation in a cell.
-        /// \param[in]  cells  Array of n cell indices to be associated with the pressure values.
-        /// \return            Array of n viscosity values.
-        virtual
-        ADB muGas(const ADB& pg,
-                  const ADB& T,
-                  const ADB& rv,
-                  const std::vector<PhasePresence>& cond,
-                  const Cells& cells) const = 0;
-
-        // ------ Formation volume factor (b) ------
-
-        /// Water formation volume factor.
-        /// \param[in]  pw     Array of n water pressure values.
-        /// \param[in]  T      Array of n temperature values.
-        /// \param[in]  cells  Array of n cell indices to be associated with the pressure values.
-        /// \return            Array of n formation volume factor values.
-        virtual
-        ADB bWat(const ADB& pw,
-                 const ADB& T,
-                 const Cells& cells) const = 0;
-
-        /// Oil formation volume factor.
-        /// \param[in]  po     Array of n oil pressure values.
-        /// \param[in]  T      Array of n temperature values.
-        /// \param[in]  rs     Array of n gas solution factor values.
-        /// \param[in]  cond   Array of n objects, each specifying which phases are present with non-zero saturation in a cell.
-        /// \param[in]  cells  Array of n cell indices to be associated with the pressure values.
-        /// \return            Array of n formation volume factor values.
-        virtual
-        ADB bOil(const ADB& po,
-                 const ADB& T,
-                 const ADB& rs,
-                 const std::vector<PhasePresence>& cond,
-                 const Cells& cells) const = 0;
-
-        /// Gas formation volume factor.
-        /// \param[in]  pg     Array of n gas pressure values.
-        /// \param[in]  T      Array of n temperature values.
-        /// \param[in]  rv     Array of n vapor oil/gas ratios.
-        /// \param[in]  cond   Array of n objects, each specifying which phases are present with non-zero saturation in a cell.
-        /// \param[in]  cells  Array of n cell indices to be associated with the pressure values.
-        /// \return            Array of n formation volume factor values.
-        virtual
-        ADB bGas(const ADB& pg,
-                 const ADB& T,
-                 const ADB& rv,
-                 const std::vector<PhasePresence>& cond,
-                 const Cells& cells) const = 0;
-
-        // ------ Rs bubble point curve ------
-
-        /// Bubble point curve for Rs as function of oil pressure.
-        /// \param[in]  po     Array of n oil pressure values.
-        /// \param[in]  cells  Array of n cell indices to be associated with the pressure values.
-        /// \return            Array of n bubble point values for Rs.
-        virtual
-        ADB rsSat(const ADB& po,
-                  const Cells& cells) const = 0;
-
-        /// Bubble point curve for Rs as function of oil pressure.
-        /// \param[in]  po     Array of n oil pressure values.
-        /// \param[in]  so     Array of n oil saturation values.
-        /// \param[in]  cells  Array of n cell indices to be associated with the pressure values.
-        /// \return            Array of n bubble point values for Rs.
-        virtual
-        ADB rsSat(const ADB& po,
-                  const ADB& so,
-                  const Cells& cells) const = 0;
-
-        // ------ Rv condensation curve ------
-
-        /// Condensation curve for Rv as function of oil pressure.
-        /// \param[in]  po     Array of n oil pressure values.
-        /// \param[in]  cells  Array of n cell indices to be associated with the pressure values.
-        /// \return            Array of n condensation point values for Rv.
-        virtual
-        ADB rvSat(const ADB& po,
-                  const Cells& cells) const = 0;
-
-        /// Condensation curve for Rv as function of oil pressure.
-        /// \param[in]  po     Array of n oil pressure values.
-        /// \param[in]  so     Array of n oil saturation values.
-        /// \param[in]  cells  Array of n cell indices to be associated with the pressure values.
-        /// \return            Array of n condensation point values for Rv.
-        virtual
-        ADB rvSat(const ADB& po,
-                  const ADB& so,
-                  const Cells& cells) const = 0;
-
-        // ------ Relative permeability ------
-
-        /// Relative permeabilities for all phases.
-        /// \param[in]  sw     Array of n water saturation values.
-        /// \param[in]  so     Array of n oil saturation values.
-        /// \param[in]  sg     Array of n gas saturation values.
-        /// \param[in]  cells  Array of n cell indices to be associated with the saturation values.
-        /// \return            An std::vector with 3 elements, each an array of n relperm values,
-        ///                    containing krw, kro, krg. Use PhaseIndex for indexing into the result.
-        virtual
-        std::vector<ADB> relperm(const ADB& sw,
-                                 const ADB& so,
-                                 const ADB& sg,
-                                 const Cells& cells) const = 0;
-
-
-        /// Capillary pressure for all phases.
-        /// \param[in]  sw     Array of n water saturation values.
-        /// \param[in]  so     Array of n oil saturation values.
-        /// \param[in]  sg     Array of n gas saturation values.
-        /// \param[in]  cells  Array of n cell indices to be associated with the saturation values.
-        /// \return            An std::vector with 3 elements, each an array of n capillary pressure values,
-        ///                    containing the offsets for each p_g, p_o, p_w. The capillary pressure between
-        ///                    two arbitrary phases alpha and beta is then given as p_alpha - p_beta.
-        virtual
-        std::vector<ADB> capPress(const ADB& sw,
-                                  const ADB& so,
-                                  const ADB& sg,
-                                  const Cells& cells) const = 0;
-                                  
-        /// Saturation update for hysteresis behavior.
-        /// \param[in]  cells       Array of n cell indices to be associated with the saturation values.
-        virtual
-        void updateSatHyst(const std::vector<double>& saturation,
-                           const std::vector<int>& cells) = 0;
-
-        /// Update for max oil saturation.
-        virtual                  
-        void updateSatOilMax(const std::vector<double>& saturation) = 0;
-
-        /// Obtain the scaled critical oil in gas saturation values.
-        /// \param[in]  cells  Array of cell indices.
-        /// \return Array of critical oil in gas saturaion values.
-        virtual
-        V scaledCriticalOilinGasSaturations(const Cells& cells) const = 0;
-
-        /// Obtain the scaled critical gas saturation values.
-        /// \param[in]  cells  Array of cell indices.
-        /// \return Array of scaled critical gas saturaion values.
-        virtual
-        V scaledCriticalGasSaturations(const Cells& cells) const = 0;
-
-    };
-
-} // namespace Opm
-
-#endif // OPM_BLACKOILPROPSADINTERFACE_HEADER_INCLUDED

opm/autodiff/BlackoilSequentialModel.hpp

@@ -74,7 +74,7 @@ namespace Opm {
         /// \param[in] terminal_output  request output to cout/cerr
         BlackoilSequentialModel(const ModelParameters&          param,
                                 const Grid&                     grid ,
-                                const BlackoilPropsAdInterface& fluid,
+                                const BlackoilPropsAdFromDeck& fluid,
                                 const DerivedGeology&           geo  ,
                                 const RockCompressibility*      rock_comp_props,
                                 const WellModel                 well_model,

opm/autodiff/BlackoilSolventModel.hpp

@@ -67,7 +67,7 @@ namespace Opm {
         /// \param[in] is_miscible         turn on miscible feature
         BlackoilSolventModel(const typename Base::ModelParameters&   param,
                              const Grid&                             grid,
-                             const BlackoilPropsAdInterface&         fluid,
+                             const BlackoilPropsAdFromDeck&         fluid,
                              const DerivedGeology&                   geo,
                              const RockCompressibility*              rock_comp_props,
                              const SolventPropsAdFromDeck&           solvent_props,

opm/autodiff/BlackoilSolventModel_impl.hpp

@@ -25,7 +25,7 @@
 #include <opm/autodiff/AutoDiffBlock.hpp>
 #include <opm/autodiff/AutoDiffHelpers.hpp>
 #include <opm/autodiff/GridHelpers.hpp>
-#include <opm/autodiff/BlackoilPropsAdInterface.hpp>
+#include <opm/autodiff/BlackoilPropsAdFromDeck.hpp>
 #include <opm/autodiff/GeoProps.hpp>
 #include <opm/autodiff/WellDensitySegmented.hpp>
 
@@ -72,7 +72,7 @@ namespace Opm {
     template <class Grid>
     BlackoilSolventModel<Grid>::BlackoilSolventModel(const typename Base::ModelParameters&   param,
                                                      const Grid&                             grid,
-                                                     const BlackoilPropsAdInterface&         fluid,
+                                                     const BlackoilPropsAdFromDeck&         fluid,
                                                      const DerivedGeology&                   geo,
                                                      const RockCompressibility*              rock_comp_props,
                                                      const SolventPropsAdFromDeck&           solvent_props,

opm/autodiff/BlackoilTransportModel.hpp

@@ -59,7 +59,7 @@ namespace Opm {
         /// \param[in] terminal_output  request output to cout/cerr
         BlackoilTransportModel(const typename Base::ModelParameters&   param,
                                const Grid&                             grid,
-                               const BlackoilPropsAdInterface&         fluid,
+                               const BlackoilPropsAdFromDeck&         fluid,
                                const DerivedGeology&                   geo,
                                const RockCompressibility*              rock_comp_props,
                                const StandardWells&                    std_wells,

opm/autodiff/FlowMainEbos.hpp

@@ -30,7 +30,6 @@
 #include <opm/autodiff/NewtonIterationBlackoilCPR.hpp>
 #include <opm/autodiff/NewtonIterationBlackoilInterleaved.hpp>
 #include <opm/autodiff/MissingFeatures.hpp>
-#include <opm/autodiff/BlackoilPropsAdFromDeck.hpp>
 #include <opm/autodiff/moduleVersion.hpp>
 #include <opm/autodiff/ExtractParallelGridInformationToISTL.hpp>
 

opm/autodiff/ImpesTPFAAD.cpp

@@ -144,7 +144,7 @@ namespace {
 
 
     ImpesTPFAAD::ImpesTPFAAD(const UnstructuredGrid&         grid,
-                             const BlackoilPropsAdInterface& fluid,
+                             const BlackoilPropsAdFromDeck& fluid,
                              const DerivedGeology&           geo,
                              const Wells&                    wells,
                              const LinearSolverInterface&    linsolver)

opm/autodiff/ImpesTPFAAD.hpp

@@ -24,7 +24,7 @@
 #include <opm/autodiff/AutoDiffBlock.hpp>
 #include <opm/autodiff/AutoDiffHelpers.hpp>
 #include <opm/autodiff/BlackoilModelEnums.hpp>
-#include <opm/autodiff/BlackoilPropsAdInterface.hpp>
+#include <opm/autodiff/BlackoilPropsAdFromDeck.hpp>
 
 struct UnstructuredGrid;
 struct Wells;
@@ -46,7 +46,7 @@ namespace Opm {
     public:
         /// Construct impes solver.
         ImpesTPFAAD(const UnstructuredGrid&         grid,
-                    const BlackoilPropsAdInterface& fluid,
+                    const BlackoilPropsAdFromDeck& fluid,
                     const DerivedGeology&           geo,
                     const Wells&                    wells,
                     const LinearSolverInterface&    linsolver);
@@ -77,7 +77,7 @@ namespace Opm {
 
         // Data
         const UnstructuredGrid&      grid_;
-        const BlackoilPropsAdInterface&               fluid_;
+        const BlackoilPropsAdFromDeck&               fluid_;
         const DerivedGeology&        geo_ ;
         const Wells&                 wells_;
         const LinearSolverInterface& linsolver_;

opm/autodiff/MultisegmentWells.cpp

@@ -223,7 +223,7 @@ namespace Opm {
 
 
     void
-    MultisegmentWells::init(const BlackoilPropsAdInterface* fluid_arg,
+    MultisegmentWells::init(const BlackoilPropsAdFromDeck* fluid_arg,
                             const std::vector<bool>* active_arg,
                             const std::vector<PhasePresence>* pc_arg,
                             const VFPProperties*  vfp_properties_arg,

opm/autodiff/MultisegmentWells.hpp

@@ -37,7 +37,7 @@
 #include <opm/autodiff/AutoDiffBlock.hpp>
 #include <opm/autodiff/AutoDiffHelpers.hpp>
 #include <opm/autodiff/BlackoilModelEnums.hpp>
-#include <opm/autodiff/BlackoilPropsAdInterface.hpp>
+#include <opm/autodiff/BlackoilPropsAdFromDeck.hpp>
 #include <opm/autodiff/LinearisedBlackoilResidual.hpp>
 #include <opm/autodiff/WellHelpers.hpp>
 #include <opm/autodiff/VFPProperties.hpp>
@@ -98,7 +98,7 @@ namespace Opm {
                                                                      const std::vector< const Well* >& wells_ecl,
                                                                      const int time_step);
 
-            void init(const BlackoilPropsAdInterface* fluid_arg,
+            void init(const BlackoilPropsAdFromDeck* fluid_arg,
                       const std::vector<bool>* active_arg,
                       const std::vector<PhasePresence>* pc_arg,
                       const VFPProperties*  vfp_properties_arg,
@@ -261,7 +261,7 @@ namespace Opm {
         // TODO: they should be split eventually.
         const Wells* wells_;
 
-        const BlackoilPropsAdInterface* fluid_;
+        const BlackoilPropsAdFromDeck* fluid_;
         const std::vector<bool>*  active_;
         const std::vector<PhasePresence>*  phase_condition_;
         const VFPProperties* vfp_properties_;

opm/autodiff/RateConverter.hpp

@@ -21,7 +21,7 @@
 #ifndef OPM_RATECONVERTER_HPP_HEADER_INCLUDED
 #define OPM_RATECONVERTER_HPP_HEADER_INCLUDED
 
-#include <opm/autodiff/BlackoilPropsAdInterface.hpp>
+#include <opm/autodiff/BlackoilPropsAdFromDeck.hpp>
 
 #include <opm/core/props/BlackoilPhases.hpp>
 #include <opm/core/simulator/BlackoilState.hpp>

opm/autodiff/SimulatorBase.hpp

@@ -30,7 +30,7 @@
 
 #include <opm/autodiff/GeoProps.hpp>
 #include <opm/autodiff/BlackoilModel.hpp>
-#include <opm/autodiff/BlackoilPropsAdInterface.hpp>
+#include <opm/autodiff/BlackoilPropsAdFromDeck.hpp>
 #include <opm/autodiff/WellStateFullyImplicitBlackoil.hpp>
 #include <opm/autodiff/RateConverter.hpp>
 
@@ -124,7 +124,7 @@ namespace Opm
         SimulatorBase(const parameter::ParameterGroup& param,
                       const Grid& grid,
                       DerivedGeology& geo,
-                      BlackoilPropsAdInterface& props,
+                      BlackoilPropsAdFromDeck& props,
                       const RockCompressibility* rock_comp_props,
                       NewtonIterationBlackoilInterface& linsolver,
                       const double* gravity,
@@ -189,7 +189,7 @@ namespace Opm
 
         // Data.
         typedef RateConverter::
-        SurfaceToReservoirVoidage< BlackoilPropsAdInterface,
+        SurfaceToReservoirVoidage< BlackoilPropsAdFromDeck,
                                    std::vector<int> > RateConverterType;
         typedef typename Traits::Model Model;
         typedef typename Model::ModelParameters ModelParameters;
@@ -201,7 +201,7 @@ namespace Opm
 
         // Observed objects.
         const Grid& grid_;
-        BlackoilPropsAdInterface& props_;
+        BlackoilPropsAdFromDeck& props_;
         const RockCompressibility* rock_comp_props_;
         const double* gravity_;
         // Solvers

opm/autodiff/SimulatorBase_impl.hpp

@@ -36,7 +36,7 @@ namespace Opm
     SimulatorBase<Implementation>::SimulatorBase(const parameter::ParameterGroup& param,
                                                  const Grid& grid,
                                                  DerivedGeology& geo,
-                                                 BlackoilPropsAdInterface& props,
+                                                 BlackoilPropsAdFromDeck& props,
                                                  const RockCompressibility* rock_comp_props,
                                                  NewtonIterationBlackoilInterface& linsolver,
                                                  const double* gravity,

opm/autodiff/SimulatorFullyImplicitBlackoil.hpp

@@ -54,7 +54,7 @@ public:
     SimulatorFullyImplicitBlackoil(const parameter::ParameterGroup& param,
                                    const typename Base::Grid& grid,
                                    DerivedGeology& geo,
-                                   BlackoilPropsAdInterface& props,
+                                   BlackoilPropsAdFromDeck& props,
                                    const RockCompressibility* rock_comp_props,
                                    NewtonIterationBlackoilInterface& linsolver,
                                    const double* gravity,

opm/autodiff/SimulatorFullyImplicitBlackoilEbos.hpp

@@ -94,7 +94,7 @@ public:
     SimulatorFullyImplicitBlackoilEbos(Simulator& ebosSimulator,
                                        const parameter::ParameterGroup& param,
                                        DerivedGeology& geo,
-                                       BlackoilPropsAdInterface& props,
+                                       BlackoilPropsAdFromDeck& props,
                                        NewtonIterationBlackoilInterface& linsolver,
                                        const double* gravity,
                                        const bool has_disgas,
@@ -715,7 +715,7 @@ protected:
     Simulator& ebosSimulator_;
 
     typedef RateConverter::
-    SurfaceToReservoirVoidage< BlackoilPropsAdInterface,
+    SurfaceToReservoirVoidage< BlackoilPropsAdFromDeck,
                                std::vector<int> > RateConverterType;
     typedef typename Solver::SolverParameters SolverParameters;
 
@@ -724,7 +724,7 @@ protected:
     SolverParameters solver_param_;
 
     // Observed objects.
-    BlackoilPropsAdInterface& props_;
+    BlackoilPropsAdFromDeck& props_;
     const double* gravity_;
     // Solvers
     DerivedGeology& geo_;

opm/autodiff/SimulatorFullyImplicitBlackoilMultiSegment.hpp

@@ -65,7 +65,7 @@ public:
     SimulatorFullyImplicitBlackoilMultiSegment(const parameter::ParameterGroup& param,
                                    const GridT& grid,
                                    DerivedGeology& geo,
-                                   BlackoilPropsAdInterface& props,
+                                   BlackoilPropsAdFromDeck& props,
                                    const RockCompressibility* rock_comp_props,
                                    NewtonIterationBlackoilInterface& linsolver,
                                    const double* gravity,

opm/autodiff/SimulatorFullyImplicitBlackoilSolvent.hpp

@@ -29,7 +29,7 @@
 #include <opm/common/ErrorMacros.hpp>
 
 #include <opm/autodiff/GeoProps.hpp>
-#include <opm/autodiff/BlackoilPropsAdInterface.hpp>
+#include <opm/autodiff/BlackoilPropsAdFromDeck.hpp>
 #include <opm/autodiff/SolventPropsAdFromDeck.hpp>
 #include <opm/autodiff/RateConverter.hpp>
 #include <opm/autodiff/NonlinearSolver.hpp>
@@ -111,7 +111,7 @@ namespace Opm
         SimulatorFullyImplicitBlackoilSolvent(const parameter::ParameterGroup& param,
                                               const GridT& grid,
                                               DerivedGeology& geo,
-                                              BlackoilPropsAdInterface& props,
+                                              BlackoilPropsAdFromDeck& props,
                                               const SolventPropsAdFromDeck& solvent_props,
                                               const RockCompressibility* rock_comp_props,
                                               NewtonIterationBlackoilInterface& linsolver,

opm/autodiff/SimulatorFullyImplicitBlackoilSolvent_impl.hpp

@@ -27,7 +27,7 @@ namespace Opm
     SimulatorFullyImplicitBlackoilSolvent(const parameter::ParameterGroup& param,
                                           const GridT& grid,
                                           DerivedGeology& geo,
-                                          BlackoilPropsAdInterface& props,
+                                          BlackoilPropsAdFromDeck& props,
                                           const SolventPropsAdFromDeck& solvent_props,
                                           const RockCompressibility* rock_comp_props,
                                           NewtonIterationBlackoilInterface& linsolver,

opm/autodiff/SimulatorSequentialBlackoil.hpp

@@ -55,7 +55,7 @@ public:
     SimulatorSequentialBlackoil(const parameter::ParameterGroup& param,
                                 const typename Base::Grid& grid,
                                 DerivedGeology& geo,
-                                BlackoilPropsAdInterface& props,
+                                BlackoilPropsAdFromDeck& props,
                                 const RockCompressibility* rock_comp_props,
                                 NewtonIterationBlackoilInterface& linsolver,
                                 const double* gravity,

opm/autodiff/SolventPropsAdFromDeck.hpp

@@ -20,7 +20,7 @@
 #ifndef SOLVENTPROPSADFROMDECK_HPP
 #define SOLVENTPROPSADFROMDECK_HPP
 
-#include <opm/autodiff/BlackoilPropsAdInterface.hpp>
+#include <opm/autodiff/BlackoilPropsAdFromDeck.hpp>
 #include <opm/autodiff/AutoDiffBlock.hpp>
 
 #include <opm/core/utility/NonuniformTableLinear.hpp>

opm/autodiff/StandardWells.hpp

@@ -41,7 +41,7 @@
 #include <opm/core/wells/WellCollection.hpp>
 #include <opm/autodiff/AutoDiffBlock.hpp>
 #include <opm/autodiff/AutoDiffHelpers.hpp>
-#include <opm/autodiff/BlackoilPropsAdInterface.hpp>
+#include <opm/autodiff/BlackoilPropsAdFromDeck.hpp>
 #include <opm/simulators/WellSwitchingLogger.hpp>
 
 namespace Opm {
@@ -73,7 +73,7 @@ namespace Opm {
             // ---------  Public methods  ---------
             StandardWells(const Wells* wells_arg, WellCollection* well_collection);
 
-            void init(const BlackoilPropsAdInterface* fluid_arg,
+            void init(const BlackoilPropsAdFromDeck* fluid_arg,
                       const std::vector<bool>* active_arg,
                       const std::vector<PhasePresence>* pc_arg,
                       const VFPProperties*  vfp_properties_arg,
@@ -210,7 +210,7 @@ namespace Opm {
             // By default, they should all be one.
             Vector well_perforation_efficiency_factors_;
 
-            const BlackoilPropsAdInterface* fluid_;
+            const BlackoilPropsAdFromDeck* fluid_;
             const std::vector<bool>*  active_;
             const std::vector<PhasePresence>*  phase_condition_;
             const VFPProperties* vfp_properties_;

opm/autodiff/StandardWellsDense.hpp

@@ -36,12 +36,12 @@
 #include <opm/core/wells.h>
 #include <opm/core/wells/DynamicListEconLimited.hpp>
 #include <opm/autodiff/VFPProperties.hpp>
-#include <opm/autodiff/BlackoilPropsAdInterface.hpp>
 #include <opm/autodiff/VFPInjProperties.hpp>
 #include <opm/autodiff/VFPProdProperties.hpp>
 #include <opm/autodiff/WellHelpers.hpp>
 #include <opm/autodiff/BlackoilModelEnums.hpp>
 #include <opm/autodiff/WellDensitySegmented.hpp>
+#include <opm/autodiff/BlackoilPropsAdFromDeck.hpp>
 #include <opm/autodiff/BlackoilDetails.hpp>
 #include <opm/autodiff/BlackoilModelParameters.hpp>
 #include <opm/autodiff/LinearisedBlackoilResidual.hpp>
@@ -104,7 +104,7 @@ enum WellVariablePositions {
                 }
               }
 
-            void init(const BlackoilPropsAdInterface* fluid_arg,
+            void init(const BlackoilPropsAdFromDeck* fluid_arg,
                       const std::vector<bool>* active_arg,
                       const VFPProperties*  vfp_properties_arg,
                       const double gravity_arg,
@@ -1483,7 +1483,7 @@ enum WellVariablePositions {
             ModelParameters param_;
             bool terminal_output_;
 
-            const BlackoilPropsAdInterface* fluid_;
+            const BlackoilPropsAdFromDeck* fluid_;
             const std::vector<bool>*  active_;
             const VFPProperties* vfp_properties_;
             double gravity_;

opm/autodiff/StandardWells_impl.hpp

@@ -92,7 +92,7 @@ namespace Opm
 
 
     void
-    StandardWells::init(const BlackoilPropsAdInterface* fluid_arg,
+    StandardWells::init(const BlackoilPropsAdFromDeck* fluid_arg,
                         const std::vector<bool>* active_arg,
                         const std::vector<PhasePresence>* pc_arg,
                         const VFPProperties*  vfp_properties_arg,

opm/polymer/fullyimplicit/BlackoilPolymerModel.hpp

@@ -76,7 +76,7 @@ namespace Opm {
         /// \param[in] terminal_output  request output to cout/cerr
         BlackoilPolymerModel(const typename Base::ModelParameters&   param,
                              const Grid&                             grid,
-                             const BlackoilPropsAdInterface&         fluid,
+                             const BlackoilPropsAdFromDeck&         fluid,
                              const DerivedGeology&                   geo,
                              const RockCompressibility*              rock_comp_props,
                              const PolymerPropsAd&                   polymer_props_ad,

opm/polymer/fullyimplicit/BlackoilPolymerModel_impl.hpp

@@ -29,7 +29,7 @@
 #include <opm/autodiff/AutoDiffBlock.hpp>
 #include <opm/autodiff/AutoDiffHelpers.hpp>
 #include <opm/autodiff/GridHelpers.hpp>
-#include <opm/autodiff/BlackoilPropsAdInterface.hpp>
+#include <opm/autodiff/BlackoilPropsAdFromDeck.hpp>
 #include <opm/autodiff/GeoProps.hpp>
 #include <opm/autodiff/WellDensitySegmented.hpp>
 
@@ -76,7 +76,7 @@ namespace Opm {
     template <class Grid>
     BlackoilPolymerModel<Grid>::BlackoilPolymerModel(const typename Base::ModelParameters&   param,
                                                      const Grid&                             grid,
-                                                     const BlackoilPropsAdInterface&         fluid,
+                                                     const BlackoilPropsAdFromDeck&         fluid,
                                                      const DerivedGeology&                   geo,
                                                      const RockCompressibility*              rock_comp_props,
                                                      const PolymerPropsAd&                   polymer_props_ad,

opm/polymer/fullyimplicit/FullyImplicitCompressiblePolymerSolver.cpp

@@ -25,7 +25,7 @@
 
 #include <opm/autodiff/AutoDiffBlock.hpp>
 #include <opm/autodiff/AutoDiffHelpers.hpp>
-#include <opm/autodiff/BlackoilPropsAdInterface.hpp>
+#include <opm/autodiff/BlackoilPropsAdFromDeck.hpp>
 #include <opm/autodiff/GeoProps.hpp>
 #include <opm/autodiff/WellStateFullyImplicitBlackoil.hpp>
 
@@ -167,7 +167,7 @@ namespace {
 
     FullyImplicitCompressiblePolymerSolver::
     FullyImplicitCompressiblePolymerSolver(const UnstructuredGrid&  		grid,
-                                		   const BlackoilPropsAdInterface&  fluid,
+                                		   const BlackoilPropsAdFromDeck&  fluid,
                                 		   const DerivedGeology&           	geo  ,
                                 		   const RockCompressibility*      	rock_comp_props,
                                 		   const PolymerPropsAd&           	polymer_props_ad,

opm/polymer/fullyimplicit/FullyImplicitCompressiblePolymerSolver.hpp

@@ -111,7 +111,7 @@ namespace Opm {
         /// \param[in] wells            well structure
         /// \param[in] linsolver        linear solver
         FullyImplicitCompressiblePolymerSolver(const UnstructuredGrid&         grid ,
-        		                       const BlackoilPropsAdInterface& fluid,
+        		                       const BlackoilPropsAdFromDeck& fluid,
                    			       const DerivedGeology&           geo  ,
                                                const RockCompressibility*      rock_comp_props,
                                                const PolymerPropsAd&           polymer_props_ad,
@@ -185,7 +185,7 @@ namespace Opm {
 
         // Member data
         const UnstructuredGrid&         grid_;
-        const BlackoilPropsAdInterface& fluid_;
+        const BlackoilPropsAdFromDeck& fluid_;
         const DerivedGeology&           geo_;
         const RockCompressibility*      rock_comp_props_;
         const PolymerPropsAd&           polymer_props_ad_;

opm/polymer/fullyimplicit/SimulatorFullyImplicitBlackoilPolymer.hpp

@@ -32,7 +32,7 @@
 #include <opm/common/ErrorMacros.hpp>
 
 #include <opm/autodiff/GeoProps.hpp>
-#include <opm/autodiff/BlackoilPropsAdInterface.hpp>
+#include <opm/autodiff/BlackoilPropsAdFromDeck.hpp>
 #include <opm/autodiff/RateConverter.hpp>
 #include <opm/autodiff/NonlinearSolver.hpp>
 
@@ -111,7 +111,7 @@ namespace Opm
         SimulatorFullyImplicitBlackoilPolymer(const parameter::ParameterGroup& param,
                                               const GridT& grid,
                                               DerivedGeology& geo,
-                                              BlackoilPropsAdInterface& props,
+                                              BlackoilPropsAdFromDeck& props,
                                               const PolymerPropsAd& polymer_props,
                                               const RockCompressibility* rock_comp_props,
                                               NewtonIterationBlackoilInterface& linsolver,

opm/polymer/fullyimplicit/SimulatorFullyImplicitBlackoilPolymer_impl.hpp

@@ -26,7 +26,7 @@ namespace Opm
     SimulatorFullyImplicitBlackoilPolymer(const parameter::ParameterGroup& param,
                                           const GridT& grid,
                                           DerivedGeology& geo,
-                                          BlackoilPropsAdInterface& props,
+                                          BlackoilPropsAdFromDeck& props,
                                           const PolymerPropsAd& polymer_props,
                                           const RockCompressibility* rock_comp_props,
                                           NewtonIterationBlackoilInterface& linsolver,

opm/polymer/fullyimplicit/SimulatorFullyImplicitCompressiblePolymer.hpp

@@ -25,7 +25,7 @@
 #include <opm/common/ErrorMacros.hpp>
 
 #include <opm/autodiff/GeoProps.hpp>
-#include <opm/autodiff/BlackoilPropsAdInterface.hpp>
+#include <opm/autodiff/BlackoilPropsAdFromDeck.hpp>
 #include <opm/autodiff/WellStateFullyImplicitBlackoil.hpp>
 #include <opm/autodiff/SimulatorBase.hpp>
 
@@ -103,7 +103,7 @@ namespace Opm
         SimulatorFullyImplicitCompressiblePolymer(const parameter::ParameterGroup& param,
                                                   const GridT& grid,
                                                   DerivedGeology& geo,
-                                                  BlackoilPropsAdInterface& props,
+                                                  BlackoilPropsAdFromDeck& props,
                                                   const PolymerPropsAd&    polymer_props,
                                                   const RockCompressibility* rock_comp_props,
                                                   std::shared_ptr<EclipseState> eclipse_state,

opm/polymer/fullyimplicit/SimulatorFullyImplicitCompressiblePolymer_impl.hpp

@@ -29,7 +29,7 @@ SimulatorFullyImplicitCompressiblePolymer<GridT>::
 SimulatorFullyImplicitCompressiblePolymer(const parameter::ParameterGroup& param,
                                           const GridT& grid,
                                           DerivedGeology& geo,
-                                          BlackoilPropsAdInterface& props,
+                                          BlackoilPropsAdFromDeck& props,
                                           const PolymerPropsAd&    polymer_props,
                                           const RockCompressibility* rock_comp_props,
                                           std::shared_ptr<EclipseState> eclipse_state,