OPM · multitalentloes · Dec 11, 2025 · Dec 11, 2025 · Dec 11, 2025 · Dec 11, 2025
diff --git a/CMakeLists_files.cmake b/CMakeLists_files.cmake
@@ -723,6 +723,7 @@ list (APPEND PUBLIC_HEADER_FILES
   opm/models/blackoil/blackoillocalresidualtpfa.hh
   opm/models/blackoil/blackoilmeanings.hh
   opm/models/blackoil/blackoilmodel.hh
+  opm/models/blackoil/blackoilmoduleparams.hh
   opm/models/blackoil/blackoilnewtonmethod.hpp
   opm/models/blackoil/blackoilnewtonmethodparams.hpp
   opm/models/blackoil/blackoilonephaseindices.hh

diff --git a/flowexperimental/BlackOilIntensiveQuantitiesGlobalIndex.hpp b/flowexperimental/BlackOilIntensiveQuantitiesGlobalIndex.hpp
@@ -524,6 +524,22 @@ class BlackOilIntensiveQuantitiesGlobalIndex
         throw std::logic_error("permFactor() is not yet implemented for compositional modeling");
     }
 
+    /*!
+     * \brief Returns the fluid system used by this intensive quantities.
+     */
+    OPM_HOST_DEVICE auto& getFluidSystem() const
+    {
+        return fluidState_.fluidSystem();
+    }
+
+    /*!
+     * \brief Returns a pointer to the fluid system used by this intensive quantities.
+     */
+    OPM_HOST_DEVICE auto getFluidSystemPtr() const
+    {
+        return fluidState_.fluidSystemPtr();
+    }
+
 private:
     friend BlackOilSolventIntensiveQuantities<TypeTag, enableSolvent>;
     friend BlackOilExtboIntensiveQuantities<TypeTag, enableExtbo>;

diff --git a/opm/models/blackoil/blackoilconvectivemixingmodule.hh b/opm/models/blackoil/blackoilconvectivemixingmodule.hh
diff --git a/opm/models/blackoil/blackoilintensivequantities.hh b/opm/models/blackoil/blackoilintensivequantities.hh
@@ -818,6 +818,22 @@ public:
         }
     }
 
+    /*!
+     * \brief Returns the fluid system used by this intensive quantities.
+     */
+    OPM_HOST_DEVICE auto& getFluidSystem() const
+    {
+        return fluidState_.fluidSystem();
+    }
+
+    /*!
+     * \brief Returns a pointer to the fluid system used by this intensive quantities.
+     */
+    OPM_HOST_DEVICE auto getFluidSystemPtr() const
+    {
+        return fluidState_.fluidSystemPtr();
+    }
+
 private:
     friend BlackOilSolventIntensiveQuantities<TypeTag, enableSolvent>;
     friend BlackOilExtboIntensiveQuantities<TypeTag, enableExtbo>;

diff --git a/opm/models/blackoil/blackoillocalresidualtpfa.hh b/opm/models/blackoil/blackoillocalresidualtpfa.hh
@@ -43,6 +43,7 @@
 #include <opm/models/blackoil/blackoilenergymodules.hh>
 #include <opm/models/blackoil/blackoilextbomodules.hh>
 #include <opm/models/blackoil/blackoilfoammodules.hh>
+#include <opm/models/blackoil/blackoilmoduleparams.hh>
 #include <opm/models/blackoil/blackoilpolymermodules.hh>
 #include <opm/models/blackoil/blackoilproperties.hh>
 #include <opm/models/blackoil/blackoilsolventmodules.hh>
@@ -117,7 +118,7 @@ class BlackOilLocalResidualTPFA : public GetPropType<TypeTag, Properties::DiscLo
     using BrineModule = BlackOilBrineModule<TypeTag>;
     using DiffusionModule = BlackOilDiffusionModule<TypeTag, enableDiffusion>;
     using ConvectiveMixingModule = BlackOilConvectiveMixingModule<TypeTag, enableConvectiveMixing>;
-    using ConvectiveMixingModuleParam = typename ConvectiveMixingModule::ConvectiveMixingModuleParam;
+    using ModuleParams = BlackoilModuleParams<ConvectiveMixingModuleParam<Scalar>>;
 
     using DispersionModule = BlackOilDispersionModule<TypeTag, enableDispersion>;
     using BioeffectsModule = BlackOilBioeffectsModule<TypeTag>;
@@ -140,11 +141,6 @@ public:
         ConditionalStorage<enableDispersion, double> dispersivity;
     };
 
-    struct ModuleParams
-    {
-        ConvectiveMixingModuleParam convectiveMixingModuleParam;
-    };
-
     /*!
      * \copydoc FvBaseLocalResidual::computeStorage
      */

