[test][porousmediumflow][3p3c] use new base spatial params

test/porousmediumflow/3p3c/infiltration/problem.hh

@@ -105,9 +105,8 @@ public:
     InfiltrationThreePThreeCProblem(std::shared_ptr<const GridGeometry> gridGeometry)
     : ParentType(gridGeometry)
     {
-        temperature_ = 273.15 + 10.0; // -> 10 degrees Celsius
-        FluidSystem::init(/*tempMin=*/temperature_ - 1,
-                          /*tempMax=*/temperature_ + 1,
+        FluidSystem::init(/*tempMin=*/282.15,
+                          /*tempMax=*/284.15,
                           /*nTemp=*/3,
                           /*pressMin=*/0.8*1e5,
                           /*pressMax=*/3*1e5,
@@ -124,18 +123,6 @@ public:
     const std::string& name() const
     { return name_; }
 
-    /*!
-     * \brief Returns the temperature within the domain.
-     *
-     * \param globalPos The global position
-     *
-     * This problem assumes a temperature of 10 degrees Celsius.
-     */
-    Scalar temperatureAtPos(const GlobalPosition &globalPos) const
-    {
-        return temperature_;
-    }
-
     // \}
 
     /*!
@@ -273,7 +260,6 @@ private:
         return(sw);
     }
 
-    Scalar temperature_;
     static constexpr Scalar eps_ = 1e-6;
     std::string name_;
 };

test/porousmediumflow/3p3c/infiltration/spatialparams.hh

@@ -27,7 +27,7 @@
 #define DUMUX_INFILTRATION_THREEPTHREEC_SPATIAL_PARAMETERS_HH
 
 #include <dumux/porousmediumflow/properties.hh>
-#include <dumux/material/spatialparams/fv.hh>
+#include <dumux/porousmediumflow/fvspatialparamsmp.hh>
 #include <dumux/material/fluidmatrixinteractions/3p/parkervangenuchten.hh>
 
 namespace Dumux {
@@ -38,15 +38,15 @@ namespace Dumux {
  */
 template<class GridGeometry, class Scalar>
 class InfiltrationThreePThreeCSpatialParams
-: public FVSpatialParams<GridGeometry, Scalar,
-                         InfiltrationThreePThreeCSpatialParams<GridGeometry, Scalar>>
+: public FVPorousMediumSpatialParamsMP<GridGeometry, Scalar,
+                                       InfiltrationThreePThreeCSpatialParams<GridGeometry, Scalar>>
 {
     using GridView = typename GridGeometry::GridView;
     using FVElementGeometry = typename GridGeometry::LocalView;
     using SubControlVolume = typename FVElementGeometry::SubControlVolume;
     using Element = typename GridView::template Codim<0>::Entity;
-    using ParentType = FVSpatialParams<GridGeometry, Scalar,
-                                       InfiltrationThreePThreeCSpatialParams<GridGeometry, Scalar>>;
+    using ParentType = FVPorousMediumSpatialParamsMP<GridGeometry, Scalar,
+                                                     InfiltrationThreePThreeCSpatialParams<GridGeometry, Scalar>>;
 
     using GlobalPosition = typename SubControlVolume::GlobalPosition;
 
@@ -107,6 +107,16 @@ public:
         return makeFluidMatrixInteraction(pcKrSwCurve_);
     }
 
+    /*!
+     * \brief Returns the temperature at a given location
+     *
+     * \param globalPos The global coordinates for the given location
+     */
+    Scalar temperatureAtPos(const GlobalPosition &globalPos) const
+    {
+        return 273.15 + 10.0; // -> 10 degrees Celsius
+    }
+
 private:
     bool isFineMaterial_(const GlobalPosition &globalPos) const
     { return