diff --git a/.patches/exercise-biomineralization/exercise-biomineralization.patch b/.patches/exercise-biomineralization/exercise-biomineralization.patch index d547f932032ed7741893076d6432408ed2204882..c03e902d822db84efc27d1977934e6fb6b957942 100644 --- a/.patches/exercise-biomineralization/exercise-biomineralization.patch +++ b/.patches/exercise-biomineralization/exercise-biomineralization.patch @@ -1,6 +1,6 @@ diff -ruN exercises/exercise-biomineralization/biominproblem.hh exercises/solution/exercise-biomineralization/biominproblem.hh ---- exercises/exercise-biomineralization/biominproblem.hh 2024-05-21 14:15:07.137554735 +0200 -+++ exercises/solution/exercise-biomineralization/biominproblem.hh 2024-05-21 14:15:07.205555067 +0200 +--- exercises/exercise-biomineralization/biominproblem.hh 2024-07-15 15:46:37.927878669 +0200 ++++ exercises/solution/exercise-biomineralization/biominproblem.hh 2024-07-15 15:46:37.975878668 +0200 @@ -31,10 +31,12 @@ // TODO: dumux-course-task @@ -69,8 +69,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 2024-05-21 14:15:07.137554735 +0200 -+++ exercises/solution/exercise-biomineralization/biominspatialparams.hh 2024-05-21 14:15:07.205555067 +0200 +--- exercises/exercise-biomineralization/biominspatialparams.hh 2024-07-15 15:46:37.927878669 +0200 ++++ exercises/solution/exercise-biomineralization/biominspatialparams.hh 2024-07-15 15:46:37.975878668 +0200 @@ -30,7 +30,7 @@ #include <dumux/material/fluidmatrixinteractions/porosityprecipitation.hh> // TODO: dumux-course-task @@ -90,8 +90,8 @@ 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 2024-05-21 14:15:07.137554735 +0200 -+++ exercises/solution/exercise-biomineralization/chemistry/simplebiominreactions.hh 2024-05-21 14:15:07.205555067 +0200 +--- exercises/exercise-biomineralization/chemistry/simplebiominreactions.hh 2024-07-15 15:46:37.927878669 +0200 ++++ exercises/solution/exercise-biomineralization/chemistry/simplebiominreactions.hh 2024-07-15 15:46:37.975878668 +0200 @@ -93,6 +93,7 @@ // TODO: dumux-course-task @@ -129,8 +129,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 2024-05-21 14:15:07.137554735 +0200 -+++ exercises/solution/exercise-biomineralization/CMakeLists.txt 2024-05-21 14:15:07.205555067 +0200 +--- exercises/exercise-biomineralization/CMakeLists.txt 2024-07-15 15:46:37.927878669 +0200 ++++ exercises/solution/exercise-biomineralization/CMakeLists.txt 2024-07-15 15:46:37.975878668 +0200 @@ -1,7 +1,7 @@ # executables for exercisebiomin -dumux_add_test(NAME exercise_biomin @@ -142,8 +142,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 2024-05-21 14:15:07.137554735 +0200 -+++ exercises/solution/exercise-biomineralization/components/biofilm.hh 2024-05-21 14:15:07.205555067 +0200 +--- exercises/exercise-biomineralization/components/biofilm.hh 2024-07-15 15:46:37.927878669 +0200 ++++ exercises/solution/exercise-biomineralization/components/biofilm.hh 2024-07-15 15:46:37.975878668 +0200 @@ -24,9 +24,10 @@ #ifndef DUMUX_BIOFILM_HH #define DUMUX_BIOFILM_HH @@ -157,8 +157,8 @@ 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 2024-05-21 14:15:07.137554735 +0200 -+++ exercises/solution/exercise-biomineralization/fluidmatrixinteractions/permeabilitypowerlaw.hh 2024-05-21 14:15:07.205555067 +0200 +--- exercises/exercise-biomineralization/fluidmatrixinteractions/permeabilitypowerlaw.hh 2024-07-15 15:46:37.927878669 +0200 ++++ exercises/solution/exercise-biomineralization/fluidmatrixinteractions/permeabilitypowerlaw.hh 2024-07-15 15:46:37.975878668 +0200 @@ -53,10 +53,11 @@ using std::pow; // TODO: dumux-course-task @@ -173,8 +173,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 2024-05-21 14:15:07.141554755 +0200 -+++ exercises/solution/exercise-biomineralization/fluidsystems/biomin.hh 2024-05-21 14:15:07.205555067 +0200 +--- exercises/exercise-biomineralization/fluidsystems/biomin.hh 2024-07-15 15:46:37.927878669 +0200 ++++ exercises/solution/exercise-biomineralization/fluidsystems/biomin.hh 2024-07-15 15:46:37.975878668 +0200 @@ -231,7 +231,7 @@ static void init() { @@ -185,8 +185,8 @@ 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 2024-05-21 14:15:07.141554755 +0200 -+++ exercises/solution/exercise-biomineralization/params.input 2024-05-21 14:15:07.205555067 +0200 +--- exercises/exercise-biomineralization/params.input 2024-07-15 15:46:37.927878669 +0200 ++++ exercises/solution/exercise-biomineralization/params.input 2024-07-15 15:46:37.975878668 +0200 @@ -16,10 +16,10 @@ InitBiofilm = 0.05 # [-] initial volumefraction biofilm @@ -218,8 +218,8 @@ diff -ruN exercises/exercise-biomineralization/params.input exercises/solution/e +[PowerLaw] +Exponent = 5.0 diff -ruN exercises/exercise-biomineralization/properties.hh exercises/solution/exercise-biomineralization/properties.hh ---- exercises/exercise-biomineralization/properties.hh 2024-05-21 14:15:07.141554755 +0200 -+++ exercises/solution/exercise-biomineralization/properties.hh 2024-05-21 14:15:07.205555067 +0200 +--- exercises/exercise-biomineralization/properties.hh 2024-07-15 15:46:37.927878669 +0200 ++++ exercises/solution/exercise-biomineralization/properties.hh 2024-07-15 15:46:37.975878668 +0200 @@ -30,17 +30,20 @@ #include <dumux/discretization/cctpfa.hh> #include <dumux/porousmediumflow/2pncmin/model.hh> @@ -253,7 +253,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 2024-05-21 14:15:07.137554735 +0200 +--- exercises/exercise-biomineralization/README.md 2024-07-16 15:31:32.174538877 +0200 +++ exercises/solution/exercise-biomineralization/README.md 1970-01-01 01:00:00.000000000 +0100 @@ -1,255 +0,0 @@ -# Exercise Biomineralization (DuMuX Course) @@ -262,7 +262,7 @@ diff -ruN exercises/exercise-biomineralization/README.md exercises/solution/exer - -## Problem set-up - --The domain has a size of 20 x 15 m and contains a sealing aquitard in the middle. The aquitard is interrupted by a "fault zone" and thereby connects the upper drinking water aquifer and the lower CO<sub>2</sub>-storage aquifer. Initially, the domain is fully saturated with water and biofilm is present in the lower CO<sub>2</sub>-storage aquifer. Calcium and urea are injected in the upper drinking water aquifer by means of a Neumann boundary condition. The remaining parts of the upper boundary and the entire lower boundary are modelled with Neumann no-flow conditions, while on the right-hand side a Dirichlet boundary conditions is assigned, which fixes there the the initial values. +-The domain has a size of 20 x 15 m and contains a sealing aquitard in the middle. The aquitard is interrupted by a "fault zone" and thereby connects the upper drinking water aquifer and the lower CO<sub>2</sub>-storage aquifer. Initially, the domain is fully saturated with water and biofilm is present in the lower CO<sub>2</sub>-storage aquifer. Calcium and urea are injected in the upper drinking water aquifer by means of a Neumann boundary condition. The remaining parts of the upper boundary and the entire lower boundary are modelled with Neumann no-flow conditions, while on the right-hand side a Dirichlet boundary conditions is assigned, which fixes there the initial values. - - -Disclaimer: Please note, that this is not a realistic scenario. No one would think of storing gaseous CO<sub>2</sub> in this subcritical setting. @@ -476,7 +476,7 @@ diff -ruN exercises/exercise-biomineralization/README.md exercises/solution/exer - -__Task:__ - --The CO<sub>2</sub> component is used in the fluidsystem, which is defined in `properties.hh`. Replace the component `SimpleCO2` with `CO2` defined in `dumux/material/components/co2.hh`, with a CO<sub>2</sub> table as an additional template parameter. Use the the table defined in `dumux/material/components/defaultco2table.hh`, noting the different namespace. Take care to include the appropriate headers. +-The CO<sub>2</sub> component is used in the fluidsystem, which is defined in `properties.hh`. Replace the component `SimpleCO2` with `CO2` defined in `dumux/material/components/co2.hh`, with a CO<sub>2</sub> table as an additional template parameter. Use the table defined in `dumux/material/components/defaultco2table.hh`, noting the different namespace. Take care to include the appropriate headers. - -```c++ -#include <dumux/material/components/co2.hh> //!< CO2 component for use with tabulated values @@ -512,8 +512,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 2024-05-21 14:15:07.141554755 +0200 -+++ exercises/solution/exercise-biomineralization/solidsystems/biominsolidphase.hh 2024-05-21 14:15:07.205555067 +0200 +--- exercises/exercise-biomineralization/solidsystems/biominsolidphase.hh 2024-07-15 15:46:37.927878669 +0200 ++++ exercises/solution/exercise-biomineralization/solidsystems/biominsolidphase.hh 2024-07-15 15:46:37.975878668 +0200 @@ -27,12 +27,12 @@ #include <string> #include <dune/common/exceptions.hh> diff --git a/.patches/exercise-dunemodule/exercise-dunemodule.patch b/.patches/exercise-dunemodule/exercise-dunemodule.patch index f2ded273d8abd619fbdd35364b2b0015bcf61423..6c91e8970b086080651f2ebbb49034de81daee17 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 2024-07-15 15:50:06.499877396 +0200 +--- exercises/exercise-dunemodule/README.md 2024-07-16 15:24:17.152614242 +0200 +++ exercises/solution/exercise-dunemodule/README.md 1970-01-01 01:00:00.000000000 +0100 @@ -1,114 +0,0 @@ -# Exercise New Dune Module (DuMuX course) @@ -10,7 +10,7 @@ diff -ruN exercises/exercise-dunemodule/README.md exercises/solution/exercise-du -This is the suggested -workflow to develop code on top of DuMuX. - --### Task 1: Create new dune module +-## Task 1: Create new dune module - -* Execute the following command (bash environment) in the top-folder, i.e. above the dumux folder - @@ -25,7 +25,7 @@ diff -ruN exercises/exercise-dunemodule/README.md exercises/solution/exercise-du - * your email address - - --### Task 2: Rerun dunecontrol to configure your new project +-## Task 2: Rerun dunecontrol to configure your new project - -The following command will configure your new module - @@ -35,7 +35,7 @@ diff -ruN exercises/exercise-dunemodule/README.md exercises/solution/exercise-du - -You need to run this command in the folder with content dumux, dumux-course, dune-common, dune-geometry, dune-grid, dune-istl, etc. `<module-name>` needs to be replaced (please replace the angle brackets also) by the name of the module, e.g., by `dumux-example`. - --### Task 3: Create a new test case within your new DuMuX module +-## Task 3: Create a new test case within your new DuMuX module - -* Create a new folder (in your module folder), e.g., `appl` - @@ -78,7 +78,7 @@ diff -ruN exercises/exercise-dunemodule/README.md exercises/solution/exercise-du -``` - - --### Task 4: Create a new GitLab project +-## Task 4: Create a new GitLab project - - -* Login with your username and password at https://git.iws.uni-stuttgart.de/ diff --git a/exercises/exercise-dunemodule/README.md b/exercises/exercise-dunemodule/README.md index 3db9496ca84a2278334cbadd840fb069df35343a..9556e798ecc4a2debbaa106981fe590c5edf3113 100644 --- a/exercises/exercise-dunemodule/README.md +++ b/exercises/exercise-dunemodule/README.md @@ -6,7 +6,7 @@ and how to create a corresponding GitLab project. This is the suggested workflow to develop code on top of DuMuX. -### Task 1: Create new dune module +## Task 1: Create new dune module * Execute the following command (bash environment) in the top-folder, i.e. above the dumux folder @@ -21,7 +21,7 @@ workflow to develop code on top of DuMuX. * your email address -### Task 2: Rerun dunecontrol to configure your new project +## Task 2: Rerun dunecontrol to configure your new project The following command will configure your new module @@ -31,7 +31,7 @@ The following command will configure your new module You need to run this command in the folder with content dumux, dumux-course, dune-common, dune-geometry, dune-grid, dune-istl, etc. `<module-name>` needs to be replaced (please replace the angle brackets also) by the name of the module, e.g., by `dumux-example`. -### Task 3: Create a new test case within your new DuMuX module +## Task 3: Create a new test case within your new DuMuX module * Create a new folder (in your module folder), e.g., `appl` @@ -74,7 +74,7 @@ cd appl ``` -### Task 4: Create a new GitLab project +## Task 4: Create a new GitLab project * Login with your username and password at https://git.iws.uni-stuttgart.de/