From 7f47b54a5197103f4560254afd48d002aa846e50 Mon Sep 17 00:00:00 2001
From: Roman Winter <rwinter@shrek.iws.uni-stuttgart.de>
Date: Thu, 29 Oct 2020 15:58:22 +0100
Subject: [PATCH] [cleanup] removed try and add boundarytypes

---
 exercises/exercise-basic/2p2cmain.cc                        | 2 +-
 exercises/exercise-basic/2pmain.cc                          | 2 +-
 exercises/exercise-basic/injection2p2cproblem.hh            | 1 +
 exercises/exercise-basic/injection2pniproblem.hh            | 1 +
 exercises/exercise-basic/injection2pproblem.hh              | 1 +
 exercises/exercise-biomineralization/biominproblem.hh       | 1 +
 exercises/exercise-biomineralization/fluidsystems/biomin.hh | 6 ------
 exercises/exercise-biomineralization/main.cc                | 2 +-
 .../exercise-coupling-ff-pm/interface/freeflowsubproblem.hh | 1 +
 exercises/exercise-coupling-ff-pm/interface/main.cc         | 2 +-
 .../interface/porousmediumsubproblem.hh                     | 1 +
 .../exercise-coupling-ff-pm/models/freeflowsubproblem.hh    | 1 +
 exercises/exercise-coupling-ff-pm/models/main.cc            | 2 +-
 .../models/porousmediumsubproblem.hh                        | 1 +
 .../turbulence/freeflowsubproblem.hh                        | 1 +
 exercises/exercise-coupling-ff-pm/turbulence/main.cc        | 2 +-
 .../turbulence/porousmediumsubproblem.hh                    | 1 +
 exercises/exercise-fluidsystem/2p2cproblem.hh               | 1 +
 exercises/exercise-fluidsystem/2pproblem.hh                 | 1 +
 exercises/exercise-fluidsystem/main.cc                      | 2 +-
 exercises/exercise-fractures/fractureproblem.hh             | 1 +
 exercises/exercise-fractures/main.cc                        | 2 +-
 exercises/exercise-fractures/matrixproblem.hh               | 1 +
 exercises/exercise-grids/main.cc                            | 2 +-
 exercises/exercise-grids/problem.hh                         | 1 +
 exercises/exercise-mainfile/1pproblem.hh                    | 1 +
 exercises/exercise-mainfile/exercise1pamain.cc              | 2 +-
 exercises/exercise-mainfile/exercise1pbmain.cc              | 2 +-
 exercises/exercise-mainfile/exercise1pcmain.cc              | 2 +-
 exercises/exercise-properties/main.cc                       | 2 +-
 exercises/exercise-properties/problem.hh                    | 1 +
 exercises/exercise-runtimeparams/main.cc                    | 2 +-
 exercises/exercise-runtimeparams/problem.hh                 | 1 +
 exercises/solution/exercise-basic/2pnimain.cc               | 2 +-
 exercises/solution/exercise-basic/injection2pniproblem.hh   | 1 +
 .../solution/exercise-biomineralization/biominproblem.hh    | 1 +
 exercises/solution/exercise-biomineralization/main.cc       | 2 +-
 .../exercise-coupling-ff-pm/interface/freeflowsubproblem.hh | 1 +
 .../solution/exercise-coupling-ff-pm/interface/main.cc      | 2 +-
 .../interface/porousmediumsubproblem.hh                     | 1 +
 .../exercise-coupling-ff-pm/models/freeflowsubproblem.hh    | 1 +
 exercises/solution/exercise-coupling-ff-pm/models/main.cc   | 2 +-
 .../models/porousmediumsubproblem.hh                        | 1 +
 .../turbulence/freeflowsubproblem.hh                        | 1 +
 .../solution/exercise-coupling-ff-pm/turbulence/main.cc     | 2 +-
 .../turbulence/porousmediumsubproblem.hh                    | 1 +
 exercises/solution/exercise-fluidsystem/2p2cproblem.hh      | 1 +
 exercises/solution/exercise-fluidsystem/2pproblem.hh        | 1 +
 exercises/solution/exercise-fluidsystem/main.cc             | 2 +-
 exercises/solution/exercise-fractures/fractureproblem.hh    | 1 +
 exercises/solution/exercise-fractures/main.cc               | 2 +-
 exercises/solution/exercise-fractures/matrixproblem.hh      | 1 +
 exercises/solution/exercise-grids/main.cc                   | 2 +-
 exercises/solution/exercise-grids/problem.hh                | 1 +
 exercises/solution/exercise-mainfile/1pproblem.hh           | 1 +
 .../solution/exercise-mainfile/exercise1pa_solution_main.cc | 2 +-
 exercises/solution/exercise-properties/main.cc              | 2 +-
 exercises/solution/exercise-properties/problem.hh           | 1 +
 exercises/solution/exercise-runtimeparams/main.cc           | 2 +-
 exercises/solution/exercise-runtimeparams/problem.hh        | 1 +
 60 files changed, 59 insertions(+), 31 deletions(-)

diff --git a/exercises/exercise-basic/2p2cmain.cc b/exercises/exercise-basic/2p2cmain.cc
index 35006564..9bac0255 100644
--- a/exercises/exercise-basic/2p2cmain.cc
+++ b/exercises/exercise-basic/2p2cmain.cc
@@ -52,7 +52,7 @@
 ////////////////////////
 // the main function
 ////////////////////////
