add GPU decorators in fluidmatrixinteractions

opm/material/fluidmatrixinteractions/EclDefaultMaterial.hpp

@@ -29,6 +29,7 @@
 
 #include <opm/common/TimingMacros.hpp>
 
+#include <opm/common/utility/gpuDecorators.hpp>
 #include <opm/material/common/MathToolbox.hpp>
 #include <opm/material/common/Valgrind.hpp>
 #include <opm/material/fluidmatrixinteractions/EclDefaultMaterialParams.hpp>
@@ -134,7 +135,7 @@ class EclDefaultMaterial : public TraitsT
      * \param state The fluid state
      */
     template <class ContainerT, class FluidState, class ...Args>
-    static void capillaryPressures(ContainerT& values,
+    OPM_HOST_DEVICE static void capillaryPressures(ContainerT& values,
                                    const Params& params,
                                    const FluidState& state)
     {
@@ -261,7 +262,7 @@ class EclDefaultMaterial : public TraitsT
      * \f]
      */
     template <class FluidState, class Evaluation, class ...Args>
-    static Evaluation pcgn(const Params& params,
+    OPM_HOST_DEVICE static Evaluation pcgn(const Params& params,
                            const FluidState& fs)
     {
         OPM_TIMEFUNCTION_LOCAL(Subsystem::SatProps);
@@ -280,7 +281,7 @@ class EclDefaultMaterial : public TraitsT
      * \f]
      */
     template <class FluidState, class Evaluation, class ...Args>
-    static Evaluation pcnw(const Params& params,
+    OPM_HOST_DEVICE static Evaluation pcnw(const Params& params,
                            const FluidState& fs)
     {
         OPM_TIMEFUNCTION_LOCAL(Subsystem::SatProps);
@@ -345,7 +346,7 @@ class EclDefaultMaterial : public TraitsT
      * technical description.
      */
     template <class ContainerT, class FluidState, class ...Args>
-    static void relativePermeabilities(ContainerT& values,
+    OPM_HOST_DEVICE static void relativePermeabilities(ContainerT& values,
                                        const Params& params,
                                        const FluidState& fluidState)
     {
@@ -361,7 +362,7 @@ class EclDefaultMaterial : public TraitsT
      * \brief The relative permeability of the gas phase.
      */
     template <class FluidState, class Evaluation, class ...Args>
-    static Evaluation krg(const Params& params,
+    OPM_HOST_DEVICE static Evaluation krg(const Params& params,
                           const FluidState& fluidState)
     {
         OPM_TIMEFUNCTION_LOCAL(Subsystem::SatProps);
@@ -374,7 +375,7 @@ class EclDefaultMaterial : public TraitsT
      * \brief The relative permeability of the wetting phase.
      */
     template <class FluidState, class Evaluation, class ...Args>
-    static Evaluation krw(const Params& params,
+    OPM_HOST_DEVICE static Evaluation krw(const Params& params,
                           const FluidState& fluidState)
     {
         OPM_TIMEFUNCTION_LOCAL(Subsystem::SatProps);
@@ -386,7 +387,7 @@ class EclDefaultMaterial : public TraitsT
      * \brief The relative permeability of the non-wetting (i.e., oil) phase.
      */
     template <class FluidState, class Evaluation, class ...Args>
-    static Evaluation krn(const Params& params,
+    OPM_HOST_DEVICE static Evaluation krn(const Params& params,
                           const FluidState& fluidState)
     {
         OPM_TIMEFUNCTION_LOCAL(Subsystem::SatProps);
@@ -425,7 +426,7 @@ class EclDefaultMaterial : public TraitsT
      * \brief The relative permeability of oil in oil/gas system.
      */
     template <class Evaluation, class FluidState, class ...Args>
-    static Evaluation relpermOilInOilGasSystem(const Params& params,
+    OPM_HOST_DEVICE static Evaluation relpermOilInOilGasSystem(const Params& params,
                                                const FluidState& fluidState)
     {
         OPM_TIMEFUNCTION_LOCAL(Subsystem::SatProps);
@@ -443,7 +444,7 @@ class EclDefaultMaterial : public TraitsT
      * \brief The relative permeability of oil in oil/water system.
      */
     template <class Evaluation, class FluidState, class ...Args>
-    static Evaluation relpermOilInOilWaterSystem(const Params& params,
+    OPM_HOST_DEVICE static Evaluation relpermOilInOilWaterSystem(const Params& params,
                                                  const FluidState& fluidState)
     {
         OPM_TIMEFUNCTION_LOCAL(Subsystem::SatProps);

opm/material/fluidmatrixinteractions/EclDefaultMaterialParams.hpp

@@ -29,6 +29,7 @@
 
 #include <memory>
 
+#include <opm/common/utility/gpuDecorators.hpp>
 #include <opm/material/common/EnsureFinalized.hpp>
 
 namespace Opm {
@@ -55,20 +56,20 @@ class EclDefaultMaterialParams : public EnsureFinalized
     /*!
      * \brief The default constructor.
      */
-    EclDefaultMaterialParams()
+    OPM_HOST_DEVICE EclDefaultMaterialParams()
     {
     }
 
     /*!
      * \brief The parameter object for the gas-oil twophase law.
      */
-    const GasOilParams& gasOilParams() const
+    OPM_HOST_DEVICE const GasOilParams& gasOilParams() const
     { EnsureFinalized::check(); return gasOilParams_; }
 
     /*!
      * \brief The parameter object for the gas-oil twophase law.
      */
-    GasOilParams& gasOilParams()
+    OPM_HOST_DEVICE GasOilParams& gasOilParams()
     { EnsureFinalized::check(); return gasOilParams_; }
 
     /*!
@@ -80,13 +81,13 @@ class EclDefaultMaterialParams : public EnsureFinalized
     /*!
      * \brief The parameter object for the oil-water twophase law.
      */
-    const OilWaterParams& oilWaterParams() const
+    OPM_HOST_DEVICE const OilWaterParams& oilWaterParams() const
     { EnsureFinalized::check(); return oilWaterParams_; }
 
     /*!
      * \brief The parameter object for the oil-water twophase law.
      */
-    OilWaterParams& oilWaterParams()
+    OPM_HOST_DEVICE OilWaterParams& oilWaterParams()
     { EnsureFinalized::check(); return oilWaterParams_; }
 
     /*!
@@ -112,7 +113,7 @@ class EclDefaultMaterialParams : public EnsureFinalized
     /*!
      * \brief Return the saturation of "connate" water.
      */
-    Scalar Swl() const
+    OPM_HOST_DEVICE Scalar Swl() const
     { EnsureFinalized::check(); return Swl_; }
 
     /*!

opm/material/fluidmatrixinteractions/EclEpsConfig.hpp

@@ -27,6 +27,8 @@
 #ifndef OPM_ECL_EPS_CONFIG_HPP
 #define OPM_ECL_EPS_CONFIG_HPP
 
+#include <opm/common/utility/gpuDecorators.hpp>
+
 #include <string>
 
 namespace Opm {
@@ -62,7 +64,7 @@ class EclEpsConfig
     /*!
      * \brief Returns whether saturation scaling is enabled.
      */
-    bool enableSatScaling() const
+    OPM_HOST_DEVICE bool enableSatScaling() const
     { return enableSatScaling_; }
 
     /*!
@@ -76,7 +78,7 @@ class EclEpsConfig
      * \brief Returns whether three point saturation scaling is enabled for the relative
      *        permeabilities.
      */
-    bool enableThreePointKrSatScaling() const
+    OPM_HOST_DEVICE bool enableThreePointKrSatScaling() const
     { return enableThreePointKrSatScaling_; }
 
     /*!
@@ -88,7 +90,7 @@ class EclEpsConfig
     /*!
      * \brief Returns whether relative permeability scaling is enabled for the wetting phase.
      */
-    bool enableKrwScaling() const
+    OPM_HOST_DEVICE bool enableKrwScaling() const
     { return enableKrwScaling_; }
 
     /*!
@@ -102,7 +104,7 @@ class EclEpsConfig
      * \brief Whether or not three-point relative permeability value scaling
      * is enabled for the wetting phase (KRWR + KRW).
      */
-    bool enableThreePointKrwScaling() const
+    OPM_HOST_DEVICE bool enableThreePointKrwScaling() const
     { return this->enableThreePointKrwScaling_; }
 
     /*!
@@ -116,7 +118,7 @@ class EclEpsConfig
      * \brief Whether or not three-point relative permeability value scaling
      * is enabled for the non-wetting phase (e.g., KRORW + KRO).
      */
-    bool enableThreePointKrnScaling() const
+    OPM_HOST_DEVICE bool enableThreePointKrnScaling() const
     { return this->enableThreePointKrnScaling_; }
 
     /*!
@@ -128,7 +130,7 @@ class EclEpsConfig
     /*!
      * \brief Returns whether relative permeability scaling is enabled for the non-wetting phase.
      */
-    bool enableKrnScaling() const
+    OPM_HOST_DEVICE bool enableKrnScaling() const
     { return enableKrnScaling_; }
 
     /*!
@@ -140,7 +142,7 @@ class EclEpsConfig
     /*!
      * \brief Returns whether capillary pressure scaling is enabled.
      */
-    bool enablePcScaling() const
+    OPM_HOST_DEVICE bool enablePcScaling() const
     { return enablePcScaling_; }
 
     /*!
@@ -160,7 +162,7 @@ class EclEpsConfig
      * the normal capillary pressure scaling and the value of enablePcScaling() does not
      * matter anymore.
      */
-    bool enableLeverettScaling() const
+    OPM_HOST_DEVICE bool enableLeverettScaling() const
     { return enableLeverettScaling_; }
 
     /*!

opm/material/fluidmatrixinteractions/EclEpsScalingPoints.hpp

@@ -27,6 +27,8 @@
 #ifndef OPM_ECL_EPS_SCALING_POINTS_HPP
 #define OPM_ECL_EPS_SCALING_POINTS_HPP
 
+#include <opm/common/utility/gpuDecorators.hpp>
+
 #include <array>
 #include <vector>
 
@@ -166,7 +168,7 @@ class EclEpsScalingPoints
     /*!
      * \brief Returns the points used for capillary pressure saturation scaling
      */
-    const std::array<Scalar, 3>& saturationPcPoints() const
+    OPM_HOST_DEVICE const std::array<Scalar, 3>& saturationPcPoints() const
     { return saturationPcPoints_; }
 
     /*!
@@ -178,7 +180,7 @@ class EclEpsScalingPoints
     /*!
      * \brief Returns the points used for wetting phase relperm saturation scaling
      */
-    const std::array<Scalar, 3>& saturationKrwPoints() const
+    OPM_HOST_DEVICE const std::array<Scalar, 3>& saturationKrwPoints() const
     { return saturationKrwPoints_; }
 
     /*!
@@ -190,7 +192,7 @@ class EclEpsScalingPoints
     /*!
      * \brief Returns the points used for non-wetting phase relperm saturation scaling
      */
-    const std::array<Scalar, 3>& saturationKrnPoints() const
+    OPM_HOST_DEVICE const std::array<Scalar, 3>& saturationKrnPoints() const
     { return saturationKrnPoints_; }
 
     /*!
@@ -202,7 +204,7 @@ class EclEpsScalingPoints
     /*!
      * \brief Returns the maximum capillary pressure
      */
-    Scalar maxPcnw() const
+    OPM_HOST_DEVICE Scalar maxPcnw() const
     { return maxPcnwOrLeverettFactor_; }
 
     /*!
@@ -214,7 +216,7 @@ class EclEpsScalingPoints
     /*!
      * \brief Returns the Leverett scaling factor for capillary pressure
      */
-    Scalar leverettFactor() const
+    OPM_HOST_DEVICE Scalar leverettFactor() const
     { return maxPcnwOrLeverettFactor_; }
 
     /*!
@@ -228,7 +230,7 @@ class EclEpsScalingPoints
      * \brief Returns wetting-phase relative permeability at residual
      * saturation of non-wetting phase.
      */
-    Scalar krwr() const
+    OPM_HOST_DEVICE Scalar krwr() const
     { return this->Krwr_; }
 
     /*!
@@ -240,7 +242,7 @@ class EclEpsScalingPoints
     /*!
      * \brief Returns the maximum wetting phase relative permeability
      */
-    Scalar maxKrw() const
+    OPM_HOST_DEVICE Scalar maxKrw() const
     { return maxKrw_; }
 
     /*!
@@ -254,7 +256,7 @@ class EclEpsScalingPoints
      * \brief Returns non-wetting phase relative permeability at residual
      * saturation of wetting phase.
      */
-    Scalar krnr() const
+    OPM_HOST_DEVICE Scalar krnr() const
     { return this->Krnr_; }
 
     /*!
@@ -266,7 +268,7 @@ class EclEpsScalingPoints
     /*!
      * \brief Returns the maximum wetting phase relative permeability
      */
-    Scalar maxKrn() const
+    OPM_HOST_DEVICE Scalar maxKrn() const
     { return maxKrn_; }
 
     void print() const;