adapted Readme to new versions. fixed target names for system tests

README.md

@@ -85,19 +85,19 @@ Depending on your system configuration, there will be more packages necessary to
 | FFTW3 | | with MPI support
 | Python | 2.7 or 3.x |
 | pip | 2.7 or 3.x |
-| MPI | | Tested with OpenMPI and Mpich
+| MPI | | Tested with OpenMPI
 | SuperLU | 4.3 or 5.x |
 | VirtualEnv | | Install via `pip` |
-| [UG](https://gitlab.dune-project.org/ug/ug) | 3.12.1 | Follow the [IWR Installation Instructions](http://www.iwr.uni-heidelberg.de/frame/iwrwikiequipment/software/ug)
-| [dune-common](https://gitlab.dune-project.org/core/dune-common) | releases/2.4
-| [dune-geometry](https://gitlab.dune-project.org/core/dune-geometry) | releases/2.4
-| [dune-grid](https://gitlab.dune-project.org/core/dune-grid) | releases/2.4
-| [dune-istl](https://gitlab.dune-project.org/core/dune-istl) | releases/2.4
-| [dune-localfunctions](https://gitlab.dune-project.org/core/dune-localfunctions) | releases/2.4
-| [dune-typetree](https://gitlab.dune-project.org/pdelab/dune-typetree) | releases/2.4
-| [dune-pdelab](https://gitlab.dune-project.org/pdelab/dune-pdelab) | releases/2.4
-| [dune-python](https://gitlab.dune-project.org/quality/dune-python) | releases/2.4
-| [dune-testtools](https://gitlab.dune-project.org/quality/dune-testtools) | releases/2.4
+| [dune-common](https://gitlab.dune-project.org/core/dune-common) | releases/2.5
+| [dune-geometry](https://gitlab.dune-project.org/core/dune-geometry) | releases/2.5
+| [dune-grid](https://gitlab.dune-project.org/core/dune-grid) | releases/2.5
+| [dune-uggrid](https://gitlab.dune-project.org/staging/dune-uggrid) | releases/2.5
+| [dune-istl](https://gitlab.dune-project.org/core/dune-istl) | releases/2.5
+| [dune-localfunctions](https://gitlab.dune-project.org/core/dune-localfunctions) | releases/2.5
+| [dune-typetree](https://gitlab.dune-project.org/pdelab/dune-typetree) | master
+| [dune-pdelab](https://gitlab.dune-project.org/pdelab/dune-pdelab) | releases/2.5
+| [dune-python](https://gitlab.dune-project.org/quality/dune-python) | releases/2.5
+| [dune-testtools](https://gitlab.dune-project.org/quality/dune-testtools) | releases/2.5
 
 If you also want to build the documentation, you will additionally need to install Doxygen, Sphinx and Breathe.
 
@@ -145,23 +145,17 @@ These instructions are suitable for a clean **Ubuntu** or **Mac OS X** setup. Th
 
     to enfore the Homebrew'd GCC compiler. Note that this variable export only lasts for your current terminal session. Always make sure that the configuration tool actually finds GCC instead of the Apple Clang.
 
-3. Clone the specified version of UG into a suitable folder on your machine. Install it by calling
-
-        autoreconf -is
-        ./configure --enable-parallel --without-x --enable-dune --enable-system-heap
-        make && make install
-
-4. Clone the DUNE modules and DORiE into a suitable folder on your machine. Make sure that you check out the correct branches (2.4 release branch). Enter the parent folder, and call
+4. Clone the DUNE modules and DORiE into a suitable folder on your machine. Make sure that you check out the correct branches (see above). Enter the parent folder, and call
 
         MAKE_FLAGS="-j <N>" ./dune-common/bin/dunecontrol all
 
-    to build all DUNE modules in parallel on `N` processes. If you installed software into paths not appended to your `PATH` variable, you will have to add a custom options file to make sure that CMake finds all packages. See the [DUNE Installation Instructions](https://dune-project.org/doc/installation/) for details. CMake will throw an error if required packages are not found.
+    to build all DUNE modules in parallel on `N` processes. If you installed software into paths not appended to your `PATH` variable, you will have to add `CMAKE_FLAGS` to the call to make sure that CMake finds all packages. Alternatively, you can add a custom options file. See the [DUNE Installation Instructions](https://dune-project.org/doc/installation/) for details. CMake will throw an error if required packages are not found.
  
 5. To install all DUNE packages into system locations (so you can call `dunecontrol` and `dorie` from anywhere), you can run
 
         ./dune-common/bin/dunecontrol make install
 
-    This may require `sudo` rights on your machine. If you choose not to do this, make sure to append the location of `dunecontrol` (`dune-common/bin`) and `dorie` (`dorie/build-cmake/bin`) to your search path.
+    which may require `sudo` rights on your machine. This action is **optional and not required to run DORiE**. If you choose not to install DORiE, make sure to append the location of `dunecontrol` (`dune-common/bin`) and `dorie` (`dorie/build-cmake/bin`) to your search path.
 
 
 ## Recommended Third-Party Software

testing/CMakeLists.txt

@@ -17,17 +17,17 @@ dorie_add_system_test(dorie ode_higherorder.mini)
 dorie_add_system_test(dorie ode_evaporation.mini)
 dorie_add_system_test(dorie ode_linear_interpolator.mini)
 dorie_add_system_test(dorie muphi.mini)
-dorie_add_system_test_dependency(dorie_muphi dorie-pfg_muphi_pfg)
+dorie_add_system_test_dependency(dorie_muphi dorie-rfg_muphi_pfg)
 dorie_add_system_test(dorie reference_2d.mini)
 dorie_add_system_test(dorie reference_3d.mini)
 dorie_add_system_test(dorie reference_evaporation.mini)
 dorie_add_system_test(dorie reference_interpolators.mini)
 
 # dorie pfg
-dorie_add_system_test(dorie-pfg parfield.mini)
-dorie_add_system_test(dorie-pfg parfield_muphi.mini)
-dorie_add_system_test(dorie-pfg correlation.mini)
-dorie_add_system_test(dorie-pfg correlation_parallel.mini)
+dorie_add_system_test(dorie-rfg parfield.mini)
+dorie_add_system_test(dorie-rfg parfield_muphi.mini)
+dorie_add_system_test(dorie-rfg correlation.mini)
+dorie_add_system_test(dorie-rfg correlation_parallel.mini)
 
 # dorie plot
 dorie_add_system_test(dorie plot.mini)