diff --git a/opm/models/blackoil/blackoilmoduleparams.hh b/opm/models/blackoil/blackoilmoduleparams.hh
@@ -0,0 +1,27 @@
+/*
+  Copyright 2025 Equinor ASA
+  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_MODELS_BLACKOIL_MODULEPARAM_HH
+#define OPM_MODELS_BLACKOIL_MODULEPARAM_HH
+
+namespace Opm {
+    template<class ConvectiveMixingModuleParamT>
+    struct BlackoilModuleParams
+    {
+        ConvectiveMixingModuleParamT convectiveMixingModuleParam;
+    };
+} // namespace Opm
+
+#endif // OPM_MODELS_BLACKOIL_MODULEPARAM_HH
diff --git a/opm/simulators/flow/FlowProblemBlackoil.hpp b/opm/simulators/flow/FlowProblemBlackoil.hpp
@@ -39,7 +39,8 @@
 #include <opm/material/fluidsystems/blackoilpvt/ConstantCompressibilityOilPvt.hpp>
 #include <opm/material/fluidsystems/blackoilpvt/ConstantCompressibilityWaterPvt.hpp>
 
-#include <opm/models/blackoil/blackoillocalresidualtpfa.hh>
+#include <opm/models/blackoil/blackoilconvectivemixingmodule.hh>
+#include <opm/models/blackoil/blackoilmoduleparams.hh>
 
 #include <opm/output/eclipse/EclipseIO.hpp>
 
@@ -149,7 +150,7 @@ class FlowProblemBlackoil : public FlowProblem<TypeTag>
     using DispersionModule = BlackOilDispersionModule<TypeTag, enableDispersion>;
     using DiffusionModule = BlackOilDiffusionModule<TypeTag, enableDiffusion>;
     using ConvectiveMixingModule = BlackOilConvectiveMixingModule<TypeTag, enableConvectiveMixing>;
-    using ModuleParams = typename BlackOilLocalResidualTPFA<TypeTag>::ModuleParams;
+    using ModuleParams = BlackoilModuleParams<ConvectiveMixingModuleParam<Scalar>>;
     using HybridNewton = BlackOilHybridNewton<TypeTag>;
 
     using InitialFluidState = typename EquilInitializer<TypeTag>::ScalarFluidState;

diff --git a/opm/simulators/flow/NewTranFluxModule.hpp b/opm/simulators/flow/NewTranFluxModule.hpp
@@ -44,7 +44,10 @@
 #include <opm/models/discretization/common/fvbaseproperties.hh>
 #include <opm/models/blackoil/blackoilproperties.hh>
 #include <opm/models/utils/signum.hh>
-#include <opm/models/blackoil/blackoillocalresidualtpfa.hh>
+#include <opm/models/blackoil/blackoilmoduleparams.hh>
+#include <opm/models/blackoil/blackoilconvectivemixingmodule.hh>
+
+#include <opm/common/utility/gpuDecorators.hpp>
 
 #include <array>
 
@@ -132,12 +135,12 @@ class NewTranExtensiveQuantities
     using DimMatrix = Dune::FieldMatrix<Scalar, dimWorld, dimWorld>;
 
     using ConvectiveMixingModule = BlackOilConvectiveMixingModule<TypeTag, enableConvectiveMixing>;
-    using ModuleParams = typename BlackOilLocalResidualTPFA<TypeTag>::ModuleParams;
+    using ModuleParams = BlackoilModuleParams<ConvectiveMixingModuleParam<Scalar>>;
 public:
     /*!
      * \brief Return the intrinsic permeability tensor at a face [m^2]
      */
-    const DimMatrix& intrinsicPermeability() const
+    OPM_HOST_DEVICE const DimMatrix& intrinsicPermeability() const
     {
         throw std::invalid_argument("The ECL transmissibility module does not provide an explicit intrinsic permeability");
     }
@@ -148,7 +151,7 @@ class NewTranExtensiveQuantities
      *
      * \param phaseIdx The index of the fluid phase
      */
-    const EvalDimVector& potentialGrad(unsigned) const
+    OPM_HOST_DEVICE const EvalDimVector& potentialGrad(unsigned) const
     {
         throw std::invalid_argument("The ECL transmissibility module does not provide explicit potential gradients");
     }
@@ -159,7 +162,7 @@ class NewTranExtensiveQuantities
      *
      * \param phaseIdx The index of the fluid phase
      */
-    const Evaluation& pressureDifference(unsigned phaseIdx) const
+    OPM_HOST_DEVICE const Evaluation& pressureDifference(unsigned phaseIdx) const
     { return pressureDifference_[phaseIdx]; }
 
     /*!
@@ -168,7 +171,7 @@ class NewTranExtensiveQuantities
      *
      * \param phaseIdx The index of the fluid phase
      */
-    const EvalDimVector& filterVelocity(unsigned) const
+    OPM_HOST_DEVICE const EvalDimVector& filterVelocity(unsigned) const
     {
         throw std::invalid_argument("The ECL transmissibility module does not provide explicit filter velocities");
     }
