From 9ba9306067bf000b486bebbf8a47622476232be2 Mon Sep 17 00:00:00 2001 From: Ned Coltman <edward.coltman@iws.uni-stuttgart.de> Date: Tue, 17 Jul 2018 11:07:33 +0200 Subject: [PATCH] Cleanup/mainfile basic numbers --- exercises/exercise-basic/README.md | 2 +- exercises/exercise-basic/injection2p2cproblem.hh | 4 ++-- exercises/exercise-basic/injection2pniproblem.hh | 4 ++-- exercises/exercise-basic/injection2pproblem.hh | 4 ++-- exercises/exercise-basic/injection2pspatialparams.hh | 4 ++-- exercises/exercise-mainfile/1pproblem.hh | 6 +++--- exercises/exercise-mainfile/1pspatialparams.hh | 4 ++-- exercises/exercise-mainfile/README.md | 2 +- exercises/solution/exercise-basic/injection2pniproblem.hh | 4 ++-- exercises/solution/exercise-mainfile/1pproblem.hh | 6 +++--- exercises/solution/exercise-mainfile/1pspatialparams.hh | 4 ++-- 11 files changed, 22 insertions(+), 22 deletions(-) diff --git a/exercises/exercise-basic/README.md b/exercises/exercise-basic/README.md index 92a3f4aa..8aee3292 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 c5a123e1..5749f06e 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 e4512e24..fb2bbe00 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 e289798c..feb61325 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 fa328bc1..715d02f2 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 605ffbad..e2e2ab62 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 af762f34..49a5969e 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 85380d6c..b1dec1ab 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 24bdce9a..95c63a16 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 12a91808..063ae7c3 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 af762f34..49a5969e 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> -- GitLab