Merge branch 'fix/fix-exercises' into 'master'

[exercise] fix small errors due to update to dumux 3.0

See merge request !68

exercises/exercise-basic/README.md

@@ -95,4 +95,4 @@ make exercise_basic_2pni # builds new executable
 
 <img src="https://git.iws.uni-stuttgart.de/dumux-repositories/dumux-course/raw/master/exercises/extradoc/exercise1_nonisothermal.png" width="800">
 
-The non-isothermal model requires additional parameters like the thermal conductivity of the solid component. They are already implemented and set in `exercise_basic.input`, you just need to _uncomment_ them.
+The non-isothermal model requires additional parameters like the thermal conductivity of the solid component. They are already implemented and set in `params.input`, you just need to _uncomment_ them.

exercises/exercise-dunemodule/README.md

@@ -31,19 +31,19 @@ The following command will configure your new module
 ./dune-common/bin/dunecontrol --opts=<opts file> --only=dumux-example all
 ```
 
-You need to run this command in the folder with content dumux, dumux-course, dune-common, dune-geometry, dune-grid, dune-istl, etc. `<opts file>` needs to be replaced (please replace the angle brackets also) by an options file, e.g. by `./dumux/cmake.opts`. Have a look at the comments in this file to see how you can adapt it to your needs.
+You need to run this command in the folder with content dumux, dumux-course, dune-common, dune-geometry, dune-grid, dune-istl, etc. `<opts file>` needs to be replaced (please replace the angle brackets also) by an options file, e.g., by `./dumux/cmake.opts`. Have a look at the comments in this file to see how you can adapt it to your needs.
 
 <hr><br><br>
 ### Task 3: Create a new test case within your new DuMuX module
 <hr>
 
-* Create a new folder (in your module folder), e.g. `appl`
+* Create a new folder (in your module folder), e.g., `appl`
 
 ```bash
 mkdir appl
 ```
 
-* Copy some test case from the dumux module, e.g. test_1p from test/porousmediumflow/1p/implicit/compressible/stationary
+* Copy some test case from the dumux module, e.g., test_1p from test/porousmediumflow/1p/implicit/compressible/stationary in your new folder (e.g., `appl`)
 * Copy the problem, spatialparams, cc source file, input file
 
 * Adjust the CMakeLists.txt file within the dumux-example (or your module name)-folder to include your new subdirectory
@@ -74,7 +74,7 @@ cmake build-cmake
 cd build-cmake
 make build_tests
 cd appl
-./test_1p_compressible_tpfa test_1p.input
+./test_1p_compressible_stationary_tpfa params.input
 ```
 
 <hr><br><br>

exercises/exercise-fluidsystem/exercise-fluidsystem.cc

@@ -63,7 +63,7 @@ int main(int argc, char** argv) try
     // define the type tag for this problem
     // TYPETAG is set in CMakeLists.txt as compile time definition
     // alternatively you could write `using TypeTag = Properties::TTag::ExerciseFluidsystemBoxTwoP;`
-    // then, for the 2p2c problem you have to change this line to `using TypeTag = Properties::TTag::ExerciseFluidsystemBoxTwoP;`
+    // then, for the 2p2c problem you have to change this line to `using TypeTag = Properties::TTag::ExerciseFluidsystemBoxTwoPTwoC;`
     // and recompile the executable
     using TypeTag = Properties::TTag::TYPETAG;
 

exercises/exercise-mainfile/exercise_1p_a.cc

@@ -105,7 +105,7 @@ int main(int argc, char** argv) try
     using IOFields = GetPropType<TypeTag, Properties::IOFields>;
     IOFields::initOutputModule(vtkWriter); //!< Add model specific output fields
     vtkWriter.write(0.0);
-
+    
     Dune::Timer timer;
 
     // TODO: dumux-course-task

exercises/exercise-properties/mylocalresidual.hh

@@ -53,7 +53,7 @@ class MyLocalResidual : public GetPropType<TypeTag, Properties::BaseLocalResidua
     using EnergyLocalResidual = GetPropType<TypeTag, Properties::EnergyLocalResidual>;
 
     using ModelTraits = GetPropType<TypeTag, Properties::ModelTraits>;
-    static constexpr int numPhases = ModelTraits::numPhases();
+    static constexpr int numPhases = ModelTraits::numFluidPhases();
     static constexpr int conti0EqIdx = ModelTraits::Indices::conti0EqIdx; //!< first index for the mass balance
 
 public:

exercises/solution/exercise-mainfile/exercise_1p_a_solution.cc

@@ -51,7 +51,7 @@ int main(int argc, char** argv) try
     using namespace Dumux;
 
     // define the type tag for this problem
-    using TypeTag = Properties::TTag::TYPETAG;
+    using TypeTag = Properties::TTag::OnePIncompressible;
 
     ////////////////////////////////////////////////////////////
     ////////////////////////////////////////////////////////////

scripts/test_dumux.sh

 # Compile and runs a simple
 # one-phase ground water flow example
 # and visualizes the result using paraview.
-cd dumux/build-cmake/test/porousmediumflow/1p/implicit
+cd dumux/build-cmake/test/porousmediumflow/1p/implicit/incompressible
 echo "Compiling a one-phase test using a cell-centered TPFA discretization (might take a while)..."
-make -B test_1pcctpfa
+make -B test_1p_incompressible_tpfa_anadiff
 echo "Running simulation..."
-./test_1pcctpfa test_1pfv.input -Grid.Cells "100 100"
+./test_1p_incompressible_tpfa_anadiff params.input -Grid.Cells "100 100"
 paraview *pvd