OPM · multitalentloes · Aug 14, 2024 · Aug 14, 2024 · Aug 14, 2024 · Aug 28, 2024
diff --git a/CMakeLists_files.cmake b/CMakeLists_files.cmake
@@ -325,7 +325,11 @@ if(ENABLE_ECL_INPUT)
     opm/material/fluidmatrixinteractions/EclHysteresisConfig.cpp
     opm/material/fluidmatrixinteractions/EclMaterialLawManager.cpp
     opm/material/fluidmatrixinteractions/EclMaterialLawManagerReadEffectiveParams.cpp
+    opm/material/fluidmatrixinteractions/EclMaterialLawManagerSimple.cpp
+    opm/material/fluidmatrixinteractions/EclMaterialLawManagerSimpleReadEffectiveParams.cpp
+    opm/material/fluidmatrixinteractions/EclMaterialLawManagerSimpleHystParams.cpp
     opm/material/fluidmatrixinteractions/EclMaterialLawManagerInitParams.cpp
+    opm/material/fluidmatrixinteractions/EclMaterialLawManagerSimpleInitParams.cpp
     opm/material/fluidmatrixinteractions/EclMaterialLawManagerHystParams.cpp
     opm/material/fluidsystems/blackoilpvt/BrineCo2Pvt.cpp
     opm/material/fluidsystems/blackoilpvt/Co2GasPvt.cpp
