Merge branch 'cleanup/exercise_basic' into 'master'

Smaller changes to exercise-basic

See merge request !184

exercises/exercise-basic/README.md

@@ -68,7 +68,7 @@ paraview injection-2p2c.pvd
 
 ```cmake
 # the two-phase non-isothermal simulation program
-dune_add_test(NAME exercise_basic_2pni
+dumux_add_test(NAME exercise_basic_2pni
               SOURCES 2pnimain.cc)
 ```
 

exercises/exercise-basic/injection2pspatialparams.hh

@@ -41,13 +41,13 @@ namespace Dumux {
  *        which uses the isothermal two-phase two-component
  *        fully implicit model.
  */
-template<class FVGridGeometry, class Scalar>
+template<class GridGeometry, class Scalar>
 class InjectionSpatialParams
-: public FVPorousMediumFlowSpatialParamsMP<FVGridGeometry, Scalar, InjectionSpatialParams<FVGridGeometry, Scalar>>
+: public FVPorousMediumFlowSpatialParamsMP<GridGeometry, Scalar, InjectionSpatialParams<GridGeometry, Scalar>>
 {
-    using ThisType = InjectionSpatialParams<FVGridGeometry, Scalar>;
-    using ParentType = FVPorousMediumFlowSpatialParamsMP<FVGridGeometry, Scalar, ThisType>;
-    using GridView = typename FVGridGeometry::GridView;
+    using ThisType = InjectionSpatialParams<GridGeometry, Scalar>;
+    using ParentType = FVPorousMediumFlowSpatialParamsMP<GridGeometry, Scalar, ThisType>;
+    using GridView = typename GridGeometry::GridView;
 
     // get the dimensions of the simulation domain from GridView
     static const int dimWorld = GridView::dimensionworld;
@@ -63,10 +63,10 @@ public:
     /*!
      * \brief The constructor
      *
-     * \param fvGridGeometry The finite volume grid geometry
+     * \param gridGeometry The finite volume grid geometry
      */
-    InjectionSpatialParams(std::shared_ptr<const FVGridGeometry>& fvGridGeometry)
-    : ParentType(fvGridGeometry)
+    InjectionSpatialParams(std::shared_ptr<const GridGeometry>& gridGeometry)
+    : ParentType(gridGeometry)
     , aquitardPcKrSwCurve_("SpatialParams.Aquitard")
     , aquiferPcKrSwCurve_("SpatialParams.Aquifer")
     {

exercises/solution/exercise-basic/spatialparams.hh → exercises/solution/exercise-basic/injection2pspatialparams.hh

@@ -128,6 +128,15 @@ public:
     int wettingPhaseAtPos(const GlobalPosition& globalPos) const
     { return FluidSystem::H2OIdx; }
 
+    /*!
+     * \brief Returns the temperature at the domain at the given position
+     * \param globalPos The position in global coordinates where the temperature should be specified
+     */
+    Scalar temperatureAtPos(const GlobalPosition& globalPos) const
+    {
+        return 273.15 + 30; // [K]
+    }
+
 private:
 
     static constexpr Scalar eps_ = 1e-6;
@@ -143,7 +152,6 @@ private:
     Scalar aquiferK_;
     Scalar aquiferHeightFromBottom_;
 
-
     Scalar aquitardPorosity_;
     Scalar aquiferPorosity_;
 

exercises/solution/exercise-basic/properties2pni.hh

@@ -31,7 +31,7 @@
 #include <dumux/porousmediumflow/2p/model.hh>
 #include <dumux/material/fluidsystems/h2on2.hh>
 
-#include "spatialparams.hh"
+#include "injection2pspatialparams.hh"
 #include "injection2pniproblem.hh"
 
 namespace Dumux::Properties {