From 388ea871d15d9ac9dbf6b109cad85ef8b0237747 Mon Sep 17 00:00:00 2001
From: hommel <johannes.hommel@iws.uni-stuttgart.de>
Date: Thu, 19 Sep 2019 14:14:15 +0200
Subject: [PATCH] [course][exercises][naming] adapted towards the general
naming conventions, unified naming of files and executables for the course
---
exercises/exercise-basic/CMakeLists.txt | 4 +--
exercises/exercise-basic/README.md | 4 +--
...xercise_basic_2p.cc => exercisebasic2p.cc} | 0
...ise_basic_2p2c.cc => exercisebasic2p2c.cc} | 0
.../exercise-biomineralization/CMakeLists.txt | 4 +--
.../exercise-biomineralization/README.md | 2 +-
...cisebiomin.input => exercise_biomin.input} | 0
exercises/exercise-coupling-ff-pm/README.md | 11 +++----
.../interface/CMakeLists.txt | 6 ++--
...> exercise_interface_coupling_ff-pm.input} | 0
...pm.cc => exerciseinterfacecouplingffpm.cc} | 4 +--
...ace_ffproblem.hh => interfaceffproblem.hh} | 0
...ace_pmproblem.hh => interfacepmproblem.hh} | 0
.../models/CMakeLists.txt | 6 ++--
...t => exercise_models_coupling_ff-pm.input} | 0
...ff-pm.cc => exercisemodelscouplingffpm.cc} | 4 +--
...models_ffproblem.hh => modelsffproblem.hh} | 0
...models_pmproblem.hh => modelspmproblem.hh} | 0
.../turbulence/CMakeLists.txt | 6 ++--
... => exercise_turbulence_coupling_ff-pm.cc} | 4 +--
... exercise_turbulence_coupling_ff-pm.input} | 0
...ce_ffproblem.hh => turbulenceffproblem.hh} | 0
...ce_pmproblem.hh => turbulencepmproblem.hh} | 0
exercises/exercise-fluidsystem/CMakeLists.txt | 10 +++----
exercises/exercise-fluidsystem/README.md | 22 +++++++-------
...m_a.input => exercise_fluidsystem_a.input} | 0
...m_b.input => exercise_fluidsystem_b.input} | 0
...-fluidsystem.cc => exercisefluidsystem.cc} | 0
exercises/exercise-fractures/CMakeLists.txt | 4 +--
exercises/exercise-fractures/README.md | 2 +-
...cise_fractures.cc => exercisefractures.cc} | 0
exercises/exercise-grids/CMakeLists.txt | 2 +-
.../{exercise_grids.cc => exercisegrids.cc} | 0
exercises/exercise-mainfile/CMakeLists.txt | 14 ++++-----
exercises/exercise-mainfile/README.md | 30 +++++++++----------
...e_1p_a.input => exercise_mainfile_a.input} | 0
...e_1p_b.input => exercise_mainfile_b.input} | 0
...e_1p_c.input => exercise_mainfile_c.input} | 0
...{exercise_1p_a.cc => exercisemainfilea.cc} | 0
...{exercise_1p_b.cc => exercisemainfileb.cc} | 0
...{exercise_1p_c.cc => exercisemainfilec.cc} | 0
exercises/exercise-properties/CMakeLists.txt | 2 +-
exercises/exercise-properties/README.md | 2 +-
...se_properties.cc => exerciseproperties.cc} | 0
.../exercise-runtimeparams/CMakeLists.txt | 2 +-
...timeparams.cc => exerciseruntimeparams.cc} | 0
.../solution/exercise-basic/CMakeLists.txt | 2 +-
...ise_basic_2pni.cc => exercisebasic2pni.cc} | 0
.../exercise-biomineralization/CMakeLists.txt | 4 +--
.../interface/CMakeLists.txt | 18 +++++------
...pm.cc => exerciseinterfacecouplingffpm.cc} | 4 +--
...ace_ffproblem.hh => interfaceffproblem.hh} | 0
...ace_pmproblem.hh => interfacepmproblem.hh} | 0
.../models/CMakeLists.txt | 18 +++++------
...ff-pm.cc => exercisemodelscouplingffpm.cc} | 4 +--
...models_ffproblem.hh => modelsffproblem.hh} | 0
...models_pmproblem.hh => modelspmproblem.hh} | 0
.../turbulence/CMakeLists.txt | 14 ++++-----
...m.cc => exerciseturbulencecouplingffpm.cc} | 4 +--
...ce_ffproblem.hh => turbulenceffproblem.hh} | 0
...ce_pmproblem.hh => turbulencepmproblem.hh} | 0
.../exercise-fluidsystem/CMakeLists.txt | 10 +++----
... => exercise_fluidsystem_a_solution.input} | 0
... => exercise_fluidsystem_b_solution.input} | 0
...-fluidsystem.cc => exercisefluidsystem.cc} | 0
.../exercise-fractures/CMakeLists.txt | 28 ++++++++---------
...cise_fractures.cc => exercisefractures.cc} | 0
.../solution/exercise-grids/CMakeLists.txt | 2 +-
..._solution.cc => exercisegrids_solution.cc} | 0
.../solution/exercise-mainfile/CMakeLists.txt | 6 ++--
...put => exercise_mainfile_a_solution.input} | 0
...tion.cc => exercisemainfile_a_solution.cc} | 0
.../exercise-properties/CMakeLists.txt | 2 +-
...tion.cc => exerciseproperties_solution.cc} | 0
.../exercise-runtimeparams/CMakeLists.txt | 2 +-
...n.cc => exerciseruntimeparams_solution.cc} | 0
76 files changed, 132 insertions(+), 131 deletions(-)
rename exercises/exercise-basic/{exercise_basic_2p.cc => exercisebasic2p.cc} (100%)
rename exercises/exercise-basic/{exercise_basic_2p2c.cc => exercisebasic2p2c.cc} (100%)
rename exercises/exercise-biomineralization/{exercisebiomin.input => exercise_biomin.input} (100%)
rename exercises/exercise-coupling-ff-pm/interface/{ex_interface_coupling_ff-pm.input => exercise_interface_coupling_ff-pm.input} (100%)
rename exercises/exercise-coupling-ff-pm/interface/{ex_interface_coupling_ff-pm.cc => exerciseinterfacecouplingffpm.cc} (99%)
rename exercises/exercise-coupling-ff-pm/interface/{ex_interface_ffproblem.hh => interfaceffproblem.hh} (100%)
rename exercises/exercise-coupling-ff-pm/interface/{ex_interface_pmproblem.hh => interfacepmproblem.hh} (100%)
rename exercises/exercise-coupling-ff-pm/models/{ex_models_coupling_ff-pm.input => exercise_models_coupling_ff-pm.input} (100%)
rename exercises/exercise-coupling-ff-pm/models/{ex_models_coupling_ff-pm.cc => exercisemodelscouplingffpm.cc} (99%)
rename exercises/exercise-coupling-ff-pm/models/{ex_models_ffproblem.hh => modelsffproblem.hh} (100%)
rename exercises/exercise-coupling-ff-pm/models/{ex_models_pmproblem.hh => modelspmproblem.hh} (100%)
rename exercises/exercise-coupling-ff-pm/turbulence/{ex_turbulence_coupling_ff-pm.cc => exercise_turbulence_coupling_ff-pm.cc} (99%)
rename exercises/exercise-coupling-ff-pm/turbulence/{ex_turbulence_coupling_ff-pm.input => exercise_turbulence_coupling_ff-pm.input} (100%)
rename exercises/exercise-coupling-ff-pm/turbulence/{ex_turbulence_ffproblem.hh => turbulenceffproblem.hh} (100%)
rename exercises/exercise-coupling-ff-pm/turbulence/{ex_turbulence_pmproblem.hh => turbulencepmproblem.hh} (100%)
rename exercises/exercise-fluidsystem/{exercise-fluidsystem_a.input => exercise_fluidsystem_a.input} (100%)
rename exercises/exercise-fluidsystem/{exercise-fluidsystem_b.input => exercise_fluidsystem_b.input} (100%)
rename exercises/exercise-fluidsystem/{exercise-fluidsystem.cc => exercisefluidsystem.cc} (100%)
rename exercises/exercise-fractures/{exercise_fractures.cc => exercisefractures.cc} (100%)
rename exercises/exercise-grids/{exercise_grids.cc => exercisegrids.cc} (100%)
rename exercises/exercise-mainfile/{exercise_1p_a.input => exercise_mainfile_a.input} (100%)
rename exercises/exercise-mainfile/{exercise_1p_b.input => exercise_mainfile_b.input} (100%)
rename exercises/exercise-mainfile/{exercise_1p_c.input => exercise_mainfile_c.input} (100%)
rename exercises/exercise-mainfile/{exercise_1p_a.cc => exercisemainfilea.cc} (100%)
rename exercises/exercise-mainfile/{exercise_1p_b.cc => exercisemainfileb.cc} (100%)
rename exercises/exercise-mainfile/{exercise_1p_c.cc => exercisemainfilec.cc} (100%)
rename exercises/exercise-properties/{exercise_properties.cc => exerciseproperties.cc} (100%)
rename exercises/exercise-runtimeparams/{exercise_runtimeparams.cc => exerciseruntimeparams.cc} (100%)
rename exercises/solution/exercise-basic/{exercise_basic_2pni.cc => exercisebasic2pni.cc} (100%)
rename exercises/solution/exercise-coupling-ff-pm/interface/{ex_interface_coupling_ff-pm.cc => exerciseinterfacecouplingffpm.cc} (99%)
rename exercises/solution/exercise-coupling-ff-pm/interface/{ex_interface_ffproblem.hh => interfaceffproblem.hh} (100%)
rename exercises/solution/exercise-coupling-ff-pm/interface/{ex_interface_pmproblem.hh => interfacepmproblem.hh} (100%)
rename exercises/solution/exercise-coupling-ff-pm/models/{ex_models_coupling_ff-pm.cc => exercisemodelscouplingffpm.cc} (99%)
rename exercises/solution/exercise-coupling-ff-pm/models/{ex_models_ffproblem.hh => modelsffproblem.hh} (100%)
rename exercises/solution/exercise-coupling-ff-pm/models/{ex_models_pmproblem.hh => modelspmproblem.hh} (100%)
rename exercises/solution/exercise-coupling-ff-pm/turbulence/{ex_turbulence_coupling_ff-pm.cc => exerciseturbulencecouplingffpm.cc} (99%)
rename exercises/solution/exercise-coupling-ff-pm/turbulence/{ex_turbulence_ffproblem.hh => turbulenceffproblem.hh} (100%)
rename exercises/solution/exercise-coupling-ff-pm/turbulence/{ex_turbulence_pmproblem.hh => turbulencepmproblem.hh} (100%)
rename exercises/solution/exercise-fluidsystem/{exercise-fluidsystem_a_solution.input => exercise_fluidsystem_a_solution.input} (100%)
rename exercises/solution/exercise-fluidsystem/{exercise-fluidsystem_b_solution.input => exercise_fluidsystem_b_solution.input} (100%)
rename exercises/solution/exercise-fluidsystem/{exercise-fluidsystem.cc => exercisefluidsystem.cc} (100%)
rename exercises/solution/exercise-fractures/{exercise_fractures.cc => exercisefractures.cc} (100%)
rename exercises/solution/exercise-grids/{exercise_grids_solution.cc => exercisegrids_solution.cc} (100%)
rename exercises/solution/exercise-mainfile/{exercise_1p_a_solution.input => exercise_mainfile_a_solution.input} (100%)
rename exercises/solution/exercise-mainfile/{exercise_1p_a_solution.cc => exercisemainfile_a_solution.cc} (100%)
rename exercises/solution/exercise-properties/{exercise_properties_solution.cc => exerciseproperties_solution.cc} (100%)
rename exercises/solution/exercise-runtimeparams/{exercise_runtimeparams_solution.cc => exerciseruntimeparams_solution.cc} (100%)
diff --git a/exercises/exercise-basic/CMakeLists.txt b/exercises/exercise-basic/CMakeLists.txt
index d304b9d4..9281f68d 100644
--- a/exercises/exercise-basic/CMakeLists.txt
+++ b/exercises/exercise-basic/CMakeLists.txt
@@ -1,10 +1,10 @@
# 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
diff --git a/exercises/exercise-basic/README.md b/exercises/exercise-basic/README.md
index 357e3606..178bdc0d 100644
--- a/exercises/exercise-basic/README.md
+++ b/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`
diff --git a/exercises/exercise-basic/exercise_basic_2p.cc b/exercises/exercise-basic/exercisebasic2p.cc
similarity index 100%
rename from exercises/exercise-basic/exercise_basic_2p.cc
rename to exercises/exercise-basic/exercisebasic2p.cc
diff --git a/exercises/exercise-basic/exercise_basic_2p2c.cc b/exercises/exercise-basic/exercisebasic2p2c.cc
similarity index 100%
rename from exercises/exercise-basic/exercise_basic_2p2c.cc
rename to exercises/exercise-basic/exercisebasic2p2c.cc
diff --git a/exercises/exercise-biomineralization/CMakeLists.txt b/exercises/exercise-biomineralization/CMakeLists.txt
index cc68a96f..1a3e189d 100644
--- a/exercises/exercise-biomineralization/CMakeLists.txt
+++ b/exercises/exercise-biomineralization/CMakeLists.txt
@@ -1,10 +1,10 @@
# 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()
diff --git a/exercises/exercise-biomineralization/README.md b/exercises/exercise-biomineralization/README.md
index a5909d93..6980306b 100644
--- a/exercises/exercise-biomineralization/README.md
+++ b/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
diff --git a/exercises/exercise-biomineralization/exercisebiomin.input b/exercises/exercise-biomineralization/exercise_biomin.input
similarity index 100%
rename from exercises/exercise-biomineralization/exercisebiomin.input
rename to exercises/exercise-biomineralization/exercise_biomin.input
diff --git a/exercises/exercise-coupling-ff-pm/README.md b/exercises/exercise-coupling-ff-pm/README.md
index e3150fb9..5e8f6fd3 100644
--- a/exercises/exercise-coupling-ff-pm/README.md
+++ b/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.)
diff --git a/exercises/exercise-coupling-ff-pm/interface/CMakeLists.txt b/exercises/exercise-coupling-ff-pm/interface/CMakeLists.txt
index 2865c75a..c73b34e9 100644
--- a/exercises/exercise-coupling-ff-pm/interface/CMakeLists.txt
+++ b/exercises/exercise-coupling-ff-pm/interface/CMakeLists.txt
@@ -1,9 +1,9 @@
# 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()
diff --git a/exercises/exercise-coupling-ff-pm/interface/ex_interface_coupling_ff-pm.input b/exercises/exercise-coupling-ff-pm/interface/exercise_interface_coupling_ff-pm.input
similarity index 100%
rename from exercises/exercise-coupling-ff-pm/interface/ex_interface_coupling_ff-pm.input
rename to exercises/exercise-coupling-ff-pm/interface/exercise_interface_coupling_ff-pm.input
diff --git a/exercises/exercise-coupling-ff-pm/interface/ex_interface_coupling_ff-pm.cc b/exercises/exercise-coupling-ff-pm/interface/exerciseinterfacecouplingffpm.cc
similarity index 99%
rename from exercises/exercise-coupling-ff-pm/interface/ex_interface_coupling_ff-pm.cc
rename to exercises/exercise-coupling-ff-pm/interface/exerciseinterfacecouplingffpm.cc
index 17829377..4e1c3e4e 100644
--- a/exercises/exercise-coupling-ff-pm/interface/ex_interface_coupling_ff-pm.cc
+++ b/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 {
diff --git a/exercises/exercise-coupling-ff-pm/interface/ex_interface_ffproblem.hh b/exercises/exercise-coupling-ff-pm/interface/interfaceffproblem.hh
similarity index 100%
rename from exercises/exercise-coupling-ff-pm/interface/ex_interface_ffproblem.hh
rename to exercises/exercise-coupling-ff-pm/interface/interfaceffproblem.hh
diff --git a/exercises/exercise-coupling-ff-pm/interface/ex_interface_pmproblem.hh b/exercises/exercise-coupling-ff-pm/interface/interfacepmproblem.hh
similarity index 100%
rename from exercises/exercise-coupling-ff-pm/interface/ex_interface_pmproblem.hh
rename to exercises/exercise-coupling-ff-pm/interface/interfacepmproblem.hh
diff --git a/exercises/exercise-coupling-ff-pm/models/CMakeLists.txt b/exercises/exercise-coupling-ff-pm/models/CMakeLists.txt
index c0f7fdef..17e5579b 100644
--- a/exercises/exercise-coupling-ff-pm/models/CMakeLists.txt
+++ b/exercises/exercise-coupling-ff-pm/models/CMakeLists.txt
@@ -1,9 +1,9 @@
# 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()
diff --git a/exercises/exercise-coupling-ff-pm/models/ex_models_coupling_ff-pm.input b/exercises/exercise-coupling-ff-pm/models/exercise_models_coupling_ff-pm.input
similarity index 100%
rename from exercises/exercise-coupling-ff-pm/models/ex_models_coupling_ff-pm.input
rename to exercises/exercise-coupling-ff-pm/models/exercise_models_coupling_ff-pm.input
diff --git a/exercises/exercise-coupling-ff-pm/models/ex_models_coupling_ff-pm.cc b/exercises/exercise-coupling-ff-pm/models/exercisemodelscouplingffpm.cc
similarity index 99%
rename from exercises/exercise-coupling-ff-pm/models/ex_models_coupling_ff-pm.cc
rename to exercises/exercise-coupling-ff-pm/models/exercisemodelscouplingffpm.cc
index 6f48a6df..44689a3d 100644
--- a/exercises/exercise-coupling-ff-pm/models/ex_models_coupling_ff-pm.cc
+++ b/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 {
diff --git a/exercises/exercise-coupling-ff-pm/models/ex_models_ffproblem.hh b/exercises/exercise-coupling-ff-pm/models/modelsffproblem.hh
similarity index 100%
rename from exercises/exercise-coupling-ff-pm/models/ex_models_ffproblem.hh
rename to exercises/exercise-coupling-ff-pm/models/modelsffproblem.hh
diff --git a/exercises/exercise-coupling-ff-pm/models/ex_models_pmproblem.hh b/exercises/exercise-coupling-ff-pm/models/modelspmproblem.hh
similarity index 100%
rename from exercises/exercise-coupling-ff-pm/models/ex_models_pmproblem.hh
rename to exercises/exercise-coupling-ff-pm/models/modelspmproblem.hh
diff --git a/exercises/exercise-coupling-ff-pm/turbulence/CMakeLists.txt b/exercises/exercise-coupling-ff-pm/turbulence/CMakeLists.txt
index 3315f6a8..7f951f71 100644
--- a/exercises/exercise-coupling-ff-pm/turbulence/CMakeLists.txt
+++ b/exercises/exercise-coupling-ff-pm/turbulence/CMakeLists.txt
@@ -1,10 +1,10 @@
# 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)
diff --git a/exercises/exercise-coupling-ff-pm/turbulence/ex_turbulence_coupling_ff-pm.cc b/exercises/exercise-coupling-ff-pm/turbulence/exercise_turbulence_coupling_ff-pm.cc
similarity index 99%
rename from exercises/exercise-coupling-ff-pm/turbulence/ex_turbulence_coupling_ff-pm.cc
rename to exercises/exercise-coupling-ff-pm/turbulence/exercise_turbulence_coupling_ff-pm.cc
index 69a4063a..e92117b8 100644
--- a/exercises/exercise-coupling-ff-pm/turbulence/ex_turbulence_coupling_ff-pm.cc
+++ b/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 {
diff --git a/exercises/exercise-coupling-ff-pm/turbulence/ex_turbulence_coupling_ff-pm.input b/exercises/exercise-coupling-ff-pm/turbulence/exercise_turbulence_coupling_ff-pm.input
similarity index 100%
rename from exercises/exercise-coupling-ff-pm/turbulence/ex_turbulence_coupling_ff-pm.input
rename to exercises/exercise-coupling-ff-pm/turbulence/exercise_turbulence_coupling_ff-pm.input
diff --git a/exercises/exercise-coupling-ff-pm/turbulence/ex_turbulence_ffproblem.hh b/exercises/exercise-coupling-ff-pm/turbulence/turbulenceffproblem.hh
similarity index 100%
rename from exercises/exercise-coupling-ff-pm/turbulence/ex_turbulence_ffproblem.hh
rename to exercises/exercise-coupling-ff-pm/turbulence/turbulenceffproblem.hh
diff --git a/exercises/exercise-coupling-ff-pm/turbulence/ex_turbulence_pmproblem.hh b/exercises/exercise-coupling-ff-pm/turbulence/turbulencepmproblem.hh
similarity index 100%
rename from exercises/exercise-coupling-ff-pm/turbulence/ex_turbulence_pmproblem.hh
rename to exercises/exercise-coupling-ff-pm/turbulence/turbulencepmproblem.hh
diff --git a/exercises/exercise-fluidsystem/CMakeLists.txt b/exercises/exercise-fluidsystem/CMakeLists.txt
index 6eb70e08..3ee66daa 100644
--- a/exercises/exercise-fluidsystem/CMakeLists.txt
+++ b/exercises/exercise-fluidsystem/CMakeLists.txt
@@ -1,18 +1,18 @@
# executables for exercise part a & b
#part a: 2pproblem
-dune_add_test(NAME exercise-fluidsystem_a
- SOURCES exercise-fluidsystem.cc
+dune_add_test(NAME exercise_fluidsystem_a
+ SOURCES exercisefluidsystem.cc
COMPILE_DEFINITIONS TYPETAG=ExerciseFluidsystemTwoP
COMPILE_ONLY) # for testing purposes, ignore for the exercise
#part b: 2p2cproblem
-dune_add_test(NAME exercise-fluidsystem_b
- SOURCES exercise-fluidsystem.cc
+dune_add_test(NAME exercise_fluidsystem_b
+ SOURCES exercisefluidsystem.cc
COMPILE_DEFINITIONS TYPETAG=ExerciseFluidsystemTwoPTwoC
COMPILE_ONLY) # for testing purposes, ignore for the exercise
# add exercises to the common target
-add_dependencies(test_exercises exercise-fluidsystem_a exercise-fluidsystem_b)
+add_dependencies(test_exercises exercise_fluidsystem_a exercise_fluidsystem_b)
# add a symlink for each input file
add_input_file_links()
diff --git a/exercises/exercise-fluidsystem/README.md b/exercises/exercise-fluidsystem/README.md
index 124002bb..9f4b8740 100644
--- a/exercises/exercise-fluidsystem/README.md
+++ b/exercises/exercise-fluidsystem/README.md
@@ -1,7 +1,7 @@
# Exercise Fluidsystem
The aim of this exercise is to get familiar with the _DuMuX_ way of implementing new components (fluids) and fluid systems (mixtures). In the scope of this exercise, a new fictitious component is implemented
-(exercise-fluidsystem a) as well as its mixture with water (exercise-fluidsystem b).
+(exercise fluidsystem a) as well as its mixture with water (exercise fluidsystem b).
## Problem set-up
@@ -17,10 +17,10 @@ The domain has a size of 60 x 60 m and contains two low-permeable lenses. Initia
### 1. Getting familiar with the code
Locate all the files you will need for this exercise
-* The shared __main file__ : `exercise-fluidsystem.cc`
-* The __input file__ for part a: `exercise-fluidsystem_a.input`
+* The shared __main file__ : `exercisefluidsystem.cc`
+* The __input file__ for part a: `exercise_fluidsystem_a.input`
* The __problem file__ for part a: `2pproblem.hh`
-* The __input file__ for part b: `exercise-fluidsystem_b.input`
+* The __input file__ for part b: `exercise_fluidsystem_b.input`
* The __problem file__ for part b: `2p2cproblem.hh`
* The __spatial parameters file__: `spatialparams.hh`
@@ -150,8 +150,8 @@ In order to execute the program, change to the build directory and compile and e
```bash
cd build-cmake/exercises/exercise-fluidsystem
-make exercise-fluidsystem_a
-./exercise-fluidsystem_a exercise-fluidsystem_a.input
+make exercise_fluidsystem_a
+./exercise_fluidsystem_a exercise_fluidsystem_a.input
```
The saturation distribution of the nonwetting phase S$`_n`$ (the phase consisting of our fictitious incompressible component) at the final simulation time should look like this:
@@ -168,7 +168,7 @@ where $`p`$ is the pressure and $`\rho_{min} = 1440 `$, $`\rho_{max} = 1480 `$ a
-You can plot the density of the phase consisting of your compressible component by setting `PlotDensity` in `exercise-fluidsystem_a.input` to `true` and starting the simulation again.
+You can plot the density of the phase consisting of your compressible component by setting `PlotDensity` in `exercise_fluidsystem_a.input` to `true` and starting the simulation again.
Compare the gnuplot output to the following plot of the density function from above:
@@ -228,8 +228,8 @@ Implement this dependency in the `density()` method in the fluid system. In orde
```bash
cd build-cmake/exercises/exercise-fluidsystem
-make exercise-fluidsystem_b
-./exercise-fluidsystem_b exercise-fluidsystem_b.input
+make exercise_fluidsystem_b
+./exercise_fluidsystem_b exercise_fluidsystem_b.input
```
You will observe an error message and an abortion of the program. This is due to the fact that in order for the constraint solver and other mechanisms in the two-phase two-component model to work, an additional functionality in the component has to be implemented: the model has to know the vapour pressure. As in the previous exercise, check the `dumux/material/components/base.hh` file for this function and implement it into `mycompressiblecomponent.hh`. For the vapour pressure, use a value of $`3900`$ Pa.
@@ -259,6 +259,6 @@ Change this function such that the the phase of our new component is the wetting
```bash
cd build-cmake/exercises/exercise-fluidsystem
-make exercise-fluidsystem_b
-./exercise-fluidsystem_b exercise-fluidsystem_b.input
+make exercise_fluidsystem_b
+./exercise_fluidsystem_b exercise_fluidsystem_b.input
```
diff --git a/exercises/exercise-fluidsystem/exercise-fluidsystem_a.input b/exercises/exercise-fluidsystem/exercise_fluidsystem_a.input
similarity index 100%
rename from exercises/exercise-fluidsystem/exercise-fluidsystem_a.input
rename to exercises/exercise-fluidsystem/exercise_fluidsystem_a.input
diff --git a/exercises/exercise-fluidsystem/exercise-fluidsystem_b.input b/exercises/exercise-fluidsystem/exercise_fluidsystem_b.input
similarity index 100%
rename from exercises/exercise-fluidsystem/exercise-fluidsystem_b.input
rename to exercises/exercise-fluidsystem/exercise_fluidsystem_b.input
diff --git a/exercises/exercise-fluidsystem/exercise-fluidsystem.cc b/exercises/exercise-fluidsystem/exercisefluidsystem.cc
similarity index 100%
rename from exercises/exercise-fluidsystem/exercise-fluidsystem.cc
rename to exercises/exercise-fluidsystem/exercisefluidsystem.cc
diff --git a/exercises/exercise-fractures/CMakeLists.txt b/exercises/exercise-fractures/CMakeLists.txt
index 9f10ed08..24d6ccd2 100644
--- a/exercises/exercise-fractures/CMakeLists.txt
+++ b/exercises/exercise-fractures/CMakeLists.txt
@@ -1,6 +1,6 @@
dune_add_test(NAME exercise_fractures
CMAKE_GUARD "( dune-foamgrid_FOUND AND dune-alugrid_FOUND )"
- SOURCES exercise_fractures.cc)
+ SOURCES exercisefractures.cc)
# add a symlink for each input file
add_input_file_links()
@@ -9,7 +9,7 @@ dune_symlink_to_source_files(FILES grids)
#install sources
install(FILES
-exercise_fractures.cc
+exercisefractures.cc
matrixproblem.hh
fractureproblem.hh
matrixspatialparams.hh
diff --git a/exercises/exercise-fractures/README.md b/exercises/exercise-fractures/README.md
index a31fe60b..f6b19d64 100644
--- a/exercises/exercise-fractures/README.md
+++ b/exercises/exercise-fractures/README.md
@@ -14,7 +14,7 @@ In the initial setup of this exercise, we want to consider buoyancy-driven upwar
Navigate to the directory `dumux/exercises/exercise-fractures` and familiarize yourself with the files necessary for this exercise:
-* The __main file__: `exercise_fractures.cc`
+* The __main file__: `exercisefractures.cc`
* The __input file__: `exercise_fractures.input`
* The __problem file__ for the matrix domain: `matrixproblem.hh`
* The __problem file__ for the fracture domain: `fractureproblem.hh`
diff --git a/exercises/exercise-fractures/exercise_fractures.cc b/exercises/exercise-fractures/exercisefractures.cc
similarity index 100%
rename from exercises/exercise-fractures/exercise_fractures.cc
rename to exercises/exercise-fractures/exercisefractures.cc
diff --git a/exercises/exercise-grids/CMakeLists.txt b/exercises/exercise-grids/CMakeLists.txt
index f9028d80..b83a9f84 100644
--- a/exercises/exercise-grids/CMakeLists.txt
+++ b/exercises/exercise-grids/CMakeLists.txt
@@ -1,6 +1,6 @@
# the grid exercise simulation program
dune_add_test(NAME exercise_grids
- SOURCES exercise_grids.cc)
+ SOURCES exercisegrids.cc)
# add tutorial to the common target
add_dependencies(test_exercises exercise_grids)
diff --git a/exercises/exercise-grids/exercise_grids.cc b/exercises/exercise-grids/exercisegrids.cc
similarity index 100%
rename from exercises/exercise-grids/exercise_grids.cc
rename to exercises/exercise-grids/exercisegrids.cc
diff --git a/exercises/exercise-mainfile/CMakeLists.txt b/exercises/exercise-mainfile/CMakeLists.txt
index f98c9146..9644fedf 100644
--- a/exercises/exercise-mainfile/CMakeLists.txt
+++ b/exercises/exercise-mainfile/CMakeLists.txt
@@ -1,15 +1,15 @@
# the one-phase simulation program
-dune_add_test(NAME exercise_1p_a
- SOURCES exercise_1p_a.cc)
+dune_add_test(NAME exercise_mainfile_a
+ SOURCES exercisemainfilea.cc)
-dune_add_test(NAME exercise_1p_b
- SOURCES exercise_1p_b.cc)
+dune_add_test(NAME exercise_mainfile_b
+ SOURCES exercisemainfileb.cc)
-dune_add_test(NAME exercise_1p_c
- SOURCES exercise_1p_c.cc)
+dune_add_test(NAME exercise_mainfile_c
+ SOURCES exercisemainfilec.cc)
# add tutorial to the common target
-add_dependencies(test_exercises exercise_1p_a exercise_1p_b exercise_1p_c)
+add_dependencies(test_exercises exercise_mainfile_a exercise_mainfile_b exercise_mainfile_c)
# add a symlink for each input file
add_input_file_links()
diff --git a/exercises/exercise-mainfile/README.md b/exercises/exercise-mainfile/README.md
index 04d5aa5f..2291b8f6 100644
--- a/exercises/exercise-mainfile/README.md
+++ b/exercises/exercise-mainfile/README.md
@@ -9,9 +9,9 @@ In order to do so, there are three examples of one phase flow problems. Two exam
The stationary examples differ in the fluidssystems they are using which means they differ in the fluid properties (e.g. density, thermal conductivity etc). The first problem (a) uses an incompressible fluid which means that the density does not change when pressure changes. This makes it possible to solve the system linearly. The second problem uses a compressible fluid, that means the density is a function of pressure and we need to use a nonlinear solver.
To summarize the problems differ in:
-* exercise_1p_a: a one-phase incompressible, stationary problem
-* exercise_1p_b: a one-phase compressible, stationary problem
-* exercise_1p_c: a one-phase compressible, instationary problem
+* exercise mainfile a: a one-phase incompressible, stationary problem
+* exercise mainfile b: a one-phase compressible, stationary problem
+* exercise mainfile c: a one-phase compressible, instationary problem
The problem set-up for all three examples is always the same: It is a two dimensional problem and the domain is $`1 m`$ by $`1 m`$. It is a heterogeneous set-up with a lens in the middle of the domain which has a lower permeability ($`1\cdot 10^{-12} m^2`$ compared to $`1\cdot 10^{-10} m^2`$ in the rest of the domain).
@@ -28,14 +28,14 @@ In the beginning there is a uniform pressure of $`1\cdot 10^5 Pa`$ in the whole
<hr>
Locate all the files you will need for this exercise
-* The __main file__ for the __1p incompressible, stationary__ problem : `exercise_1p_a.cc`
-* The __main file__ for the __1p compressible, stationary__ problem : `exercise_1p_b.cc`
-* The __main file__ for the __1p compressible, instationary__ problem : `exercise_1p_c.cc`
+* The __main file__ for the __incompressible, stationary__ problem : `exercisemainfilea.cc`
+* The __main file__ for the __compressible, stationary__ problem : `exercisemainfileb.cc`
+* The __main file__ for the __compressible, instationary__ problem : `exercisemainfilec.cc`
* The shared __problem file__: `1pproblem.hh`
* The shared __spatial parameters file__: `1pspatialparams.hh`
-* The __input file__ for the __1p incompressible, stationary__ problem: `exercise_1p_a.input`
-* The __input file__ for the __1p compressible, stationary__ problem: `exercise_1p_b.input`
-* The __input file__ for the __1p compressible, instationary__ problem: `exercise_1p_c.input`
+* The __input file__ for the __incompressible, stationary__ problem: `exercise_mainfile_a.input`
+* The __input file__ for the __compressible, stationary__ problem: `exercise_mainfile_b.input`
+* The __input file__ for the __compressible, instationary__ problem: `exercise_mainfile_c.input`
Please pay special attention to the similarities and differences in the three main files. The first main file is solved linearly and does not need a newton solver or any other nonlinear solver method. The second problem is a nonlinear problem and uses newton's method to solve the system. The third problem is nonlinear and additionally instationary. Therefore a time loop needs to be included in the main file.
@@ -154,7 +154,7 @@ timeLoop->finalize(leafGridView.comm());
cd ../../build-cmake/exercises/exercise-mainfile
```
-* Compile all three executables `exercise_1p_a` and `exercise_1p_b` and `exercise_1p_c`
+* Compile all three executables `exercise_mainfile_a` and `exercise_mainfile_b` and `exercise_mainfile_c`
```bash
make exercise_1p_a exercise_1p_b exercise_1p_c
@@ -163,9 +163,9 @@ make exercise_1p_a exercise_1p_b exercise_1p_c
* Execute the three problems and inspect the result
```bash
-./exercise_1p_a
-./exercise_1p_b
-./exercise_1p_c
+./exercise_mainfile_a
+./exercise_mainfile_b
+./exercise_mainfile_c
```
* you can look at the results (e.g. for the first example) with paraview:
@@ -180,11 +180,11 @@ paraview 1p_incompressible_stationary.pvd
In the input file `exercise_1p_a.input` you will see that there is a variable BaseEpsilon. This defines the base for the epsilon used in the numeric differentiation. If that value is too small, you will see that the solution of the numeric differentiation is not correct. Change that value to $`1 \cdot 10^{-15}`$ and have a look at the solution.
-For the incompressible one phase problem it is possible to also have an analytic solution method. Then the epsilon does not play a role anymore since the derivatives are calculated analytically. To implement that follow the directions in the `exercise_1p_a.cc` and the `1pproblem.hh` marked by:
+For the incompressible one phase problem it is possible to also have an analytic solution method. Then the epsilon does not play a role anymore since the derivatives are calculated analytically. To implement that follow the directions in the `exercisemainfilea.cc` and the `1pproblem.hh` marked by:
```c++
// TODO: dumux-course-task
```
For the analytic solution of your immiscible problem you need analytic solutions for the derivatives of the jacobian. For that we have a special local residual, the `OnePIncompressibleLocalResidual` which provides that. You just need to include `incompressiblelocalresidual.hh` in your `1pproblem.hh` and use that instead of the `immisciblelocalresidual.hh` which is used as a standard for all immiscible models.
-Additionally you need to set the differentiation method in the main file `exercise_1p_a.cc` to analytic.
+Additionally you need to set the differentiation method in the main file `exercisemainfilea.cc` to analytic.
diff --git a/exercises/exercise-mainfile/exercise_1p_a.input b/exercises/exercise-mainfile/exercise_mainfile_a.input
similarity index 100%
rename from exercises/exercise-mainfile/exercise_1p_a.input
rename to exercises/exercise-mainfile/exercise_mainfile_a.input
diff --git a/exercises/exercise-mainfile/exercise_1p_b.input b/exercises/exercise-mainfile/exercise_mainfile_b.input
similarity index 100%
rename from exercises/exercise-mainfile/exercise_1p_b.input
rename to exercises/exercise-mainfile/exercise_mainfile_b.input
diff --git a/exercises/exercise-mainfile/exercise_1p_c.input b/exercises/exercise-mainfile/exercise_mainfile_c.input
similarity index 100%
rename from exercises/exercise-mainfile/exercise_1p_c.input
rename to exercises/exercise-mainfile/exercise_mainfile_c.input
diff --git a/exercises/exercise-mainfile/exercise_1p_a.cc b/exercises/exercise-mainfile/exercisemainfilea.cc
similarity index 100%
rename from exercises/exercise-mainfile/exercise_1p_a.cc
rename to exercises/exercise-mainfile/exercisemainfilea.cc
diff --git a/exercises/exercise-mainfile/exercise_1p_b.cc b/exercises/exercise-mainfile/exercisemainfileb.cc
similarity index 100%
rename from exercises/exercise-mainfile/exercise_1p_b.cc
rename to exercises/exercise-mainfile/exercisemainfileb.cc
diff --git a/exercises/exercise-mainfile/exercise_1p_c.cc b/exercises/exercise-mainfile/exercisemainfilec.cc
similarity index 100%
rename from exercises/exercise-mainfile/exercise_1p_c.cc
rename to exercises/exercise-mainfile/exercisemainfilec.cc
diff --git a/exercises/exercise-properties/CMakeLists.txt b/exercises/exercise-properties/CMakeLists.txt
index 2b3f14f2..9f5fb8cd 100644
--- a/exercises/exercise-properties/CMakeLists.txt
+++ b/exercises/exercise-properties/CMakeLists.txt
@@ -1,6 +1,6 @@
# the property exercise simulation program
dune_add_test(NAME exercise_properties
- SOURCES exercise_properties.cc)
+ SOURCES exerciseproperties.cc)
# add tutorial to the common target
add_dependencies(test_exercises exercise_properties)
diff --git a/exercises/exercise-properties/README.md b/exercises/exercise-properties/README.md
index 1e80194f..cd27d507 100644
--- a/exercises/exercise-properties/README.md
+++ b/exercises/exercise-properties/README.md
@@ -15,7 +15,7 @@ _Exercise Properties_ deals with a two-phase immiscible incompressible problem (
<hr>
Locate all the files you will need for this exercise
-* The __main file__: `exercise_properties.cc`
+* The __main file__: `exerciseproperties.cc`
* The __problem file__: `problem.hh`
* The __spatial parameters file__: `spatialparams.hh`
* The __input file__: `exercise_properties.input`
diff --git a/exercises/exercise-properties/exercise_properties.cc b/exercises/exercise-properties/exerciseproperties.cc
similarity index 100%
rename from exercises/exercise-properties/exercise_properties.cc
rename to exercises/exercise-properties/exerciseproperties.cc
diff --git a/exercises/exercise-runtimeparams/CMakeLists.txt b/exercises/exercise-runtimeparams/CMakeLists.txt
index 15c7e583..ade559a2 100644
--- a/exercises/exercise-runtimeparams/CMakeLists.txt
+++ b/exercises/exercise-runtimeparams/CMakeLists.txt
@@ -1,6 +1,6 @@
# the runtime parameter exercise simulation program
dune_add_test(NAME exercise_runtimeparams
- SOURCES exercise_runtimeparams.cc)
+ SOURCES exerciseruntimeparams.cc)
# add tutorial to the common target
add_dependencies(test_exercises exercise_runtimeparams)
diff --git a/exercises/exercise-runtimeparams/exercise_runtimeparams.cc b/exercises/exercise-runtimeparams/exerciseruntimeparams.cc
similarity index 100%
rename from exercises/exercise-runtimeparams/exercise_runtimeparams.cc
rename to exercises/exercise-runtimeparams/exerciseruntimeparams.cc
diff --git a/exercises/solution/exercise-basic/CMakeLists.txt b/exercises/solution/exercise-basic/CMakeLists.txt
index b845b89a..5ec8e31d 100644
--- a/exercises/solution/exercise-basic/CMakeLists.txt
+++ b/exercises/solution/exercise-basic/CMakeLists.txt
@@ -1,6 +1,6 @@
# the two-phase non-isothermal simulation program
dune_add_test(NAME exercise_basic_2pni_solution
- SOURCES exercise_basic_2pni.cc)
+ SOURCES exercisebasic2pni.cc)
# add exercise to the common target
diff --git a/exercises/solution/exercise-basic/exercise_basic_2pni.cc b/exercises/solution/exercise-basic/exercisebasic2pni.cc
similarity index 100%
rename from exercises/solution/exercise-basic/exercise_basic_2pni.cc
rename to exercises/solution/exercise-basic/exercisebasic2pni.cc
diff --git a/exercises/solution/exercise-biomineralization/CMakeLists.txt b/exercises/solution/exercise-biomineralization/CMakeLists.txt
index 8b741991..fe0a3993 100644
--- a/exercises/solution/exercise-biomineralization/CMakeLists.txt
+++ b/exercises/solution/exercise-biomineralization/CMakeLists.txt
@@ -1,10 +1,10 @@
# executables for exercisebiomin
-dune_add_test(NAME exercisebiomin_solution
+dune_add_test(NAME exercise_biomin_solution
SOURCES exercisebiomin.cc
CMD_ARGS -TimeLoop.TEnd 1e5)
# add tutorial to the common target
-add_dependencies(test_exercises exercisebiomin_solution)
+add_dependencies(test_exercises exercise_biomin_solution)
# add a symlink for each input file
add_input_file_links()
diff --git a/exercises/solution/exercise-coupling-ff-pm/interface/CMakeLists.txt b/exercises/solution/exercise-coupling-ff-pm/interface/CMakeLists.txt
index b0eb1798..d1658564 100644
--- a/exercises/solution/exercise-coupling-ff-pm/interface/CMakeLists.txt
+++ b/exercises/solution/exercise-coupling-ff-pm/interface/CMakeLists.txt
@@ -1,22 +1,22 @@
-dune_add_test(NAME orig_ex_interface_coupling_ff-pm
- SOURCES ex_interface_coupling_ff-pm.cc
+dune_add_test(NAME exercise_interface_coupling_ff-pm_original
+ SOURCES exerciseinterfacecouplingffpm.cc
COMPILE_DEFINITIONS EXNUMBER=0)
-dune_add_test(NAME sol_a_ex_interface_coupling_ff-pm
- SOURCES ex_interface_coupling_ff-pm.cc
+dune_add_test(NAME exercise_interface_coupling_ff-pm_a_solution
+ SOURCES exerciseinterfacecouplingffpm.cc
COMPILE_DEFINITIONS EXNUMBER=1)
-dune_add_test(NAME sol_b_ex_interface_coupling_ff-pm
- SOURCES ex_interface_coupling_ff-pm.cc
+dune_add_test(NAME exercise_interface_coupling_ff-pm_b_solution
+ SOURCES exerciseinterfacecouplingffpm.cc
COMPILE_DEFINITIONS EXNUMBER=2)
-dune_add_test(NAME sol_c_ex_interface_coupling_ff-pm
- SOURCES ex_interface_coupling_ff-pm.cc
+dune_add_test(NAME exercise_interface_coupling_ff-pm_c_solution
+ SOURCES exerciseinterfacecouplingffpm.cc
COMPILE_DEFINITIONS EXNUMBER=3)
# add exercise to the common target
-add_dependencies(test_exercises sol_a_ex_interface_coupling_ff-pm sol_b_ex_interface_coupling_ff-pm sol_b_ex_interface_coupling_ff-pm)
+add_dependencies(test_exercises exercise_interface_coupling_ff-pm_a_solution exercise_interface_coupling_ff-pm_b_solution exercise_interface_coupling_ff-pm_c_solution)
# add a symlink for each input file
add_input_file_links()
diff --git a/exercises/solution/exercise-coupling-ff-pm/interface/ex_interface_coupling_ff-pm.cc b/exercises/solution/exercise-coupling-ff-pm/interface/exerciseinterfacecouplingffpm.cc
similarity index 99%
rename from exercises/solution/exercise-coupling-ff-pm/interface/ex_interface_coupling_ff-pm.cc
rename to exercises/solution/exercise-coupling-ff-pm/interface/exerciseinterfacecouplingffpm.cc
index 6f5b2e00..9c1d8732 100644
--- a/exercises/solution/exercise-coupling-ff-pm/interface/ex_interface_coupling_ff-pm.cc
+++ b/exercises/solution/exercise-coupling-ff-pm/interface/exerciseinterfacecouplingffpm.cc
@@ -47,8 +47,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 {
diff --git a/exercises/solution/exercise-coupling-ff-pm/interface/ex_interface_ffproblem.hh b/exercises/solution/exercise-coupling-ff-pm/interface/interfaceffproblem.hh
similarity index 100%
rename from exercises/solution/exercise-coupling-ff-pm/interface/ex_interface_ffproblem.hh
rename to exercises/solution/exercise-coupling-ff-pm/interface/interfaceffproblem.hh
diff --git a/exercises/solution/exercise-coupling-ff-pm/interface/ex_interface_pmproblem.hh b/exercises/solution/exercise-coupling-ff-pm/interface/interfacepmproblem.hh
similarity index 100%
rename from exercises/solution/exercise-coupling-ff-pm/interface/ex_interface_pmproblem.hh
rename to exercises/solution/exercise-coupling-ff-pm/interface/interfacepmproblem.hh
diff --git a/exercises/solution/exercise-coupling-ff-pm/models/CMakeLists.txt b/exercises/solution/exercise-coupling-ff-pm/models/CMakeLists.txt
index dc982cb0..9a15eb81 100644
--- a/exercises/solution/exercise-coupling-ff-pm/models/CMakeLists.txt
+++ b/exercises/solution/exercise-coupling-ff-pm/models/CMakeLists.txt
@@ -1,21 +1,21 @@
-dune_add_test(NAME orig_ex_models_coupling_ff-pm
- SOURCES ex_models_coupling_ff-pm.cc
+dune_add_test(NAME exercise_models_coupling_ff-pm_original
+ SOURCES exercisemodelscouplingffpm.cc
COMPILE_DEFINITIONS EXNUMBER=0)
-dune_add_test(NAME sol_a_ex_models_coupling_ff-pm
- SOURCES ex_models_coupling_ff-pm.cc
+dune_add_test(NAME exercise_models_coupling_ff-pm_a_solution
+ SOURCES exercisemodelscouplingffpm.cc
COMPILE_DEFINITIONS EXNUMBER=1)
-dune_add_test(NAME sol_b_ex_models_coupling_ff-pm
- SOURCES ex_models_coupling_ff-pm.cc
+dune_add_test(NAME exercise_models_coupling_ff-pm_b_solution
+ SOURCES exercisemodelscouplingffpm.cc
COMPILE_DEFINITIONS EXNUMBER=2)
-dune_add_test(NAME sol_c_ex_models_coupling_ff-pm
- SOURCES ex_models_coupling_ff-pm.cc
+dune_add_test(NAME exercise_models_coupling_ff-pm_c_solution
+ SOURCES exercisemodelscouplingffpm.cc
COMPILE_DEFINITIONS EXNUMBER=3)
# add exercise to the common target
-add_dependencies(test_exercises sol_a_ex_models_coupling_ff-pm sol_b_ex_models_coupling_ff-pm sol_b_ex_models_coupling_ff-pm)
+add_dependencies(test_exercises exercise_models_coupling_ff-pm_a_solution exercise_models_coupling_ff-pm_b_solution exercise_models_coupling_ff-pm_c_solution)
# add a symlink for each input file
add_input_file_links()
diff --git a/exercises/solution/exercise-coupling-ff-pm/models/ex_models_coupling_ff-pm.cc b/exercises/solution/exercise-coupling-ff-pm/models/exercisemodelscouplingffpm.cc
similarity index 99%
rename from exercises/solution/exercise-coupling-ff-pm/models/ex_models_coupling_ff-pm.cc
rename to exercises/solution/exercise-coupling-ff-pm/models/exercisemodelscouplingffpm.cc
index 11b70769..9cc9de17 100644
--- a/exercises/solution/exercise-coupling-ff-pm/models/ex_models_coupling_ff-pm.cc
+++ b/exercises/solution/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 {
diff --git a/exercises/solution/exercise-coupling-ff-pm/models/ex_models_ffproblem.hh b/exercises/solution/exercise-coupling-ff-pm/models/modelsffproblem.hh
similarity index 100%
rename from exercises/solution/exercise-coupling-ff-pm/models/ex_models_ffproblem.hh
rename to exercises/solution/exercise-coupling-ff-pm/models/modelsffproblem.hh
diff --git a/exercises/solution/exercise-coupling-ff-pm/models/ex_models_pmproblem.hh b/exercises/solution/exercise-coupling-ff-pm/models/modelspmproblem.hh
similarity index 100%
rename from exercises/solution/exercise-coupling-ff-pm/models/ex_models_pmproblem.hh
rename to exercises/solution/exercise-coupling-ff-pm/models/modelspmproblem.hh
diff --git a/exercises/solution/exercise-coupling-ff-pm/turbulence/CMakeLists.txt b/exercises/solution/exercise-coupling-ff-pm/turbulence/CMakeLists.txt
index f39c13f2..aef2743c 100644
--- a/exercises/solution/exercise-coupling-ff-pm/turbulence/CMakeLists.txt
+++ b/exercises/solution/exercise-coupling-ff-pm/turbulence/CMakeLists.txt
@@ -1,17 +1,17 @@
-dune_add_test(NAME orig_turbulence_coupling_ff-pm
- SOURCES ex_turbulence_coupling_ff-pm.cc
+dune_add_test(NAME turbulence_coupling_ff-pm_original
+ SOURCES exerciseturbulencecouplingffpm.cc
COMPILE_DEFINITIONS EXNUMBER=0)
-dune_add_test(NAME sol_a_ex_turbulence_coupling_ff-pm
- SOURCES ex_turbulence_coupling_ff-pm.cc
+dune_add_test(NAME exercise_turbulence_coupling_ff-pm_a_solution
+ SOURCES exerciseturbulencecouplingffpm.cc
COMPILE_DEFINITIONS EXNUMBER=1)
-dune_add_test(NAME sol_b_ex_turbulence_coupling_ff-pm
- SOURCES ex_turbulence_coupling_ff-pm.cc
+dune_add_test(NAME exercise_turbulence_coupling_ff-pm_b_solution
+ SOURCES exerciseturbulencecouplingffpm.cc
COMPILE_DEFINITIONS EXNUMBER=2)
# add exercise to the common target
-add_dependencies(test_exercises sol_a_ex_turbulence_coupling_ff-pm sol_b_ex_turbulence_coupling_ff-pm sol_b_ex_turbulence_coupling_ff-pm)
+add_dependencies(test_exercises exercise_turbulence_coupling_ff-pm_a_solution exercise_turbulence_coupling_ff-pm_b_solution)
# add a symlink for each input file
add_input_file_links()
diff --git a/exercises/solution/exercise-coupling-ff-pm/turbulence/ex_turbulence_coupling_ff-pm.cc b/exercises/solution/exercise-coupling-ff-pm/turbulence/exerciseturbulencecouplingffpm.cc
similarity index 99%
rename from exercises/solution/exercise-coupling-ff-pm/turbulence/ex_turbulence_coupling_ff-pm.cc
rename to exercises/solution/exercise-coupling-ff-pm/turbulence/exerciseturbulencecouplingffpm.cc
index 995a7604..97a8dbaa 100644
--- a/exercises/solution/exercise-coupling-ff-pm/turbulence/ex_turbulence_coupling_ff-pm.cc
+++ b/exercises/solution/exercise-coupling-ff-pm/turbulence/exerciseturbulencecouplingffpm.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 {
diff --git a/exercises/solution/exercise-coupling-ff-pm/turbulence/ex_turbulence_ffproblem.hh b/exercises/solution/exercise-coupling-ff-pm/turbulence/turbulenceffproblem.hh
similarity index 100%
rename from exercises/solution/exercise-coupling-ff-pm/turbulence/ex_turbulence_ffproblem.hh
rename to exercises/solution/exercise-coupling-ff-pm/turbulence/turbulenceffproblem.hh
diff --git a/exercises/solution/exercise-coupling-ff-pm/turbulence/ex_turbulence_pmproblem.hh b/exercises/solution/exercise-coupling-ff-pm/turbulence/turbulencepmproblem.hh
similarity index 100%
rename from exercises/solution/exercise-coupling-ff-pm/turbulence/ex_turbulence_pmproblem.hh
rename to exercises/solution/exercise-coupling-ff-pm/turbulence/turbulencepmproblem.hh
diff --git a/exercises/solution/exercise-fluidsystem/CMakeLists.txt b/exercises/solution/exercise-fluidsystem/CMakeLists.txt
index 4861d487..57b95d69 100644
--- a/exercises/solution/exercise-fluidsystem/CMakeLists.txt
+++ b/exercises/solution/exercise-fluidsystem/CMakeLists.txt
@@ -1,16 +1,16 @@
# executables for exercise part a & b
#part a: 2pproblem
-dune_add_test(NAME exercise-fluidsystem_a_solution
- SOURCES exercise-fluidsystem.cc
+dune_add_test(NAME exercise_fluidsystem_a_solution
+ SOURCES exercisefluidsystem.cc
COMPILE_DEFINITIONS TYPETAG=ExerciseFluidsystemTwoP)
#part b: 2p2cproblem
-dune_add_test(NAME exercise-fluidsystem_b_solution
- SOURCES exercise-fluidsystem.cc
+dune_add_test(NAME exercise_fluidsystem_b_solution
+ SOURCES exercisefluidsystem.cc
COMPILE_DEFINITIONS TYPETAG=ExerciseFluidsystemTwoPTwoC)
# add exercises to the common target
-add_dependencies(test_exercises exercise-fluidsystem_a exercise-fluidsystem_b)
+add_dependencies(test_exercises exercise_fluidsystem_a_solution exercise_fluidsystem_b_solution)
# add a symlink for each input file
add_input_file_links()
diff --git a/exercises/solution/exercise-fluidsystem/exercise-fluidsystem_a_solution.input b/exercises/solution/exercise-fluidsystem/exercise_fluidsystem_a_solution.input
similarity index 100%
rename from exercises/solution/exercise-fluidsystem/exercise-fluidsystem_a_solution.input
rename to exercises/solution/exercise-fluidsystem/exercise_fluidsystem_a_solution.input
diff --git a/exercises/solution/exercise-fluidsystem/exercise-fluidsystem_b_solution.input b/exercises/solution/exercise-fluidsystem/exercise_fluidsystem_b_solution.input
similarity index 100%
rename from exercises/solution/exercise-fluidsystem/exercise-fluidsystem_b_solution.input
rename to exercises/solution/exercise-fluidsystem/exercise_fluidsystem_b_solution.input
diff --git a/exercises/solution/exercise-fluidsystem/exercise-fluidsystem.cc b/exercises/solution/exercise-fluidsystem/exercisefluidsystem.cc
similarity index 100%
rename from exercises/solution/exercise-fluidsystem/exercise-fluidsystem.cc
rename to exercises/solution/exercise-fluidsystem/exercisefluidsystem.cc
diff --git a/exercises/solution/exercise-fractures/CMakeLists.txt b/exercises/solution/exercise-fractures/CMakeLists.txt
index 62a08e09..bbb615fe 100644
--- a/exercises/solution/exercise-fractures/CMakeLists.txt
+++ b/exercises/solution/exercise-fractures/CMakeLists.txt
@@ -1,23 +1,23 @@
# executable for the exercise
-add_executable(exercise_fractures_solution EXCLUDE_FROM_ALL exercise_fractures.cc)
+add_executable(exercisefractures_solution EXCLUDE_FROM_ALL exercisefractures.cc)
-dune_add_test(NAME exercise_fractures_solution_a
+dune_add_test(NAME exercisefractures_solution_a
CMAKE_GUARD "( dune-foamgrid_FOUND AND dune-alugrid_FOUND )"
- TARGET exercise_fractures_solution
- COMMAND ./exercise_fractures_solution
- CMD_ARGS exercise_fractures_solution_a.input)
+ TARGET exercisefractures_solution
+ COMMAND ./exercisefractures_solution
+ CMD_ARGS exercisefractures_solution_a.input)
-dune_add_test(NAME exercise_fractures_solution_b
+dune_add_test(NAME exercisefractures_solution_b
CMAKE_GUARD "( dune-foamgrid_FOUND AND dune-alugrid_FOUND )"
- TARGET exercise_fractures_solution
- COMMAND ./exercise_fractures_solution
- CMD_ARGS exercise_fractures_solution_b.input)
+ TARGET exercisefractures_solution
+ COMMAND ./exercisefractures_solution
+ CMD_ARGS exercisefractures_solution_b.input)
-dune_add_test(NAME exercise_fractures_solution_c
+dune_add_test(NAME exercisefractures_solution_c
CMAKE_GUARD "( dune-foamgrid_FOUND AND dune-alugrid_FOUND )"
- TARGET exercise_fractures_solution
- COMMAND ./exercise_fractures_solution
- CMD_ARGS exercise_fractures_solution_c.input)
+ TARGET exercisefractures_solution
+ COMMAND ./exercisefractures_solution
+ CMD_ARGS exercisefractures_solution_c.input)
# add a symlink for each input file
add_input_file_links()
@@ -26,7 +26,7 @@ dune_symlink_to_source_files(FILES grids)
#install sources
install(FILES
-exercise_fractures.cc
+exercisefractures.cc
matrixproblem.hh
fractureproblem.hh
matrixspatialparams.hh
diff --git a/exercises/solution/exercise-fractures/exercise_fractures.cc b/exercises/solution/exercise-fractures/exercisefractures.cc
similarity index 100%
rename from exercises/solution/exercise-fractures/exercise_fractures.cc
rename to exercises/solution/exercise-fractures/exercisefractures.cc
diff --git a/exercises/solution/exercise-grids/CMakeLists.txt b/exercises/solution/exercise-grids/CMakeLists.txt
index ddbf143b..7f68884b 100644
--- a/exercises/solution/exercise-grids/CMakeLists.txt
+++ b/exercises/solution/exercise-grids/CMakeLists.txt
@@ -1,6 +1,6 @@
# the grid exercise simulation program
dune_add_test(NAME exercise_grids_solution
- SOURCES exercise_grids_solution.cc)
+ SOURCES exercisegrids_solution.cc)
# add tutorial to the common target
add_dependencies(test_exercises exercise_grids_solution)
diff --git a/exercises/solution/exercise-grids/exercise_grids_solution.cc b/exercises/solution/exercise-grids/exercisegrids_solution.cc
similarity index 100%
rename from exercises/solution/exercise-grids/exercise_grids_solution.cc
rename to exercises/solution/exercise-grids/exercisegrids_solution.cc
diff --git a/exercises/solution/exercise-mainfile/CMakeLists.txt b/exercises/solution/exercise-mainfile/CMakeLists.txt
index 894df90d..1715a91e 100644
--- a/exercises/solution/exercise-mainfile/CMakeLists.txt
+++ b/exercises/solution/exercise-mainfile/CMakeLists.txt
@@ -1,12 +1,12 @@
# the one-phase simulation program
-dune_add_test(NAME exercise_1p_a_solution
- SOURCES exercise_1p_a_solution.cc
+dune_add_test(NAME exercise_mainfile_a_solution
+ SOURCES exercisemainfile_a_solution.cc
COMPILE_DEFINITIONS TYPETAG=OnePIncompressible)
# here, add the two-phase non-isothermal simulation program
# add tutorial to the common target
-add_dependencies(test_exercises exercise_1p_a_solution)
+add_dependencies(test_exercises exercise_mainfile_a_solution)
# add a symlink for each input file
add_input_file_links()
diff --git a/exercises/solution/exercise-mainfile/exercise_1p_a_solution.input b/exercises/solution/exercise-mainfile/exercise_mainfile_a_solution.input
similarity index 100%
rename from exercises/solution/exercise-mainfile/exercise_1p_a_solution.input
rename to exercises/solution/exercise-mainfile/exercise_mainfile_a_solution.input
diff --git a/exercises/solution/exercise-mainfile/exercise_1p_a_solution.cc b/exercises/solution/exercise-mainfile/exercisemainfile_a_solution.cc
similarity index 100%
rename from exercises/solution/exercise-mainfile/exercise_1p_a_solution.cc
rename to exercises/solution/exercise-mainfile/exercisemainfile_a_solution.cc
diff --git a/exercises/solution/exercise-properties/CMakeLists.txt b/exercises/solution/exercise-properties/CMakeLists.txt
index 5ce66c9d..0dc0690d 100644
--- a/exercises/solution/exercise-properties/CMakeLists.txt
+++ b/exercises/solution/exercise-properties/CMakeLists.txt
@@ -1,6 +1,6 @@
# the solution to the properties exercise
dune_add_test(NAME exercise_properties_solution
- SOURCES exercise_properties_solution.cc)
+ SOURCES exerciseproperties_solution.cc)
# add tutorial to the common target
add_dependencies(test_exercises exercise_properties_solution)
diff --git a/exercises/solution/exercise-properties/exercise_properties_solution.cc b/exercises/solution/exercise-properties/exerciseproperties_solution.cc
similarity index 100%
rename from exercises/solution/exercise-properties/exercise_properties_solution.cc
rename to exercises/solution/exercise-properties/exerciseproperties_solution.cc
diff --git a/exercises/solution/exercise-runtimeparams/CMakeLists.txt b/exercises/solution/exercise-runtimeparams/CMakeLists.txt
index 50048b9b..4921053c 100644
--- a/exercises/solution/exercise-runtimeparams/CMakeLists.txt
+++ b/exercises/solution/exercise-runtimeparams/CMakeLists.txt
@@ -1,6 +1,6 @@
# the runtime parameter exercise simulation program
dune_add_test(NAME exercise_runtimeparams_solution
- SOURCES exercise_runtimeparams_solution.cc)
+ SOURCES exerciseruntimeparams_solution.cc)
# add tutorial to the common target
add_dependencies(test_exercises exercise_runtimeparams_solution)
diff --git a/exercises/solution/exercise-runtimeparams/exercise_runtimeparams_solution.cc b/exercises/solution/exercise-runtimeparams/exerciseruntimeparams_solution.cc
similarity index 100%
rename from exercises/solution/exercise-runtimeparams/exercise_runtimeparams_solution.cc
rename to exercises/solution/exercise-runtimeparams/exerciseruntimeparams_solution.cc
--
GitLab