[course][exercises][naming] adapted towards the general naming conventions,...

[course][exercises][naming] adapted towards the general naming conventions, unified naming of files and executables for the course

exercises/exercise-basic/CMakeLists.txt

 # the immiscible two-phase simulation program
 dune_add_test(NAME exercise_basic_2p
-              SOURCES exercise_basic_2p.cc)
+              SOURCES exercisebasic2p.cc)
 
 # the compositional two-phase two-component simulation program
 dune_add_test(NAME exercise_basic_2p2c
-              SOURCES exercise_basic_2p2c.cc)
+              SOURCES exercisebasic2p2c.cc)
 
 # here, add the two-phase non-isothermal simulation program
 

exercises/exercise-basic/README.md

@@ -18,8 +18,8 @@ This exercise deals with two problems: a two-phase immiscible problem (__2p__) a
 <hr>
 
 Locate all the files you will need for this exercise
-* The __main file__ for the __2p__ problem : `exercise_basic_2p.cc`
-* The __main file__ for the __2p2c__ problem : `exercise_basic_2p2c.cc`
+* The __main file__ for the __2p__ problem : `exercisebasic2p.cc`
+* The __main file__ for the __2p2c__ problem : `exercisebasic2p2c.cc`
 * The __problem file__ for the __2p__ problem: `injection2pproblem.hh`
 * The __problem file__ for the __2p2c__ problem: `injection2p2cproblem.hh`
 * The shared __spatial parameters file__: `injection2pspatialparams.hh`

exercises/exercise-biomineralization/CMakeLists.txt

 # executables for exercisebiomin