-int main(int argc, char** argv) try
+int main(int argc, char** argv)
 {
     using namespace Dumux;
 
diff --git a/exercises/exercise-basic/2pmain.cc b/exercises/exercise-basic/2pmain.cc
index 0a59395d..16d628b5 100644
--- a/exercises/exercise-basic/2pmain.cc
+++ b/exercises/exercise-basic/2pmain.cc
@@ -53,7 +53,7 @@
 ////////////////////////
 // the main function
 ////////////////////////
-int main(int argc, char** argv) try
+int main(int argc, char** argv)
 {
     using namespace Dumux;
 
diff --git a/exercises/exercise-basic/injection2p2cproblem.hh b/exercises/exercise-basic/injection2p2cproblem.hh
index 47d165c1..e2985372 100644
--- a/exercises/exercise-basic/injection2p2cproblem.hh
+++ b/exercises/exercise-basic/injection2p2cproblem.hh
@@ -26,6 +26,7 @@
 #define DUMUX_EX_BASIC_PROBLEM_2P2C_HH
 
 #include <dumux/common/properties.hh>
+#include <dumux/common/boundarytypes.hh>
 #include <dumux/porousmediumflow/problem.hh>
 #include <dumux/material/binarycoefficients/h2o_n2.hh>
 
diff --git a/exercises/exercise-basic/injection2pniproblem.hh b/exercises/exercise-basic/injection2pniproblem.hh
index cddb9195..b45191f9 100644
--- a/exercises/exercise-basic/injection2pniproblem.hh
+++ b/exercises/exercise-basic/injection2pniproblem.hh
@@ -26,6 +26,7 @@
 #define DUMUX_EX_BASIC_PROBLEM_2PNI_HH
 
 #include <dumux/common/properties.hh>
+#include <dumux/common/boundarytypes.hh>
 #include <dumux/porousmediumflow/problem.hh>
 
 namespace Dumux {
diff --git a/exercises/exercise-basic/injection2pproblem.hh b/exercises/exercise-basic/injection2pproblem.hh
index 20845f75..ba30b0a5 100644
--- a/exercises/exercise-basic/injection2pproblem.hh
+++ b/exercises/exercise-basic/injection2pproblem.hh
@@ -26,6 +26,7 @@
 #define DUMUX_EX_BASIC_PROBLEM_2P_HH
 
 #include <dumux/common/properties.hh>
+#include <dumux/common/boundarytypes.hh>
 #include <dumux/porousmediumflow/problem.hh>
 
 namespace Dumux {
diff --git a/exercises/exercise-biomineralization/biominproblem.hh b/exercises/exercise-biomineralization/biominproblem.hh
index c63e6dc7..da6e8dae 100644
--- a/exercises/exercise-biomineralization/biominproblem.hh
+++ b/exercises/exercise-biomineralization/biominproblem.hh
@@ -25,6 +25,7 @@
 #define DUMUX_EXERCISE_FOUR_PROBLEM_HH
 
 #include <dumux/common/properties.hh>
+#include <dumux/common/boundarytypes.hh>
 #include <dumux/porousmediumflow/problem.hh>
 
 // TODO: dumux-course-task
diff --git a/exercises/exercise-biomineralization/fluidsystems/biomin.hh b/exercises/exercise-biomineralization/fluidsystems/biomin.hh
index 32330fc0..ae2632fc 100644
--- a/exercises/exercise-biomineralization/fluidsystems/biomin.hh
+++ b/exercises/exercise-biomineralization/fluidsystems/biomin.hh
@@ -332,20 +332,14 @@ public:
 
         // assume brine with viscosity effect of Ca for the liquid phase.
         if (phaseIdx == liquidPhaseIdx)
-        {
             return Brine::liquidViscosity(temperature, pressure);
-        }
 
         // assume pure CO2 for the gas phase.
         else if (phaseIdx == gasPhaseIdx)
-        {
             return CO2::gasViscosity(temperature, pressure);
-        }
 
         else
-        {
             DUNE_THROW(Dune::InvalidStateException, "Invalid phase index " << phaseIdx);
-        }
 
     }
 
diff --git a/exercises/exercise-biomineralization/main.cc b/exercises/exercise-biomineralization/main.cc
index 65511439..9aa45302 100644
--- a/exercises/exercise-biomineralization/main.cc
+++ b/exercises/exercise-biomineralization/main.cc
@@ -54,7 +54,7 @@
 ////////////////////////
 // the main function
 ////////////////////////
-int main(int argc, char** argv) try
+int main(int argc, char** argv)
 {
     using namespace Dumux;
 
diff --git a/exercises/exercise-coupling-ff-pm/interface/freeflowsubproblem.hh b/exercises/exercise-coupling-ff-pm/interface/freeflowsubproblem.hh
index 47a243eb..de401b44 100644
--- a/exercises/exercise-coupling-ff-pm/interface/freeflowsubproblem.hh
+++ b/exercises/exercise-coupling-ff-pm/interface/freeflowsubproblem.hh
@@ -25,6 +25,7 @@
 
 #include <dumux/freeflow/navierstokes/problem.hh>
 #include <dumux/common/properties.hh>
+#include <dumux/common/boundarytypes.hh>
 
 namespace Dumux {
 
diff --git a/exercises/exercise-coupling-ff-pm/interface/main.cc b/exercises/exercise-coupling-ff-pm/interface/main.cc
index a3318b41..aa532622 100644
--- a/exercises/exercise-coupling-ff-pm/interface/main.cc
+++ b/exercises/exercise-coupling-ff-pm/interface/main.cc
@@ -48,7 +48,7 @@
 
 #include "properties.hh"
 
-int main(int argc, char** argv) try
+int main(int argc, char** argv)
 {
     using namespace Dumux;
 
diff --git a/exercises/exercise-coupling-ff-pm/interface/porousmediumsubproblem.hh b/exercises/exercise-coupling-ff-pm/interface/porousmediumsubproblem.hh
index 689e9b61..5c4b8235 100644
--- a/exercises/exercise-coupling-ff-pm/interface/porousmediumsubproblem.hh
+++ b/exercises/exercise-coupling-ff-pm/interface/porousmediumsubproblem.hh
@@ -26,6 +26,7 @@
 
 #include <dumux/porousmediumflow/problem.hh>
 #include <dumux/common/properties.hh>
+#include <dumux/common/boundarytypes.hh>
 
 namespace Dumux {
 
diff --git a/exercises/exercise-coupling-ff-pm/models/freeflowsubproblem.hh b/exercises/exercise-coupling-ff-pm/models/freeflowsubproblem.hh
index 0a4f0b99..4efa03b9 100644
--- a/exercises/exercise-coupling-ff-pm/models/freeflowsubproblem.hh
+++ b/exercises/exercise-coupling-ff-pm/models/freeflowsubproblem.hh
@@ -25,6 +25,7 @@
 #define DUMUX_STOKES1P2C_SUBPROBLEM_HH
 
 #include <dumux/common/properties.hh>
+#include <dumux/common/boundarytypes.hh>
 #include <dumux/common/timeloop.hh>
 
 #include <dumux/freeflow/navierstokes/problem.hh>
diff --git a/exercises/exercise-coupling-ff-pm/models/main.cc b/exercises/exercise-coupling-ff-pm/models/main.cc
index 584a8b30..c19c3f9a 100644
--- a/exercises/exercise-coupling-ff-pm/models/main.cc
+++ b/exercises/exercise-coupling-ff-pm/models/main.cc
@@ -51,7 +51,7 @@
 
 #include "properties.hh"
 
-int main(int argc, char** argv) try
+int main(int argc, char** argv)
 {
     using namespace Dumux;
 
diff --git a/exercises/exercise-coupling-ff-pm/models/porousmediumsubproblem.hh b/exercises/exercise-coupling-ff-pm/models/porousmediumsubproblem.hh
index 28ebbb51..9d510fd2 100644
--- a/exercises/exercise-coupling-ff-pm/models/porousmediumsubproblem.hh
+++ b/exercises/exercise-coupling-ff-pm/models/porousmediumsubproblem.hh
@@ -25,6 +25,7 @@
 #define DUMUX_DARCY_SUBPROBLEM_HH
 
 #include <dumux/common/properties.hh>
+#include <dumux/common/boundarytypes.hh>
 #include <dumux/common/timeloop.hh>
 #include <dumux/io/gnuplotinterface.hh>
 
diff --git a/exercises/exercise-coupling-ff-pm/turbulence/freeflowsubproblem.hh b/exercises/exercise-coupling-ff-pm/turbulence/freeflowsubproblem.hh
index 109c9a11..392a2dc0 100644
--- a/exercises/exercise-coupling-ff-pm/turbulence/freeflowsubproblem.hh
+++ b/exercises/exercise-coupling-ff-pm/turbulence/freeflowsubproblem.hh
@@ -24,6 +24,7 @@
 #define DUMUX_FREEFLOW1P2C_SUBPROBLEM_HH
 
 #include <dumux/common/properties.hh>
+#include <dumux/common/boundarytypes.hh>
 #include <dumux/common/timeloop.hh>
 #include <dumux/multidomain/boundary/stokesdarcy/couplingdata.hh>
 
diff --git a/exercises/exercise-coupling-ff-pm/turbulence/main.cc b/exercises/exercise-coupling-ff-pm/turbulence/main.cc
index bc17c379..006688dc 100644
--- a/exercises/exercise-coupling-ff-pm/turbulence/main.cc
+++ b/exercises/exercise-coupling-ff-pm/turbulence/main.cc
@@ -51,7 +51,7 @@
 
 #include "properties.hh"
 
-int main(int argc, char** argv) try
+int main(int argc, char** argv)
 {
     using namespace Dumux;
 
diff --git a/exercises/exercise-coupling-ff-pm/turbulence/porousmediumsubproblem.hh b/exercises/exercise-coupling-ff-pm/turbulence/porousmediumsubproblem.hh
index 3ec5c400..328b8f0f 100644
--- a/exercises/exercise-coupling-ff-pm/turbulence/porousmediumsubproblem.hh
+++ b/exercises/exercise-coupling-ff-pm/turbulence/porousmediumsubproblem.hh
@@ -25,6 +25,7 @@
 #define DUMUX_DARCY2P2C_SUBPROBLEM_HH
 
 #include <dumux/porousmediumflow/problem.hh>
+#include <dumux/common/boundarytypes.hh>
 #include <dumux/common/properties.hh>
 #include <dumux/common/timeloop.hh>
 #include <dumux/multidomain/boundary/stokesdarcy/couplingdata.hh>
diff --git a/exercises/exercise-fluidsystem/2p2cproblem.hh b/exercises/exercise-fluidsystem/2p2cproblem.hh
index 50933e81..5a43a26c 100644
--- a/exercises/exercise-fluidsystem/2p2cproblem.hh
+++ b/exercises/exercise-fluidsystem/2p2cproblem.hh
@@ -26,6 +26,7 @@
 
 // The base porous media box problem
 #include <dumux/porousmediumflow/problem.hh>
+#include <dumux/common/boundarytypes.hh>
 #include <dumux/common/properties.hh>
 
 namespace Dumux {
diff --git a/exercises/exercise-fluidsystem/2pproblem.hh b/exercises/exercise-fluidsystem/2pproblem.hh
index c9f74c95..4786b3e7 100644
--- a/exercises/exercise-fluidsystem/2pproblem.hh
+++ b/exercises/exercise-fluidsystem/2pproblem.hh
@@ -26,6 +26,7 @@
 
 // The porous media base problem
 #include <dumux/porousmediumflow/problem.hh>
+#include <dumux/common/boundarytypes.hh>
 #include <dumux/common/properties.hh>
 
 // The water component
diff --git a/exercises/exercise-fluidsystem/main.cc b/exercises/exercise-fluidsystem/main.cc
index caa371bd..ddbb05f6 100644
--- a/exercises/exercise-fluidsystem/main.cc
+++ b/exercises/exercise-fluidsystem/main.cc
@@ -56,7 +56,7 @@
 ////////////////////////
 // the main function
 ////////////////////////
-int main(int argc, char** argv) try
+int main(int argc, char** argv)
 {
     using namespace Dumux;
 
diff --git a/exercises/exercise-fractures/fractureproblem.hh b/exercises/exercise-fractures/fractureproblem.hh
index 1a69ca69..b4b3687c 100644
--- a/exercises/exercise-fractures/fractureproblem.hh
+++ b/exercises/exercise-fractures/fractureproblem.hh
@@ -29,6 +29,7 @@
 // include the base problem and properties we inherit from
 #include <dumux/porousmediumflow/problem.hh>
 #include <dumux/common/properties.hh>
+#include <dumux/common/boundarytypes.hh>
 
 namespace Dumux {
 
diff --git a/exercises/exercise-fractures/main.cc b/exercises/exercise-fractures/main.cc
index a50dbc2f..12485ac9 100644
--- a/exercises/exercise-fractures/main.cc
+++ b/exercises/exercise-fractures/main.cc
@@ -70,7 +70,7 @@ struct CouplingManager<TypeTag, TTag::FractureProblem> { using type = TheCouplin
 } // end namespace Dumux
 
 // main program
-int main(int argc, char** argv) try
+int main(int argc, char** argv)
 {
     using namespace Dumux;
 
diff --git a/exercises/exercise-fractures/matrixproblem.hh b/exercises/exercise-fractures/matrixproblem.hh
index ae307676..ca9c07c7 100644
--- a/exercises/exercise-fractures/matrixproblem.hh
+++ b/exercises/exercise-fractures/matrixproblem.hh
@@ -33,6 +33,7 @@
 // include the base problem and properties we inherit from
 #include <dumux/porousmediumflow/problem.hh>
 #include <dumux/common/properties.hh>
+#include <dumux/common/boundarytypes.hh>
 
 namespace Dumux {
 
diff --git a/exercises/exercise-grids/main.cc b/exercises/exercise-grids/main.cc
index 2b9e531e..ab18bc53 100644
--- a/exercises/exercise-grids/main.cc
+++ b/exercises/exercise-grids/main.cc
@@ -53,7 +53,7 @@
 ////////////////////////
 // the main function
 ////////////////////////
-int main(int argc, char** argv) try
+int main(int argc, char** argv)
 {
     using namespace Dumux;
 
diff --git a/exercises/exercise-grids/problem.hh b/exercises/exercise-grids/problem.hh
index b61d5a71..a187cdc8 100644
--- a/exercises/exercise-grids/problem.hh
+++ b/exercises/exercise-grids/problem.hh
@@ -27,6 +27,7 @@
 
 #include <dumux/porousmediumflow/problem.hh>
 #include <dumux/common/properties.hh>
+#include <dumux/common/boundarytypes.hh>
 
 namespace Dumux {
 
diff --git a/exercises/exercise-mainfile/1pproblem.hh b/exercises/exercise-mainfile/1pproblem.hh
index 9f821fa1..81c18c9d 100644
--- a/exercises/exercise-mainfile/1pproblem.hh
+++ b/exercises/exercise-mainfile/1pproblem.hh
@@ -25,6 +25,7 @@
 #define DUMUX_EX_MAINFILE_ONEP_TEST_PROBLEM_HH
 
 #include <dumux/common/properties.hh>
+#include <dumux/common/boundarytypes.hh>
 #include <dumux/porousmediumflow/problem.hh>
 
 namespace Dumux {
diff --git a/exercises/exercise-mainfile/exercise1pamain.cc b/exercises/exercise-mainfile/exercise1pamain.cc
index 7b6862d4..d3b3b5d5 100644
--- a/exercises/exercise-mainfile/exercise1pamain.cc
+++ b/exercises/exercise-mainfile/exercise1pamain.cc
@@ -46,7 +46,7 @@
 #include <dumux/io/vtkoutputmodule.hh>
 #include <dumux/io/grid/gridmanager.hh>
 
-int main(int argc, char** argv) try
+int main(int argc, char** argv)
 {
     using namespace Dumux;
 
diff --git a/exercises/exercise-mainfile/exercise1pbmain.cc b/exercises/exercise-mainfile/exercise1pbmain.cc
index 830c71a9..eadf97ac 100644
--- a/exercises/exercise-mainfile/exercise1pbmain.cc
+++ b/exercises/exercise-mainfile/exercise1pbmain.cc
@@ -47,7 +47,7 @@
 #include <dumux/io/vtkoutputmodule.hh>
 #include <dumux/io/grid/gridmanager.hh>
 
-int main(int argc, char** argv) try
+int main(int argc, char** argv)
 {
     using namespace Dumux;
 
diff --git a/exercises/exercise-mainfile/exercise1pcmain.cc b/exercises/exercise-mainfile/exercise1pcmain.cc
index 20c87d17..003677cb 100644
--- a/exercises/exercise-mainfile/exercise1pcmain.cc
+++ b/exercises/exercise-mainfile/exercise1pcmain.cc
@@ -47,7 +47,7 @@
 #include <dumux/io/vtkoutputmodule.hh>
 #include <dumux/io/grid/gridmanager.hh>
 
-int main(int argc, char** argv) try
+int main(int argc, char** argv)
 {
     using namespace Dumux;
 
diff --git a/exercises/exercise-properties/main.cc b/exercises/exercise-properties/main.cc
index 3b2d4baf..2f4b3774 100644
--- a/exercises/exercise-properties/main.cc
+++ b/exercises/exercise-properties/main.cc
@@ -83,7 +83,7 @@ void usage(const char *progName, const std::string &errorMsg)
     }
 }
 
-int main(int argc, char** argv) try
+int main(int argc, char** argv)
 {
     using namespace Dumux;
 
diff --git a/exercises/exercise-properties/problem.hh b/exercises/exercise-properties/problem.hh
index 6e579c90..b71fb428 100644
--- a/exercises/exercise-properties/problem.hh
+++ b/exercises/exercise-properties/problem.hh
@@ -25,6 +25,7 @@
 
 #include <dumux/porousmediumflow/problem.hh>
 #include <dumux/common/properties.hh>
+#include <dumux/common/boundarytypes.hh>
 
 namespace Dumux {
 
diff --git a/exercises/exercise-runtimeparams/main.cc b/exercises/exercise-runtimeparams/main.cc
index a6cf7bda..c16c2bd6 100644
--- a/exercises/exercise-runtimeparams/main.cc
+++ b/exercises/exercise-runtimeparams/main.cc
@@ -53,7 +53,7 @@
 ////////////////////////
 // the main function
 ////////////////////////
-int main(int argc, char** argv) try
+int main(int argc, char** argv)
 {
     using namespace Dumux;
 
diff --git a/exercises/exercise-runtimeparams/problem.hh b/exercises/exercise-runtimeparams/problem.hh
index 12c72a9e..fb8f501f 100644
--- a/exercises/exercise-runtimeparams/problem.hh
+++ b/exercises/exercise-runtimeparams/problem.hh
@@ -26,6 +26,7 @@
 #define DUMUX_EXRUNTIMEPARAMS_INJECTION_PROBLEM_2P_HH
 
 #include <dumux/common/properties.hh>
+#include <dumux/common/boundarytypes.hh>
 #include <dumux/porousmediumflow/problem.hh>
 
 namespace Dumux {
diff --git a/exercises/solution/exercise-basic/2pnimain.cc b/exercises/solution/exercise-basic/2pnimain.cc
index 79b39ea9..df321e50 100644
--- a/exercises/solution/exercise-basic/2pnimain.cc
+++ b/exercises/solution/exercise-basic/2pnimain.cc
@@ -53,7 +53,7 @@
 ////////////////////////
 // the main function
 ////////////////////////
-int main(int argc, char** argv) try
+int main(int argc, char** argv)
 {
     using namespace Dumux;
 
diff --git a/exercises/solution/exercise-basic/injection2pniproblem.hh b/exercises/solution/exercise-basic/injection2pniproblem.hh
index 282fc2f3..783fd212 100644
--- a/exercises/solution/exercise-basic/injection2pniproblem.hh
+++ b/exercises/solution/exercise-basic/injection2pniproblem.hh
@@ -26,6 +26,7 @@
 #define DUMUX_EX_BASIC_PROBLEM_2PNI_HH
 
 #include <dumux/common/properties.hh>
+#include <dumux/common/boundarytypes.hh>
 #include <dumux/porousmediumflow/problem.hh>
 
 namespace Dumux {
diff --git a/exercises/solution/exercise-biomineralization/biominproblem.hh b/exercises/solution/exercise-biomineralization/biominproblem.hh
index 6f8b64a9..8cd46b4c 100644
--- a/exercises/solution/exercise-biomineralization/biominproblem.hh
+++ b/exercises/solution/exercise-biomineralization/biominproblem.hh
@@ -25,6 +25,7 @@
 #define DUMUX_EXERCISE_FOUR_PROBLEM_HH
 
 #include <dumux/common/properties.hh>
+#include <dumux/common/boundarytypes.hh>
 #include <dumux/porousmediumflow/problem.hh>
 
 // TODO: dumux-course-task
diff --git a/exercises/solution/exercise-biomineralization/main.cc b/exercises/solution/exercise-biomineralization/main.cc
index 65511439..9aa45302 100644
--- a/exercises/solution/exercise-biomineralization/main.cc
+++ b/exercises/solution/exercise-biomineralization/main.cc
@@ -54,7 +54,7 @@
 ////////////////////////
 // the main function
 ////////////////////////
-int main(int argc, char** argv) try
+int main(int argc, char** argv)
 {
     using namespace Dumux;
 
diff --git a/exercises/solution/exercise-coupling-ff-pm/interface/freeflowsubproblem.hh b/exercises/solution/exercise-coupling-ff-pm/interface/freeflowsubproblem.hh
index 311643c4..9f4427e7 100644
--- a/exercises/solution/exercise-coupling-ff-pm/interface/freeflowsubproblem.hh
+++ b/exercises/solution/exercise-coupling-ff-pm/interface/freeflowsubproblem.hh
@@ -24,6 +24,7 @@
 #define DUMUX_STOKES_SUBPROBLEM_HH
 
 #include <dumux/common/properties.hh>
+#include <dumux/common/boundarytypes.hh>
 #include <dumux/common/timeloop.hh>
 
 #include <dumux/freeflow/navierstokes/problem.hh>
diff --git a/exercises/solution/exercise-coupling-ff-pm/interface/main.cc b/exercises/solution/exercise-coupling-ff-pm/interface/main.cc
index 0cc7c91b..c4ca97b1 100644
--- a/exercises/solution/exercise-coupling-ff-pm/interface/main.cc
+++ b/exercises/solution/exercise-coupling-ff-pm/interface/main.cc
@@ -49,7 +49,7 @@
 
 #include "properties.hh"
 
-int main(int argc, char** argv) try
+int main(int argc, char** argv)
 {
     using namespace Dumux;
 
diff --git a/exercises/solution/exercise-coupling-ff-pm/interface/porousmediumsubproblem.hh b/exercises/solution/exercise-coupling-ff-pm/interface/porousmediumsubproblem.hh
index 57d55d0b..9edcfe38 100644
--- a/exercises/solution/exercise-coupling-ff-pm/interface/porousmediumsubproblem.hh
+++ b/exercises/solution/exercise-coupling-ff-pm/interface/porousmediumsubproblem.hh
@@ -26,6 +26,7 @@
 
 #include <dumux/porousmediumflow/problem.hh>
 #include <dumux/common/properties.hh>
+#include <dumux/common/boundarytypes.hh>
 
 namespace Dumux {
 
diff --git a/exercises/solution/exercise-coupling-ff-pm/models/freeflowsubproblem.hh b/exercises/solution/exercise-coupling-ff-pm/models/freeflowsubproblem.hh
index 39b3304b..d453f0bc 100644
--- a/exercises/solution/exercise-coupling-ff-pm/models/freeflowsubproblem.hh
+++ b/exercises/solution/exercise-coupling-ff-pm/models/freeflowsubproblem.hh
@@ -25,6 +25,7 @@
 #define DUMUX_STOKES1P2C_SUBPROBLEM_HH
 
 #include <dumux/common/properties.hh>
+#include <dumux/common/boundarytypes.hh>
 #include <dumux/common/timeloop.hh>
 
 #include <dumux/freeflow/navierstokes/problem.hh>
diff --git a/exercises/solution/exercise-coupling-ff-pm/models/main.cc b/exercises/solution/exercise-coupling-ff-pm/models/main.cc
index 614bec96..7b1adffa 100644
--- a/exercises/solution/exercise-coupling-ff-pm/models/main.cc
+++ b/exercises/solution/exercise-coupling-ff-pm/models/main.cc
@@ -51,7 +51,7 @@
 
 #include "properties.hh"
 
-int main(int argc, char** argv) try
+int main(int argc, char** argv)
 {
     using namespace Dumux;
 
diff --git a/exercises/solution/exercise-coupling-ff-pm/models/porousmediumsubproblem.hh b/exercises/solution/exercise-coupling-ff-pm/models/porousmediumsubproblem.hh
index 4c47a9ac..c07452cd 100644
--- a/exercises/solution/exercise-coupling-ff-pm/models/porousmediumsubproblem.hh
+++ b/exercises/solution/exercise-coupling-ff-pm/models/porousmediumsubproblem.hh
@@ -25,6 +25,7 @@
 #define DUMUX_DARCY_SUBPROBLEM_HH
 
 #include <dumux/common/properties.hh>
+#include <dumux/common/boundarytypes.hh>
 #include <dumux/common/timeloop.hh>
 
 #include <dumux/io/gnuplotinterface.hh>
diff --git a/exercises/solution/exercise-coupling-ff-pm/turbulence/freeflowsubproblem.hh b/exercises/solution/exercise-coupling-ff-pm/turbulence/freeflowsubproblem.hh
index 891fb158..f88c64d9 100644
--- a/exercises/solution/exercise-coupling-ff-pm/turbulence/freeflowsubproblem.hh
+++ b/exercises/solution/exercise-coupling-ff-pm/turbulence/freeflowsubproblem.hh
@@ -31,6 +31,7 @@
 
 #include <dumux/common/timeloop.hh>
 #include <dumux/common/properties.hh>
+#include <dumux/common/boundarytypes.hh>
 #include <dumux/multidomain/boundary/stokesdarcy/couplingdata.hh>
 
 namespace Dumux {
diff --git a/exercises/solution/exercise-coupling-ff-pm/turbulence/main.cc b/exercises/solution/exercise-coupling-ff-pm/turbulence/main.cc
index 258be5ba..880c3c29 100644
--- a/exercises/solution/exercise-coupling-ff-pm/turbulence/main.cc
+++ b/exercises/solution/exercise-coupling-ff-pm/turbulence/main.cc
@@ -51,7 +51,7 @@
 
 #include "properties.hh"
 
-int main(int argc, char** argv) try
+int main(int argc, char** argv)
 {
     using namespace Dumux;
 
diff --git a/exercises/solution/exercise-coupling-ff-pm/turbulence/porousmediumsubproblem.hh b/exercises/solution/exercise-coupling-ff-pm/turbulence/porousmediumsubproblem.hh
index 10f74908..cdf1f4e1 100644
--- a/exercises/solution/exercise-coupling-ff-pm/turbulence/porousmediumsubproblem.hh
+++ b/exercises/solution/exercise-coupling-ff-pm/turbulence/porousmediumsubproblem.hh
@@ -25,6 +25,7 @@
 #define DUMUX_DARCY2P2C_SUBPROBLEM_HH
 
 #include <dumux/common/properties.hh>
+#include <dumux/common/boundarytypes.hh>
 #include <dumux/common/timeloop.hh>
 
 #include <dumux/porousmediumflow/problem.hh>
diff --git a/exercises/solution/exercise-fluidsystem/2p2cproblem.hh b/exercises/solution/exercise-fluidsystem/2p2cproblem.hh
index 76f1fba5..74a6cb4d 100644
--- a/exercises/solution/exercise-fluidsystem/2p2cproblem.hh
+++ b/exercises/solution/exercise-fluidsystem/2p2cproblem.hh
@@ -27,6 +27,7 @@
 // The base porous media box problem
 #include <dumux/porousmediumflow/problem.hh>
 #include <dumux/common/properties.hh>
+#include <dumux/common/boundarytypes.hh>
 
 namespace Dumux {
 
diff --git a/exercises/solution/exercise-fluidsystem/2pproblem.hh b/exercises/solution/exercise-fluidsystem/2pproblem.hh
index 7eac67ff..e34bc398 100644
--- a/exercises/solution/exercise-fluidsystem/2pproblem.hh
+++ b/exercises/solution/exercise-fluidsystem/2pproblem.hh
@@ -27,6 +27,7 @@
 // The porous media base problem
 #include <dumux/porousmediumflow/problem.hh>
 #include <dumux/common/properties.hh>
+#include <dumux/common/boundarytypes.hh>
 
 // The water component
 #include <dumux/material/components/tabulatedcomponent.hh>
diff --git a/exercises/solution/exercise-fluidsystem/main.cc b/exercises/solution/exercise-fluidsystem/main.cc
index a210b1e2..60058a58 100644
--- a/exercises/solution/exercise-fluidsystem/main.cc
+++ b/exercises/solution/exercise-fluidsystem/main.cc
@@ -55,7 +55,7 @@
 ////////////////////////
 // the main function
 ////////////////////////
-int main(int argc, char** argv) try
+int main(int argc, char** argv)
 {
     using namespace Dumux;
 
diff --git a/exercises/solution/exercise-fractures/fractureproblem.hh b/exercises/solution/exercise-fractures/fractureproblem.hh
index 17740330..9a803e36 100644
--- a/exercises/solution/exercise-fractures/fractureproblem.hh
+++ b/exercises/solution/exercise-fractures/fractureproblem.hh
@@ -29,6 +29,7 @@
 // include the base problem and properties we inherit from
 #include <dumux/porousmediumflow/problem.hh>
 #include <dumux/common/properties.hh>
+#include <dumux/common/boundarytypes.hh>
 
 namespace Dumux {
 
diff --git a/exercises/solution/exercise-fractures/main.cc b/exercises/solution/exercise-fractures/main.cc
index 3b6943c6..f3d7e80a 100644
--- a/exercises/solution/exercise-fractures/main.cc
+++ b/exercises/solution/exercise-fractures/main.cc
@@ -70,7 +70,7 @@ struct CouplingManager<TypeTag, TTag::FractureProblem> { using type = TheCouplin
 } // end namespace Dumux
 
 // main program
-int main(int argc, char** argv) try
+int main(int argc, char** argv)
 {
     using namespace Dumux;
 
diff --git a/exercises/solution/exercise-fractures/matrixproblem.hh b/exercises/solution/exercise-fractures/matrixproblem.hh
index 1e5239d1..033e53f9 100644
--- a/exercises/solution/exercise-fractures/matrixproblem.hh
+++ b/exercises/solution/exercise-fractures/matrixproblem.hh
@@ -33,6 +33,7 @@
 // include the base problem and properties we inherit from
 #include <dumux/porousmediumflow/problem.hh>
 #include <dumux/common/properties.hh>
+#include <dumux/common/boundarytypes.hh>
 
 namespace Dumux {
 
diff --git a/exercises/solution/exercise-grids/main.cc b/exercises/solution/exercise-grids/main.cc
index edf5bfde..916d1e79 100644
--- a/exercises/solution/exercise-grids/main.cc
+++ b/exercises/solution/exercise-grids/main.cc
@@ -53,7 +53,7 @@
 ////////////////////////
 // the main function
 ////////////////////////
-int main(int argc, char** argv) try
+int main(int argc, char** argv)
 {
     using namespace Dumux;
 
diff --git a/exercises/solution/exercise-grids/problem.hh b/exercises/solution/exercise-grids/problem.hh
index ffdac382..1cd5cc45 100644
--- a/exercises/solution/exercise-grids/problem.hh
+++ b/exercises/solution/exercise-grids/problem.hh
@@ -27,6 +27,7 @@
 
 #include <dumux/porousmediumflow/problem.hh>
 #include <dumux/common/properties.hh>
+#include <dumux/common/boundarytypes.hh>
 
 namespace Dumux {
 
diff --git a/exercises/solution/exercise-mainfile/1pproblem.hh b/exercises/solution/exercise-mainfile/1pproblem.hh
index deb3f45a..f5a5bdbb 100644
--- a/exercises/solution/exercise-mainfile/1pproblem.hh
+++ b/exercises/solution/exercise-mainfile/1pproblem.hh
@@ -26,6 +26,7 @@
 
 #include <dumux/porousmediumflow/problem.hh>
 #include <dumux/common/properties.hh>
+#include <dumux/common/boundarytypes.hh>
 
 namespace Dumux {
 
diff --git a/exercises/solution/exercise-mainfile/exercise1pa_solution_main.cc b/exercises/solution/exercise-mainfile/exercise1pa_solution_main.cc
index ea615c46..fb8cb728 100644
--- a/exercises/solution/exercise-mainfile/exercise1pa_solution_main.cc
+++ b/exercises/solution/exercise-mainfile/exercise1pa_solution_main.cc
@@ -48,7 +48,7 @@
 
 #include "properties.hh"
 
-int main(int argc, char** argv) try
+int main(int argc, char** argv)
 {
     using namespace Dumux;
 
diff --git a/exercises/solution/exercise-properties/main.cc b/exercises/solution/exercise-properties/main.cc
index 7d25d8b4..b5616e68 100644
--- a/exercises/solution/exercise-properties/main.cc
+++ b/exercises/solution/exercise-properties/main.cc
@@ -84,7 +84,7 @@ void usage(const char *progName, const std::string &errorMsg)
     }
 }
 
-int main(int argc, char** argv) try
+int main(int argc, char** argv)
 {
     using namespace Dumux;
 
diff --git a/exercises/solution/exercise-properties/problem.hh b/exercises/solution/exercise-properties/problem.hh
index b870dd3c..ec2b921d 100644
--- a/exercises/solution/exercise-properties/problem.hh
+++ b/exercises/solution/exercise-properties/problem.hh
@@ -26,6 +26,7 @@
 #include <dumux/material/components/trichloroethene.hh>
 #include <dumux/porousmediumflow/problem.hh>
 #include <dumux/common/properties.hh>
+#include <dumux/common/boundarytypes.hh>
 
 namespace Dumux {
 
diff --git a/exercises/solution/exercise-runtimeparams/main.cc b/exercises/solution/exercise-runtimeparams/main.cc
index a6cf7bda..c16c2bd6 100644
--- a/exercises/solution/exercise-runtimeparams/main.cc
+++ b/exercises/solution/exercise-runtimeparams/main.cc
@@ -53,7 +53,7 @@
 ////////////////////////
 // the main function
 ////////////////////////
-int main(int argc, char** argv) try
+int main(int argc, char** argv)
 {
     using namespace Dumux;
 
diff --git a/exercises/solution/exercise-runtimeparams/problem.hh b/exercises/solution/exercise-runtimeparams/problem.hh
index 55f4e4b2..85aba7c1 100644
--- a/exercises/solution/exercise-runtimeparams/problem.hh
+++ b/exercises/solution/exercise-runtimeparams/problem.hh
@@ -26,6 +26,7 @@
 #define DUMUX_EXRUNTIMEPARAMS_INJECTION_PROBLEM_2P_HH
 
 #include <dumux/common/properties.hh>
+#include <dumux/common/boundarytypes.hh>
 #include <dumux/porousmediumflow/problem.hh>
 
 namespace Dumux {
-- 
GitLab