From 515fe7d0d13a131ab04e8680b5524b1d2b44cc8a Mon Sep 17 00:00:00 2001
From: VivienL <vivien.langhans@iws.uni-stuttgart.de>
Date: Tue, 4 Mar 2025 10:57:01 +0100
Subject: [PATCH] merge conflict solved, add patches

---
 .patches/exercise-basic/exercise-basic.patch  |  46 ++++---
 .../exercise-biomineralization.patch          | 123 +++++++++++-------
 .../exercise-coupling-ff-pm.patch             | 112 +++++++++-------
 .../exercise-dunemodule.patch                 |   2 +-
 .../exercise-fluidsystem.patch                |  47 +++----
 .../exercise-fractures.patch                  |  68 +++++-----
 .patches/exercise-grids/exercise-grids.patch  |  22 ++--
 .../exercise-mainfile/exercise-mainfile.patch |  29 +++--
 .patches/exercise-model/exercise-model.patch  |  28 ++--
 .../exercise-properties.patch                 |  18 +--
 .../exercise-runtimeparams.patch              |  25 ++--
 11 files changed, 292 insertions(+), 228 deletions(-)

diff --git a/.patches/exercise-basic/exercise-basic.patch b/.patches/exercise-basic/exercise-basic.patch
index e38d3644..26e8cd0d 100644
--- a/.patches/exercise-basic/exercise-basic.patch
+++ b/.patches/exercise-basic/exercise-basic.patch
@@ -1,7 +1,7 @@
 diff -ruN exercises/exercise-basic/2pmain.cc exercises/solution/exercise-basic/2pmain.cc
---- exercises/exercise-basic/2pmain.cc	2025-03-04 21:00:57.445082578 +0100
+--- exercises/exercise-basic/2pmain.cc	2025-02-26 11:57:52.812342780 +0100
 +++ exercises/solution/exercise-basic/2pmain.cc	1970-01-01 01:00:00.000000000 +0100
-@@ -1,145 +0,0 @@
+@@ -1,153 +0,0 @@
 -// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
 -// vi: set et ts=4 sw=4 sts=4:
 -//
@@ -31,6 +31,10 @@ diff -ruN exercises/exercise-basic/2pmain.cc exercises/solution/exercise-basic/2
 -#include <dumux/io/vtkoutputmodule.hh>
 -#include <dumux/io/grid/gridmanager_yasp.hh>
 -
+-/*!
+-  * TODO:dumux-course-task 3:
+-    * In 2pnimain.cc include the correct properties headerfile 
+- */
 -// The properties file, where the compile time options are defined
 -#include "properties2p.hh"
 -
@@ -40,7 +44,11 @@ diff -ruN exercises/exercise-basic/2pmain.cc exercises/solution/exercise-basic/2
 -int main(int argc, char** argv)
 -{
 -    using namespace Dumux;
--
+-    
+-    /*!
+-      * TODO:dumux-course-task 3:
+-        * In 2pnimain.cc change the type tag for the new injection problem
+-     */
 -    // define the type tag for this problem
 -    using TypeTag = Properties::TTag::Injection2pCC;
 -
@@ -149,7 +157,7 @@ diff -ruN exercises/exercise-basic/2pmain.cc exercises/solution/exercise-basic/2
 -} // end main
 diff -ruN exercises/exercise-basic/2pnimain.cc exercises/solution/exercise-basic/2pnimain.cc
 --- exercises/exercise-basic/2pnimain.cc	1970-01-01 01:00:00.000000000 +0100
-+++ exercises/solution/exercise-basic/2pnimain.cc	2025-03-04 21:00:57.449082471 +0100
++++ exercises/solution/exercise-basic/2pnimain.cc	2025-02-26 11:38:46.841816361 +0100
 @@ -0,0 +1,138 @@
 +// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
 +// vi: set et ts=4 sw=4 sts=4:
@@ -290,8 +298,8 @@ diff -ruN exercises/exercise-basic/2pnimain.cc exercises/solution/exercise-basic
 +    return 0;
 +} // end main
 diff -ruN exercises/exercise-basic/CMakeLists.txt exercises/solution/exercise-basic/CMakeLists.txt
---- exercises/exercise-basic/CMakeLists.txt	2025-03-04 21:00:57.445082578 +0100
-+++ exercises/solution/exercise-basic/CMakeLists.txt	2025-03-04 21:00:57.449082471 +0100
+--- exercises/exercise-basic/CMakeLists.txt	2025-02-26 12:06:05.764771983 +0100
++++ exercises/solution/exercise-basic/CMakeLists.txt	2025-02-26 11:38:46.841816361 +0100
 @@ -1,12 +1,9 @@
  # SPDX-FileCopyrightText: Copyright © DuMux-Course contributors, see AUTHORS.md in root folder
  # SPDX-License-Identifier: GPL-3.0-or-later
@@ -300,7 +308,7 @@ diff -ruN exercises/exercise-basic/CMakeLists.txt exercises/solution/exercise-ba
 -dumux_add_test(NAME exercise_basic_2p
 -               SOURCES 2pmain.cc)
 -
--# here, add the two-phase non-isothermal simulation program
+-# TODO: add the two-phase non-isothermal simulation program
 -
 +# the two-phase non-isothermal simulation program
 +dumux_add_test(NAME exercise_basic_2pni_solution
@@ -309,8 +317,8 @@ diff -ruN exercises/exercise-basic/CMakeLists.txt exercises/solution/exercise-ba
  # add a symlink for each input file
  add_input_file_links()
 diff -ruN exercises/exercise-basic/injection2pniproblem.hh exercises/solution/exercise-basic/injection2pniproblem.hh
---- exercises/exercise-basic/injection2pniproblem.hh	2025-03-04 21:00:57.445082578 +0100
-+++ exercises/solution/exercise-basic/injection2pniproblem.hh	2025-03-04 21:00:57.449082471 +0100
+--- exercises/exercise-basic/injection2pniproblem.hh	2025-02-26 11:38:46.801818192 +0100
++++ exercises/solution/exercise-basic/injection2pniproblem.hh	2025-02-26 11:38:46.841816361 +0100
 @@ -7,7 +7,7 @@
  /*!
   * \file
@@ -401,7 +409,7 @@ diff -ruN exercises/exercise-basic/injection2pniproblem.hh exercises/solution/ex
      }
  
 diff -ruN exercises/exercise-basic/injection2pproblem.hh exercises/solution/exercise-basic/injection2pproblem.hh
---- exercises/exercise-basic/injection2pproblem.hh	2025-03-04 21:00:57.446082551 +0100
+--- exercises/exercise-basic/injection2pproblem.hh	2025-02-26 11:38:46.801818192 +0100
 +++ exercises/solution/exercise-basic/injection2pproblem.hh	1970-01-01 01:00:00.000000000 +0100
 @@ -1,211 +0,0 @@
 -// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
@@ -616,22 +624,24 @@ diff -ruN exercises/exercise-basic/injection2pproblem.hh exercises/solution/exer
 -
 -#endif
 diff -ruN exercises/exercise-basic/params.input exercises/solution/exercise-basic/params.input
---- exercises/exercise-basic/params.input	2024-07-11 13:35:11.644137283 +0200
-+++ exercises/solution/exercise-basic/params.input	2025-03-03 15:23:33.246567644 +0100
-@@ -24,7 +24,7 @@
+--- exercises/exercise-basic/params.input	2025-02-26 12:13:01.057757112 +0100
++++ exercises/solution/exercise-basic/params.input	2025-02-26 11:38:46.841816361 +0100
+@@ -23,8 +23,8 @@
+ Aquifer.Swr = 0.2
  Aquifer.Snr = 0.0
  
- # these parameters are only used in the nonisothermal model. Uncomment them for that
+-# TODO: these parameters are only used in the nonisothermal model. Uncomment them for that
 -#[Component]
 -#SolidDensity = 2700 # solid density of granite
 -#SolidThermalConductivity = 2.8 # solid thermal conducitivity of granite
 -#SolidHeatCapacity = 790 # solid heat capacity of granite
++# these parameters are only used in the nonisothermal model. Uncomment them for that
 +[Component]
 +SolidDensity = 2700 # solid density of granite
 +SolidThermalConductivity = 2.8 # solid thermal conducitivity of granite
 +SolidHeatCapacity = 790 # solid heat capacity of granite
 diff -ruN exercises/exercise-basic/properties2p.hh exercises/solution/exercise-basic/properties2p.hh
---- exercises/exercise-basic/properties2p.hh	2025-03-04 21:00:57.446082551 +0100
+--- exercises/exercise-basic/properties2p.hh	2025-02-26 11:38:46.801818192 +0100
 +++ exercises/solution/exercise-basic/properties2p.hh	1970-01-01 01:00:00.000000000 +0100
 @@ -1,63 +0,0 @@
 -// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
@@ -698,8 +708,8 @@ diff -ruN exercises/exercise-basic/properties2p.hh exercises/solution/exercise-b
 -
 -#endif
 diff -ruN exercises/exercise-basic/properties2pni.hh exercises/solution/exercise-basic/properties2pni.hh
---- exercises/exercise-basic/properties2pni.hh	2025-03-04 21:00:57.446082551 +0100
-+++ exercises/solution/exercise-basic/properties2pni.hh	2025-03-04 21:00:57.449082471 +0100
+--- exercises/exercise-basic/properties2pni.hh	2025-02-26 11:38:46.801818192 +0100
++++ exercises/solution/exercise-basic/properties2pni.hh	2025-02-26 11:38:46.841816361 +0100
 @@ -24,13 +24,9 @@
  
  namespace Dumux::Properties {
@@ -716,7 +726,7 @@ diff -ruN exercises/exercise-basic/properties2pni.hh exercises/solution/exercise
  } // end namespace TTag
  
 diff -ruN exercises/exercise-basic/README.md exercises/solution/exercise-basic/README.md
---- exercises/exercise-basic/README.md	2025-03-03 15:23:33.239567801 +0100
+--- exercises/exercise-basic/README.md	2025-03-04 10:55:49.676212309 +0100
 +++ exercises/solution/exercise-basic/README.md	1970-01-01 01:00:00.000000000 +0100
 @@ -1,94 +0,0 @@
 -# Exercise Basics (DuMuX course)
diff --git a/.patches/exercise-biomineralization/exercise-biomineralization.patch b/.patches/exercise-biomineralization/exercise-biomineralization.patch
index 65eb7920..7a2f6aae 100644
--- a/.patches/exercise-biomineralization/exercise-biomineralization.patch
+++ b/.patches/exercise-biomineralization/exercise-biomineralization.patch
@@ -1,9 +1,12 @@
 diff -ruN exercises/exercise-biomineralization/biominproblem.hh exercises/solution/exercise-biomineralization/biominproblem.hh
---- exercises/exercise-biomineralization/biominproblem.hh	2025-03-04 21:00:57.446082551 +0100
-+++ exercises/solution/exercise-biomineralization/biominproblem.hh	2025-03-04 21:00:57.449082471 +0100
-@@ -19,10 +19,12 @@
+--- exercises/exercise-biomineralization/biominproblem.hh	2025-03-03 11:34:18.218509920 +0100
++++ exercises/solution/exercise-biomineralization/biominproblem.hh	2025-02-26 11:38:46.841816361 +0100
+@@ -17,12 +17,14 @@
+ #include <dumux/common/numeqvector.hh>
+ #include <dumux/porousmediumflow/problem.hh>
  
- // TODO: dumux-course-task
+-// TODO: dumux-course-task 3
++// TODO: dumux-course-task
  // include chemistry file here
 +#include "chemistry/simplebiominreactions.hh" // chemical reactions
  
@@ -14,9 +17,12 @@ diff -ruN exercises/exercise-biomineralization/biominproblem.hh exercises/soluti
   * \brief Problem biomineralization (MICP) in an experimental setup.
   */
  template <class TypeTag>
-@@ -53,6 +55,7 @@
+@@ -51,8 +53,9 @@
+     using Element = typename GridView::template Codim<0>::Entity;
+     using SolutionVector = GetPropType<TypeTag, Properties::SolutionVector>;
      using SubControlVolume = typename FVElementGeometry::SubControlVolume;
-     // TODO: dumux-course-task
+-    // TODO: dumux-course-task 3
++    // TODO: dumux-course-task
      // set the chemistry TypeTag
 +    using Chemistry = typename Dumux::SimpleBiominReactions<NumEqVector, VolumeVariables>;
  
@@ -37,9 +43,12 @@ diff -ruN exercises/exercise-biomineralization/biominproblem.hh exercises/soluti
             && globalPos[1] < 12.0 + eps_
             && time_ < injBioTime_)
          {
-@@ -185,6 +188,13 @@
+@@ -183,8 +186,15 @@
+             values[conti0EqIdx + CaIdx]   = - waterFlux * concCa_ / FluidSystem::molarMass(CaIdx);
+             values[conti0EqIdx + UreaIdx] = - waterFlux * concUrea_ / FluidSystem::molarMass(UreaIdx);
          }
-         // TODO: dumux-course-task
+-        // TODO: dumux-course-task 5
++        // TODO: dumux-course-task
          // Set CO2 injection below aquitard after the injBioTime
 +        if(globalPos[0] < eps_
 +                && globalPos[1] > 2.0 + eps_
@@ -51,9 +60,12 @@ diff -ruN exercises/exercise-biomineralization/biominproblem.hh exercises/soluti
  
          return values;
      }
-@@ -247,14 +257,15 @@
+@@ -245,16 +255,17 @@
+     {
+         NumEqVector source(0.0);
  
-         // TODO: dumux-course-task
+-        // TODO: dumux-course-task 3
++        // TODO: dumux-course-task
          // set Chemistry
 -//         Chemistry chemistry;
 +        Chemistry chemistry;
@@ -70,8 +82,8 @@ diff -ruN exercises/exercise-biomineralization/biominproblem.hh exercises/soluti
      {
          return Kxx_;
 diff -ruN exercises/exercise-biomineralization/biominspatialparams.hh exercises/solution/exercise-biomineralization/biominspatialparams.hh
---- exercises/exercise-biomineralization/biominspatialparams.hh	2025-03-04 21:00:57.446082551 +0100
-+++ exercises/solution/exercise-biomineralization/biominspatialparams.hh	2025-03-04 21:00:57.449082471 +0100
+--- exercises/exercise-biomineralization/biominspatialparams.hh	2025-02-26 11:38:46.802818146 +0100
++++ exercises/solution/exercise-biomineralization/biominspatialparams.hh	2025-02-26 11:38:46.841816361 +0100
 @@ -18,7 +18,7 @@
  #include <dumux/material/fluidmatrixinteractions/porosityprecipitation.hh>
  // TODO: dumux-course-task
@@ -91,9 +103,9 @@ diff -ruN exercises/exercise-biomineralization/biominspatialparams.hh exercises/
  
      Scalar initialPorosity_;
 diff -ruN exercises/exercise-biomineralization/chemistry/simplebiominreactions.hh exercises/solution/exercise-biomineralization/chemistry/simplebiominreactions.hh
---- exercises/exercise-biomineralization/chemistry/simplebiominreactions.hh	2025-03-04 21:00:57.446082551 +0100
-+++ exercises/solution/exercise-biomineralization/chemistry/simplebiominreactions.hh	2025-03-04 21:00:57.449082471 +0100
-@@ -73,24 +73,26 @@
+--- exercises/exercise-biomineralization/chemistry/simplebiominreactions.hh	2025-03-03 11:26:35.285339610 +0100
++++ exercises/solution/exercise-biomineralization/chemistry/simplebiominreactions.hh	2025-02-26 11:38:46.841816361 +0100
+@@ -73,36 +73,38 @@
          //   define and compute some parameters for convenience:
          const Scalar xwCa = volVars.moleFraction(liquidPhaseIdx,CaIdx);
          const Scalar densityBiofilm = volVars.solidComponentDensity(BiofilmPhaseIdx);
@@ -101,8 +113,9 @@ diff -ruN exercises/exercise-biomineralization/chemistry/simplebiominreactions.h
          using std::max;
          const Scalar volFracBiofilm = max(volVars.solidVolumeFraction(BiofilmPhaseIdx),0.0);
  
+-        // TODO: dumux-course-task 2
 +
-         // TODO: dumux-course-task
++        // TODO: dumux-course-task
          // implement mass of biofilm
 -        const Scalar massBiofilm = 0.0;
 +        const Scalar massBiofilm = densityBiofilm * volFracBiofilm;
@@ -111,22 +124,24 @@ diff -ruN exercises/exercise-biomineralization/chemistry/simplebiominreactions.h
                                                   xwCa,
                                                   volVars.moleFraction(liquidPhaseIdx,CO2Idx));  // [mol_urea/kg_H2O]
  
-         // TODO: dumux-course-task
+-        // TODO: dumux-course-task 2
 -        // compute rate of ureolysis by implementing Zub and rurea
 -        const Scalar Zub = 0.0;
 -        const Scalar rurea = 0.0;
++        // TODO: dumux-course-task
 +        // compute rate of ureolysis by implementing Z_urease,biofilm and r_urea
 +        const Scalar Zub = kub_ *  massBiofilm; // [kg urease/m³]
 +        const Scalar rurea = kUrease_ * Zub * molalityUrea / (kUrea_ + molalityUrea); // [mol/m³s]
  
--        // TODO: dumux-course-task
+-        // TODO: dumux-course-task 2
          // compute/set dissolution and precipitation rate of calcite
 -        const Scalar rprec = 0.0;
 +        const Scalar rprec = rurea;
  
          // set source terms
-         // TODO: dumux-course-task
-@@ -98,11 +100,11 @@
+-        // TODO: dumux-course-task 2
++        // TODO: dumux-course-task
+         // set the source terms using the reaction rates defined above and signs based on the stoichiometry of the reactions.
          // Hint: Ammonium occurs in the reaction equation, but is not accounted for in this simplified setup.
          // Additionally, the consumption of water by the reaction may be neglected, as water is present in excess.
          q[H2OIdx]     += 0.0;
@@ -143,8 +158,8 @@ diff -ruN exercises/exercise-biomineralization/chemistry/simplebiominreactions.h
  
  private:
 diff -ruN exercises/exercise-biomineralization/CMakeLists.txt exercises/solution/exercise-biomineralization/CMakeLists.txt
---- exercises/exercise-biomineralization/CMakeLists.txt	2025-03-04 21:00:57.446082551 +0100
-+++ exercises/solution/exercise-biomineralization/CMakeLists.txt	2025-03-04 21:00:57.449082471 +0100
+--- exercises/exercise-biomineralization/CMakeLists.txt	2025-02-26 11:38:46.801818192 +0100
++++ exercises/solution/exercise-biomineralization/CMakeLists.txt	2025-02-26 11:38:46.841816361 +0100
 @@ -2,9 +2,9 @@
  # SPDX-License-Identifier: GPL-3.0-or-later
  
@@ -158,8 +173,8 @@ diff -ruN exercises/exercise-biomineralization/CMakeLists.txt exercises/solution
  # add a symlink for each input file
  add_input_file_links()
 diff -ruN exercises/exercise-biomineralization/components/biofilm.hh exercises/solution/exercise-biomineralization/components/biofilm.hh
---- exercises/exercise-biomineralization/components/biofilm.hh	2025-03-04 21:00:57.446082551 +0100
-+++ exercises/solution/exercise-biomineralization/components/biofilm.hh	2025-03-04 21:00:57.449082471 +0100
+--- exercises/exercise-biomineralization/components/biofilm.hh	2025-02-26 11:38:46.802818146 +0100
++++ exercises/solution/exercise-biomineralization/components/biofilm.hh	2025-02-26 11:38:46.842816315 +0100
 @@ -12,9 +12,10 @@
  #ifndef DUMUX_BIOFILM_HH
  #define DUMUX_BIOFILM_HH
@@ -173,15 +188,19 @@ diff -ruN exercises/exercise-biomineralization/components/biofilm.hh exercises/s
  namespace Dumux::Components {
  
 diff -ruN exercises/exercise-biomineralization/fluidmatrixinteractions/permeabilitypowerlaw.hh exercises/solution/exercise-biomineralization/fluidmatrixinteractions/permeabilitypowerlaw.hh
---- exercises/exercise-biomineralization/fluidmatrixinteractions/permeabilitypowerlaw.hh	2025-03-04 21:00:57.446082551 +0100
-+++ exercises/solution/exercise-biomineralization/fluidmatrixinteractions/permeabilitypowerlaw.hh	2025-03-04 21:00:57.450082444 +0100
-@@ -41,10 +41,11 @@
+--- exercises/exercise-biomineralization/fluidmatrixinteractions/permeabilitypowerlaw.hh	2025-03-03 11:37:11.636848883 +0100
++++ exercises/solution/exercise-biomineralization/fluidmatrixinteractions/permeabilitypowerlaw.hh	2025-02-26 11:38:46.842816315 +0100
+@@ -39,12 +39,13 @@
+     PermeabilityType evaluatePermeability(PermeabilityType refPerm, Scalar refPoro, Scalar poro) const
+     {
          using std::pow;
-         // TODO: dumux-course-task
+-        // TODO: dumux-course-task 6
++        // TODO: dumux-course-task
          // read the exponent for the power law from the input file
 +        const Scalar exponent = getParam<Scalar>("PowerLaw.Exponent", 5.0);
  
-         // TODO: dumux-course-task
+-        // TODO: dumux-course-task 6
++        // TODO: dumux-course-task
          // return the updated permeability according to K=K_0*(poro/refPoro)^exponent
 -        return refPerm;
 +        return refPerm * pow(poro/refPoro, exponent);
@@ -189,8 +208,8 @@ diff -ruN exercises/exercise-biomineralization/fluidmatrixinteractions/permeabil
  };
  
 diff -ruN exercises/exercise-biomineralization/fluidsystems/biomin.hh exercises/solution/exercise-biomineralization/fluidsystems/biomin.hh
---- exercises/exercise-biomineralization/fluidsystems/biomin.hh	2025-03-04 21:00:57.446082551 +0100
-+++ exercises/solution/exercise-biomineralization/fluidsystems/biomin.hh	2025-03-04 21:00:57.450082444 +0100
+--- exercises/exercise-biomineralization/fluidsystems/biomin.hh	2025-02-26 11:38:46.802818146 +0100
++++ exercises/solution/exercise-biomineralization/fluidsystems/biomin.hh	2025-02-26 11:38:46.842816315 +0100
 @@ -219,7 +219,7 @@
      static void init()
      {
@@ -201,9 +220,17 @@ diff -ruN exercises/exercise-biomineralization/fluidsystems/biomin.hh exercises/
      }
  
 diff -ruN exercises/exercise-biomineralization/params.input exercises/solution/exercise-biomineralization/params.input
---- exercises/exercise-biomineralization/params.input	2025-03-03 15:23:33.241567756 +0100
-+++ exercises/solution/exercise-biomineralization/params.input	2025-03-03 15:23:33.246567644 +0100
-@@ -16,10 +16,10 @@
+--- exercises/exercise-biomineralization/params.input	2025-03-03 11:36:58.886338421 +0100
++++ exercises/solution/exercise-biomineralization/params.input	2025-02-26 11:38:46.842816315 +0100
+@@ -10,18 +10,16 @@
+ UpperRight = 20 15 # x-/y-coordinates of the upper-right corner of the grid [m]
+ Cells = 20 15 # x-/y-resolution of the grid
+ 
+-# TODO: dumux-course-task 4
+-# vary parameters InjBioTime, InitBiofilm, InjVolumeflux, ConcUrea and ConcCa
+ [Initial]
+ InitDensityW = 997 # [kg/m³] initial wetting density
+ InitPressure = 1e5 # [Pa] initial pressure
  InitBiofilm = 0.05 # [-] initial volumefraction biofilm
  
  [Injection]
@@ -217,7 +244,7 @@ diff -ruN exercises/exercise-biomineralization/params.input exercises/solution/e
  ConcCa = 40 # [kg/m³] injected calcium concentration (max: 50)
  ConcUrea = 60 # [kg/m³] injected urea concentration, should be 1.5 times ConcCa (max: 80)
  
-@@ -35,7 +35,6 @@
+@@ -37,7 +35,6 @@
  Aquitard.Swr = 0.0
  Aquitard.Snr = 0.0
  
@@ -225,23 +252,26 @@ diff -ruN exercises/exercise-biomineralization/params.input exercises/solution/e
  [BioCoefficients]
  RhoBiofilm = 6.9 # [kg/m³] density of biofilm
  
-@@ -48,4 +47,6 @@
+@@ -49,5 +46,7 @@
+ [Brine]
  Salinity = 0.1
  
- #TODO: dumux-course-task
+-#TODO: dumux-course-task 6
 -# add the power law's exponent parameter PowerLaw.Exponent = 5.0
++#TODO: dumux-course-task
 +# add the power law's exponent parameter PowerLaw.Exponent = 5
 +[PowerLaw]
 +Exponent = 5.0
 diff -ruN exercises/exercise-biomineralization/properties.hh exercises/solution/exercise-biomineralization/properties.hh
---- exercises/exercise-biomineralization/properties.hh	2025-03-04 21:00:57.446082551 +0100
-+++ exercises/solution/exercise-biomineralization/properties.hh	2025-03-04 21:00:57.450082444 +0100
+--- exercises/exercise-biomineralization/properties.hh	2025-03-03 11:38:57.413788851 +0100
++++ exercises/solution/exercise-biomineralization/properties.hh	2025-02-26 11:38:46.842816315 +0100
 @@ -18,17 +18,20 @@
  #include <dumux/discretization/cctpfa.hh>
  #include <dumux/porousmediumflow/2pncmin/model.hh>
  #include <dumux/porousmediumflow/problem.hh>
 -#include <dumux/material/components/simpleco2.hh> //!< Simplified CO2 component based on ideal gas law
- // TODO: dumux-course-task
+-// TODO: dumux-course-task 7
++// TODO: dumux-course-task
  // include the CO2 component and tabulated values from DuMux
 -#include "solidsystems/biominsolidphase.hh" // The biomineralization solid system
 +#include <dumux/material/components/co2.hh> //!< CO2 component for use with tabulated values
@@ -259,9 +289,12 @@ diff -ruN exercises/exercise-biomineralization/properties.hh exercises/solution/
  namespace Properties {
  
  //! Create new type tag for the problem
-@@ -54,7 +57,7 @@
+@@ -52,9 +55,9 @@
+ {
+ private:
      using Scalar = GetPropType<TypeTag, Properties::Scalar>;
-     // TODO: dumux-course-task
+-    // TODO: dumux-course-task 7
++    // TODO: dumux-course-task
      // use the CO2 component with tabulated values
 -    using CO2Impl = Components::SimpleCO2<Scalar>;
 +    using CO2Impl = Components::CO2<Scalar, GeneratedCO2Tables::CO2Tables>;
@@ -269,7 +302,7 @@ diff -ruN exercises/exercise-biomineralization/properties.hh exercises/solution/
  public:
      using type = FluidSystems::BioMin<Scalar, CO2Impl, H2OType>;
 diff -ruN exercises/exercise-biomineralization/README.md exercises/solution/exercise-biomineralization/README.md
---- exercises/exercise-biomineralization/README.md	2025-03-03 15:23:33.240567779 +0100
+--- exercises/exercise-biomineralization/README.md	2025-03-04 10:55:49.676212309 +0100
 +++ exercises/solution/exercise-biomineralization/README.md	1970-01-01 01:00:00.000000000 +0100
 @@ -1,257 +0,0 @@
 -# Exercise Biomineralization (DuMuX Course)
@@ -530,8 +563,8 @@ diff -ruN exercises/exercise-biomineralization/README.md exercises/solution/exer
 -output.CellData.append((S_gas_0-S_gas_1),'diffS_gas');
 -```
 diff -ruN exercises/exercise-biomineralization/solidsystems/biominsolidphase.hh exercises/solution/exercise-biomineralization/solidsystems/biominsolidphase.hh
---- exercises/exercise-biomineralization/solidsystems/biominsolidphase.hh	2025-03-04 21:00:57.446082551 +0100
-+++ exercises/solution/exercise-biomineralization/solidsystems/biominsolidphase.hh	2025-03-04 21:00:57.450082444 +0100
+--- exercises/exercise-biomineralization/solidsystems/biominsolidphase.hh	2025-02-26 11:38:46.803818101 +0100
++++ exercises/solution/exercise-biomineralization/solidsystems/biominsolidphase.hh	2025-02-26 11:38:46.842816315 +0100
 @@ -15,12 +15,12 @@
  #include <string>
  #include <dune/common/exceptions.hh>
diff --git a/.patches/exercise-coupling-ff-pm/exercise-coupling-ff-pm.patch b/.patches/exercise-coupling-ff-pm/exercise-coupling-ff-pm.patch
index d8d19838..c62102c7 100644
--- a/.patches/exercise-coupling-ff-pm/exercise-coupling-ff-pm.patch
+++ b/.patches/exercise-coupling-ff-pm/exercise-coupling-ff-pm.patch
@@ -1,6 +1,6 @@
 diff -ruN exercises/exercise-coupling-ff-pm/interface/CMakeLists.txt exercises/solution/exercise-coupling-ff-pm/interface/CMakeLists.txt
---- exercises/exercise-coupling-ff-pm/interface/CMakeLists.txt	2025-03-04 21:00:57.446082551 +0100
-+++ exercises/solution/exercise-coupling-ff-pm/interface/CMakeLists.txt	2025-03-04 21:00:57.450082444 +0100
+--- exercises/exercise-coupling-ff-pm/interface/CMakeLists.txt	2025-02-26 11:38:46.803818101 +0100
++++ exercises/solution/exercise-coupling-ff-pm/interface/CMakeLists.txt	2025-02-26 11:38:46.842816315 +0100
 @@ -1,10 +1,30 @@
  # SPDX-FileCopyrightText: Copyright © DuMux-Course contributors, see AUTHORS.md in root folder
  # SPDX-License-Identifier: GPL-3.0-or-later
@@ -36,8 +36,8 @@ diff -ruN exercises/exercise-coupling-ff-pm/interface/CMakeLists.txt exercises/s
  # add a symlink for each input file
  add_input_file_links()
 diff -ruN exercises/exercise-coupling-ff-pm/interface/freeflowsubproblem.hh exercises/solution/exercise-coupling-ff-pm/interface/freeflowsubproblem.hh
---- exercises/exercise-coupling-ff-pm/interface/freeflowsubproblem.hh	2025-03-04 21:00:57.446082551 +0100
-+++ exercises/solution/exercise-coupling-ff-pm/interface/freeflowsubproblem.hh	2025-03-04 21:00:57.450082444 +0100
+--- exercises/exercise-coupling-ff-pm/interface/freeflowsubproblem.hh	2025-02-28 14:04:01.038375893 +0100
++++ exercises/solution/exercise-coupling-ff-pm/interface/freeflowsubproblem.hh	2025-02-26 11:38:46.842816315 +0100
 @@ -71,8 +71,7 @@
  
          const auto& globalPos = scvf.dofPosition();
@@ -48,7 +48,7 @@ diff -ruN exercises/exercise-coupling-ff-pm/interface/freeflowsubproblem.hh exer
          if(onUpperBoundary_(globalPos))
          {
              values.setDirichlet(Indices::velocityXIdx);
-@@ -85,20 +84,45 @@
+@@ -85,19 +84,45 @@
              values.setDirichlet(Indices::velocityXIdx);
              values.setDirichlet(Indices::velocityYIdx);
          }
@@ -73,6 +73,9 @@ diff -ruN exercises/exercise-coupling-ff-pm/interface/freeflowsubproblem.hh exer
          // coupling interface
          if(couplingManager().isCoupledEntity(CouplingManager::stokesIdx, scvf))
          {
+-            // TODO: dumux-course-task 1.C
+-            // set the Beaver-Joseph-Saffman slip condition for the tangential momentum balance equation,
+-            // consider orientation of face automatically
              values.setCouplingNeumann(Indices::conti0EqIdx);
 +#if EXNUMBER < 3
              values.setCouplingNeumann(Indices::momentumYBalanceIdx);
@@ -84,25 +87,25 @@ diff -ruN exercises/exercise-coupling-ff-pm/interface/freeflowsubproblem.hh exer
 +            values.setCouplingNeumann(scvf.directionIndex());
 +#endif
  
--            // TODO: dumux-course-task 1.C
 +#if EXNUMBER < 2
 +            values.setDirichlet(Indices::velocityXIdx); // assume no slip on interface
 +#elif EXNUMBER == 2
 +            // set the Beaver-Joseph-Saffman slip condition for the tangential momentum balance equation
 +            values.setBeaversJoseph(Indices::momentumXBalanceIdx);
 +#else
-             // set the Beaver-Joseph-Saffman slip condition for the tangential momentum balance equation,
-             // consider orientation of face automatically
--
++            // set the Beaver-Joseph-Saffman slip condition for the tangential momentum balance equation,
++            // consider orientation of face automatically
 +            values.setBeaversJoseph(1 - scvf.directionIndex());
 +#endif
          }
  
          return values;
-@@ -112,9 +136,18 @@
+@@ -111,11 +136,18 @@
      PrimaryVariables dirichletAtPos(const GlobalPosition& globalPos) const
      {
          PrimaryVariables values(0.0);
+-        // TODO: dumux-course-task 1.A
+-        // set a no-slip, no-flow condition at the top
 +#if EXNUMBER == 0
          values[Indices::velocityYIdx] = -1e-6 * globalPos[0] * (this->gridGeometry().bBoxMax()[0] - globalPos[0]);
 -        // TODO: dumux-course-task 1.A
@@ -119,7 +122,7 @@ diff -ruN exercises/exercise-coupling-ff-pm/interface/freeflowsubproblem.hh exer
  
          return values;
      }
-@@ -140,9 +173,13 @@
+@@ -141,9 +173,13 @@
          if(couplingManager().isCoupledEntity(CouplingManager::stokesIdx, scvf))
          {
              values[Indices::conti0EqIdx] = couplingManager().couplingData().massCouplingCondition(element, fvGeometry, elemVolVars, elemFaceVars, scvf);
@@ -135,8 +138,8 @@ diff -ruN exercises/exercise-coupling-ff-pm/interface/freeflowsubproblem.hh exer
      }
  
 diff -ruN exercises/exercise-coupling-ff-pm/interface/main.cc exercises/solution/exercise-coupling-ff-pm/interface/main.cc
---- exercises/exercise-coupling-ff-pm/interface/main.cc	2025-03-04 21:00:57.446082551 +0100
-+++ exercises/solution/exercise-coupling-ff-pm/interface/main.cc	2025-03-04 21:00:57.450082444 +0100
+--- exercises/exercise-coupling-ff-pm/interface/main.cc	2025-02-26 11:38:46.803818101 +0100
++++ exercises/solution/exercise-coupling-ff-pm/interface/main.cc	2025-02-26 11:38:46.842816315 +0100
 @@ -52,9 +52,7 @@
      using FreeflowTypeTag = Properties::TTag::FreeflowOneP;
      using PorousMediumTypeTag = Properties::TTag::PorousMediumFlowOneP;
@@ -263,9 +266,9 @@ diff -ruN exercises/exercise-coupling-ff-pm/interface/main.cc exercises/solution
      using PorousMediumSolutionVector = GetPropType<PorousMediumTypeTag, Properties::SolutionVector>;
      VtkOutputModule<PorousMediumGridVariables, PorousMediumSolutionVector> porousMediumVtkWriter(*porousMediumGridVariables,
 diff -ruN exercises/exercise-coupling-ff-pm/interface/params.input exercises/solution/exercise-coupling-ff-pm/interface/params.input
---- exercises/exercise-coupling-ff-pm/interface/params.input	2025-03-03 15:23:33.242567734 +0100
-+++ exercises/solution/exercise-coupling-ff-pm/interface/params.input	2025-03-03 15:23:33.246567644 +0100
-@@ -1,16 +1,14 @@
+--- exercises/exercise-coupling-ff-pm/interface/params.input	2025-02-28 13:50:32.335817360 +0100
++++ exercises/solution/exercise-coupling-ff-pm/interface/params.input	2025-02-26 11:38:46.842816315 +0100
+@@ -1,17 +1,14 @@
 -# # TODO: dumux-course-task 1.C: uncomment the following group [Grid]
 -# # for dune-subgrid
 -#[Grid]
@@ -288,22 +291,29 @@ diff -ruN exercises/exercise-coupling-ff-pm/interface/params.input exercises/sol
 +Offset = 0.5 # [m]
 +Scaling = 0.2 #[m]
  
+-# TODO: dumux-course-task 1.B: change the grid resolution and examine the effects on the velocity profile
 -# TODO: dumux-course-task 1.C: comment or delete the group [Freeflow.Grid]
  [Freeflow.Grid]
  Verbosity = true
  Positions0 = 0.0 1.0
-@@ -19,7 +17,6 @@
+@@ -20,8 +17,6 @@
  Cells1 = 100
  Grading1 = 1
  
+-# TODO: dumux-course-task 1.B: change the grid resolution and examine the effects on the velocity profile
 -# TODO: dumux-course-task 1.C: comment or delete the group [PorousMedium.Grid]
  [PorousMedium.Grid]
  Verbosity = true
  Positions0 = 0.0 1.0
 diff -ruN exercises/exercise-coupling-ff-pm/interface/porousmediumsubproblem.hh exercises/solution/exercise-coupling-ff-pm/interface/porousmediumsubproblem.hh
---- exercises/exercise-coupling-ff-pm/interface/porousmediumsubproblem.hh	2025-03-04 21:00:57.446082551 +0100
-+++ exercises/solution/exercise-coupling-ff-pm/interface/porousmediumsubproblem.hh	2025-03-04 21:00:57.450082444 +0100
-@@ -68,9 +68,10 @@
+--- exercises/exercise-coupling-ff-pm/interface/porousmediumsubproblem.hh	2025-02-28 12:14:15.560013094 +0100
++++ exercises/solution/exercise-coupling-ff-pm/interface/porousmediumsubproblem.hh	2025-02-26 11:38:46.842816315 +0100
+@@ -65,14 +65,13 @@
+     {
+         BoundaryTypes values;
+ 
+-        // TODO: dumux-course-task 1.A
+-        // Set for all boundaries Neumann no-flow and keep the coupling conditions
          // set Neumann BCs to all boundaries first
          values.setAllNeumann();
  
@@ -316,8 +326,8 @@ diff -ruN exercises/exercise-coupling-ff-pm/interface/porousmediumsubproblem.hh
          // set the coupling boundary condition at the interface
          if (couplingManager().isCoupledEntity(CouplingManager::darcyIdx, scvf))
 diff -ruN exercises/exercise-coupling-ff-pm/interface/properties.hh exercises/solution/exercise-coupling-ff-pm/interface/properties.hh
---- exercises/exercise-coupling-ff-pm/interface/properties.hh	2025-03-04 21:00:57.447082525 +0100
-+++ exercises/solution/exercise-coupling-ff-pm/interface/properties.hh	2025-03-04 21:00:57.450082444 +0100
+--- exercises/exercise-coupling-ff-pm/interface/properties.hh	2025-02-26 11:38:46.804818055 +0100
++++ exercises/solution/exercise-coupling-ff-pm/interface/properties.hh	2025-02-26 11:38:46.842816315 +0100
 @@ -16,9 +16,9 @@
  #include <dumux/multidomain/staggeredtraits.hh>
  #include <dumux/multidomain/boundary/stokesdarcy/couplingmanager.hh>
@@ -374,7 +384,7 @@ diff -ruN exercises/exercise-coupling-ff-pm/interface/properties.hh exercises/so
  
  template<class TypeTag>
 diff -ruN exercises/exercise-coupling-ff-pm/interface/README.md exercises/solution/exercise-coupling-ff-pm/interface/README.md
---- exercises/exercise-coupling-ff-pm/interface/README.md	2025-03-03 15:23:33.241567756 +0100
+--- exercises/exercise-coupling-ff-pm/interface/README.md	2025-03-04 10:55:49.676212309 +0100
 +++ exercises/solution/exercise-coupling-ff-pm/interface/README.md	1970-01-01 01:00:00.000000000 +0100
 @@ -1,175 +0,0 @@
 -## 1. Changing the interface
@@ -553,8 +563,8 @@ diff -ruN exercises/exercise-coupling-ff-pm/interface/README.md exercises/soluti
 -What changes to the left boundary conditions in the free-flow domain would you make to introduce this? What conditions can be enforced on the right boundary?
 -Hint: A relation between velocity and position is used for the vertical velocity component in the original form of the `dirichletAtPos` method.
 diff -ruN exercises/exercise-coupling-ff-pm/models/CMakeLists.txt exercises/solution/exercise-coupling-ff-pm/models/CMakeLists.txt
---- exercises/exercise-coupling-ff-pm/models/CMakeLists.txt	2025-03-04 21:00:57.447082525 +0100
-+++ exercises/solution/exercise-coupling-ff-pm/models/CMakeLists.txt	2025-03-04 21:00:57.450082444 +0100
+--- exercises/exercise-coupling-ff-pm/models/CMakeLists.txt	2025-02-26 11:38:46.804818055 +0100
++++ exercises/solution/exercise-coupling-ff-pm/models/CMakeLists.txt	2025-02-26 11:38:46.843816269 +0100
 @@ -1,9 +1,32 @@
  # SPDX-FileCopyrightText: Copyright © DuMux-Course contributors, see AUTHORS.md in root folder
  # SPDX-License-Identifier: GPL-3.0-or-later
@@ -593,8 +603,8 @@ diff -ruN exercises/exercise-coupling-ff-pm/models/CMakeLists.txt exercises/solu
 +
 +dune_symlink_to_source_files(FILES "params_orig_a.input" "params_b_c.input" plotFluxes.py)
 diff -ruN exercises/exercise-coupling-ff-pm/models/main.cc exercises/solution/exercise-coupling-ff-pm/models/main.cc
---- exercises/exercise-coupling-ff-pm/models/main.cc	2025-03-04 21:00:57.447082525 +0100
-+++ exercises/solution/exercise-coupling-ff-pm/models/main.cc	2025-03-04 21:00:57.450082444 +0100
+--- exercises/exercise-coupling-ff-pm/models/main.cc	2025-02-26 11:38:46.804818055 +0100
++++ exercises/solution/exercise-coupling-ff-pm/models/main.cc	2025-02-26 11:38:46.843816269 +0100
 @@ -127,9 +127,15 @@
      auto porousMediumGridVariables = std::make_shared<PorousMediumGridVariables>(porousMediumProblem, porousMediumFvGridGeometry);
      porousMediumGridVariables->init(sol[porousMediumIdx]);
@@ -616,7 +626,7 @@ diff -ruN exercises/exercise-coupling-ff-pm/models/main.cc exercises/solution/ex
      GetPropType<FreeflowTypeTag, Properties::IOFields>::initOutputModule(freeflowVtkWriter);
 diff -ruN exercises/exercise-coupling-ff-pm/models/params_b_c.input exercises/solution/exercise-coupling-ff-pm/models/params_b_c.input
 --- exercises/exercise-coupling-ff-pm/models/params_b_c.input	1970-01-01 01:00:00.000000000 +0100
-+++ exercises/solution/exercise-coupling-ff-pm/models/params_b_c.input	2025-03-03 15:23:33.246567644 +0100
++++ exercises/solution/exercise-coupling-ff-pm/models/params_b_c.input	2025-02-26 11:38:46.843816269 +0100
 @@ -0,0 +1,57 @@
 +[TimeLoop]
 +DtInitial = 100 # s
@@ -676,9 +686,9 @@ diff -ruN exercises/exercise-coupling-ff-pm/models/params_b_c.input exercises/so
 +[Assembly]
 +NumericDifference.BaseEpsilon = 1e-8
 diff -ruN exercises/exercise-coupling-ff-pm/models/params.input exercises/solution/exercise-coupling-ff-pm/models/params.input
---- exercises/exercise-coupling-ff-pm/models/params.input	2025-03-03 15:23:33.242567734 +0100
+--- exercises/exercise-coupling-ff-pm/models/params.input	2025-02-28 14:41:58.699499416 +0100
 +++ exercises/solution/exercise-coupling-ff-pm/models/params.input	1970-01-01 01:00:00.000000000 +0100
-@@ -1,58 +0,0 @@
+@@ -1,60 +0,0 @@
 -[TimeLoop]
 -DtInitial = 100 # s
 -EpisodeLength = -360 # s # 0.25 days
@@ -723,6 +733,8 @@ diff -ruN exercises/exercise-coupling-ff-pm/models/params.input exercises/soluti
 -
 -[Problem]
 -Name = models_coupling
+-# TODO: dumux-course-task 2.B: enable ExportStorage for .csv output file, 
+-# enable plotting for gnuplot, enable ExportFluxes to export to .json file
 -ExportStorage = false
 -PlotStorage = false
 -ExportFluxes = false
@@ -739,7 +751,7 @@ diff -ruN exercises/exercise-coupling-ff-pm/models/params.input exercises/soluti
 -NumericDifference.BaseEpsilon = 1e-8
 diff -ruN exercises/exercise-coupling-ff-pm/models/params_orig_a.input exercises/solution/exercise-coupling-ff-pm/models/params_orig_a.input
 --- exercises/exercise-coupling-ff-pm/models/params_orig_a.input	1970-01-01 01:00:00.000000000 +0100
-+++ exercises/solution/exercise-coupling-ff-pm/models/params_orig_a.input	2025-03-03 15:23:33.246567644 +0100
++++ exercises/solution/exercise-coupling-ff-pm/models/params_orig_a.input	2025-02-26 11:38:46.843816269 +0100
 @@ -0,0 +1,56 @@
 +[TimeLoop]
 +DtInitial = 100 # s
@@ -798,8 +810,8 @@ diff -ruN exercises/exercise-coupling-ff-pm/models/params_orig_a.input exercises
 +[Assembly]
 +NumericDifference.BaseEpsilon = 1e-8
 diff -ruN exercises/exercise-coupling-ff-pm/models/porousmediumsubproblem.hh exercises/solution/exercise-coupling-ff-pm/models/porousmediumsubproblem.hh
---- exercises/exercise-coupling-ff-pm/models/porousmediumsubproblem.hh	2025-03-04 21:00:57.447082525 +0100
-+++ exercises/solution/exercise-coupling-ff-pm/models/porousmediumsubproblem.hh	2025-03-04 21:00:57.450082444 +0100
+--- exercises/exercise-coupling-ff-pm/models/porousmediumsubproblem.hh	2025-02-26 11:38:46.804818055 +0100
++++ exercises/solution/exercise-coupling-ff-pm/models/porousmediumsubproblem.hh	2025-02-26 11:38:46.843816269 +0100
 @@ -52,10 +52,15 @@
      // primary variable indices
      static constexpr int conti0EqIdx = Indices::conti0EqIdx;
@@ -921,8 +933,8 @@ diff -ruN exercises/exercise-coupling-ff-pm/models/porousmediumsubproblem.hh exe
      std::shared_ptr<CouplingManager> couplingManager_;
  
 diff -ruN exercises/exercise-coupling-ff-pm/models/properties.hh exercises/solution/exercise-coupling-ff-pm/models/properties.hh
---- exercises/exercise-coupling-ff-pm/models/properties.hh	2025-03-04 21:00:57.447082525 +0100
-+++ exercises/solution/exercise-coupling-ff-pm/models/properties.hh	2025-03-04 21:00:57.450082444 +0100
+--- exercises/exercise-coupling-ff-pm/models/properties.hh	2025-02-26 11:38:46.804818055 +0100
++++ exercises/solution/exercise-coupling-ff-pm/models/properties.hh	2025-02-26 11:38:46.843816269 +0100
 @@ -25,12 +25,14 @@
  #include <dumux/discretization/cctpfa.hh>
  #include <dumux/material/fluidmatrixinteractions/diffusivityconstanttortuosity.hh>
@@ -1005,7 +1017,7 @@ diff -ruN exercises/exercise-coupling-ff-pm/models/properties.hh exercises/solut
  template<class TypeTag>
  struct EnableGridGeometryCache<TypeTag, TTag::FreeflowNC> { static constexpr bool value = true; };
 diff -ruN exercises/exercise-coupling-ff-pm/models/README.md exercises/solution/exercise-coupling-ff-pm/models/README.md
---- exercises/exercise-coupling-ff-pm/models/README.md	2025-03-03 15:23:33.242567734 +0100
+--- exercises/exercise-coupling-ff-pm/models/README.md	2025-02-26 11:38:46.804818055 +0100
 +++ exercises/solution/exercise-coupling-ff-pm/models/README.md	1970-01-01 01:00:00.000000000 +0100
 @@ -1,118 +0,0 @@
 -## 2. Changing the porous medium model
@@ -1127,7 +1139,7 @@ diff -ruN exercises/exercise-coupling-ff-pm/models/README.md exercises/solution/
 -
 -Now you are able to simulate a complete drying of the porous medium. Have a look the resulting liquid saturation distribution within the porous medium (with using paraview).
 diff -ruN exercises/exercise-coupling-ff-pm/README.md exercises/solution/exercise-coupling-ff-pm/README.md
---- exercises/exercise-coupling-ff-pm/README.md	2025-03-03 15:23:33.241567756 +0100
+--- exercises/exercise-coupling-ff-pm/README.md	2025-02-26 11:38:46.803818101 +0100
 +++ exercises/solution/exercise-coupling-ff-pm/README.md	1970-01-01 01:00:00.000000000 +0100
 @@ -1,125 +0,0 @@
 -# Exercise Coupling free flow/porous medium flow (DuMuX Course)
@@ -1256,8 +1268,8 @@ diff -ruN exercises/exercise-coupling-ff-pm/README.md exercises/solution/exercis
 -* [**Exercise 2:** Changing the porous medium model](./models/README.md)
 -* [**Exercise 3:** Introducing a turbulence model in the free flow domain](./turbulence/README.md)
 diff -ruN exercises/exercise-coupling-ff-pm/turbulence/CMakeLists.txt exercises/solution/exercise-coupling-ff-pm/turbulence/CMakeLists.txt
---- exercises/exercise-coupling-ff-pm/turbulence/CMakeLists.txt	2025-03-04 21:00:57.447082525 +0100
-+++ exercises/solution/exercise-coupling-ff-pm/turbulence/CMakeLists.txt	2025-03-04 21:00:57.450082444 +0100
+--- exercises/exercise-coupling-ff-pm/turbulence/CMakeLists.txt	2025-02-26 11:38:46.804818055 +0100
++++ exercises/solution/exercise-coupling-ff-pm/turbulence/CMakeLists.txt	2025-02-26 11:38:46.843816269 +0100
 @@ -1,10 +1,33 @@
  # SPDX-FileCopyrightText: Copyright © DuMux-Course contributors, see AUTHORS.md in root folder
  # SPDX-License-Identifier: GPL-3.0-or-later
@@ -1296,8 +1308,8 @@ diff -ruN exercises/exercise-coupling-ff-pm/turbulence/CMakeLists.txt exercises/
  # add a symlink for each input file
  add_input_file_links()
 diff -ruN exercises/exercise-coupling-ff-pm/turbulence/freeflowsubproblem.hh exercises/solution/exercise-coupling-ff-pm/turbulence/freeflowsubproblem.hh
---- exercises/exercise-coupling-ff-pm/turbulence/freeflowsubproblem.hh	2025-03-04 21:00:57.447082525 +0100
-+++ exercises/solution/exercise-coupling-ff-pm/turbulence/freeflowsubproblem.hh	2025-03-04 21:00:57.451082417 +0100
+--- exercises/exercise-coupling-ff-pm/turbulence/freeflowsubproblem.hh	2025-02-26 11:38:46.805818009 +0100
++++ exercises/solution/exercise-coupling-ff-pm/turbulence/freeflowsubproblem.hh	2025-02-26 11:38:46.843816269 +0100
 @@ -8,8 +8,8 @@
   * \file
   * \brief The free-flow sub problem
@@ -1513,8 +1525,8 @@ diff -ruN exercises/exercise-coupling-ff-pm/turbulence/freeflowsubproblem.hh exe
          return values;
      }
 diff -ruN exercises/exercise-coupling-ff-pm/turbulence/main.cc exercises/solution/exercise-coupling-ff-pm/turbulence/main.cc
---- exercises/exercise-coupling-ff-pm/turbulence/main.cc	2025-03-04 21:00:57.447082525 +0100
-+++ exercises/solution/exercise-coupling-ff-pm/turbulence/main.cc	2025-03-04 21:00:57.451082417 +0100
+--- exercises/exercise-coupling-ff-pm/turbulence/main.cc	2025-02-26 11:38:46.805818009 +0100
++++ exercises/solution/exercise-coupling-ff-pm/turbulence/main.cc	2025-02-26 11:38:46.843816269 +0100
 @@ -122,11 +122,12 @@
  
      couplingManager->init(freeflowProblem, porousMediumProblem, sol);
@@ -1545,7 +1557,7 @@ diff -ruN exercises/exercise-coupling-ff-pm/turbulence/main.cc exercises/solutio
          porousMediumProblem->postTimeStep(sol[porousMediumIdx], *porousMediumGridVariables, timeLoop->timeStepSize());
 diff -ruN exercises/exercise-coupling-ff-pm/turbulence/params_b.input exercises/solution/exercise-coupling-ff-pm/turbulence/params_b.input
 --- exercises/exercise-coupling-ff-pm/turbulence/params_b.input	1970-01-01 01:00:00.000000000 +0100
-+++ exercises/solution/exercise-coupling-ff-pm/turbulence/params_b.input	2025-03-03 15:23:33.246567644 +0100
++++ exercises/solution/exercise-coupling-ff-pm/turbulence/params_b.input	2025-02-26 11:38:46.843816269 +0100
 @@ -0,0 +1,72 @@
 +[TimeLoop]
 +DtInitial =  1e-1 # [s]
@@ -1621,7 +1633,7 @@ diff -ruN exercises/exercise-coupling-ff-pm/turbulence/params_b.input exercises/
 +IsFlatWallBounded = True
 diff -ruN exercises/exercise-coupling-ff-pm/turbulence/params_c_d.input exercises/solution/exercise-coupling-ff-pm/turbulence/params_c_d.input
 --- exercises/exercise-coupling-ff-pm/turbulence/params_c_d.input	1970-01-01 01:00:00.000000000 +0100
-+++ exercises/solution/exercise-coupling-ff-pm/turbulence/params_c_d.input	2025-03-03 15:23:33.246567644 +0100
++++ exercises/solution/exercise-coupling-ff-pm/turbulence/params_c_d.input	2025-02-26 11:38:46.843816269 +0100
 @@ -0,0 +1,72 @@
 +[TimeLoop]
 +DtInitial =  1e-1 # [s]
@@ -1696,7 +1708,7 @@ diff -ruN exercises/exercise-coupling-ff-pm/turbulence/params_c_d.input exercise
 +[RANS]
 +IsFlatWallBounded = True
 diff -ruN exercises/exercise-coupling-ff-pm/turbulence/params.input exercises/solution/exercise-coupling-ff-pm/turbulence/params.input
---- exercises/exercise-coupling-ff-pm/turbulence/params.input	2025-03-03 15:23:33.243567711 +0100
+--- exercises/exercise-coupling-ff-pm/turbulence/params.input	2025-02-26 11:38:46.805818009 +0100
 +++ exercises/solution/exercise-coupling-ff-pm/turbulence/params.input	1970-01-01 01:00:00.000000000 +0100
 @@ -1,73 +0,0 @@
 -[TimeLoop]
@@ -1774,7 +1786,7 @@ diff -ruN exercises/exercise-coupling-ff-pm/turbulence/params.input exercises/so
 -SolidHeatCapacity = 790
 diff -ruN exercises/exercise-coupling-ff-pm/turbulence/params_orig_a.input exercises/solution/exercise-coupling-ff-pm/turbulence/params_orig_a.input
 --- exercises/exercise-coupling-ff-pm/turbulence/params_orig_a.input	1970-01-01 01:00:00.000000000 +0100
-+++ exercises/solution/exercise-coupling-ff-pm/turbulence/params_orig_a.input	2025-03-03 15:23:33.246567644 +0100
++++ exercises/solution/exercise-coupling-ff-pm/turbulence/params_orig_a.input	2025-02-26 11:38:46.843816269 +0100
 @@ -0,0 +1,72 @@
 +[TimeLoop]
 +DtInitial =  1e-1 # [s]
@@ -1849,8 +1861,8 @@ diff -ruN exercises/exercise-coupling-ff-pm/turbulence/params_orig_a.input exerc
 +[RANS]
 +IsFlatWallBounded = True
 diff -ruN exercises/exercise-coupling-ff-pm/turbulence/properties.hh exercises/solution/exercise-coupling-ff-pm/turbulence/properties.hh
---- exercises/exercise-coupling-ff-pm/turbulence/properties.hh	2025-03-04 21:00:57.447082525 +0100
-+++ exercises/solution/exercise-coupling-ff-pm/turbulence/properties.hh	2025-03-04 21:00:57.451082417 +0100
+--- exercises/exercise-coupling-ff-pm/turbulence/properties.hh	2025-02-26 11:38:46.805818009 +0100
++++ exercises/solution/exercise-coupling-ff-pm/turbulence/properties.hh	2025-02-26 11:38:46.843816269 +0100
 @@ -8,8 +8,8 @@
   * \file
   * \brief The coupled exercise properties file or the turbulent case.
@@ -1892,7 +1904,7 @@ diff -ruN exercises/exercise-coupling-ff-pm/turbulence/properties.hh exercises/s
  
  // Set the coupling manager
 diff -ruN exercises/exercise-coupling-ff-pm/turbulence/README.md exercises/solution/exercise-coupling-ff-pm/turbulence/README.md
---- exercises/exercise-coupling-ff-pm/turbulence/README.md	2025-03-03 15:23:33.242567734 +0100
+--- exercises/exercise-coupling-ff-pm/turbulence/README.md	2025-03-04 10:55:49.677212273 +0100
 +++ exercises/solution/exercise-coupling-ff-pm/turbulence/README.md	1970-01-01 01:00:00.000000000 +0100
 @@ -1,126 +0,0 @@
 -## 3. Use a turbulence model in the free flow domain
diff --git a/.patches/exercise-dunemodule/exercise-dunemodule.patch b/.patches/exercise-dunemodule/exercise-dunemodule.patch
index 8eec6797..f941f82d 100644
--- a/.patches/exercise-dunemodule/exercise-dunemodule.patch
+++ b/.patches/exercise-dunemodule/exercise-dunemodule.patch
@@ -1,5 +1,5 @@
 diff -ruN exercises/exercise-dunemodule/README.md exercises/solution/exercise-dunemodule/README.md
---- exercises/exercise-dunemodule/README.md	2025-03-03 15:23:33.243567711 +0100
+--- exercises/exercise-dunemodule/README.md	2025-02-26 11:38:46.805818009 +0100
 +++ exercises/solution/exercise-dunemodule/README.md	1970-01-01 01:00:00.000000000 +0100
 @@ -1,114 +0,0 @@
 -# Exercise New Dune Module (DuMuX course)
diff --git a/.patches/exercise-fluidsystem/exercise-fluidsystem.patch b/.patches/exercise-fluidsystem/exercise-fluidsystem.patch
index 0b394727..a71e36d2 100644
--- a/.patches/exercise-fluidsystem/exercise-fluidsystem.patch
+++ b/.patches/exercise-fluidsystem/exercise-fluidsystem.patch
@@ -1,6 +1,6 @@
 diff -ruN exercises/exercise-fluidsystem/2p2cproblem.hh exercises/solution/exercise-fluidsystem/2p2cproblem.hh
---- exercises/exercise-fluidsystem/2p2cproblem.hh	2025-03-04 21:00:57.447082525 +0100
-+++ exercises/solution/exercise-fluidsystem/2p2cproblem.hh	2025-03-04 21:00:57.451082417 +0100
+--- exercises/exercise-fluidsystem/2p2cproblem.hh	2025-02-26 11:38:46.805818009 +0100
++++ exercises/solution/exercise-fluidsystem/2p2cproblem.hh	2025-02-26 11:38:46.843816269 +0100
 @@ -12,7 +12,7 @@
  #ifndef DUMUX_EXERCISE_FLUIDSYSTEM_B_PROBLEM_HH
  #define DUMUX_EXERCISE_FLUIDSYSTEM_B_PROBLEM_HH
@@ -11,8 +11,8 @@ diff -ruN exercises/exercise-fluidsystem/2p2cproblem.hh exercises/solution/exerc
  #include <dumux/common/boundarytypes.hh>
  #include <dumux/common/properties.hh>
 diff -ruN exercises/exercise-fluidsystem/2pproperties.hh exercises/solution/exercise-fluidsystem/2pproperties.hh
---- exercises/exercise-fluidsystem/2pproperties.hh	2025-03-04 21:00:57.447082525 +0100
-+++ exercises/solution/exercise-fluidsystem/2pproperties.hh	2025-03-04 21:00:57.451082417 +0100
+--- exercises/exercise-fluidsystem/2pproperties.hh	2025-02-26 11:38:46.805818009 +0100
++++ exercises/solution/exercise-fluidsystem/2pproperties.hh	2025-02-26 11:38:46.843816269 +0100
 @@ -25,15 +25,13 @@
  #include "spatialparams.hh"
  
@@ -52,8 +52,8 @@ diff -ruN exercises/exercise-fluidsystem/2pproperties.hh exercises/solution/exer
  public:
      using type = typename FluidSystems::TwoPImmiscible<Scalar, LiquidWaterPhase, LiquidMyComponentPhase>;
 diff -ruN exercises/exercise-fluidsystem/aparams.input exercises/solution/exercise-fluidsystem/aparams.input
---- exercises/exercise-fluidsystem/aparams.input	2025-03-03 15:23:33.243567711 +0100
-+++ exercises/solution/exercise-fluidsystem/aparams.input	2025-03-03 15:23:33.246567644 +0100
+--- exercises/exercise-fluidsystem/aparams.input	2025-02-27 11:12:28.808186516 +0100
++++ exercises/solution/exercise-fluidsystem/aparams.input	2025-02-26 11:38:46.843816269 +0100
 @@ -3,7 +3,7 @@
  DtInitial = 10 # initial time step size [s]
  
@@ -63,15 +63,16 @@ diff -ruN exercises/exercise-fluidsystem/aparams.input exercises/solution/exerci
  
  [SpatialParams]
  BrooksCoreyPcEntry = 5.0e2 # [Pa]
-@@ -20,4 +20,4 @@
+@@ -20,5 +20,4 @@
  Cells = 60 60 # x-/y-resolution of the grid
  
  [Output]
+-# TODO Task 2.2: Set the plot density to true
 -PlotDensity = false # plot density over pressure for your component
 +PlotDensity = true # plot density over pressure for your component
 diff -ruN exercises/exercise-fluidsystem/bparams.input exercises/solution/exercise-fluidsystem/bparams.input
---- exercises/exercise-fluidsystem/bparams.input	2025-03-03 15:23:33.243567711 +0100
-+++ exercises/solution/exercise-fluidsystem/bparams.input	2025-03-03 15:23:33.246567644 +0100
+--- exercises/exercise-fluidsystem/bparams.input	2025-02-26 11:38:46.806817963 +0100
++++ exercises/solution/exercise-fluidsystem/bparams.input	2025-02-26 11:38:46.844816223 +0100
 @@ -3,7 +3,7 @@
  DtInitial = 10 # initial time step size [s]
  
@@ -82,8 +83,8 @@ diff -ruN exercises/exercise-fluidsystem/bparams.input exercises/solution/exerci
  [SpatialParams]
  BrooksCoreyPcEntry = 5.0e2 # [Pa]
 diff -ruN exercises/exercise-fluidsystem/CMakeLists.txt exercises/solution/exercise-fluidsystem/CMakeLists.txt
---- exercises/exercise-fluidsystem/CMakeLists.txt	2025-03-04 21:00:57.447082525 +0100
-+++ exercises/solution/exercise-fluidsystem/CMakeLists.txt	2025-03-04 21:00:57.451082417 +0100
+--- exercises/exercise-fluidsystem/CMakeLists.txt	2025-02-26 11:38:46.805818009 +0100
++++ exercises/solution/exercise-fluidsystem/CMakeLists.txt	2025-02-26 11:38:46.843816269 +0100
 @@ -3,18 +3,16 @@
  
  # executables for exercise part a & b
@@ -110,8 +111,8 @@ diff -ruN exercises/exercise-fluidsystem/CMakeLists.txt exercises/solution/exerc
 -# add a symlink for the grids folder
 -dune_symlink_to_source_files(FILES grids)
 diff -ruN exercises/exercise-fluidsystem/components/mycompressiblecomponent.hh exercises/solution/exercise-fluidsystem/components/mycompressiblecomponent.hh
---- exercises/exercise-fluidsystem/components/mycompressiblecomponent.hh	2025-03-04 21:00:57.447082525 +0100
-+++ exercises/solution/exercise-fluidsystem/components/mycompressiblecomponent.hh	2025-03-04 21:00:57.451082417 +0100
+--- exercises/exercise-fluidsystem/components/mycompressiblecomponent.hh	2025-02-26 11:38:46.806817963 +0100
++++ exercises/solution/exercise-fluidsystem/components/mycompressiblecomponent.hh	2025-02-26 11:38:46.844816223 +0100
 @@ -38,7 +38,7 @@
      static std::string name()
      { return "MyCompressibleComponent"; }
@@ -173,8 +174,8 @@ diff -ruN exercises/exercise-fluidsystem/components/mycompressiblecomponent.hh e
  };
  
 diff -ruN exercises/exercise-fluidsystem/components/myincompressiblecomponent.hh exercises/solution/exercise-fluidsystem/components/myincompressiblecomponent.hh
---- exercises/exercise-fluidsystem/components/myincompressiblecomponent.hh	2025-03-04 21:00:57.447082525 +0100
-+++ exercises/solution/exercise-fluidsystem/components/myincompressiblecomponent.hh	2025-03-04 21:00:57.451082417 +0100
+--- exercises/exercise-fluidsystem/components/myincompressiblecomponent.hh	2025-02-26 11:38:46.806817963 +0100
++++ exercises/solution/exercise-fluidsystem/components/myincompressiblecomponent.hh	2025-02-26 11:38:46.844816223 +0100
 @@ -48,10 +48,7 @@
       */
      static Scalar molarMass()
@@ -213,7 +214,7 @@ diff -ruN exercises/exercise-fluidsystem/components/myincompressiblecomponent.hh
  
 diff -ruN exercises/exercise-fluidsystem/components/plotdensityfunction.py exercises/solution/exercise-fluidsystem/components/plotdensityfunction.py
 --- exercises/exercise-fluidsystem/components/plotdensityfunction.py	1970-01-01 01:00:00.000000000 +0100
-+++ exercises/solution/exercise-fluidsystem/components/plotdensityfunction.py	2025-03-04 21:00:57.451082417 +0100
++++ exercises/solution/exercise-fluidsystem/components/plotdensityfunction.py	2025-02-26 11:38:46.844816223 +0100
 @@ -0,0 +1,22 @@
 +#!usr/bin/env python
 +# SPDX-FileCopyrightText: Copyright © DuMux-Course contributors, see AUTHORS.md in root folder
@@ -238,8 +239,8 @@ diff -ruN exercises/exercise-fluidsystem/components/plotdensityfunction.py exerc
 +plt.semilogx(p, r)
 +plt.show()
 diff -ruN exercises/exercise-fluidsystem/fluidsystems/h2omycompressiblecomponent.hh exercises/solution/exercise-fluidsystem/fluidsystems/h2omycompressiblecomponent.hh
---- exercises/exercise-fluidsystem/fluidsystems/h2omycompressiblecomponent.hh	2025-03-04 21:00:57.448082498 +0100
-+++ exercises/solution/exercise-fluidsystem/fluidsystems/h2omycompressiblecomponent.hh	2025-03-04 21:00:57.451082417 +0100
+--- exercises/exercise-fluidsystem/fluidsystems/h2omycompressiblecomponent.hh	2025-02-26 11:38:46.806817963 +0100
++++ exercises/solution/exercise-fluidsystem/fluidsystems/h2omycompressiblecomponent.hh	2025-02-26 11:38:46.844816223 +0100
 @@ -20,10 +20,10 @@
  #include <dumux/material/fluidsystems/base.hh>
  
@@ -276,8 +277,8 @@ diff -ruN exercises/exercise-fluidsystem/fluidsystems/h2omycompressiblecomponent
          else
          {
 diff -ruN exercises/exercise-fluidsystem/main.cc exercises/solution/exercise-fluidsystem/main.cc
---- exercises/exercise-fluidsystem/main.cc	2025-03-04 21:00:57.448082498 +0100
-+++ exercises/solution/exercise-fluidsystem/main.cc	2025-03-04 21:00:57.451082417 +0100
+--- exercises/exercise-fluidsystem/main.cc	2025-02-26 11:38:46.806817963 +0100
++++ exercises/solution/exercise-fluidsystem/main.cc	2025-02-26 11:38:46.844816223 +0100
 @@ -36,7 +36,7 @@
  int main(int argc, char** argv)
  {
@@ -303,7 +304,7 @@ diff -ruN exercises/exercise-fluidsystem/main.cc exercises/solution/exercise-flu
      using IOFields = GetPropType<TypeTag, Properties::IOFields>;
      VtkOutputModule<GridVariables, SolutionVector> vtkWriter(*gridVariables, x, problem->name());
 diff -ruN exercises/exercise-fluidsystem/README.md exercises/solution/exercise-fluidsystem/README.md
---- exercises/exercise-fluidsystem/README.md	2025-03-03 15:23:33.243567711 +0100
+--- exercises/exercise-fluidsystem/README.md	2025-03-04 10:55:49.677212273 +0100
 +++ exercises/solution/exercise-fluidsystem/README.md	1970-01-01 01:00:00.000000000 +0100
 @@ -1,265 +0,0 @@
 -# Exercise Fluidsystem (DuMuX Course)
@@ -572,8 +573,8 @@ diff -ruN exercises/exercise-fluidsystem/README.md exercises/solution/exercise-f
 -./exercise_fluidsystem_b bparams.input
 -```
 diff -ruN exercises/exercise-fluidsystem/spatialparams.hh exercises/solution/exercise-fluidsystem/spatialparams.hh
---- exercises/exercise-fluidsystem/spatialparams.hh	2025-03-04 21:00:57.448082498 +0100
-+++ exercises/solution/exercise-fluidsystem/spatialparams.hh	2025-03-04 21:00:57.451082417 +0100
+--- exercises/exercise-fluidsystem/spatialparams.hh	2025-02-26 11:38:46.806817963 +0100
++++ exercises/solution/exercise-fluidsystem/spatialparams.hh	2025-02-26 11:38:46.844816223 +0100
 @@ -113,13 +113,17 @@
      template<class FluidSystem>
      int wettingPhaseAtPos(const GlobalPosition& globalPos) const
diff --git a/.patches/exercise-fractures/exercise-fractures.patch b/.patches/exercise-fractures/exercise-fractures.patch
index 0867fd19..a786a05b 100644
--- a/.patches/exercise-fractures/exercise-fractures.patch
+++ b/.patches/exercise-fractures/exercise-fractures.patch
@@ -1,6 +1,6 @@
 diff -ruN exercises/exercise-fractures/CMakeLists.txt exercises/solution/exercise-fractures/CMakeLists.txt
---- exercises/exercise-fractures/CMakeLists.txt	2025-03-04 21:00:57.448082498 +0100
-+++ exercises/solution/exercise-fractures/CMakeLists.txt	2025-03-04 21:00:57.451082417 +0100
+--- exercises/exercise-fractures/CMakeLists.txt	2025-02-26 11:38:46.806817963 +0100
++++ exercises/solution/exercise-fractures/CMakeLists.txt	2025-02-26 11:38:46.844816223 +0100
 @@ -1,9 +1,26 @@
  # SPDX-FileCopyrightText: Copyright © DuMux-Course contributors, see AUTHORS.md in root folder
  # SPDX-License-Identifier: GPL-3.0-or-later
@@ -32,7 +32,7 @@ diff -ruN exercises/exercise-fractures/CMakeLists.txt exercises/solution/exercis
  add_input_file_links()
 diff -ruN exercises/exercise-fractures/exercise_fractures_solution_a.input exercises/solution/exercise-fractures/exercise_fractures_solution_a.input
 --- exercises/exercise-fractures/exercise_fractures_solution_a.input	1970-01-01 01:00:00.000000000 +0100
-+++ exercises/solution/exercise-fractures/exercise_fractures_solution_a.input	2024-07-11 13:35:11.680138513 +0200
++++ exercises/solution/exercise-fractures/exercise_fractures_solution_a.input	2025-02-26 11:38:46.844816223 +0100
 @@ -0,0 +1,41 @@
 +[TimeLoop]
 +TEnd = 30000 # [s]
@@ -77,7 +77,7 @@ diff -ruN exercises/exercise-fractures/exercise_fractures_solution_a.input exerc
 +SpatialParams.Barrier.Swr = 0.0
 diff -ruN exercises/exercise-fractures/exercise_fractures_solution_b.input exercises/solution/exercise-fractures/exercise_fractures_solution_b.input
 --- exercises/exercise-fractures/exercise_fractures_solution_b.input	1970-01-01 01:00:00.000000000 +0100
-+++ exercises/solution/exercise-fractures/exercise_fractures_solution_b.input	2024-07-11 13:35:11.680138513 +0200
++++ exercises/solution/exercise-fractures/exercise_fractures_solution_b.input	2025-02-26 11:38:46.844816223 +0100
 @@ -0,0 +1,41 @@
 +[TimeLoop]
 +TEnd = 30000 # [s]
@@ -122,7 +122,7 @@ diff -ruN exercises/exercise-fractures/exercise_fractures_solution_b.input exerc
 +SpatialParams.Barrier.Swr = 0.0
 diff -ruN exercises/exercise-fractures/exercise_fractures_solution_c.input exercises/solution/exercise-fractures/exercise_fractures_solution_c.input
 --- exercises/exercise-fractures/exercise_fractures_solution_c.input	1970-01-01 01:00:00.000000000 +0100
-+++ exercises/solution/exercise-fractures/exercise_fractures_solution_c.input	2024-07-11 13:35:11.680138513 +0200
++++ exercises/solution/exercise-fractures/exercise_fractures_solution_c.input	2025-02-26 11:38:46.844816223 +0100
 @@ -0,0 +1,41 @@
 +[TimeLoop]
 +TEnd = 30000 # [s]
@@ -166,8 +166,8 @@ diff -ruN exercises/exercise-fractures/exercise_fractures_solution_c.input exerc
 +SpatialParams.Barrier.Snr = 0.0
 +SpatialParams.Barrier.Swr = 0.0
 diff -ruN exercises/exercise-fractures/fractureproblem.hh exercises/solution/exercise-fractures/fractureproblem.hh
---- exercises/exercise-fractures/fractureproblem.hh	2025-03-04 21:00:57.448082498 +0100
-+++ exercises/solution/exercise-fractures/fractureproblem.hh	2025-03-04 21:00:57.451082417 +0100
+--- exercises/exercise-fractures/fractureproblem.hh	2025-02-26 11:38:46.806817963 +0100
++++ exercises/solution/exercise-fractures/fractureproblem.hh	2025-02-26 11:38:46.844816223 +0100
 @@ -59,6 +59,10 @@
                         std::shared_ptr<typename ParentType::SpatialParams> spatialParams,
                         const std::string& paramGroup)
@@ -199,8 +199,8 @@ diff -ruN exercises/exercise-fractures/fractureproblem.hh exercises/solution/exe
          return values;
      }
 diff -ruN exercises/exercise-fractures/fracturespatialparams.hh exercises/solution/exercise-fractures/fracturespatialparams.hh
---- exercises/exercise-fractures/fracturespatialparams.hh	2025-03-04 21:00:57.448082498 +0100
-+++ exercises/solution/exercise-fractures/fracturespatialparams.hh	2025-03-04 21:00:57.451082417 +0100
+--- exercises/exercise-fractures/fracturespatialparams.hh	2025-03-03 10:33:05.767624826 +0100
++++ exercises/solution/exercise-fractures/fracturespatialparams.hh	2025-02-26 11:38:46.844816223 +0100
 @@ -41,6 +41,7 @@
      using Element = typename GridView::template Codim<0>::Entity;
      using GlobalPosition = typename Element::Geometry::GlobalCoordinate;
@@ -226,7 +226,7 @@ diff -ruN exercises/exercise-fractures/fracturespatialparams.hh exercises/soluti
                                    const SubControlVolume& scv,
                                    const ElementSolution& elemSol) const
      {
--        // TODO dumux-course-task B
+-        // TODO dumux-course-task B/C
 -        // Change fracture properties
 -        return permeability_;
 +        // in the unmodified state and exercise part a return the non-barrier parameters
@@ -252,7 +252,7 @@ diff -ruN exercises/exercise-fractures/fracturespatialparams.hh exercises/soluti
                      const SubControlVolume& scv,
                      const ElementSolution& elemSol) const
      {
--        // TODO dumux-course-task B
+-        // TODO dumux-course-task B/C
 -        // Change fracture properties
 -        return porosity_;
 +        // in the unmodified state and exercise part a return the non-barrier parameters
@@ -278,7 +278,7 @@ diff -ruN exercises/exercise-fractures/fracturespatialparams.hh exercises/soluti
                                  const SubControlVolume& scv,
                                  const ElementSolution& elemSol) const
      {
--        // TODO dumux-course-task B
+-        // TODO dumux-course-task B/C
 -        // Change fracture properties
 -        return makeFluidMatrixInteraction(pcKrSwCurve_);
 +        // in the unmodified state and exercise part a return the non-barrier parameters
@@ -322,8 +322,8 @@ diff -ruN exercises/exercise-fractures/fracturespatialparams.hh exercises/soluti
  
  } // end namespace Dumux
 diff -ruN exercises/exercise-fractures/main.cc exercises/solution/exercise-fractures/main.cc
---- exercises/exercise-fractures/main.cc	2025-03-04 21:00:57.448082498 +0100
-+++ exercises/solution/exercise-fractures/main.cc	2025-03-04 21:00:57.451082417 +0100
+--- exercises/exercise-fractures/main.cc	2025-02-26 11:38:46.808817872 +0100
++++ exercises/solution/exercise-fractures/main.cc	2025-02-26 11:38:46.845816177 +0100
 @@ -245,4 +245,5 @@
      Parameters::print();
  
@@ -331,8 +331,8 @@ diff -ruN exercises/exercise-fractures/main.cc exercises/solution/exercise-fract
 +
  }// end main
 diff -ruN exercises/exercise-fractures/matrixproblem.hh exercises/solution/exercise-fractures/matrixproblem.hh
---- exercises/exercise-fractures/matrixproblem.hh	2025-03-04 21:00:57.448082498 +0100
-+++ exercises/solution/exercise-fractures/matrixproblem.hh	2025-03-04 21:00:57.451082417 +0100
+--- exercises/exercise-fractures/matrixproblem.hh	2025-03-03 10:40:58.942820843 +0100
++++ exercises/solution/exercise-fractures/matrixproblem.hh	2025-02-26 11:38:46.845816177 +0100
 @@ -65,11 +65,18 @@
      : ParentType(gridGeometry, spatialParams, paramGroup)
      , boundaryOverPressure_(getParamFromGroup<Scalar>(paramGroup, "Problem.BoundaryOverPressure"))
@@ -383,14 +383,16 @@ diff -ruN exercises/exercise-fractures/matrixproblem.hh exercises/solution/exerc
  
          return values;
      }
-@@ -107,10 +124,30 @@
+@@ -107,12 +124,29 @@
          // the interior boundary conditions to Dirichlet.
          // IMPORTANT: Note that you will never be asked to set any values at the interior boundaries!
          //            This simply chooses a different interface condition!
--        // TODO dumux-course-task C
+-        // TODO dumux-course-task B
 -        // Change coupling conditions!
          values.setAllDirichlet();
  
+-        // TODO dumux-course-task additional task
+-        // Set interior boundary condition depending on the domain marker of the fracture domain elements!
 +        if (isExercisePartB_)
 +            values.setAllNeumann();
 +        else if (isExercisePartC_)
@@ -412,11 +414,10 @@ diff -ruN exercises/exercise-fractures/matrixproblem.hh exercises/solution/exerc
 +            if (fractureElementMarker == 2)
 +                values.setAllNeumann();
 +        }
-+
+ 
          return values;
      }
- 
-@@ -120,11 +157,23 @@
+@@ -123,11 +157,23 @@
          // initialize values with the initial conditions
          auto values = initialAtPos(globalPos);
  
@@ -445,7 +446,7 @@ diff -ruN exercises/exercise-fractures/matrixproblem.hh exercises/solution/exerc
  
          return values;
      }
-@@ -158,6 +207,9 @@
+@@ -161,6 +207,9 @@
  
      Scalar boundaryOverPressure_;
      Scalar boundarySaturation_;
@@ -456,8 +457,8 @@ diff -ruN exercises/exercise-fractures/matrixproblem.hh exercises/solution/exerc
  
  } // end namespace Dumux
 diff -ruN exercises/exercise-fractures/matrixspatialparams.hh exercises/solution/exercise-fractures/matrixspatialparams.hh
---- exercises/exercise-fractures/matrixspatialparams.hh	2025-03-04 21:00:57.448082498 +0100
-+++ exercises/solution/exercise-fractures/matrixspatialparams.hh	2025-03-04 21:00:57.452082391 +0100
+--- exercises/exercise-fractures/matrixspatialparams.hh	2025-02-26 11:38:46.808817872 +0100
++++ exercises/solution/exercise-fractures/matrixspatialparams.hh	2025-02-26 11:38:46.845816177 +0100
 @@ -40,6 +40,7 @@
      using Element = typename GridView::template Codim<0>::Entity;
      using GlobalPosition = typename Element::Geometry::GlobalCoordinate;
@@ -467,11 +468,13 @@ diff -ruN exercises/exercise-fractures/matrixspatialparams.hh exercises/solution
  
  public:
 diff -ruN exercises/exercise-fractures/params.input exercises/solution/exercise-fractures/params.input
---- exercises/exercise-fractures/params.input	2024-07-11 13:35:11.652137556 +0200
-+++ exercises/solution/exercise-fractures/params.input	2024-07-11 13:35:11.680138513 +0200
-@@ -5,6 +5,9 @@
+--- exercises/exercise-fractures/params.input	2025-03-03 10:08:54.361892136 +0100
++++ exercises/solution/exercise-fractures/params.input	2025-02-26 11:38:46.845816177 +0100
+@@ -4,8 +4,10 @@
+ MaxTimeStepSize = 2500 # [s]
  
  [Problem]
+-# TODO dumux-course-task A: switch off gravity
  EnableGravity = true
 +IsExercisePartA = false
 +IsExercisePartB = false
@@ -479,7 +482,7 @@ diff -ruN exercises/exercise-fractures/params.input exercises/solution/exercise-
  
  [Grid]
  File = ./grids/complex.msh
-@@ -16,8 +19,8 @@
+@@ -17,8 +19,8 @@
  Problem.BoundarySaturation = 0.5
  SpatialParams.Permeability = 1e-12
  SpatialParams.Porosity = 0.1
@@ -490,10 +493,11 @@ diff -ruN exercises/exercise-fractures/params.input exercises/solution/exercise-
  SpatialParams.Snr = 0.0
  SpatialParams.Swr = 0.0
  
-@@ -28,11 +31,11 @@
+@@ -29,12 +31,11 @@
  SpatialParams.PermeabilityBarrier = 1e-16
  SpatialParams.Porosity = 0.85
  SpatialParams.PorosityBarrier = 0.05
+-# TODO: set the VGAlpha parameter e.g. to 1e.5 and examine the nitrogen saturation in the fracture tips (then reset to 1e-1 again)
 -SpatialParams.VanGenuchtenAlpha = 1e-1
 -SpatialParams.VanGenuchtenN = 2
 -SpatialParams.Swr = 0.0
@@ -510,8 +514,8 @@ diff -ruN exercises/exercise-fractures/params.input exercises/solution/exercise-
 +SpatialParams.Swr = 0.0
 +SpatialParams.SwrBarrier = 0.0
 diff -ruN exercises/exercise-fractures/properties.hh exercises/solution/exercise-fractures/properties.hh
---- exercises/exercise-fractures/properties.hh	2025-03-04 21:00:57.448082498 +0100
-+++ exercises/solution/exercise-fractures/properties.hh	2025-03-04 21:00:57.452082391 +0100
+--- exercises/exercise-fractures/properties.hh	2025-02-26 11:38:46.808817872 +0100
++++ exercises/solution/exercise-fractures/properties.hh	2025-02-26 11:38:46.845816177 +0100
 @@ -45,6 +45,7 @@
  // with tpfa.
  #include <dumux/multidomain/facet/cellcentered/tpfa/properties.hh>
@@ -530,7 +534,7 @@ diff -ruN exercises/exercise-fractures/properties.hh exercises/solution/exercise
  struct Grid<TypeTag, TTag::MatrixProblem> { using type = Dune::ALUGrid<2, 2, Dune::simplex, Dune::conforming>; };
  template<class TypeTag>
 diff -ruN exercises/exercise-fractures/README.md exercises/solution/exercise-fractures/README.md
---- exercises/exercise-fractures/README.md	2025-03-03 15:23:33.244567689 +0100
+--- exercises/exercise-fractures/README.md	2025-03-04 10:55:49.677212273 +0100
 +++ exercises/solution/exercise-fractures/README.md	1970-01-01 01:00:00.000000000 +0100
 @@ -1,216 +0,0 @@
 -# Exercise Discrete Fractures (DuMuX Course)
diff --git a/.patches/exercise-grids/exercise-grids.patch b/.patches/exercise-grids/exercise-grids.patch
index eb36de05..57d8511d 100644
--- a/.patches/exercise-grids/exercise-grids.patch
+++ b/.patches/exercise-grids/exercise-grids.patch
@@ -1,6 +1,6 @@
 diff -ruN exercises/exercise-grids/CMakeLists.txt exercises/solution/exercise-grids/CMakeLists.txt
---- exercises/exercise-grids/CMakeLists.txt	2025-03-04 21:00:57.448082498 +0100
-+++ exercises/solution/exercise-grids/CMakeLists.txt	2025-03-04 21:00:57.452082391 +0100
+--- exercises/exercise-grids/CMakeLists.txt	2025-02-26 11:38:46.808817872 +0100
++++ exercises/solution/exercise-grids/CMakeLists.txt	2025-02-26 11:38:46.845816177 +0100
 @@ -2,7 +2,7 @@
  # SPDX-License-Identifier: GPL-3.0-or-later
  
@@ -11,7 +11,7 @@ diff -ruN exercises/exercise-grids/CMakeLists.txt exercises/solution/exercise-gr
  
  # add a symlink for each input file
 diff -ruN exercises/exercise-grids/grids/grid_structured.dgf exercises/solution/exercise-grids/grids/grid_structured.dgf
---- exercises/exercise-grids/grids/grid_structured.dgf	2024-07-11 13:35:11.652137556 +0200
+--- exercises/exercise-grids/grids/grid_structured.dgf	2025-02-26 11:38:46.808817872 +0100
 +++ exercises/solution/exercise-grids/grids/grid_structured.dgf	1970-01-01 01:00:00.000000000 +0100
 @@ -1,6 +0,0 @@
 -DGF
@@ -21,7 +21,7 @@ diff -ruN exercises/exercise-grids/grids/grid_structured.dgf exercises/solution/
 -30 20   % cells in x and y direction
 -#
 diff -ruN exercises/exercise-grids/grids/grid_structured.geo exercises/solution/exercise-grids/grids/grid_structured.geo
---- exercises/exercise-grids/grids/grid_structured.geo	2024-07-11 13:35:11.652137556 +0200
+--- exercises/exercise-grids/grids/grid_structured.geo	2025-02-26 11:38:46.808817872 +0100
 +++ exercises/solution/exercise-grids/grids/grid_structured.geo	1970-01-01 01:00:00.000000000 +0100
 @@ -1,30 +0,0 @@
 -X = 60;
@@ -55,8 +55,8 @@ diff -ruN exercises/exercise-grids/grids/grid_structured.geo exercises/solution/
 -Transfinite Volume "*";
 -
 diff -ruN exercises/exercise-grids/main.cc exercises/solution/exercise-grids/main.cc
---- exercises/exercise-grids/main.cc	2025-03-04 21:00:57.448082498 +0100
-+++ exercises/solution/exercise-grids/main.cc	2025-03-04 21:00:57.452082391 +0100
+--- exercises/exercise-grids/main.cc	2025-02-26 11:38:46.809817826 +0100
++++ exercises/solution/exercise-grids/main.cc	2025-02-26 11:38:46.846816132 +0100
 @@ -6,7 +6,7 @@
  //
  /*!
@@ -67,8 +67,8 @@ diff -ruN exercises/exercise-grids/main.cc exercises/solution/exercise-grids/mai
  #include <config.h>
  
 diff -ruN exercises/exercise-grids/params.input exercises/solution/exercise-grids/params.input
---- exercises/exercise-grids/params.input	2025-03-03 15:23:33.244567689 +0100
-+++ exercises/solution/exercise-grids/params.input	2024-07-11 13:35:11.680138513 +0200
+--- exercises/exercise-grids/params.input	2025-02-26 11:38:46.809817826 +0100
++++ exercises/solution/exercise-grids/params.input	2025-02-26 11:38:46.846816132 +0100
 @@ -3,13 +3,34 @@
  TEnd = 3.154e9 # in seconds, i.e ten years
  
@@ -110,8 +110,8 @@ diff -ruN exercises/exercise-grids/params.input exercises/solution/exercise-grid
  [Problem]
  Name = grid_exercise
 diff -ruN exercises/exercise-grids/properties.hh exercises/solution/exercise-grids/properties.hh
---- exercises/exercise-grids/properties.hh	2025-03-04 21:00:57.448082498 +0100
-+++ exercises/solution/exercise-grids/properties.hh	2025-03-04 21:00:57.452082391 +0100
+--- exercises/exercise-grids/properties.hh	2025-02-26 11:38:46.809817826 +0100
++++ exercises/solution/exercise-grids/properties.hh	2025-02-26 11:38:46.846816132 +0100
 @@ -5,9 +5,9 @@
  // SPDX-License-Identifier: GPL-3.0-or-later
  //
@@ -163,7 +163,7 @@ diff -ruN exercises/exercise-grids/properties.hh exercises/solution/exercise-gri
  // Set the problem property
  template<class TypeTag>
 diff -ruN exercises/exercise-grids/README.md exercises/solution/exercise-grids/README.md
---- exercises/exercise-grids/README.md	2025-03-03 15:23:33.244567689 +0100
+--- exercises/exercise-grids/README.md	2025-02-26 11:38:46.808817872 +0100
 +++ exercises/solution/exercise-grids/README.md	1970-01-01 01:00:00.000000000 +0100
 @@ -1,159 +0,0 @@
 -# Exercise Grids (DuMuX course)
diff --git a/.patches/exercise-mainfile/exercise-mainfile.patch b/.patches/exercise-mainfile/exercise-mainfile.patch
index acaedcbf..e7d1e8d3 100644
--- a/.patches/exercise-mainfile/exercise-mainfile.patch
+++ b/.patches/exercise-mainfile/exercise-mainfile.patch
@@ -1,6 +1,6 @@
 diff -ruN exercises/exercise-mainfile/CMakeLists.txt exercises/solution/exercise-mainfile/CMakeLists.txt
---- exercises/exercise-mainfile/CMakeLists.txt	2025-03-04 21:00:57.448082498 +0100
-+++ exercises/solution/exercise-mainfile/CMakeLists.txt	2025-03-04 21:00:57.452082391 +0100
+--- exercises/exercise-mainfile/CMakeLists.txt	2025-02-26 11:38:46.809817826 +0100
++++ exercises/solution/exercise-mainfile/CMakeLists.txt	2025-02-26 11:38:46.846816132 +0100
 @@ -2,14 +2,9 @@
  # SPDX-License-Identifier: GPL-3.0-or-later
  
@@ -20,7 +20,7 @@ diff -ruN exercises/exercise-mainfile/CMakeLists.txt exercises/solution/exercise
  # add a symlink for each input file
  add_input_file_links()
 diff -ruN exercises/exercise-mainfile/exercise1pamain.cc exercises/solution/exercise-mainfile/exercise1pamain.cc
---- exercises/exercise-mainfile/exercise1pamain.cc	2025-03-04 21:00:57.448082498 +0100
+--- exercises/exercise-mainfile/exercise1pamain.cc	2025-02-26 11:38:46.809817826 +0100
 +++ exercises/solution/exercise-mainfile/exercise1pamain.cc	1970-01-01 01:00:00.000000000 +0100
 @@ -1,130 +0,0 @@
 -// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
@@ -155,7 +155,7 @@ diff -ruN exercises/exercise-mainfile/exercise1pamain.cc exercises/solution/exer
 -}// end main
 diff -ruN exercises/exercise-mainfile/exercise1pa_solution_main.cc exercises/solution/exercise-mainfile/exercise1pa_solution_main.cc
 --- exercises/exercise-mainfile/exercise1pa_solution_main.cc	1970-01-01 01:00:00.000000000 +0100
-+++ exercises/solution/exercise-mainfile/exercise1pa_solution_main.cc	2025-03-04 21:00:57.452082391 +0100
++++ exercises/solution/exercise-mainfile/exercise1pa_solution_main.cc	2025-02-26 11:38:46.847816086 +0100
 @@ -0,0 +1,130 @@
 +// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
 +// vi: set et ts=4 sw=4 sts=4:
@@ -288,7 +288,7 @@ diff -ruN exercises/exercise-mainfile/exercise1pa_solution_main.cc exercises/sol
 +
 +}// end main
 diff -ruN exercises/exercise-mainfile/exercise1pbmain.cc exercises/solution/exercise-mainfile/exercise1pbmain.cc
---- exercises/exercise-mainfile/exercise1pbmain.cc	2025-03-04 21:00:57.448082498 +0100
+--- exercises/exercise-mainfile/exercise1pbmain.cc	2025-02-26 11:38:46.810817780 +0100
 +++ exercises/solution/exercise-mainfile/exercise1pbmain.cc	1970-01-01 01:00:00.000000000 +0100
 @@ -1,120 +0,0 @@
 -// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
@@ -412,7 +412,7 @@ diff -ruN exercises/exercise-mainfile/exercise1pbmain.cc exercises/solution/exer
 -
 -}// end main
 diff -ruN exercises/exercise-mainfile/exercise1pcmain.cc exercises/solution/exercise-mainfile/exercise1pcmain.cc
---- exercises/exercise-mainfile/exercise1pcmain.cc	2025-03-04 21:00:57.448082498 +0100
+--- exercises/exercise-mainfile/exercise1pcmain.cc	2025-02-26 11:38:46.810817780 +0100
 +++ exercises/solution/exercise-mainfile/exercise1pcmain.cc	1970-01-01 01:00:00.000000000 +0100
 @@ -1,146 +0,0 @@
 -// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
@@ -562,9 +562,9 @@ diff -ruN exercises/exercise-mainfile/exercise1pcmain.cc exercises/solution/exer
 -
 -}// end main
 diff -ruN exercises/exercise-mainfile/exercise_mainfile_a.input exercises/solution/exercise-mainfile/exercise_mainfile_a.input
---- exercises/exercise-mainfile/exercise_mainfile_a.input	2024-07-11 13:35:11.652137556 +0200
+--- exercises/exercise-mainfile/exercise_mainfile_a.input	2025-02-26 13:56:01.169864268 +0100
 +++ exercises/solution/exercise-mainfile/exercise_mainfile_a.input	1970-01-01 01:00:00.000000000 +0100
-@@ -1,18 +0,0 @@
+@@ -1,19 +0,0 @@
 -[Grid]
 -LowerLeft = 0 0
 -UpperRight = 1 1
@@ -582,10 +582,11 @@ diff -ruN exercises/exercise-mainfile/exercise_mainfile_a.input exercises/soluti
 -
 -[Assembly.NumericDifference]
 -PriVarMagnitude = 1e5
+-# TODO: Task 3: Change BaseEpsilon to a smaller value 1e-15
 -BaseEpsilon = 1e-10
 diff -ruN exercises/exercise-mainfile/exercise_mainfile_a_solution.input exercises/solution/exercise-mainfile/exercise_mainfile_a_solution.input
 --- exercises/exercise-mainfile/exercise_mainfile_a_solution.input	1970-01-01 01:00:00.000000000 +0100
-+++ exercises/solution/exercise-mainfile/exercise_mainfile_a_solution.input	2025-03-03 15:23:33.247567621 +0100
++++ exercises/solution/exercise-mainfile/exercise_mainfile_a_solution.input	2025-02-26 11:38:46.847816086 +0100
 @@ -0,0 +1,18 @@
 +[Grid]
 +LowerLeft = 0 0
@@ -606,7 +607,7 @@ diff -ruN exercises/exercise-mainfile/exercise_mainfile_a_solution.input exercis
 +PriVarMagnitude = 1e5
 +BaseEpsilon = 1e-10
 diff -ruN exercises/exercise-mainfile/exercise_mainfile_b.input exercises/solution/exercise-mainfile/exercise_mainfile_b.input
---- exercises/exercise-mainfile/exercise_mainfile_b.input	2024-07-11 13:35:11.652137556 +0200
+--- exercises/exercise-mainfile/exercise_mainfile_b.input	2025-02-26 11:38:46.810817780 +0100
 +++ exercises/solution/exercise-mainfile/exercise_mainfile_b.input	1970-01-01 01:00:00.000000000 +0100
 @@ -1,17 +0,0 @@
 -[Grid]
@@ -627,7 +628,7 @@ diff -ruN exercises/exercise-mainfile/exercise_mainfile_b.input exercises/soluti
 -[Assembly.NumericDifference]
 -PriVarMagnitude = 1e5
 diff -ruN exercises/exercise-mainfile/exercise_mainfile_c.input exercises/solution/exercise-mainfile/exercise_mainfile_c.input
---- exercises/exercise-mainfile/exercise_mainfile_c.input	2025-03-03 15:23:33.245567666 +0100
+--- exercises/exercise-mainfile/exercise_mainfile_c.input	2025-02-26 11:38:46.810817780 +0100
 +++ exercises/solution/exercise-mainfile/exercise_mainfile_c.input	1970-01-01 01:00:00.000000000 +0100
 @@ -1,21 +0,0 @@
 -[TimeLoop]
@@ -652,8 +653,8 @@ diff -ruN exercises/exercise-mainfile/exercise_mainfile_c.input exercises/soluti
 -[Assembly.NumericDifference]
 -PriVarMagnitude = 1e5
 diff -ruN exercises/exercise-mainfile/properties.hh exercises/solution/exercise-mainfile/properties.hh
---- exercises/exercise-mainfile/properties.hh	2025-03-04 21:00:57.448082498 +0100
-+++ exercises/solution/exercise-mainfile/properties.hh	2025-03-04 21:00:57.452082391 +0100
+--- exercises/exercise-mainfile/properties.hh	2025-02-26 11:38:46.810817780 +0100
++++ exercises/solution/exercise-mainfile/properties.hh	2025-02-26 11:38:46.847816086 +0100
 @@ -25,8 +25,8 @@
  
  #include <dumux/porousmediumflow/1p/model.hh>
@@ -677,7 +678,7 @@ diff -ruN exercises/exercise-mainfile/properties.hh exercises/solution/exercise-
  
  // the fluid system for compressible tests
 diff -ruN exercises/exercise-mainfile/README.md exercises/solution/exercise-mainfile/README.md
---- exercises/exercise-mainfile/README.md	2025-03-03 15:23:33.245567666 +0100
+--- exercises/exercise-mainfile/README.md	2025-03-04 10:55:49.677212273 +0100
 +++ exercises/solution/exercise-mainfile/README.md	1970-01-01 01:00:00.000000000 +0100
 @@ -1,196 +0,0 @@
 -# Exercise Mainfiles (DuMuX course)
diff --git a/.patches/exercise-model/exercise-model.patch b/.patches/exercise-model/exercise-model.patch
index a219468e..1a7d07ea 100644
--- a/.patches/exercise-model/exercise-model.patch
+++ b/.patches/exercise-model/exercise-model.patch
@@ -1,6 +1,6 @@
 diff -ruN exercises/exercise-model/CMakeLists.txt exercises/solution/exercise-model/CMakeLists.txt
---- exercises/exercise-model/CMakeLists.txt	2025-03-04 21:00:57.448082498 +0100
-+++ exercises/solution/exercise-model/CMakeLists.txt	2025-03-04 21:00:57.452082391 +0100
+--- exercises/exercise-model/CMakeLists.txt	2025-02-26 11:38:46.810817780 +0100
++++ exercises/solution/exercise-model/CMakeLists.txt	2025-02-26 11:38:46.847816086 +0100
 @@ -3,5 +3,5 @@
  
  dune_symlink_to_source_files(FILES images params.input)
@@ -9,31 +9,33 @@ diff -ruN exercises/exercise-model/CMakeLists.txt exercises/solution/exercise-mo
 +dumux_add_test(NAME exercise_nonlineardiffusion_sol
                 SOURCES main.cc)
 diff -ruN exercises/exercise-model/main.cc exercises/solution/exercise-model/main.cc
---- exercises/exercise-model/main.cc	2025-03-04 21:00:57.449082471 +0100
-+++ exercises/solution/exercise-model/main.cc	2025-03-04 21:00:57.452082391 +0100
-@@ -29,6 +29,8 @@
+--- exercises/exercise-model/main.cc	2025-02-28 10:53:32.830702341 +0100
++++ exercises/solution/exercise-model/main.cc	2025-02-26 11:38:46.847816086 +0100
+@@ -29,7 +29,7 @@
  #include <dumux/nonlinear/newtonsolver.hh>
  #include <dumux/assembly/fvassembler.hh>
  
+-// TODO Task 3.1: Include the header model.hh
 +#include "model.hh"
-+
+ 
  /*!
   * \ingroup NonlinearDiffusion
-  * \brief Test problem for image denoising using a nonlinear diffusion model
-@@ -78,7 +80,7 @@
+@@ -79,8 +79,8 @@
+ 
  struct NonlinearDiffusionTest
  {
-     // TODO: We need to set our model by replacing ModelTypeTag
+-    // TODO Task 3.1: We need to set our model by replacing ModelTypeTag
 -    using InheritsFrom = std::tuple</*ModelTypeTag,*/BoxModel>;
++    // TODO: We need to set our model by replacing ModelTypeTag
 +    using InheritsFrom = std::tuple<NonlinearDiffusionModel, BoxModel>;
  
      using Scalar = double;
      using Grid = Dune::YaspGrid<2>;
-@@ -136,63 +138,62 @@
+@@ -138,63 +138,62 @@
      // the problem for the boundary conditions, a solution vector and a grid variables instance.
      auto gridGeometry = std::make_shared<GridGeometry>(gridManager.grid().leafGridView());
  
--    // TODO: Uncomment when the model is implemented
+-    // TODO Task 3.2: Uncomment when the model is implemented
 -    // using Scalar = GetPropType<TypeTag, Properties::Scalar>;
 -    // using Problem = GetPropType<TypeTag, Properties::Problem>;
 -    // using SolutionVector = GetPropType<TypeTag, Properties::SolutionVector>;
@@ -148,7 +150,7 @@ diff -ruN exercises/exercise-model/main.cc exercises/solution/exercise-model/mai
  }// end main
 diff -ruN exercises/exercise-model/model.hh exercises/solution/exercise-model/model.hh
 --- exercises/exercise-model/model.hh	1970-01-01 01:00:00.000000000 +0100
-+++ exercises/solution/exercise-model/model.hh	2025-03-04 21:00:57.452082391 +0100
++++ exercises/solution/exercise-model/model.hh	2025-02-26 11:38:46.847816086 +0100
 @@ -0,0 +1,210 @@
 +// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
 +// vi: set et ts=4 sw=4 sts=4:
@@ -361,7 +363,7 @@ diff -ruN exercises/exercise-model/model.hh exercises/solution/exercise-model/mo
 +
 +#endif
 diff -ruN exercises/exercise-model/README.md exercises/solution/exercise-model/README.md
---- exercises/exercise-model/README.md	2025-03-03 15:23:33.245567666 +0100
+--- exercises/exercise-model/README.md	2025-03-04 10:55:49.677212273 +0100
 +++ exercises/solution/exercise-model/README.md	1970-01-01 01:00:00.000000000 +0100
 @@ -1,195 +0,0 @@
 -# Exercise Model (DuMuX course)
diff --git a/.patches/exercise-properties/exercise-properties.patch b/.patches/exercise-properties/exercise-properties.patch
index a4124ae3..12096d27 100644
--- a/.patches/exercise-properties/exercise-properties.patch
+++ b/.patches/exercise-properties/exercise-properties.patch
@@ -1,6 +1,6 @@
 diff -ruN exercises/exercise-properties/CMakeLists.txt exercises/solution/exercise-properties/CMakeLists.txt
---- exercises/exercise-properties/CMakeLists.txt	2025-03-04 21:00:57.449082471 +0100
-+++ exercises/solution/exercise-properties/CMakeLists.txt	2025-03-04 21:00:57.452082391 +0100
+--- exercises/exercise-properties/CMakeLists.txt	2025-02-26 11:38:46.811817734 +0100
++++ exercises/solution/exercise-properties/CMakeLists.txt	2025-02-26 11:38:46.847816086 +0100
 @@ -1,8 +1,8 @@
  # SPDX-FileCopyrightText: Copyright © DuMux-Course contributors, see AUTHORS.md in root folder
  # SPDX-License-Identifier: GPL-3.0-or-later
@@ -13,8 +13,8 @@ diff -ruN exercises/exercise-properties/CMakeLists.txt exercises/solution/exerci
  
  # add a symlink for each input file
 diff -ruN exercises/exercise-properties/mylocalresidual.hh exercises/solution/exercise-properties/mylocalresidual.hh
---- exercises/exercise-properties/mylocalresidual.hh	2025-03-04 21:00:57.449082471 +0100
-+++ exercises/solution/exercise-properties/mylocalresidual.hh	2025-03-04 21:00:57.452082391 +0100
+--- exercises/exercise-properties/mylocalresidual.hh	2025-03-04 10:55:49.677212273 +0100
++++ exercises/solution/exercise-properties/mylocalresidual.hh	2025-03-04 10:55:49.677212273 +0100
 @@ -59,8 +59,6 @@
       * \note The volVars can be different to allow computing
       *       the implicit euler time derivative here
@@ -51,8 +51,8 @@ diff -ruN exercises/exercise-properties/mylocalresidual.hh exercises/solution/ex
              auto eqIdx = conti0EqIdx + phaseIdx;
              flux[eqIdx] = fluxVars.advectiveFlux(phaseIdx, upwindTerm);
 diff -ruN exercises/exercise-properties/problem.hh exercises/solution/exercise-properties/problem.hh
---- exercises/exercise-properties/problem.hh	2025-03-04 21:00:57.449082471 +0100
-+++ exercises/solution/exercise-properties/problem.hh	2025-03-04 21:00:57.452082391 +0100
+--- exercises/exercise-properties/problem.hh	2025-02-26 11:38:46.811817734 +0100
++++ exercises/solution/exercise-properties/problem.hh	2025-02-26 11:38:46.847816086 +0100
 @@ -11,6 +11,7 @@
  #ifndef DUMUX_INCOMPRESSIBLE_TWOP_TEST_PROBLEM_HH
  #define DUMUX_INCOMPRESSIBLE_TWOP_TEST_PROBLEM_HH
@@ -77,8 +77,8 @@ diff -ruN exercises/exercise-properties/problem.hh exercises/solution/exercise-p
          return values;
      }
 diff -ruN exercises/exercise-properties/properties.hh exercises/solution/exercise-properties/properties.hh
---- exercises/exercise-properties/properties.hh	2025-03-04 21:00:57.449082471 +0100
-+++ exercises/solution/exercise-properties/properties.hh	2025-03-04 21:00:57.452082391 +0100
+--- exercises/exercise-properties/properties.hh	2025-02-26 11:38:46.811817734 +0100
++++ exercises/solution/exercise-properties/properties.hh	2025-02-26 11:38:46.848816040 +0100
 @@ -27,9 +27,7 @@
  
  #include "spatialparams.hh"
@@ -103,7 +103,7 @@ diff -ruN exercises/exercise-properties/properties.hh exercises/solution/exercis
  // Set the fluid system
  template<class TypeTag>
 diff -ruN exercises/exercise-properties/README.md exercises/solution/exercise-properties/README.md
---- exercises/exercise-properties/README.md	2024-07-11 13:35:11.652137556 +0200
+--- exercises/exercise-properties/README.md	2025-02-26 11:38:46.811817734 +0100
 +++ exercises/solution/exercise-properties/README.md	1970-01-01 01:00:00.000000000 +0100
 @@ -1,75 +0,0 @@
 -# Exercise Properties (DuMuX course)
diff --git a/.patches/exercise-runtimeparams/exercise-runtimeparams.patch b/.patches/exercise-runtimeparams/exercise-runtimeparams.patch
index 5832867b..e2eaa5a5 100644
--- a/.patches/exercise-runtimeparams/exercise-runtimeparams.patch
+++ b/.patches/exercise-runtimeparams/exercise-runtimeparams.patch
@@ -1,6 +1,6 @@
 diff -ruN exercises/exercise-runtimeparams/CMakeLists.txt exercises/solution/exercise-runtimeparams/CMakeLists.txt
---- exercises/exercise-runtimeparams/CMakeLists.txt	2025-03-04 21:00:57.449082471 +0100
-+++ exercises/solution/exercise-runtimeparams/CMakeLists.txt	2025-03-04 21:00:57.452082391 +0100
+--- exercises/exercise-runtimeparams/CMakeLists.txt	2025-02-26 11:38:46.811817734 +0100
++++ exercises/solution/exercise-runtimeparams/CMakeLists.txt	2025-02-26 11:38:46.848816040 +0100
 @@ -2,7 +2,7 @@
  # SPDX-License-Identifier: GPL-3.0-or-later
  
@@ -11,12 +11,13 @@ diff -ruN exercises/exercise-runtimeparams/CMakeLists.txt exercises/solution/exe
  
  # add a symlink for each input file
 diff -ruN exercises/exercise-runtimeparams/params.input exercises/solution/exercise-runtimeparams/params.input
---- exercises/exercise-runtimeparams/params.input	2024-07-11 13:35:11.652137556 +0200
-+++ exercises/solution/exercise-runtimeparams/params.input	2025-03-03 15:23:33.247567621 +0100
-@@ -12,11 +12,12 @@
+--- exercises/exercise-runtimeparams/params.input	2025-02-26 14:09:24.762108833 +0100
++++ exercises/solution/exercise-runtimeparams/params.input	2025-02-26 11:38:46.848816040 +0100
+@@ -12,12 +12,12 @@
  AquiferDepth = 2700.0 # m
  InjectionDuration = 2.628e6 # in seconds, i.e. one month
  # TODO: Task 2: Create a parameter called "TotalAreaSpecificInflow"
+-# TODO: Task 3: Run the case with and without a provided value in the input file for "TotalAreaSpecificInflow" 
 +TotalAreaSpecificInflow = -1e-4 # kg/(s m^2)
  
  [SpatialParams]
@@ -28,8 +29,8 @@ diff -ruN exercises/exercise-runtimeparams/params.input exercises/solution/exerc
  Aquitard.Swr = 0.2
  Aquitard.Snr = 0.0
 diff -ruN exercises/exercise-runtimeparams/problem.hh exercises/solution/exercise-runtimeparams/problem.hh
---- exercises/exercise-runtimeparams/problem.hh	2025-03-04 21:00:57.449082471 +0100
-+++ exercises/solution/exercise-runtimeparams/problem.hh	2025-03-04 21:00:57.452082391 +0100
+--- exercises/exercise-runtimeparams/problem.hh	2025-02-26 11:38:46.811817734 +0100
++++ exercises/solution/exercise-runtimeparams/problem.hh	2025-02-26 11:38:46.848816040 +0100
 @@ -81,12 +81,16 @@
          injectionDuration_ = getParamFromGroup<Scalar>("Problem","InjectionDuration");
          // TODO: dumux-course-task 2
@@ -67,8 +68,8 @@ diff -ruN exercises/exercise-runtimeparams/problem.hh exercises/solution/exercis
  };
  
 diff -ruN exercises/exercise-runtimeparams/properties.hh exercises/solution/exercise-runtimeparams/properties.hh
---- exercises/exercise-runtimeparams/properties.hh	2025-03-04 21:00:57.449082471 +0100
-+++ exercises/solution/exercise-runtimeparams/properties.hh	2025-03-04 21:00:57.453082364 +0100
+--- exercises/exercise-runtimeparams/properties.hh	2025-02-26 11:38:46.811817734 +0100
++++ exercises/solution/exercise-runtimeparams/properties.hh	2025-02-26 11:38:46.848816040 +0100
 @@ -58,6 +58,6 @@
                                        FluidSystems::H2ON2DefaultPolicy</*fastButSimplifiedRelations=*/ true> >;
  };
@@ -78,7 +79,7 @@ diff -ruN exercises/exercise-runtimeparams/properties.hh exercises/solution/exer
  
  #endif
 diff -ruN exercises/exercise-runtimeparams/README.md exercises/solution/exercise-runtimeparams/README.md
---- exercises/exercise-runtimeparams/README.md	2025-03-03 15:23:33.245567666 +0100
+--- exercises/exercise-runtimeparams/README.md	2025-02-26 11:38:46.811817734 +0100
 +++ exercises/solution/exercise-runtimeparams/README.md	1970-01-01 01:00:00.000000000 +0100
 @@ -1,171 +0,0 @@
 -# Exercise Runtime Parameters (DuMuX course)
@@ -253,8 +254,8 @@ diff -ruN exercises/exercise-runtimeparams/README.md exercises/solution/exercise
 -
 -* > __Task 4__: Using one of the bool `hasParam` functions, place an output in the problem file to alert the user where the parameter value comes from.
 diff -ruN exercises/exercise-runtimeparams/spatialparams.hh exercises/solution/exercise-runtimeparams/spatialparams.hh
---- exercises/exercise-runtimeparams/spatialparams.hh	2025-03-04 21:00:57.449082471 +0100
-+++ exercises/solution/exercise-runtimeparams/spatialparams.hh	2025-03-04 21:00:57.453082364 +0100
+--- exercises/exercise-runtimeparams/spatialparams.hh	2025-02-26 11:38:46.811817734 +0100
++++ exercises/solution/exercise-runtimeparams/spatialparams.hh	2025-02-26 11:38:46.848816040 +0100
 @@ -12,8 +12,8 @@
   *        fully implicit model.
   */
-- 
GitLab