@@ -983,6 +987,7 @@ list( APPEND PUBLIC_HEADER_FILES
       opm/material/fluidmatrixinteractions/EclEpsTwoPhaseLaw.hpp
       opm/material/fluidmatrixinteractions/TwoPhaseLETCurves.hpp
       opm/material/fluidmatrixinteractions/EclMaterialLawManager.hpp
+      opm/material/fluidmatrixinteractions/EclMaterialLawManagerSimple.hpp
       opm/material/fluidmatrixinteractions/DirectionalMaterialLawParams.hpp
       opm/material/fluidmatrixinteractions/DirectionalMaterialLawParams.hpp
       opm/material/fluidmatrixinteractions/RegularizedVanGenuchten.hpp

diff --git a/bin/genEvalSpecializations.py b/bin/genEvalSpecializations.py
@@ -3,10 +3,10 @@
 # This script provides "hand loop-unrolled" specializations of the
 # Evaluation class of dense automatic differentiation so that the
 # compiler can more easily emit SIMD instructions. In an ideal world,
-# C++ compilers should be smart enough to do this themselfs, but
+# C++ compilers should be smart enough to do this themselves, but
 # contemporary compilers don't seem to exhibit enough brains.
 #
-# Usage: In the opm-material top-level source directory, run
+# Usage: In the opm-common top-level source directory, run
 # `./bin/genEvalSpecializations.py [MAX_DERIVATIVES]`. The script then
 # generates specializations for Evaluations with up to MAX_DERIVATIVES
 # derivatives. The default for MAX_DERIVATIVES is 12. To run this
@@ -180,7 +180,7 @@ class Evaluation<ValueT, {{ numDerivs }}>
     //! Evaluation object are well-defined.
     OPM_HOST_DEVICE void checkDefined_() const
     {
-#ifndef NDEBUG
+#if !defined(NDEBUG) && !OPM_IS_INSIDE_DEVICE_FUNCTION
 {% if numDerivs < 0 %}\
         for (int i = dstart_(); i < dend_(); ++i)
             Valgrind::CheckDefined(data_[i]);

diff --git a/opm/material/common/EnsureFinalized.hpp b/opm/material/common/EnsureFinalized.hpp
@@ -64,7 +64,8 @@ class EnsureFinalized
 
     OPM_HOST_DEVICE void check() const
     {
-#if USE_OPM_CHECK_PARAM_FINALIZED
+// TODO: find a proper way to handle this on the gpu, the whole purpose is avoided when not throwing
+#if USE_OPM_CHECK_PARAM_FINALIZED && !OPM_IS_INSIDE_DEVICE_FUNCTION
         if (!finalized_)
             throw std::runtime_error("Parameter class has not been finalized before usage!");
 #endif

diff --git a/opm/material/densead/DynamicEvaluation.hpp b/opm/material/densead/DynamicEvaluation.hpp
@@ -85,7 +85,7 @@ class Evaluation<ValueT, DynamicSize, staticSize>
     //! Evaluation object are well-defined.
     OPM_HOST_DEVICE void checkDefined_() const
     {
-#ifndef NDEBUG
+#if !defined(NDEBUG) && !OPM_IS_INSIDE_DEVICE_FUNCTION
         for (int i = dstart_(); i < dend_(); ++i)
             Valgrind::CheckDefined(data_[i]);
 #endif

diff --git a/opm/material/densead/Evaluation.hpp b/opm/material/densead/Evaluation.hpp
@@ -89,7 +89,7 @@ class Evaluation
     //! Evaluation object are well-defined.
     OPM_HOST_DEVICE void checkDefined_() const
     {
-#ifndef NDEBUG
+#if !defined(NDEBUG) && !OPM_IS_INSIDE_DEVICE_FUNCTION
        for (const auto& v: data_)
            Valgrind::CheckDefined(v);
 #endif

diff --git a/opm/material/densead/Evaluation1.hpp b/opm/material/densead/Evaluation1.hpp
@@ -80,7 +80,7 @@ class Evaluation<ValueT, 1>
     //! Evaluation object are well-defined.
     OPM_HOST_DEVICE void checkDefined_() const
     {
-#ifndef NDEBUG
+#if !defined(NDEBUG) && !OPM_IS_INSIDE_DEVICE_FUNCTION
        for (const auto& v: data_)
            Valgrind::CheckDefined(v);
 #endif

diff --git a/opm/material/densead/Evaluation10.hpp b/opm/material/densead/Evaluation10.hpp
@@ -80,7 +80,7 @@ class Evaluation<ValueT, 10>
     //! Evaluation object are well-defined.
     OPM_HOST_DEVICE void checkDefined_() const
     {
-#ifndef NDEBUG
+#if !defined(NDEBUG) && !OPM_IS_INSIDE_DEVICE_FUNCTION
        for (const auto& v: data_)
            Valgrind::CheckDefined(v);
 #endif

diff --git a/opm/material/densead/Evaluation11.hpp b/opm/material/densead/Evaluation11.hpp
@@ -80,7 +80,7 @@ class Evaluation<ValueT, 11>
     //! Evaluation object are well-defined.
     OPM_HOST_DEVICE void checkDefined_() const
     {
-#ifndef NDEBUG
+#if !defined(NDEBUG) && !OPM_IS_INSIDE_DEVICE_FUNCTION
        for (const auto& v: data_)
            Valgrind::CheckDefined(v);
 #endif

diff --git a/opm/material/densead/Evaluation12.hpp b/opm/material/densead/Evaluation12.hpp
@@ -80,7 +80,7 @@ class Evaluation<ValueT, 12>
     //! Evaluation object are well-defined.
     OPM_HOST_DEVICE void checkDefined_() const
     {
-#ifndef NDEBUG
+#if !defined(NDEBUG) && !OPM_IS_INSIDE_DEVICE_FUNCTION
        for (const auto& v: data_)
            Valgrind::CheckDefined(v);
 #endif

diff --git a/opm/material/densead/Evaluation2.hpp b/opm/material/densead/Evaluation2.hpp
@@ -80,7 +80,7 @@ class Evaluation<ValueT, 2>
     //! Evaluation object are well-defined.
     OPM_HOST_DEVICE void checkDefined_() const
     {
-#ifndef NDEBUG
+#if !defined(NDEBUG) && !OPM_IS_INSIDE_DEVICE_FUNCTION
        for (const auto& v: data_)
            Valgrind::CheckDefined(v);
 #endif

diff --git a/opm/material/densead/Evaluation3.hpp b/opm/material/densead/Evaluation3.hpp
@@ -80,7 +80,7 @@ class Evaluation<ValueT, 3>
     //! Evaluation object are well-defined.
     OPM_HOST_DEVICE void checkDefined_() const
     {
-#ifndef NDEBUG
+#if !defined(NDEBUG) && !OPM_IS_INSIDE_DEVICE_FUNCTION
        for (const auto& v: data_)
            Valgrind::CheckDefined(v);
 #endif

diff --git a/opm/material/densead/Evaluation4.hpp b/opm/material/densead/Evaluation4.hpp
@@ -80,7 +80,7 @@ class Evaluation<ValueT, 4>
     //! Evaluation object are well-defined.
     OPM_HOST_DEVICE void checkDefined_() const
     {
-#ifndef NDEBUG
+#if !defined(NDEBUG) && !OPM_IS_INSIDE_DEVICE_FUNCTION
        for (const auto& v: data_)
            Valgrind::CheckDefined(v);
 #endif

diff --git a/opm/material/densead/Evaluation5.hpp b/opm/material/densead/Evaluation5.hpp
@@ -80,7 +80,7 @@ class Evaluation<ValueT, 5>
     //! Evaluation object are well-defined.
     OPM_HOST_DEVICE void checkDefined_() const
     {
-#ifndef NDEBUG
+#if !defined(NDEBUG) && !OPM_IS_INSIDE_DEVICE_FUNCTION
        for (const auto& v: data_)
            Valgrind::CheckDefined(v);
 #endif

diff --git a/opm/material/densead/Evaluation6.hpp b/opm/material/densead/Evaluation6.hpp
@@ -80,7 +80,7 @@ class Evaluation<ValueT, 6>
     //! Evaluation object are well-defined.
     OPM_HOST_DEVICE void checkDefined_() const
     {
-#ifndef NDEBUG
+#if !defined(NDEBUG) && !OPM_IS_INSIDE_DEVICE_FUNCTION
        for (const auto& v: data_)
            Valgrind::CheckDefined(v);
 #endif

diff --git a/opm/material/densead/Evaluation7.hpp b/opm/material/densead/Evaluation7.hpp
@@ -80,7 +80,7 @@ class Evaluation<ValueT, 7>
     //! Evaluation object are well-defined.
     OPM_HOST_DEVICE void checkDefined_() const
     {
-#ifndef NDEBUG
+#if !defined(NDEBUG) && !OPM_IS_INSIDE_DEVICE_FUNCTION
        for (const auto& v: data_)
            Valgrind::CheckDefined(v);
 #endif

diff --git a/opm/material/densead/Evaluation8.hpp b/opm/material/densead/Evaluation8.hpp
@@ -80,7 +80,7 @@ class Evaluation<ValueT, 8>
     //! Evaluation object are well-defined.
     OPM_HOST_DEVICE void checkDefined_() const
     {
-#ifndef NDEBUG
+#if !defined(NDEBUG) && !OPM_IS_INSIDE_DEVICE_FUNCTION
        for (const auto& v: data_)
            Valgrind::CheckDefined(v);
 #endif

diff --git a/opm/material/densead/Evaluation9.hpp b/opm/material/densead/Evaluation9.hpp
@@ -80,7 +80,7 @@ class Evaluation<ValueT, 9>
     //! Evaluation object are well-defined.
     OPM_HOST_DEVICE void checkDefined_() const
     {
-#ifndef NDEBUG
+#if !defined(NDEBUG) && !OPM_IS_INSIDE_DEVICE_FUNCTION
        for (const auto& v: data_)
            Valgrind::CheckDefined(v);
 #endif

diff --git a/opm/material/fluidmatrixinteractions/EclHysteresisTwoPhaseLaw.hpp b/opm/material/fluidmatrixinteractions/EclHysteresisTwoPhaseLaw.hpp
@@ -90,6 +90,8 @@ class EclHysteresisTwoPhaseLaw : public EffectiveLawT::Traits
     //! are dependent on the phase composition
     static constexpr bool isCompositionDependent = false;
 
+    static constexpr bool isHysteresisDependent = true;
+
     /*!
      * \brief The capillary pressure-saturation curves depending on absolute saturations.
      *