diff --git a/scripts/README.md b/scripts/README.md index 9bbb76c2848a7410c5aa9670ee56041797a46584..4a270c9f9d2658e90c353a72c4ed8a239cfadc71 100644 --- a/scripts/README.md +++ b/scripts/README.md @@ -31,7 +31,7 @@ and configure all modules with CMake This will clone the necessary repositories (in a subfolder `DUMUX`) and build all libaries. -Run the script `test_dumux.sh` in the newly created dumux folder +Run the script `test_dumux.sh` in the newly created `DUMUX` folder to test your installation of dumux. ```bash ./test_dumux.sh diff --git a/scripts/install.sh b/scripts/install.sh index c3048a3164a30bc06e9bc415ac449459a933690b..2ff22ae55831b50dabc470e5140151e24c9567e4 100644 --- a/scripts/install.sh +++ b/scripts/install.sh @@ -51,12 +51,12 @@ cd DUMUX # download the test script and the cmake.opts if [ ! -f "test_dumux.sh" ]; then - wget https://git.iws.uni-stuttgart.de/dumux-repositories/dumux-course/raw/releases/3.3/scripts/test_dumux.sh + wget https://git.iws.uni-stuttgart.de/dumux-repositories/dumux-course/raw/releases/3.4/scripts/test_dumux.sh fi chmod +x test_dumux.sh if [ ! -f "cmake.opts" ]; then - wget https://git.iws.uni-stuttgart.de/dumux-repositories/dumux-course/raw/releases/3.3/cmake.opts + wget https://git.iws.uni-stuttgart.de/dumux-repositories/dumux-course/raw/releases/3.4/cmake.opts fi if [ $? -ne 0 ]; then @@ -98,29 +98,29 @@ done # dune-subgrid if [ ! -d "dune-subgrid" ]; then - git clone -b releases/2.6-1 https://git.imp.fu-berlin.de/agnumpde/dune-subgrid.git + git clone -b releases/$DUNE_VERSION https://git.imp.fu-berlin.de/agnumpde/dune-subgrid.git else echo "Skip cloning dune-subgrid because the folder already exists." - git checkout releases/2.6-1 + git checkout releases/$DUNE_VERSION fi # dumux if [ ! -d "dumux" ]; then - git clone -b releases/3.3 https://git.iws.uni-stuttgart.de/dumux-repositories/dumux.git + git clone -b releases/3.4 https://git.iws.uni-stuttgart.de/dumux-repositories/dumux.git else echo "Skip cloning dumux because the folder already exists." cd dumux - git checkout releases/3.3 + git checkout releases/3.4 cd .. fi # dumux-course if [ ! -d "dumux-course" ]; then - git clone -b releases/3.3 https://git.iws.uni-stuttgart.de/dumux-repositories/dumux-course.git + git clone -b releases/3.4 https://git.iws.uni-stuttgart.de/dumux-repositories/dumux-course.git else echo "Skip cloning dumux-course because the folder already exists." cd dumux-course - git checkout releases/3.3 + git checkout releases/3.4 cd .. fi diff --git a/scripts/test_dumux.sh b/scripts/test_dumux.sh index 67e5b57b3df4e799af4b6b1846bf71c5a6a27416..5e47d4a747ac31b2acae48e938888d99e84f64eb 100755 --- a/scripts/test_dumux.sh +++ b/scripts/test_dumux.sh @@ -1,7 +1,7 @@ # 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/incompressible +cd dumux/build-cmake/test/porousmediumflow/1p/incompressible echo "Compiling a one-phase test using a cell-centered TPFA discretization (might take a while)..." make -B test_1p_incompressible_tpfa_anadiff echo "Running simulation..."