Cleanup/mainfile basic numbers

exercises/exercise-basic/README.md

-# Exercise #1 (DuMuX course)
+# Exercise Basics (DuMuX course)
 <br>
 ## Problem set-up
 

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>

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>

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>

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>

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>
 

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>

exercises/exercise-mainfile/README.md

-# Exercise #1 (DuMuX course)
+# Exercise Mainfiles (DuMuX course)
 <br>
 ## Problem set-up
 

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>

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>
 

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>