-dune_add_test(NAME exercisebiomin
+dune_add_test(NAME exercise_biomin
               SOURCES exercisebiomin.cc
               CMD_ARGS -TimeLoop.TEnd 1e5)
 
 # add tutorial to the common target
-add_dependencies(test_exercises exercisebiomin)
+add_dependencies(test_exercises exercise_biomin)
 
 # add a symlink for each input file
 add_input_file_links()

exercises/exercise-biomineralization/README.md

@@ -99,7 +99,7 @@ and type
 
 ```bash
 make exercisebiomin
-./exercisebiomin exercisebiomin.input
+./exercise_biomin exercise_biomin.input
 ```
 
 ### 4. Seal leakage pathway in the aquitard

exercises/exercise-coupling-ff-pm/README.md

@@ -15,10 +15,10 @@ Free flow is modeled in the upper subdomain, while the lower subdomain models a
 There are three sub folders: `interface` (Exercise 1), `models` (Exercise 2) and `turbulence` (Exercise 3).
 
 The problem-related files for this exercise are:
-* Three __main files__ for the three sub-tasks :`ex_interface_coupling_ff-pm.cc`, `ex_models_coupling_ff-pm.cc`, `ex_turbulence_coupling_ff-pm.cc`,
-* Three __free flow problem files__: `ex_interface_ffproblem.hh`, `ex_models_ffproblem.hh`, `ex_turbulence__ffproblem.hh`
-* Three __porous medium flow problem files__: `ex_interface_pmproblem.hh`, `ex_models_pmproblem.hh`, `ex_turbulence_pmproblem.hh`
-* The __input files__: `ex_interface_coupling_ff-pm.input`, `ex_models_coupling_ff-pm.input`, `ex_turbulence_coupling_ff-pm.input`,
+* Three __main files__ for the three sub-tasks :`exerciseinterfacecouplingffpm.cc`, `exercisemodelscouplingffpm.cc`, `exerciseturbulencecouplingffpm.cc`,
+* Three __free flow problem files__: `interfaceffproblem.hh`, `modelsffproblem.hh`, `turbulenceffproblem.hh`
+* Three __porous medium flow problem files__: `interfacepmproblem.hh`, `modelspmproblem.hh`, `turbulencepmproblem.hh`
+* The __input files__: `exercise_interface_coupling_ff-pm.input`, `exercise_models_coupling_ff-pm.input`, `exercise_turbulence_coupling_ff-pm.input`,
 * The __spatial parameters files__: `1pspatialparams.hh`, `2pspatialparams.hh`
 
 
@@ -113,6 +113,7 @@ if (couplingManager().isCoupledEntity(CouplingManager::darcyIdx, scvf))
 ```
 
 This should make the flow go from left to right.
+You can also delete the initial vertical velocity from initialAtPos(), to be consistent with the new boundary conditions.
 
 __Task B: Include slip-condition__
 
@@ -241,7 +242,7 @@ However, if only the gas phase is present, the liquid saturation is always zero.
 In this case, the chosen formulation will set the given value as the mole fraction of water vapor in the gas phase.
 * To tell to program which phases are present in which parts of the domain at the beginning of the simulation,
   you have to call `values.setState(MY_PHASE_PRESENCE);` in `initialAtPos()`. Have a look at the `indices.hh`
-  in the `2p2c` model to figure out which is the correct value of `MY_PHASE_PRESENCE` for the presence of
+  in the `2pnc` model (as the 2p2c model is a special case of the 2pnc model) to figure out which is the correct value of `MY_PHASE_PRESENCE` for the presence of
   a gas-phase only (hint: the numbering of phase indices begins with 0, the numbering of the phase presence states begins
   with 1. Take a look at your formulation to find out which phase index to use for the gas phase.)
 

exercises/exercise-coupling-ff-pm/interface/CMakeLists.txt

 # executables for ex_interface_coupling_ff-pm
-dune_add_test(NAME ex_interface_coupling_ff-pm
-              SOURCES ex_interface_coupling_ff-pm.cc)
+dune_add_test(NAME exercise_interface_coupling_ff-pm
+              SOURCES exerciseinterfacecouplingffpm.cc)
 
 # add tutorial to the common target
-add_dependencies(test_exercises ex_interface_coupling_ff-pm)
+add_dependencies(test_exercises exercise_interface_coupling_ff-pm)
 
 # add a symlink for each input file
 add_input_file_links()

exercises/exercise-coupling-ff-pm/interface/ex_interface_coupling_ff-pm.cc → exercises/exercise-coupling-ff-pm/interface/exerciseinterfacecouplingffpm.cc

@@ -46,8 +46,8 @@
 
 #include <dumux/multidomain/boundary/stokesdarcy/couplingmanager.hh>
 
-#include "ex_interface_pmproblem.hh"
-#include "ex_interface_ffproblem.hh"
+#include "interfacepmproblem.hh"
+#include "interfaceffproblem.hh"
 
 namespace Dumux {
 namespace Properties {

exercises/exercise-coupling-ff-pm/models/CMakeLists.txt

 # executables for ex_interface_coupling_ff-pm
-dune_add_test(NAME ex_models_coupling_ff-pm
-              SOURCES ex_models_coupling_ff-pm.cc)
+dune_add_test(NAME exercise_models_coupling_ff-pm
+              SOURCES exercisemodelscouplingffpm.cc)
 
 # add tutorial to the common target
-add_dependencies(test_exercises ex_models_coupling_ff-pm)
+add_dependencies(test_exercises exercise_models_coupling_ff-pm)
 
 # add a symlink for each input file
 add_input_file_links()

exercises/exercise-coupling-ff-pm/models/ex_models_coupling_ff-pm.cc → exercises/exercise-coupling-ff-pm/models/exercisemodelscouplingffpm.cc

@@ -49,8 +49,8 @@
 
 #include <dumux/multidomain/boundary/stokesdarcy/couplingmanager.hh>
 
-#include "ex_models_pmproblem.hh"
-#include "ex_models_ffproblem.hh"
+#include "modelspmproblem.hh"
+#include "modelsffproblem.hh"
 
 namespace Dumux {
 namespace Properties {

exercises/exercise-coupling-ff-pm/turbulence/CMakeLists.txt

 # executables for ex_interface_coupling_ff-pm
-dune_add_test(NAME ex_turbulence_coupling_ff-pm
-              SOURCES ex_turbulence_coupling_ff-pm.cc)
+dune_add_test(NAME exercise_turbulence_coupling_ff-pm
+              SOURCES exercise_turbulence_coupling_ff-pm.cc)
 
 
 # add a symlink for each input file
 add_input_file_links()
 
 # add tutorial to the common target
-add_dependencies(test_exercises ex_turbulence_coupling_ff-pm)
+add_dependencies(test_exercises exercise_turbulence_coupling_ff-pm)

exercises/exercise-coupling-ff-pm/turbulence/ex_turbulence_coupling_ff-pm.cc → exercises/exercise-coupling-ff-pm/turbulence/exercise_turbulence_coupling_ff-pm.cc

@@ -49,8 +49,8 @@
 
 #include <dumux/multidomain/boundary/stokesdarcy/couplingmanager.hh>
 
-#include "ex_turbulence_pmproblem.hh"
-#include "ex_turbulence_ffproblem.hh"
+#include "turbulencepmproblem.hh"
+#include "turbulenceffproblem.hh"
 
 namespace Dumux {
 namespace Properties {