diff --git a/exercises/exercise-basic/README.md b/exercises/exercise-basic/README.md index 92a3f4aaba216ff8f0ae3166116548c6aeb40fa5..8aee3292b4f5fc7e87d5e474f241aa70c50fbbf9 100644 --- a/exercises/exercise-basic/README.md +++ b/exercises/exercise-basic/README.md @@ -1,4 +1,4 @@ -# Exercise #1 (DuMuX course) +# Exercise Basics (DuMuX course) <br> ## Problem set-up diff --git a/exercises/exercise-basic/injection2p2cproblem.hh b/exercises/exercise-basic/injection2p2cproblem.hh index c5a123e1b71477c01850e4476efbdc377947e2f2..5749f06e26d7d1bfd178a9ec0dbdf95c89950c04 100644 --- a/exercises/exercise-basic/injection2p2cproblem.hh +++ b/exercises/exercise-basic/injection2p2cproblem.hh @@ -21,8 +21,8 @@ * * \brief The two-phase porousmediumflow problem for exercise-basic */ -#ifndef DUMUX_EX1_INJECTION_2P2C_PROBLEM_HH -#define DUMUX_EX1_INJECTION_2P2C_PROBLEM_HH +#ifndef DUMUX_EX_BASIC_PROBLEM_2P2C_HH +#define DUMUX_EX_BASIC_PROBLEM_2P2C_HH #include <dumux/discretization/cellcentered/tpfa/properties.hh> #include <dumux/porousmediumflow/2p2c/model.hh> diff --git a/exercises/exercise-basic/injection2pniproblem.hh b/exercises/exercise-basic/injection2pniproblem.hh index e4512e242f7d07d233535531eb6adb203f5f9b66..fb2bbe002a10e5f9ab59059c28f47f577dd8b6ae 100644 --- a/exercises/exercise-basic/injection2pniproblem.hh +++ b/exercises/exercise-basic/injection2pniproblem.hh @@ -22,8 +22,8 @@ * \brief The two-phase nonisothermal porousmediumflow problem for exercise-basic */ -#ifndef DUMUX_EX1_INJECTION_PROBLEM_2PNI_HH -#define DUMUX_EX1_INJECTION_PROBLEM_2PNI_HH +#ifndef DUMUX_EX_BASIC_PROBLEM_2PNI_HH +#define DUMUX_EX_BASIC_PROBLEM_2PNI_HH #include <dumux/discretization/cellcentered/tpfa/properties.hh> #include <dumux/porousmediumflow/2p/model.hh> diff --git a/exercises/exercise-basic/injection2pproblem.hh b/exercises/exercise-basic/injection2pproblem.hh index e289798ccfda8972f0345a7e96fe2085291d531e..feb613254f6f569e2bb74c88f322ef2373ec1b3c 100644 --- a/exercises/exercise-basic/injection2pproblem.hh +++ b/exercises/exercise-basic/injection2pproblem.hh @@ -22,8 +22,8 @@ * \brief The two-phase porousmediumflow problem for exercise-basic */ -#ifndef DUMUX_EX1_INJECTION_PROBLEM_2P_HH -#define DUMUX_EX1_INJECTION_PROBLEM_2P_HH +#ifndef DUMUX_EX_BASIC_PROBLEM_2P_HH +#define DUMUX_EX_BASIC_PROBLEM_2P_HH #include <dumux/discretization/cellcentered/tpfa/properties.hh> #include <dumux/porousmediumflow/2p/model.hh> diff --git a/exercises/exercise-basic/injection2pspatialparams.hh b/exercises/exercise-basic/injection2pspatialparams.hh index fa328bc1a82ecded90d95e7d67419c924f8a71ae..715d02f25a12fed69900e38ee5faac85cd77e8d0 100644 --- a/exercises/exercise-basic/injection2pspatialparams.hh +++ b/exercises/exercise-basic/injection2pspatialparams.hh @@ -24,8 +24,8 @@ * fully implicit model. */ -#ifndef DUMUX_EX1_INJECTION_SPATIAL_PARAMS_HH -#define DUMUX_EX1_INJECTION_SPATIAL_PARAMS_HH +#ifndef DUMUX_EX_BASIC_SPATIAL_PARAMS_HH +#define DUMUX_EX_BASIC_SPATIAL_PARAMS_HH #include <dumux/material/spatialparams/fv.hh> #include <dumux/material/fluidmatrixinteractions/2p/regularizedbrookscorey.hh> diff --git a/exercises/exercise-mainfile/1pproblem.hh b/exercises/exercise-mainfile/1pproblem.hh index 605ffbad9fee4335644af7f10991fe7a8d6e4dc0..e2e2ab62132551171387f2ae20685074890b3d49 100644 --- a/exercises/exercise-mainfile/1pproblem.hh +++ b/exercises/exercise-mainfile/1pproblem.hh @@ -19,10 +19,10 @@ /*! * \file * - * \brief The one-phase porousmediumflow problem for exercise 1 + * \brief The one-phase porousmediumflow problem for exercise mainfile */ -#ifndef DUMUX_EX1_ONEP_TEST_PROBLEM_HH -#define DUMUX_EX1_ONEP_TEST_PROBLEM_HH +#ifndef DUMUX_EX_MAINFILE_ONEP_TEST_PROBLEM_HH +#define DUMUX_EX_MAINFILE_ONEP_TEST_PROBLEM_HH #include <dune/grid/yaspgrid.hh> diff --git a/exercises/exercise-mainfile/1pspatialparams.hh b/exercises/exercise-mainfile/1pspatialparams.hh index af762f34efbdd8a603ced4597d7e7c70d9218c03..49a5969e08daeb6ce5a6da75d7cccf32d47b4f26 100644 --- a/exercises/exercise-mainfile/1pspatialparams.hh +++ b/exercises/exercise-mainfile/1pspatialparams.hh @@ -21,8 +21,8 @@ * \ingroup OnePTests * \brief The spatial params the incompressible test */ -#ifndef DUMUX_EX1_ONEP_TEST_SPATIAL_PARAMS_HH -#define DUMUX_EX1_ONEP_TEST_SPATIAL_PARAMS_HH +#ifndef DUMUX_EX_MAINFILE_ONEP_TEST_SPATIAL_PARAMS_HH +#define DUMUX_EX_MAINFILE_ONEP_TEST_SPATIAL_PARAMS_HH #include <dumux/porousmediumflow/properties.hh> #include <dumux/material/spatialparams/fv1p.hh> diff --git a/exercises/exercise-mainfile/README.md b/exercises/exercise-mainfile/README.md index 85380d6c27bcc5553f8d951969557b5709fd4b1d..b1dec1ab314a8acbfbe160d21338e1eda031e6a1 100644 --- a/exercises/exercise-mainfile/README.md +++ b/exercises/exercise-mainfile/README.md @@ -1,4 +1,4 @@ -# Exercise #1 (DuMuX course) +# Exercise Mainfiles (DuMuX course) <br> ## Problem set-up diff --git a/exercises/solution/exercise-basic/injection2pniproblem.hh b/exercises/solution/exercise-basic/injection2pniproblem.hh index 24bdce9a499b4595536016f6c75fa1453218ddd7..95c63a16afb166b2ff06055cd52840589695b3a8 100644 --- a/exercises/solution/exercise-basic/injection2pniproblem.hh +++ b/exercises/solution/exercise-basic/injection2pniproblem.hh @@ -22,8 +22,8 @@ * \brief The solution of the two-phase nonisothermal porousmediumflow problem for exercise-basic */ -#ifndef DUMUX_EX1_INJECTION_PROBLEM_2PNI_HH -#define DUMUX_EX1_INJECTION_PROBLEM_2PNI_HH +#ifndef DUMUX_EX_BASIC_PROBLEM_2PNI_HH +#define DUMUX_EX_BASIC_PROBLEM_2PNI_HH #include <dumux/discretization/cellcentered/tpfa/properties.hh> #include <dumux/porousmediumflow/2p/model.hh> diff --git a/exercises/solution/exercise-mainfile/1pproblem.hh b/exercises/solution/exercise-mainfile/1pproblem.hh index 12a9180834d8e8f330f1bd461748dcc40ac40196..063ae7c3808a6d9754e3bbdb7611f92415820b6c 100644 --- a/exercises/solution/exercise-mainfile/1pproblem.hh +++ b/exercises/solution/exercise-mainfile/1pproblem.hh @@ -19,10 +19,10 @@ /*! * \file * - * \brief The one-phase porousmediumflow problem for exercise 1 + * \brief The one-phase porousmediumflow problem for exercise mainfile */ -#ifndef DUMUX_EX1_ONEP_TEST_PROBLEM_HH -#define DUMUX_EX1_ONEP_TEST_PROBLEM_HH +#ifndef DUMUX_EX_MAINFILE_ONEP_TEST_PROBLEM_HH +#define DUMUX_EX_MAINFILE_ONEP_TEST_PROBLEM_HH #include <dune/grid/yaspgrid.hh> diff --git a/exercises/solution/exercise-mainfile/1pspatialparams.hh b/exercises/solution/exercise-mainfile/1pspatialparams.hh index af762f34efbdd8a603ced4597d7e7c70d9218c03..49a5969e08daeb6ce5a6da75d7cccf32d47b4f26 100644 --- a/exercises/solution/exercise-mainfile/1pspatialparams.hh +++ b/exercises/solution/exercise-mainfile/1pspatialparams.hh @@ -21,8 +21,8 @@ * \ingroup OnePTests * \brief The spatial params the incompressible test */ -#ifndef DUMUX_EX1_ONEP_TEST_SPATIAL_PARAMS_HH -#define DUMUX_EX1_ONEP_TEST_SPATIAL_PARAMS_HH +#ifndef DUMUX_EX_MAINFILE_ONEP_TEST_SPATIAL_PARAMS_HH +#define DUMUX_EX_MAINFILE_ONEP_TEST_SPATIAL_PARAMS_HH #include <dumux/porousmediumflow/properties.hh> #include <dumux/material/spatialparams/fv1p.hh>