From ae5498585d7d80c259fab0a9c4d823362c39a636 Mon Sep 17 00:00:00 2001
From: Beatrix Becker <beatrix.becker@iws.uni-stuttgart.de>
Date: Thu, 14 Feb 2019 11:06:27 +0000
Subject: [PATCH] Merge branch 'fix/fix-exercises' into 'master'
[exercise] fix small errors due to update to dumux 3.0
See merge request dumux-repositories/dumux-course!68
(cherry picked from commit 9c9d58f01430f1b194fbfa26666d62ff9e273931)
7879d195 [exercise] fix small errors due to update to dumux 3.0
eb7fb303 [scripts] update test script
e1420887 [exercises]clean up
---
exercises/exercise-basic/README.md | 2 +-
exercises/exercise-dunemodule/README.md | 8 ++++----
exercises/exercise-fluidsystem/exercise-fluidsystem.cc | 2 +-
exercises/exercise-mainfile/exercise_1p_a.cc | 2 +-
exercises/exercise-properties/mylocalresidual.hh | 2 +-
.../solution/exercise-mainfile/exercise_1p_a_solution.cc | 2 +-
scripts/test_dumux.sh | 6 +++---
7 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/exercises/exercise-basic/README.md b/exercises/exercise-basic/README.md
index ac7eaa57..750a957e 100644
--- a/exercises/exercise-basic/README.md
+++ b/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.
diff --git a/exercises/exercise-dunemodule/README.md b/exercises/exercise-dunemodule/README.md
index fb2f400f..e396be75 100644
--- a/exercises/exercise-dunemodule/README.md
+++ b/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>
diff --git a/exercises/exercise-fluidsystem/exercise-fluidsystem.cc b/exercises/exercise-fluidsystem/exercise-fluidsystem.cc
index 7241485c..197c3259 100644
--- a/exercises/exercise-fluidsystem/exercise-fluidsystem.cc
+++ b/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;
diff --git a/exercises/exercise-mainfile/exercise_1p_a.cc b/exercises/exercise-mainfile/exercise_1p_a.cc
index 0c624197..1c260a38 100644
--- a/exercises/exercise-mainfile/exercise_1p_a.cc
+++ b/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
diff --git a/exercises/exercise-properties/mylocalresidual.hh b/exercises/exercise-properties/mylocalresidual.hh
index f47698e5..f69e6b6a 100644
--- a/exercises/exercise-properties/mylocalresidual.hh
+++ b/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:
diff --git a/exercises/solution/exercise-mainfile/exercise_1p_a_solution.cc b/exercises/solution/exercise-mainfile/exercise_1p_a_solution.cc
index 55137bfd..93a65e39 100644
--- a/exercises/solution/exercise-mainfile/exercise_1p_a_solution.cc
+++ b/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;
////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////
diff --git a/scripts/test_dumux.sh b/scripts/test_dumux.sh
index cf77c3ed..67e5b57b 100755
--- a/scripts/test_dumux.sh
+++ b/scripts/test_dumux.sh
@@ -1,9 +1,9 @@
# 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
--
GitLab