@@ -182,7 +185,7 @@ class NewTranExtensiveQuantities
      *
      * \param phaseIdx The index of the fluid phase
      */
-    const Evaluation& volumeFlux(unsigned phaseIdx) const
+    OPM_HOST_DEVICE const Evaluation& volumeFlux(unsigned phaseIdx) const
     { return volumeFlux_[phaseIdx]; }
 
 protected:
@@ -193,7 +196,7 @@ class NewTranExtensiveQuantities
      * i.e., the DOF which exhibits a higher effective pressure for
      * the given phase.
      */
-    unsigned upstreamIndex_(unsigned phaseIdx) const
+    OPM_HOST_DEVICE unsigned upstreamIndex_(unsigned phaseIdx) const
     {
         assert(phaseIdx < numPhases);
 
@@ -207,22 +210,22 @@ class NewTranExtensiveQuantities
      * i.e., the DOF which exhibits a lower effective pressure for the
      * given phase.
      */
-    unsigned downstreamIndex_(unsigned phaseIdx) const
+    OPM_HOST_DEVICE unsigned downstreamIndex_(unsigned phaseIdx) const
     {
         assert(phaseIdx < numPhases);
 
         return dnIdx_[phaseIdx];
     }
 
-    void updateSolvent(const ElementContext& elemCtx, unsigned scvfIdx, unsigned timeIdx)
+    OPM_HOST_DEVICE void updateSolvent(const ElementContext& elemCtx, unsigned scvfIdx, unsigned timeIdx)
     { asImp_().updateVolumeFluxTrans(elemCtx, scvfIdx, timeIdx); }
 
-    void updatePolymer(const ElementContext& elemCtx, unsigned scvfIdx, unsigned timeIdx)
+    OPM_HOST_DEVICE void updatePolymer(const ElementContext& elemCtx, unsigned scvfIdx, unsigned timeIdx)
     { asImp_().updateShearMultipliers(elemCtx, scvfIdx, timeIdx); }
 
 public:
 
-    static void volumeAndPhasePressureDifferences(std::array<short, numPhases>& upIdx,
+    OPM_HOST_DEVICE static void volumeAndPhasePressureDifferences(std::array<short, numPhases>& upIdx,
                                                   std::array<short, numPhases>& dnIdx,
                                                   Evaluation (&volumeFlux)[numPhases],
                                                   Evaluation (&pressureDifferences)[numPhases],
@@ -307,7 +310,7 @@ class NewTranExtensiveQuantities
     }
 
     template<class EvalType>
-    static void calculatePhasePressureDiff_(short& upIdx,
+    OPM_HOST_DEVICE static void calculatePhasePressureDiff_(short& upIdx,
                                             short& dnIdx,
                                             EvalType& pressureDifference,
                                             const IntensiveQuantities& intQuantsIn,
@@ -414,7 +417,7 @@ class NewTranExtensiveQuantities
     /*!
      * \brief Update the required gradients for interior faces
      */
-    void calculateGradients_(const ElementContext& elemCtx, unsigned scvfIdx, unsigned timeIdx)
+    OPM_HOST_DEVICE void calculateGradients_(const ElementContext& elemCtx, unsigned scvfIdx, unsigned timeIdx)
     {
         Valgrind::SetUndefined(*this);
 
@@ -425,7 +428,7 @@ class NewTranExtensiveQuantities
      * \brief Update the required gradients for boundary faces
      */
     template <class FluidState>
-    void calculateBoundaryGradients_(const ElementContext& elemCtx,
+    OPM_HOST_DEVICE void calculateBoundaryGradients_(const ElementContext& elemCtx,
                                      unsigned scvfIdx,
                                      unsigned timeIdx,
                                      const FluidState& exFluidState)
@@ -469,7 +472,7 @@ class NewTranExtensiveQuantities
      * \brief Update the required gradients for boundary faces
      */
     template <class Problem, class FluidState, class EvaluationContainer>
-    static void calculateBoundaryGradients_(const Problem& problem,
+    OPM_HOST_DEVICE static void calculateBoundaryGradients_(const Problem& problem,
                                             const unsigned globalSpaceIdx,
                                             const IntensiveQuantities& intQuantsIn,
                                             const unsigned bfIdx,
@@ -568,10 +571,10 @@ class NewTranExtensiveQuantities
     /*!
      * \brief Update the volumetric fluxes for all fluid phases on the interior faces of the context
      */
-    void calculateFluxes_(const ElementContext&, unsigned, unsigned)
+    OPM_HOST_DEVICE void calculateFluxes_(const ElementContext&, unsigned, unsigned)
     { }
 
-    void calculateBoundaryFluxes_(const ElementContext&, unsigned, unsigned)
+    OPM_HOST_DEVICE void calculateBoundaryFluxes_(const ElementContext&, unsigned, unsigned)
     {}
 
 private: