Merge branch 'fix/mp-adapter-temp' into 'master'

[mpadapter] Store copy of pcKrSw law if called with temporary

See merge request !2501

CHANGELOG.md

@@ -12,6 +12,27 @@ Differences Between DuMu<sup>x</sup> 3.4 and DuMu<sup>x</sup> 3.3
     - `extractmodulepart.sh` no longer creates an install file, instead, you can now generate install scripts for your module using the new script `bin/util/makeinstallscript.py`.
     - Note: the old shells script will be removed after release 3.4.
 
+### Immediate interface changes not allowing/requiring a deprecation period:
+- __MPNC__: The `MPAdapter` can now also be called with a temporary `pcKrSw` objects. For this, the compiler needs to deduce the
+            class's template argument types. You may need to adapt your `spatialParams` from
+
+```
+using MPAdapter = Dumux::FluidMatrix::MPAdapter<PcKrSwCurve, 2>;
+...
+auto fluidMatrixInteractionAtPos(const GlobalPosition &globalPos) const
+{
+    return makeFluidMatrixInteraction(MPAdapter(pcKrSwCurve_));
+}
+```
+to
+```
+// alias for MPAdapter is removed
+auto fluidMatrixInteractionAtPos(const GlobalPosition &globalPos) const
+{
+    return makeFluidMatrixInteraction(FluidMatrix::MPAdapter(pcKrSwCurve_));
+}
+```
+
 Differences Between DuMu<sup>x</sup> 3.3 and DuMu<sup>x</sup> 3.2
 =============================================
 

dumux/material/fluidmatrixinteractions/2p/smoothedlinearlaw.hh

@@ -66,6 +66,12 @@ public:
     static constexpr bool isRegularized()
     { return false; }
 
+    /*!
+     * \brief Return the number of fluid phases
+     */
+    static constexpr int numFluidPhases()
+    { return 2; }
+
     /*!
      * \brief The parameter type
      * \tparam Scalar The scalar type

dumux/material/fluidmatrixinteractions/mp/mpadapter.hh

@@ -107,7 +107,7 @@ namespace Dumux::FluidMatrix {
  * \ingroup Fluidmatrixinteractions
  * \brief An adapter for mpnc to use the capillary pressure-saturation relationships
  */
-template <class MaterialLaw, int numFluidPhases = MaterialLaw::numFluidPhases()>
+template <class MaterialLaw, int numFluidPhases = std::decay_t<MaterialLaw>::numFluidPhases()>
 class MPAdapter
 {
     static_assert(AlwaysFalse<MaterialLaw>::value, "Adapter not implemented for the specified number of phases");
@@ -119,10 +119,10 @@ class MPAdapter<MaterialLaw, 2>
 : public Adapter<MPAdapter<MaterialLaw, 2>, MultiPhasePcKrSw>
 {
 public:
-    using Scalar = typename MaterialLaw::Scalar;
+    using Scalar = typename std::decay_t<MaterialLaw>::Scalar;
 
-    MPAdapter(const MaterialLaw& pcKrS)
-    : pcKrS_(pcKrS)
+    MPAdapter(MaterialLaw&& pcKrS)
+    : pcKrS_(std::forward<MaterialLaw>(pcKrS))
     {}
 
     /*!
@@ -161,9 +161,18 @@ public:
         return values;
     }
 private:
-    const MaterialLaw& pcKrS_;
+    MaterialLaw pcKrS_;
 };
 
+/*!
+ * \ingroup Fluidmatrixinteractions
+ * \brief Deduction guide for the MPAdapter class.
+ *        Makes sure that MPAdapter stores a copy of T if
+ *        the constructor is called with a temporary object.
+ */
+template<typename T>
+MPAdapter(T&&) -> MPAdapter<T>;
+
 } // end namespace Dumux::FluidMatrix
 
 

test/porousmediumflow/mpnc/2p2ccomparison/spatialparams.hh

@@ -53,7 +53,6 @@ class MPNCComparisonSpatialParams
     using GlobalPosition = typename SubControlVolume::GlobalPosition;
 
     using PcKrSwCurve = FluidMatrix::BrooksCoreyDefault<Scalar>;
-    using MPAdapter = Dumux::FluidMatrix::MPAdapter<PcKrSwCurve, 2>;
 
 public:
     using PermeabilityType = Scalar;
@@ -96,7 +95,7 @@ public:
      */
     auto fluidMatrixInteractionAtPos(const GlobalPosition& globalPos) const
     {
-        return makeFluidMatrixInteraction(MPAdapter(pcKrSw_));
+        return makeFluidMatrixInteraction(FluidMatrix::MPAdapter(pcKrSw_));
     }
 
     /*!

test/porousmediumflow/mpnc/kinetic/spatialparams.hh

@@ -63,7 +63,6 @@ class EvaporationAtmosphereSpatialParams
     static constexpr auto dimWorld = GridView::dimensionworld;
 
     using PcKrSwCurve = FluidMatrix::BrooksCoreyDefault<Scalar>;
-    using MPAdapter = Dumux::FluidMatrix::MPAdapter<PcKrSwCurve, 2>;
 
     using NonwettingSolidInterfacialArea = FluidMatrix::InterfacialArea<Scalar,
                                                                         FluidMatrix::InterfacialAreaExponentialCubic,
@@ -248,9 +247,9 @@ public:
     auto fluidMatrixInteractionAtPos(const GlobalPosition &globalPos) const
     {
         if (inFF_(globalPos))
-            return makeFluidMatrixInteraction(MPAdapter(*pcKrSwCurveFF_), *aNsFreeFlow_, *aNwFreeFlow_, *aWs_);
+            return makeFluidMatrixInteraction(FluidMatrix::MPAdapter(*pcKrSwCurveFF_), *aNsFreeFlow_, *aNwFreeFlow_, *aWs_);
         else if (inPM_(globalPos))
-            return makeFluidMatrixInteraction(MPAdapter(*pcKrSwCurvePM_), *aNs_, *aNw_, *aWs_);
+            return makeFluidMatrixInteraction(FluidMatrix::MPAdapter(*pcKrSwCurvePM_), *aNs_, *aNw_, *aWs_);
         else DUNE_THROW(Dune::InvalidStateException, "You should not be here: x=" << globalPos[0] << " y= "<< globalPos[dimWorld-1]);
     }
 

test/porousmediumflow/mpnc/obstacle/spatialparams.hh

@@ -54,7 +54,6 @@ class ObstacleSpatialParams
     using GlobalPosition = typename SubControlVolume::GlobalPosition;
 
     using PcKrSwCurve = FluidMatrix::SmoothedLinearLaw<Scalar>;
-    using MPAdapter = Dumux::FluidMatrix::MPAdapter<PcKrSwCurve, 2>;
 
 public:
     //! Export the type used for the permeability
@@ -93,7 +92,7 @@ public:
      */
     auto fluidMatrixInteractionAtPos(const GlobalPosition &globalPos) const
     {
-        return makeFluidMatrixInteraction(MPAdapter(pcKrSwCurve_));
+        return makeFluidMatrixInteraction(FluidMatrix::MPAdapter(pcKrSwCurve_));
     }
 
     /*!

test/porousmediumflow/mpnc/thermalnonequilibrium/spatialparams.hh

@@ -58,7 +58,6 @@ class CombustionSpatialParams
     using GlobalPosition = typename SubControlVolume::GlobalPosition;
 
     using PcKrSwCurve = FluidMatrix::HeatPipeLaw<Scalar>;
-    using MPAdapter = Dumux::FluidMatrix::MPAdapter<PcKrSwCurve, 2>;
 
 public:
     //! Export the type used for the permeability
@@ -195,7 +194,7 @@ public:
      */
     auto fluidMatrixInteractionAtPos(const GlobalPosition &globalPos) const
     {
-        return makeFluidMatrixInteraction(MPAdapter(*pcKrSwCurve_));
+        return makeFluidMatrixInteraction(FluidMatrix::MPAdapter(*pcKrSwCurve_));
     }
 
 private: