From e7a060f127d5131493662f980f9a41ba77b53429 Mon Sep 17 00:00:00 2001
From: davidlipp <david.lipp@iws.uni-stuttgart.de>
Date: Tue, 16 Jul 2024 15:50:27 +0200
Subject: [PATCH] update patches
---
.patches/exercise-basic/exercise-basic.patch | 32 +++++++--------
.../exercise-fluidsystem.patch | 40 +++++++++----------
.../exercise-fractures.patch | 40 +++++++++----------
.patches/exercise-grids/exercise-grids.patch | 26 ++++++------
.../exercise-mainfile/exercise-mainfile.patch | 30 +++++++-------
.../exercise-properties.patch | 18 ++++-----
.../exercise-runtimeparams.patch | 22 +++++-----
7 files changed, 104 insertions(+), 104 deletions(-)
diff --git a/.patches/exercise-basic/exercise-basic.patch b/.patches/exercise-basic/exercise-basic.patch
index 743e8081..c9a85cca 100644
--- a/.patches/exercise-basic/exercise-basic.patch
+++ b/.patches/exercise-basic/exercise-basic.patch
@@ -1,5 +1,5 @@
diff -ruN exercises/exercise-basic/2p2cmain.cc exercises/solution/exercise-basic/2p2cmain.cc
---- exercises/exercise-basic/2p2cmain.cc 2024-05-21 14:15:07.137554735 +0200
+--- exercises/exercise-basic/2p2cmain.cc 2024-07-10 10:56:47.787814108 +0200
+++ exercises/solution/exercise-basic/2p2cmain.cc 1970-01-01 01:00:00.000000000 +0100
@@ -1,154 +0,0 @@
-// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
@@ -157,7 +157,7 @@ diff -ruN exercises/exercise-basic/2p2cmain.cc exercises/solution/exercise-basic
- return 0;
-} // end main
diff -ruN exercises/exercise-basic/2pmain.cc exercises/solution/exercise-basic/2pmain.cc
---- exercises/exercise-basic/2pmain.cc 2024-05-21 14:15:07.137554735 +0200
+--- exercises/exercise-basic/2pmain.cc 2024-07-10 10:56:47.787814108 +0200
+++ exercises/solution/exercise-basic/2pmain.cc 1970-01-01 01:00:00.000000000 +0100
@@ -1,157 +0,0 @@
-// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
@@ -319,7 +319,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 2024-05-21 14:15:07.205555067 +0200
++++ exercises/solution/exercise-basic/2pnimain.cc 2024-07-10 10:56:47.811814205 +0200
@@ -0,0 +1,150 @@
+// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+// vi: set et ts=4 sw=4 sts=4:
@@ -472,8 +472,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 2024-06-26 14:27:30.147478465 +0200
-+++ exercises/solution/exercise-basic/CMakeLists.txt 2024-05-21 14:15:07.205555067 +0200
+--- exercises/exercise-basic/CMakeLists.txt 2024-07-10 10:56:47.787814108 +0200
++++ exercises/solution/exercise-basic/CMakeLists.txt 2024-07-10 10:56:47.811814205 +0200
@@ -1,13 +1,6 @@
-# the immiscible two-phase simulation program
-dumux_add_test(NAME exercise_basic_2p
@@ -492,7 +492,7 @@ 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/injection2p2cproblem.hh exercises/solution/exercise-basic/injection2p2cproblem.hh
---- exercises/exercise-basic/injection2p2cproblem.hh 2024-05-21 14:15:07.137554735 +0200
+--- exercises/exercise-basic/injection2p2cproblem.hh 2024-07-10 10:56:47.787814108 +0200
+++ exercises/solution/exercise-basic/injection2p2cproblem.hh 1970-01-01 01:00:00.000000000 +0100
@@ -1,229 +0,0 @@
-// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
@@ -725,8 +725,8 @@ diff -ruN exercises/exercise-basic/injection2p2cproblem.hh exercises/solution/ex
-
-#endif
diff -ruN exercises/exercise-basic/injection2pniproblem.hh exercises/solution/exercise-basic/injection2pniproblem.hh
---- exercises/exercise-basic/injection2pniproblem.hh 2024-06-26 13:58:48.088032356 +0200
-+++ exercises/solution/exercise-basic/injection2pniproblem.hh 2024-06-26 13:51:10.749132853 +0200
+--- exercises/exercise-basic/injection2pniproblem.hh 2024-07-10 10:56:47.787814108 +0200
++++ exercises/solution/exercise-basic/injection2pniproblem.hh 2024-07-10 10:56:47.811814205 +0200
@@ -19,7 +19,7 @@
/*!
* \file
@@ -869,7 +869,7 @@ diff -ruN exercises/exercise-basic/injection2pniproblem.hh exercises/solution/ex
static constexpr Scalar eps_ = 1e-6;
std::string name_; //! Problem name
diff -ruN exercises/exercise-basic/injection2pproblem.hh exercises/solution/exercise-basic/injection2pproblem.hh
---- exercises/exercise-basic/injection2pproblem.hh 2024-05-21 14:15:07.137554735 +0200
+--- exercises/exercise-basic/injection2pproblem.hh 2024-07-10 10:56:47.787814108 +0200
+++ exercises/solution/exercise-basic/injection2pproblem.hh 1970-01-01 01:00:00.000000000 +0100
@@ -1,223 +0,0 @@
-// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
@@ -1096,8 +1096,8 @@ 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-06-26 14:27:30.147478465 +0200
-+++ exercises/solution/exercise-basic/params.input 2024-05-21 14:15:07.205555067 +0200
+--- exercises/exercise-basic/params.input 2024-07-10 10:56:47.787814108 +0200
++++ exercises/solution/exercise-basic/params.input 2024-07-10 10:56:47.811814205 +0200
@@ -1,6 +1,6 @@
[TimeLoop]
DtInitial = 3600 # in seconds
@@ -1119,7 +1119,7 @@ diff -ruN exercises/exercise-basic/params.input exercises/solution/exercise-basi
+SolidThermalConductivity = 2.8 # solid thermal conducitivity of granite
+SolidHeatCapacity = 790 # solid heat capacity of granite
diff -ruN exercises/exercise-basic/properties2p2c.hh exercises/solution/exercise-basic/properties2p2c.hh
---- exercises/exercise-basic/properties2p2c.hh 2024-05-21 14:15:07.137554735 +0200
+--- exercises/exercise-basic/properties2p2c.hh 2024-07-10 10:56:47.787814108 +0200
+++ exercises/solution/exercise-basic/properties2p2c.hh 1970-01-01 01:00:00.000000000 +0100
@@ -1,78 +0,0 @@
-// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
@@ -1201,7 +1201,7 @@ diff -ruN exercises/exercise-basic/properties2p2c.hh exercises/solution/exercise
-
-#endif
diff -ruN exercises/exercise-basic/properties2p.hh exercises/solution/exercise-basic/properties2p.hh
---- exercises/exercise-basic/properties2p.hh 2024-05-21 14:15:07.137554735 +0200
+--- exercises/exercise-basic/properties2p.hh 2024-07-10 10:56:47.787814108 +0200
+++ exercises/solution/exercise-basic/properties2p.hh 1970-01-01 01:00:00.000000000 +0100
@@ -1,75 +0,0 @@
-// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
@@ -1280,8 +1280,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 2024-06-26 14:27:30.147478465 +0200
-+++ exercises/solution/exercise-basic/properties2pni.hh 2024-05-21 14:15:07.205555067 +0200
+--- exercises/exercise-basic/properties2pni.hh 2024-07-10 10:56:47.787814108 +0200
++++ exercises/solution/exercise-basic/properties2pni.hh 2024-07-10 10:56:47.811814205 +0200
@@ -31,18 +31,14 @@
#include <dumux/porousmediumflow/2p/model.hh>
#include <dumux/material/fluidsystems/h2on2.hh>
@@ -1315,7 +1315,7 @@ diff -ruN exercises/exercise-basic/properties2pni.hh exercises/solution/exercise
} // end namespace Dumux::Properties
diff -ruN exercises/exercise-basic/README.md exercises/solution/exercise-basic/README.md
---- exercises/exercise-basic/README.md 2024-06-26 13:51:10.749132853 +0200
+--- exercises/exercise-basic/README.md 2024-07-10 10:56:47.787814108 +0200
+++ exercises/solution/exercise-basic/README.md 1970-01-01 01:00:00.000000000 +0100
@@ -1,105 +0,0 @@
-# Exercise Basics (DuMuX course)
diff --git a/.patches/exercise-fluidsystem/exercise-fluidsystem.patch b/.patches/exercise-fluidsystem/exercise-fluidsystem.patch
index ace0a39b..4696ee09 100644
--- a/.patches/exercise-fluidsystem/exercise-fluidsystem.patch
+++ b/.patches/exercise-fluidsystem/exercise-fluidsystem.patch
@@ -1,6 +1,6 @@
diff -ruN exercises/exercise-fluidsystem/2pproperties.hh exercises/solution/exercise-fluidsystem/2pproperties.hh
---- exercises/exercise-fluidsystem/2pproperties.hh 2024-05-29 14:31:49.244625199 +0200
-+++ exercises/solution/exercise-fluidsystem/2pproperties.hh 2024-05-21 14:15:07.209555087 +0200
+--- exercises/exercise-fluidsystem/2pproperties.hh 2024-07-10 10:56:47.787814108 +0200
++++ exercises/solution/exercise-fluidsystem/2pproperties.hh 2024-07-10 10:56:47.811814205 +0200
@@ -37,10 +37,8 @@
#include "spatialparams.hh"
@@ -29,8 +29,8 @@ diff -ruN exercises/exercise-fluidsystem/2pproperties.hh exercises/solution/exer
// using LiquidMyComponentPhase = typename FluidSystems::OnePLiquid<Scalar, MyCompressibleComponent<Scalar> >;
diff -ruN exercises/exercise-fluidsystem/aparams.input exercises/solution/exercise-fluidsystem/aparams.input
---- exercises/exercise-fluidsystem/aparams.input 2024-05-29 14:31:49.245625185 +0200
-+++ exercises/solution/exercise-fluidsystem/aparams.input 2024-05-21 14:15:07.209555087 +0200
+--- exercises/exercise-fluidsystem/aparams.input 2024-07-10 10:56:47.787814108 +0200
++++ exercises/solution/exercise-fluidsystem/aparams.input 2024-07-10 10:56:47.811814205 +0200
@@ -3,7 +3,7 @@
DtInitial = 10 # initial time step size [s]
@@ -47,8 +47,8 @@ diff -ruN exercises/exercise-fluidsystem/aparams.input exercises/solution/exerci
-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 2024-05-21 14:15:07.145554774 +0200
-+++ exercises/solution/exercise-fluidsystem/bparams.input 2024-05-21 14:15:07.209555087 +0200
+--- exercises/exercise-fluidsystem/bparams.input 2024-07-10 10:56:47.787814108 +0200
++++ exercises/solution/exercise-fluidsystem/bparams.input 2024-07-10 10:56:47.811814205 +0200
@@ -3,7 +3,7 @@
DtInitial = 10 # initial time step size [s]
@@ -59,8 +59,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 2024-05-21 14:15:07.145554774 +0200
-+++ exercises/solution/exercise-fluidsystem/CMakeLists.txt 2024-05-21 14:15:07.209555087 +0200
+--- exercises/exercise-fluidsystem/CMakeLists.txt 2024-07-10 10:56:47.787814108 +0200
++++ exercises/solution/exercise-fluidsystem/CMakeLists.txt 2024-07-10 10:56:47.811814205 +0200
@@ -1,17 +1,15 @@
# executables for exercise part a & b
#part a: 2pproblem
@@ -86,8 +86,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 2024-05-29 14:31:49.245625185 +0200
-+++ exercises/solution/exercise-fluidsystem/components/mycompressiblecomponent.hh 2024-05-21 14:15:07.209555087 +0200
+--- exercises/exercise-fluidsystem/components/mycompressiblecomponent.hh 2024-07-10 10:56:47.787814108 +0200
++++ exercises/solution/exercise-fluidsystem/components/mycompressiblecomponent.hh 2024-07-10 10:56:47.811814205 +0200
@@ -50,7 +50,7 @@
static std::string name()
{ return "MyCompressibleComponent"; }
@@ -149,8 +149,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 2024-05-29 14:31:49.245625185 +0200
-+++ exercises/solution/exercise-fluidsystem/components/myincompressiblecomponent.hh 2024-05-21 14:15:07.209555087 +0200
+--- exercises/exercise-fluidsystem/components/myincompressiblecomponent.hh 2024-07-10 10:56:47.787814108 +0200
++++ exercises/solution/exercise-fluidsystem/components/myincompressiblecomponent.hh 2024-07-10 10:56:47.811814205 +0200
@@ -19,7 +19,7 @@
/*!
* \file
@@ -207,7 +207,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 2024-05-21 14:15:07.209555087 +0200
++++ exercises/solution/exercise-fluidsystem/components/plotdensityfunction.py 2024-07-10 10:56:47.811814205 +0200
@@ -0,0 +1,19 @@
+#!usr/bin/env python
+import numpy as np
@@ -229,8 +229,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 2024-05-29 14:31:49.246625171 +0200
-+++ exercises/solution/exercise-fluidsystem/fluidsystems/h2omycompressiblecomponent.hh 2024-05-21 14:15:07.209555087 +0200
+--- exercises/exercise-fluidsystem/fluidsystems/h2omycompressiblecomponent.hh 2024-07-10 10:56:47.787814108 +0200
++++ exercises/solution/exercise-fluidsystem/fluidsystems/h2omycompressiblecomponent.hh 2024-07-10 10:56:47.811814205 +0200
@@ -31,15 +31,15 @@
#include <dumux/material/fluidsystems/base.hh>
@@ -299,8 +299,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 2024-05-21 14:15:07.145554774 +0200
-+++ exercises/solution/exercise-fluidsystem/main.cc 2024-05-21 14:15:07.209555087 +0200
+--- exercises/exercise-fluidsystem/main.cc 2024-07-10 10:56:47.787814108 +0200
++++ exercises/solution/exercise-fluidsystem/main.cc 2024-07-10 10:56:47.811814205 +0200
@@ -51,8 +51,8 @@
// define the type tag for this problem
@@ -327,7 +327,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 2024-05-21 14:15:07.145554774 +0200
+--- exercises/exercise-fluidsystem/README.md 2024-07-10 10:56:47.787814108 +0200
+++ exercises/solution/exercise-fluidsystem/README.md 1970-01-01 01:00:00.000000000 +0100
@@ -1,266 +0,0 @@
-# Exercise Fluidsystem (DuMuX Course)
@@ -597,8 +597,8 @@ diff -ruN exercises/exercise-fluidsystem/README.md exercises/solution/exercise-f
-./exercise_fluidsystem_b exercise_fluidsystem_b.input
-```
diff -ruN exercises/exercise-fluidsystem/spatialparams.hh exercises/solution/exercise-fluidsystem/spatialparams.hh
---- exercises/exercise-fluidsystem/spatialparams.hh 2024-05-29 14:31:49.246625171 +0200
-+++ exercises/solution/exercise-fluidsystem/spatialparams.hh 2024-05-21 14:15:07.209555087 +0200
+--- exercises/exercise-fluidsystem/spatialparams.hh 2024-07-10 10:56:47.787814108 +0200
++++ exercises/solution/exercise-fluidsystem/spatialparams.hh 2024-07-10 10:56:47.811814205 +0200
@@ -129,9 +129,12 @@
// We want to define water as the wetting phase in
// the entire domain (see fluid system for the phase indices)
diff --git a/.patches/exercise-fractures/exercise-fractures.patch b/.patches/exercise-fractures/exercise-fractures.patch
index cd687844..5e8b9b52 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 2024-05-21 14:15:07.145554774 +0200
-+++ exercises/solution/exercise-fractures/CMakeLists.txt 2024-05-21 14:15:07.209555087 +0200
+--- exercises/exercise-fractures/CMakeLists.txt 2024-07-10 10:56:47.787814108 +0200
++++ exercises/solution/exercise-fractures/CMakeLists.txt 2024-07-10 10:56:47.811814205 +0200
@@ -1,6 +1,23 @@
-dumux_add_test(NAME exercise_fractures
+# executable for the exercise
@@ -29,7 +29,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-05-21 14:15:07.209555087 +0200
++++ exercises/solution/exercise-fractures/exercise_fractures_solution_a.input 2024-07-10 10:56:47.811814205 +0200
@@ -0,0 +1,41 @@
+[TimeLoop]
+TEnd = 30000 # [s]
@@ -74,7 +74,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-05-21 14:15:07.209555087 +0200
++++ exercises/solution/exercise-fractures/exercise_fractures_solution_b.input 2024-07-10 10:56:47.811814205 +0200
@@ -0,0 +1,41 @@
+[TimeLoop]
+TEnd = 30000 # [s]
@@ -119,7 +119,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-05-21 14:15:07.209555087 +0200
++++ exercises/solution/exercise-fractures/exercise_fractures_solution_c.input 2024-07-10 10:56:47.811814205 +0200
@@ -0,0 +1,41 @@
+[TimeLoop]
+TEnd = 30000 # [s]
@@ -163,8 +163,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 2024-05-21 14:15:07.145554774 +0200
-+++ exercises/solution/exercise-fractures/fractureproblem.hh 2024-05-21 14:15:07.209555087 +0200
+--- exercises/exercise-fractures/fractureproblem.hh 2024-07-16 15:32:50.488292620 +0200
++++ exercises/solution/exercise-fractures/fractureproblem.hh 2024-07-10 10:56:47.811814205 +0200
@@ -71,6 +71,10 @@
std::shared_ptr<typename ParentType::SpatialParams> spatialParams,
const std::string& paramGroup)
@@ -196,8 +196,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 2024-05-21 14:15:07.145554774 +0200
-+++ exercises/solution/exercise-fractures/fracturespatialparams.hh 2024-05-21 14:15:07.209555087 +0200
+--- exercises/exercise-fractures/fracturespatialparams.hh 2024-07-16 15:32:50.488292620 +0200
++++ exercises/solution/exercise-fractures/fracturespatialparams.hh 2024-07-10 10:56:47.811814205 +0200
@@ -53,6 +53,7 @@
using Element = typename GridView::template Codim<0>::Entity;
using GlobalPosition = typename Element::Geometry::GlobalCoordinate;
@@ -319,8 +319,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 2024-05-21 14:15:07.149554794 +0200
-+++ exercises/solution/exercise-fractures/main.cc 2024-05-21 14:15:07.213555107 +0200
+--- exercises/exercise-fractures/main.cc 2024-07-10 10:56:47.787814108 +0200
++++ exercises/solution/exercise-fractures/main.cc 2024-07-10 10:56:47.811814205 +0200
@@ -257,4 +257,5 @@
Parameters::print();
@@ -328,8 +328,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 2024-05-21 14:15:07.149554794 +0200
-+++ exercises/solution/exercise-fractures/matrixproblem.hh 2024-05-21 14:15:07.213555107 +0200
+--- exercises/exercise-fractures/matrixproblem.hh 2024-07-16 15:33:20.236336479 +0200
++++ exercises/solution/exercise-fractures/matrixproblem.hh 2024-07-10 10:56:47.811814205 +0200
@@ -77,11 +77,18 @@
: ParentType(gridGeometry, spatialParams, paramGroup)
, boundaryOverPressure_(getParamFromGroup<Scalar>(paramGroup, "Problem.BoundaryOverPressure"))
@@ -453,8 +453,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 2024-05-21 14:15:07.149554794 +0200
-+++ exercises/solution/exercise-fractures/matrixspatialparams.hh 2024-05-21 14:15:07.213555107 +0200
+--- exercises/exercise-fractures/matrixspatialparams.hh 2024-07-10 10:56:47.791814125 +0200
++++ exercises/solution/exercise-fractures/matrixspatialparams.hh 2024-07-10 10:56:47.811814205 +0200
@@ -52,6 +52,7 @@
using Element = typename GridView::template Codim<0>::Entity;
using GlobalPosition = typename Element::Geometry::GlobalCoordinate;
@@ -464,8 +464,8 @@ 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-05-21 14:15:07.149554794 +0200
-+++ exercises/solution/exercise-fractures/params.input 2024-05-21 14:15:07.213555107 +0200
+--- exercises/exercise-fractures/params.input 2024-07-16 15:33:30.964352395 +0200
++++ exercises/solution/exercise-fractures/params.input 2024-07-10 10:56:47.811814205 +0200
@@ -5,6 +5,9 @@
[Problem]
@@ -507,8 +507,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 2024-05-21 14:15:07.149554794 +0200
-+++ exercises/solution/exercise-fractures/properties.hh 2024-05-21 14:15:07.213555107 +0200
+--- exercises/exercise-fractures/properties.hh 2024-07-10 10:56:47.791814125 +0200
++++ exercises/solution/exercise-fractures/properties.hh 2024-07-10 10:56:47.811814205 +0200
@@ -57,6 +57,7 @@
// with tpfa.
#include <dumux/multidomain/facet/cellcentered/tpfa/properties.hh>
@@ -527,7 +527,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 2024-05-21 14:15:07.145554774 +0200
+--- exercises/exercise-fractures/README.md 2024-07-10 10:56:47.787814108 +0200
+++ 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 f9d358fb..02fdc371 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 2024-05-21 14:15:07.149554794 +0200
-+++ exercises/solution/exercise-grids/CMakeLists.txt 2024-05-21 14:15:07.213555107 +0200
+--- exercises/exercise-grids/CMakeLists.txt 2024-07-10 10:56:47.791814125 +0200
++++ exercises/solution/exercise-grids/CMakeLists.txt 2024-07-10 10:56:47.811814205 +0200
@@ -1,5 +1,5 @@
# the grid exercise simulation program
-dumux_add_test(NAME exercise_grids
@@ -9,7 +9,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-05-21 14:15:07.149554794 +0200
+--- exercises/exercise-grids/grids/grid_structured.dgf 2024-07-10 10:56:47.791814125 +0200
+++ exercises/solution/exercise-grids/grids/grid_structured.dgf 1970-01-01 01:00:00.000000000 +0100
@@ -1,6 +0,0 @@
-DGF
@@ -19,7 +19,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-05-21 14:15:07.149554794 +0200
+--- exercises/exercise-grids/grids/grid_structured.geo 2024-07-10 10:56:47.791814125 +0200
+++ exercises/solution/exercise-grids/grids/grid_structured.geo 1970-01-01 01:00:00.000000000 +0100
@@ -1,30 +0,0 @@
-X = 60;
@@ -53,8 +53,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 2024-05-21 14:15:07.149554794 +0200
-+++ exercises/solution/exercise-grids/main.cc 2024-05-21 14:15:07.213555107 +0200
+--- exercises/exercise-grids/main.cc 2024-07-10 10:56:47.791814125 +0200
++++ exercises/solution/exercise-grids/main.cc 2024-07-10 10:56:47.811814205 +0200
@@ -18,7 +18,7 @@
*****************************************************************************/
/*!
@@ -65,8 +65,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 2024-05-29 14:31:49.246625171 +0200
-+++ exercises/solution/exercise-grids/params.input 2024-05-21 14:15:07.213555107 +0200
+--- exercises/exercise-grids/params.input 2024-07-10 10:56:47.791814125 +0200
++++ exercises/solution/exercise-grids/params.input 2024-07-10 10:56:47.811814205 +0200
@@ -3,13 +3,34 @@
TEnd = 3.154e9 # in seconds, i.e ten years
@@ -112,8 +112,8 @@ diff -ruN exercises/exercise-grids/params.input exercises/solution/exercise-grid
\ No newline at end of file
+Aquifer.Snr = 0.0
diff -ruN exercises/exercise-grids/problem.hh exercises/solution/exercise-grids/problem.hh
---- exercises/exercise-grids/problem.hh 2024-05-21 14:15:07.149554794 +0200
-+++ exercises/solution/exercise-grids/problem.hh 2024-05-21 14:15:07.213555107 +0200
+--- exercises/exercise-grids/problem.hh 2024-07-10 10:56:47.791814125 +0200
++++ exercises/solution/exercise-grids/problem.hh 2024-07-10 10:56:47.811814205 +0200
@@ -134,7 +134,7 @@
}
@@ -124,8 +124,8 @@ diff -ruN exercises/exercise-grids/problem.hh exercises/solution/exercise-grids/
*
* \param globalPos The position of the integration point of the boundary segment.
diff -ruN exercises/exercise-grids/properties.hh exercises/solution/exercise-grids/properties.hh
---- exercises/exercise-grids/properties.hh 2024-05-29 14:31:49.246625171 +0200
-+++ exercises/solution/exercise-grids/properties.hh 2024-05-21 14:15:07.213555107 +0200
+--- exercises/exercise-grids/properties.hh 2024-07-10 10:56:47.791814125 +0200
++++ exercises/solution/exercise-grids/properties.hh 2024-07-10 10:56:47.811814205 +0200
@@ -17,9 +17,9 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. *
*****************************************************************************/
@@ -177,7 +177,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 2024-05-21 14:15:07.149554794 +0200
+--- exercises/exercise-grids/README.md 2024-07-10 10:56:47.791814125 +0200
+++ exercises/solution/exercise-grids/README.md 1970-01-01 01:00:00.000000000 +0100
@@ -1,169 +0,0 @@
-# Exercise Grids (DuMuX course)
diff --git a/.patches/exercise-mainfile/exercise-mainfile.patch b/.patches/exercise-mainfile/exercise-mainfile.patch
index c8a9625a..e4bad6a3 100644
--- a/.patches/exercise-mainfile/exercise-mainfile.patch
+++ b/.patches/exercise-mainfile/exercise-mainfile.patch
@@ -1,6 +1,6 @@
diff -ruN exercises/exercise-mainfile/1pproblem.hh exercises/solution/exercise-mainfile/1pproblem.hh
---- exercises/exercise-mainfile/1pproblem.hh 2024-05-21 14:15:07.149554794 +0200
-+++ exercises/solution/exercise-mainfile/1pproblem.hh 2024-05-21 14:15:07.213555107 +0200
+--- exercises/exercise-mainfile/1pproblem.hh 2024-07-10 10:56:47.791814125 +0200
++++ exercises/solution/exercise-mainfile/1pproblem.hh 2024-07-10 10:56:47.811814205 +0200
@@ -24,9 +24,9 @@
#ifndef DUMUX_EX_MAINFILE_ONEP_TEST_PROBLEM_HH
#define DUMUX_EX_MAINFILE_ONEP_TEST_PROBLEM_HH
@@ -30,8 +30,8 @@ diff -ruN exercises/exercise-mainfile/1pproblem.hh exercises/solution/exercise-m
} // end namespace Dumux
diff -ruN exercises/exercise-mainfile/CMakeLists.txt exercises/solution/exercise-mainfile/CMakeLists.txt
---- exercises/exercise-mainfile/CMakeLists.txt 2024-05-21 14:15:07.149554794 +0200
-+++ exercises/solution/exercise-mainfile/CMakeLists.txt 2024-05-21 14:15:07.213555107 +0200
+--- exercises/exercise-mainfile/CMakeLists.txt 2024-07-10 10:56:47.791814125 +0200
++++ exercises/solution/exercise-mainfile/CMakeLists.txt 2024-07-10 10:56:47.811814205 +0200
@@ -1,12 +1,9 @@
# the one-phase simulation program
-dumux_add_test(NAME exercise_mainfile_a
@@ -50,7 +50,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 2024-05-29 14:31:49.246625171 +0200
+--- exercises/exercise-mainfile/exercise1pamain.cc 2024-07-10 10:56:47.791814125 +0200
+++ exercises/solution/exercise-mainfile/exercise1pamain.cc 1970-01-01 01:00:00.000000000 +0100
@@ -1,142 +0,0 @@
-// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
@@ -197,7 +197,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 2024-05-21 14:15:07.213555107 +0200
++++ exercises/solution/exercise-mainfile/exercise1pa_solution_main.cc 2024-07-10 10:56:47.811814205 +0200
@@ -0,0 +1,143 @@
+// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+// vi: set et ts=4 sw=4 sts=4:
@@ -343,7 +343,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 2024-05-21 14:15:07.149554794 +0200
+--- exercises/exercise-mainfile/exercise1pbmain.cc 2024-07-10 10:56:47.791814125 +0200
+++ exercises/solution/exercise-mainfile/exercise1pbmain.cc 1970-01-01 01:00:00.000000000 +0100
@@ -1,132 +0,0 @@
-// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
@@ -479,7 +479,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 2024-05-21 14:15:07.149554794 +0200
+--- exercises/exercise-mainfile/exercise1pcmain.cc 2024-07-10 10:56:47.791814125 +0200
+++ exercises/solution/exercise-mainfile/exercise1pcmain.cc 1970-01-01 01:00:00.000000000 +0100
@@ -1,158 +0,0 @@
-// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
@@ -641,7 +641,7 @@ 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-05-29 14:31:49.247625156 +0200
+--- exercises/exercise-mainfile/exercise_mainfile_a.input 2024-07-10 10:56:47.791814125 +0200
+++ exercises/solution/exercise-mainfile/exercise_mainfile_a.input 1970-01-01 01:00:00.000000000 +0100
@@ -1,18 +0,0 @@
-[Grid]
@@ -664,7 +664,7 @@ diff -ruN exercises/exercise-mainfile/exercise_mainfile_a.input exercises/soluti
-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 2024-05-21 14:15:07.213555107 +0200
++++ exercises/solution/exercise-mainfile/exercise_mainfile_a_solution.input 2024-07-10 10:56:47.811814205 +0200
@@ -0,0 +1,17 @@
+[Grid]
+LowerLeft = 0 0
@@ -684,7 +684,7 @@ diff -ruN exercises/exercise-mainfile/exercise_mainfile_a_solution.input exercis
+[Assembly.NumericDifference]
+PriVarMagnitude = 1e5
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-05-21 14:15:07.149554794 +0200
+--- exercises/exercise-mainfile/exercise_mainfile_b.input 2024-07-10 10:56:47.791814125 +0200
+++ exercises/solution/exercise-mainfile/exercise_mainfile_b.input 1970-01-01 01:00:00.000000000 +0100
@@ -1,17 +0,0 @@
-[Grid]
@@ -705,7 +705,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 2024-05-21 14:15:07.149554794 +0200
+--- exercises/exercise-mainfile/exercise_mainfile_c.input 2024-07-10 10:56:47.791814125 +0200
+++ exercises/solution/exercise-mainfile/exercise_mainfile_c.input 1970-01-01 01:00:00.000000000 +0100
@@ -1,21 +0,0 @@
-[TimeLoop]
@@ -731,8 +731,8 @@ diff -ruN exercises/exercise-mainfile/exercise_mainfile_c.input exercises/soluti
-PriVarMagnitude = 1e5
\ No newline at end of file
diff -ruN exercises/exercise-mainfile/properties.hh exercises/solution/exercise-mainfile/properties.hh
---- exercises/exercise-mainfile/properties.hh 2024-05-29 14:31:49.247625156 +0200
-+++ exercises/solution/exercise-mainfile/properties.hh 2024-05-21 14:15:07.213555107 +0200
+--- exercises/exercise-mainfile/properties.hh 2024-07-10 10:56:47.791814125 +0200
++++ exercises/solution/exercise-mainfile/properties.hh 2024-07-10 10:56:47.811814205 +0200
@@ -35,20 +35,19 @@
#include <dumux/discretization/ccmpfa.hh>
#include <dumux/discretization/box.hh>
@@ -774,7 +774,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 2024-05-21 14:15:07.149554794 +0200
+--- exercises/exercise-mainfile/README.md 2024-07-10 10:56:47.791814125 +0200
+++ exercises/solution/exercise-mainfile/README.md 1970-01-01 01:00:00.000000000 +0100
@@ -1,203 +0,0 @@
-# Exercise Mainfiles (DuMuX course)
diff --git a/.patches/exercise-properties/exercise-properties.patch b/.patches/exercise-properties/exercise-properties.patch
index a94dc488..cf2b2a76 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 2024-05-21 14:15:07.153554813 +0200
-+++ exercises/solution/exercise-properties/CMakeLists.txt 2024-05-21 14:15:07.213555107 +0200
+--- exercises/exercise-properties/CMakeLists.txt 2024-07-10 10:56:47.791814125 +0200
++++ exercises/solution/exercise-properties/CMakeLists.txt 2024-07-10 10:56:47.811814205 +0200
@@ -1,5 +1,5 @@
-# the property exercise simulation program
-dumux_add_test(NAME exercise_properties
@@ -10,8 +10,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 2024-05-29 14:31:49.247625156 +0200
-+++ exercises/solution/exercise-properties/mylocalresidual.hh 2024-05-21 14:15:07.213555107 +0200
+--- exercises/exercise-properties/mylocalresidual.hh 2024-07-10 10:56:47.791814125 +0200
++++ exercises/solution/exercise-properties/mylocalresidual.hh 2024-07-10 10:56:47.811814205 +0200
@@ -71,8 +71,6 @@
* \note The volVars can be different to allow computing
* the implicit euler time derivative here
@@ -48,8 +48,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 2024-05-29 14:31:49.248625142 +0200
-+++ exercises/solution/exercise-properties/problem.hh 2024-05-21 14:15:07.213555107 +0200
+--- exercises/exercise-properties/problem.hh 2024-07-10 10:56:47.791814125 +0200
++++ exercises/solution/exercise-properties/problem.hh 2024-07-10 10:56:47.811814205 +0200
@@ -23,6 +23,7 @@
#ifndef DUMUX_INCOMPRESSIBLE_TWOP_TEST_PROBLEM_HH
#define DUMUX_INCOMPRESSIBLE_TWOP_TEST_PROBLEM_HH
@@ -74,8 +74,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 2024-05-29 14:31:49.248625142 +0200
-+++ exercises/solution/exercise-properties/properties.hh 2024-05-21 14:15:07.213555107 +0200
+--- exercises/exercise-properties/properties.hh 2024-07-10 10:56:47.791814125 +0200
++++ exercises/solution/exercise-properties/properties.hh 2024-07-10 10:56:47.811814205 +0200
@@ -39,9 +39,7 @@
#include "spatialparams.hh"
@@ -100,7 +100,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-05-21 14:15:07.153554813 +0200
+--- exercises/exercise-properties/README.md 2024-07-10 10:56:47.791814125 +0200
+++ 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 7af11f7e..b9286e86 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 2024-05-21 14:15:07.153554813 +0200
-+++ exercises/solution/exercise-runtimeparams/CMakeLists.txt 2024-05-21 14:15:07.213555107 +0200
+--- exercises/exercise-runtimeparams/CMakeLists.txt 2024-07-10 10:56:47.791814125 +0200
++++ exercises/solution/exercise-runtimeparams/CMakeLists.txt 2024-07-10 10:56:47.815814221 +0200
@@ -1,5 +1,5 @@
# the runtime parameter exercise simulation program
-dumux_add_test(NAME exercise_runtimeparams
@@ -9,8 +9,8 @@ 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-05-29 14:31:49.248625142 +0200
-+++ exercises/solution/exercise-runtimeparams/params.input 2024-05-21 14:15:07.213555107 +0200
+--- exercises/exercise-runtimeparams/params.input 2024-07-10 10:56:47.791814125 +0200
++++ exercises/solution/exercise-runtimeparams/params.input 2024-07-10 10:56:47.815814221 +0200
@@ -12,11 +12,12 @@
AquiferDepth = 2700.0 # m
InjectionDuration = 2.628e6 # in seconds, i.e. one month
@@ -33,8 +33,8 @@ diff -ruN exercises/exercise-runtimeparams/params.input exercises/solution/exerc
+Aquifer.Snr = 0.0
\ No newline at end of file
diff -ruN exercises/exercise-runtimeparams/problem.hh exercises/solution/exercise-runtimeparams/problem.hh
---- exercises/exercise-runtimeparams/problem.hh 2024-05-29 14:31:49.248625142 +0200
-+++ exercises/solution/exercise-runtimeparams/problem.hh 2024-05-21 14:15:07.213555107 +0200
+--- exercises/exercise-runtimeparams/problem.hh 2024-07-10 10:56:47.791814125 +0200
++++ exercises/solution/exercise-runtimeparams/problem.hh 2024-07-10 10:56:47.815814221 +0200
@@ -91,14 +91,15 @@
aquiferDepth_ = getParam<Scalar>("Problem.AquiferDepth");
// the duration of the injection, units: second
@@ -83,8 +83,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 2024-05-21 14:15:07.153554813 +0200
-+++ exercises/solution/exercise-runtimeparams/properties.hh 2024-05-21 14:15:07.213555107 +0200
+--- exercises/exercise-runtimeparams/properties.hh 2024-07-10 10:56:47.791814125 +0200
++++ exercises/solution/exercise-runtimeparams/properties.hh 2024-07-10 10:56:47.815814221 +0200
@@ -70,6 +70,6 @@
FluidSystems::H2ON2DefaultPolicy</*fastButSimplifiedRelations=*/ true> >;
};
@@ -94,7 +94,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 2024-05-21 14:15:07.153554813 +0200
+--- exercises/exercise-runtimeparams/README.md 2024-07-10 10:56:47.791814125 +0200
+++ exercises/solution/exercise-runtimeparams/README.md 1970-01-01 01:00:00.000000000 +0100
@@ -1,171 +0,0 @@
-# Exercise Runtime Parameters (DuMuX course)
@@ -269,8 +269,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 2024-05-21 14:15:07.153554813 +0200
-+++ exercises/solution/exercise-runtimeparams/spatialparams.hh 2024-05-21 14:15:07.213555107 +0200
+--- exercises/exercise-runtimeparams/spatialparams.hh 2024-07-10 10:56:47.791814125 +0200
++++ exercises/solution/exercise-runtimeparams/spatialparams.hh 2024-07-10 10:56:47.815814221 +0200
@@ -24,8 +24,8 @@
* fully implicit model.
*/
--
GitLab