diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f7cc6525ffa9c13ee995293a1b190ee768e2d137..b5fd8f065ed02998beff52ac5c854593523fa638 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -5,10 +5,10 @@
 ###############################################################################
 
 stages:
-   - test
-   - deploy
+- test
+- deploy
+
 
-   
 ###############################################################################
 ##                                                                           ##
 ##    Build templates                                                        ##
@@ -16,107 +16,107 @@ stages:
 ###############################################################################
 
 .build_template: &build_definition
-   script:
-      - export NUM_CORES=$(nproc --all)
-      - export MAX_BUILD_CORES=$(( $(awk '( $1 == "MemTotal:" ) { print $2 }' /proc/meminfo) / ( 4 * 1024 * 1024  ) ))
-      - "[[ $MAX_BUILD_CORES -lt $NUM_CORES ]] && export NUM_BUILD_CORES=$MAX_BUILD_CORES || export NUM_BUILD_CORES=$NUM_CORES"
-      - $CXX --version
-      - cmake --version
-      - ccache --version
-      - mpirun --version
-      - export CCACHE_BASEDIR=$CI_PROJECT_DIR
-      - mkdir $CI_PROJECT_DIR/build
-      - cd $CI_PROJECT_DIR/build
-      - if dpkg --compare-versions `ompi_info | head -2 | tail -1 | sed 's/[^0-9.]*\([0-9.]*\).*/\1/'` ge 1.10; then export MPIEXEC_PREFLAGS="--allow-run-as-root" ; fi
-      - cmake .. -DWALBERLA_BUFFER_DEBUG=$WALBERLA_BUFFER_DEBUG -DWALBERLA_BUILD_TESTS=ON -DWALBERLA_BUILD_BENCHMARKS=ON -DWALBERLA_BUILD_TUTORIALS=ON -DWALBERLA_BUILD_TOOLS=ON -DWALBERLA_BUILD_WITH_MPI=$WALBERLA_BUILD_WITH_MPI -DWALBERLA_BUILD_WITH_CUDA=$WALBERLA_BUILD_WITH_CUDA -DWALBERLA_BUILD_WITH_PYTHON=$WALBERLA_BUILD_WITH_PYTHON -DWALBERLA_BUILD_WITH_OPENMP=$WALBERLA_BUILD_WITH_OPENMP -DCMAKE_BUILD_TYPE=$CMAKE_BUILD_TYPE -DMPIEXEC_PREFLAGS=$MPIEXEC_PREFLAGS -DWALBERLA_DOUBLE_ACCURACY=$WALBERLA_DOUBLE_ACCURACY -DWARNING_ERROR=ON -DWALBERLA_BUILD_WITH_METIS=$WALBERLA_BUILD_WITH_METIS -DWALBERLA_BUILD_WITH_PARMETIS=$WALBERLA_BUILD_WITH_PARMETIS
-      - cmake . -LAH
-      - make -j $NUM_BUILD_CORES -l $NUM_CORES
-      - ctest -LE $CTEST_EXCLUDE_LABELS -C $CMAKE_BUILD_TYPE --output-on-failure -j $NUM_CORES
-   tags:
-      - docker
+  script:
+  - export NUM_CORES=$(nproc --all)
+  - export MAX_BUILD_CORES=$(( $(awk '( $1 == "MemTotal:" ) { print $2 }' /proc/meminfo) / ( 6 * 1024 * 1024  ) ))
+  - "[[ $MAX_BUILD_CORES -lt $NUM_CORES ]] && export NUM_BUILD_CORES=$MAX_BUILD_CORES || export NUM_BUILD_CORES=$NUM_CORES"
+  - $CXX --version
+  - cmake --version
+  - ccache --version
+  - mpirun --version
+  - export CCACHE_BASEDIR=$CI_PROJECT_DIR
+  - mkdir $CI_PROJECT_DIR/build
+  - cd $CI_PROJECT_DIR/build
+  - if dpkg --compare-versions `ompi_info | head -2 | tail -1 | sed 's/[^0-9.]*\([0-9.]*\).*/\1/'` ge 1.10; then export MPIEXEC_PREFLAGS="--allow-run-as-root" ; fi
+  - cmake .. -DWALBERLA_BUFFER_DEBUG=$WALBERLA_BUFFER_DEBUG -DWALBERLA_BUILD_TESTS=ON -DWALBERLA_BUILD_BENCHMARKS=ON -DWALBERLA_BUILD_TUTORIALS=ON -DWALBERLA_BUILD_TOOLS=ON -DWALBERLA_BUILD_WITH_MPI=$WALBERLA_BUILD_WITH_MPI -DWALBERLA_BUILD_WITH_CUDA=$WALBERLA_BUILD_WITH_CUDA -DWALBERLA_BUILD_WITH_PYTHON=$WALBERLA_BUILD_WITH_PYTHON -DWALBERLA_BUILD_WITH_OPENMP=$WALBERLA_BUILD_WITH_OPENMP -DCMAKE_BUILD_TYPE=$CMAKE_BUILD_TYPE -DMPIEXEC_PREFLAGS=$MPIEXEC_PREFLAGS -DWALBERLA_DOUBLE_ACCURACY=$WALBERLA_DOUBLE_ACCURACY -DWARNING_ERROR=ON -DWALBERLA_BUILD_WITH_METIS=$WALBERLA_BUILD_WITH_METIS -DWALBERLA_BUILD_WITH_PARMETIS=$WALBERLA_BUILD_WITH_PARMETIS -DWALBERLA_ENABLE_GUI=$WALBERLA_ENABLE_GUI
+  - cmake . -LAH
+  - make -j $NUM_BUILD_CORES -l $NUM_CORES
+  - ctest -LE $CTEST_EXCLUDE_LABELS -C $CMAKE_BUILD_TYPE --output-on-failure -j $NUM_CORES
+  tags:
+  - docker
 
 
 .variables: &build_serial_variables
-   CTEST_EXCLUDE_LABELS: "longrun"
-   WALBERLA_BUILD_WITH_MPI: "OFF"
-   WALBERLA_BUILD_WITH_OPENMP: "OFF"
-   CMAKE_BUILD_TYPE: "Release"
-   WALBERLA_BUFFER_DEBUG: "OFF"
-   WALBERLA_DOUBLE_ACCURACY: "ON"
-   WALBERLA_BUILD_WITH_METIS: "OFF"
-   WALBERLA_BUILD_WITH_PARMETIS: "OFF"
+  CTEST_EXCLUDE_LABELS: "longrun"
+  WALBERLA_BUILD_WITH_MPI: "OFF"
+  WALBERLA_BUILD_WITH_OPENMP: "OFF"
+  CMAKE_BUILD_TYPE: "Release"
+  WALBERLA_BUFFER_DEBUG: "OFF"
+  WALBERLA_DOUBLE_ACCURACY: "ON"
+  WALBERLA_BUILD_WITH_METIS: "OFF"
+  WALBERLA_BUILD_WITH_PARMETIS: "OFF"
 
 
 .variables: &build_mpionly_variables
-   CTEST_EXCLUDE_LABELS: "longrun"
-   WALBERLA_BUILD_WITH_MPI: "ON"
-   WALBERLA_BUILD_WITH_OPENMP: "OFF"
-   CMAKE_BUILD_TYPE: "Release"
-   WALBERLA_BUFFER_DEBUG: "OFF"
-   WALBERLA_DOUBLE_ACCURACY: "ON"
-   WALBERLA_BUILD_WITH_METIS: "OFF"
-   WALBERLA_BUILD_WITH_PARMETIS: "OFF"
+  CTEST_EXCLUDE_LABELS: "longrun"
+  WALBERLA_BUILD_WITH_MPI: "ON"
+  WALBERLA_BUILD_WITH_OPENMP: "OFF"
+  CMAKE_BUILD_TYPE: "Release"
+  WALBERLA_BUFFER_DEBUG: "OFF"
+  WALBERLA_DOUBLE_ACCURACY: "ON"
+  WALBERLA_BUILD_WITH_METIS: "OFF"
+  WALBERLA_BUILD_WITH_PARMETIS: "OFF"
 
 
 .variables: &build_hybrid_variables
-   CTEST_EXCLUDE_LABELS: "longrun"
-   WALBERLA_BUILD_WITH_MPI: "ON"
-   WALBERLA_BUILD_WITH_OPENMP: "ON"
-   OMP_NUM_THREADS: "4"
-   OMP_WAIT_POLICY: "PASSIVE"
-   CMAKE_BUILD_TYPE: "Release"
-   WALBERLA_BUFFER_DEBUG: "OFF"
-   WALBERLA_DOUBLE_ACCURACY: "ON"
-   WALBERLA_BUILD_WITH_METIS: "ON"
-   WALBERLA_BUILD_WITH_PARMETIS: "ON"
+  CTEST_EXCLUDE_LABELS: "longrun"
+  WALBERLA_BUILD_WITH_MPI: "ON"
+  WALBERLA_BUILD_WITH_OPENMP: "ON"
+  OMP_NUM_THREADS: "4"
+  OMP_WAIT_POLICY: "PASSIVE"
+  CMAKE_BUILD_TYPE: "Release"
+  WALBERLA_BUFFER_DEBUG: "OFF"
+  WALBERLA_DOUBLE_ACCURACY: "ON"
+  WALBERLA_BUILD_WITH_METIS: "ON"
+  WALBERLA_BUILD_WITH_PARMETIS: "ON"
 
 
 .variables: &build_serial_dbg_variables
-   CTEST_EXCLUDE_LABELS: "longrun"
-   WALBERLA_BUILD_WITH_MPI: "OFF"
-   WALBERLA_BUILD_WITH_OPENMP: "OFF"
-   CMAKE_BUILD_TYPE: "DebugOptimized"
-   WALBERLA_BUFFER_DEBUG: "OFF"
-   WALBERLA_DOUBLE_ACCURACY: "ON"
-   WALBERLA_BUILD_WITH_METIS: "OFF"
-   WALBERLA_BUILD_WITH_PARMETIS: "OFF"
+  CTEST_EXCLUDE_LABELS: "longrun"
+  WALBERLA_BUILD_WITH_MPI: "OFF"
+  WALBERLA_BUILD_WITH_OPENMP: "OFF"
+  CMAKE_BUILD_TYPE: "DebugOptimized"
+  WALBERLA_BUFFER_DEBUG: "OFF"
+  WALBERLA_DOUBLE_ACCURACY: "ON"
+  WALBERLA_BUILD_WITH_METIS: "OFF"
+  WALBERLA_BUILD_WITH_PARMETIS: "OFF"
 
 
 .variables: &build_mpionly_dbg_variables
-   CTEST_EXCLUDE_LABELS: "longrun"
-   WALBERLA_BUILD_WITH_MPI: "ON"
-   WALBERLA_BUILD_WITH_OPENMP: "OFF"
-   CMAKE_BUILD_TYPE: "DebugOptimized"
-   WALBERLA_BUFFER_DEBUG: "OFF"
-   WALBERLA_DOUBLE_ACCURACY: "ON"
-   WALBERLA_BUILD_WITH_METIS: "OFF"
-   WALBERLA_BUILD_WITH_PARMETIS: "OFF"
+  CTEST_EXCLUDE_LABELS: "longrun"
+  WALBERLA_BUILD_WITH_MPI: "ON"
+  WALBERLA_BUILD_WITH_OPENMP: "OFF"
+  CMAKE_BUILD_TYPE: "DebugOptimized"
+  WALBERLA_BUFFER_DEBUG: "OFF"
+  WALBERLA_DOUBLE_ACCURACY: "ON"
+  WALBERLA_BUILD_WITH_METIS: "OFF"
+  WALBERLA_BUILD_WITH_PARMETIS: "OFF"
 
 
 .variables: &build_hybrid_dbg_variables
-   CTEST_EXCLUDE_LABELS: "longrun"
-   WALBERLA_BUILD_WITH_MPI: "ON"
-   WALBERLA_BUILD_WITH_OPENMP: "ON"
-   OMP_NUM_THREADS: "4"
-   OMP_WAIT_POLICY: "PASSIVE"
-   CMAKE_BUILD_TYPE: "DebugOptimized"
-   WALBERLA_BUFFER_DEBUG: "OFF"
-   WALBERLA_DOUBLE_ACCURACY: "ON"
-   WALBERLA_BUILD_WITH_METIS: "ON"
-   WALBERLA_BUILD_WITH_PARMETIS: "ON"
+  CTEST_EXCLUDE_LABELS: "longrun"
+  WALBERLA_BUILD_WITH_MPI: "ON"
+  WALBERLA_BUILD_WITH_OPENMP: "ON"
+  OMP_NUM_THREADS: "4"
+  OMP_WAIT_POLICY: "PASSIVE"
+  CMAKE_BUILD_TYPE: "DebugOptimized"
+  WALBERLA_BUFFER_DEBUG: "OFF"
+  WALBERLA_DOUBLE_ACCURACY: "ON"
+  WALBERLA_BUILD_WITH_METIS: "ON"
+  WALBERLA_BUILD_WITH_PARMETIS: "ON"
 
 
 .variables: &build_hybrid_dbg_sp_variables
-   CTEST_EXCLUDE_LABELS: "longrun"
-   WALBERLA_BUILD_WITH_MPI: "ON"
-   WALBERLA_BUILD_WITH_OPENMP: "ON"
-   OMP_NUM_THREADS: "4"
-   OMP_WAIT_POLICY: "PASSIVE"
-   CMAKE_BUILD_TYPE: "DebugOptimized"
-   WALBERLA_BUFFER_DEBUG: "OFF"
-   WALBERLA_DOUBLE_ACCURACY: "OFF"
-   WALBERLA_BUILD_WITH_METIS: "OFF"
-   WALBERLA_BUILD_WITH_PARMETIS: "OFF"
+  CTEST_EXCLUDE_LABELS: "longrun"
+  WALBERLA_BUILD_WITH_MPI: "ON"
+  WALBERLA_BUILD_WITH_OPENMP: "ON"
+  OMP_NUM_THREADS: "4"
+  OMP_WAIT_POLICY: "PASSIVE"
+  CMAKE_BUILD_TYPE: "DebugOptimized"
+  WALBERLA_BUFFER_DEBUG: "OFF"
+  WALBERLA_DOUBLE_ACCURACY: "OFF"
+  WALBERLA_BUILD_WITH_METIS: "OFF"
+  WALBERLA_BUILD_WITH_PARMETIS: "OFF"
 
 
 ###############################################################################
@@ -128,1249 +128,1349 @@ stages:
 
 
 intel_16_serial:
-   <<: *build_definition
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/intel:16
-   variables:
-      <<: *build_serial_variables
-      WALBERLA_BUILD_WITH_CUDA: "ON"
-   only:
-      variables:
-         - $ENABLE_NIGHTLY_BUILDS
-   tags:
-      - cuda
-      - docker
-      - intel
+  <<: *build_definition
+  image: i10git.cs.fau.de:5005/walberla/buildenvs/intel:16
+  variables:
+    <<: *build_serial_variables
+    WALBERLA_BUILD_WITH_CUDA: "OFF"
+    WALBERLA_ENABLE_GUI: 0
+  only:
+    variables:
+    - $ENABLE_NIGHTLY_BUILDS
+  tags:
+  - docker
+  - intel
 
 intel_16_mpionly:
-   <<: *build_definition
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/intel:16
-   variables:
-      <<: *build_mpionly_variables
-      WALBERLA_BUILD_WITH_CUDA: "ON"
-   only:
-      variables:
-         - $ENABLE_NIGHTLY_BUILDS
-   tags:
-      - cuda
-      - docker
-      - intel
+  <<: *build_definition
+  image: i10git.cs.fau.de:5005/walberla/buildenvs/intel:16
+  variables:
+    <<: *build_mpionly_variables
+    WALBERLA_BUILD_WITH_CUDA: "OFF"
+    WALBERLA_ENABLE_GUI: 0
+  only:
+    variables:
+    - $ENABLE_NIGHTLY_BUILDS
+  tags:
+  - docker
+  - intel
 
 intel_16_hybrid:
-   <<: *build_definition
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/intel:16
-   variables:
-      <<: *build_hybrid_variables
-      WALBERLA_BUILD_WITH_CUDA: "ON"
-   only:
-      variables:
-         - $ENABLE_NIGHTLY_BUILDS
-   tags:
-      - cuda
-      - docker
-      - intel
+  <<: *build_definition
+  image: i10git.cs.fau.de:5005/walberla/buildenvs/intel:16
+  variables:
+    <<: *build_hybrid_variables
+    WALBERLA_BUILD_WITH_CUDA: "OFF"
+    WALBERLA_ENABLE_GUI: 0
+  only:
+    variables:
+    - $ENABLE_NIGHTLY_BUILDS
+  tags:
+  - docker
+  - intel
 
 intel_16_serial_dbg:
-   <<: *build_definition
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/intel:16
-   variables:
-      <<: *build_serial_dbg_variables
-      WALBERLA_BUILD_WITH_CUDA: "ON"
-   only:
-      variables:
-         - $ENABLE_NIGHTLY_BUILDS
-   tags:
-      - cuda
-      - docker
-      - intel
+  <<: *build_definition
+  image: i10git.cs.fau.de:5005/walberla/buildenvs/intel:16
+  variables:
+    <<: *build_serial_dbg_variables
+    WALBERLA_BUILD_WITH_CUDA: "OFF"
+    WALBERLA_ENABLE_GUI: 0
+  only:
+    variables:
+    - $ENABLE_NIGHTLY_BUILDS
+  tags:
+  - docker
+  - intel
 
 intel_16_mpionly_dbg:
-   <<: *build_definition
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/intel:16
-   variables:
-      <<: *build_mpionly_dbg_variables
-      WALBERLA_BUILD_WITH_CUDA: "ON"
-   only:
-      variables:
-         - $ENABLE_NIGHTLY_BUILDS
-   tags:
-      - cuda
-      - docker
-      - intel
+  <<: *build_definition
+  image: i10git.cs.fau.de:5005/walberla/buildenvs/intel:16
+  variables:
+    <<: *build_mpionly_dbg_variables
+    WALBERLA_BUILD_WITH_CUDA: "OFF"
+    WALBERLA_ENABLE_GUI: 0
+  only:
+    variables:
+    - $ENABLE_NIGHTLY_BUILDS
+  tags:
+  - docker
+  - intel
 
 intel_16_hybrid_dbg:
-   <<: *build_definition
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/intel:16
-   variables:
-      <<: *build_hybrid_dbg_variables
-      WALBERLA_BUILD_WITH_CUDA: "ON"
-   except:
-      variables:
-         - $DISABLE_PER_COMMIT_BUILDS
-   tags:
-      - cuda
-      - docker
-      - intel
+  <<: *build_definition
+  image: i10git.cs.fau.de:5005/walberla/buildenvs/intel:16
+  variables:
+    <<: *build_hybrid_dbg_variables
+    WALBERLA_BUILD_WITH_CUDA: "OFF"
+    WALBERLA_ENABLE_GUI: 0
+  except:
+    variables:
+    - $DISABLE_PER_COMMIT_BUILDS
+  tags:
+  - docker
+  - intel
 
 intel_16_hybrid_dbg_sp:
-   <<: *build_definition
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/intel:16
-   variables:
-      <<: *build_hybrid_dbg_sp_variables
-      WALBERLA_BUILD_WITH_CUDA: "ON"
-   only:
-      variables:
-         - $ENABLE_NIGHTLY_BUILDS
-   tags:
-      - cuda
-      - docker
-      - intel
+  <<: *build_definition
+  image: i10git.cs.fau.de:5005/walberla/buildenvs/intel:16
+  variables:
+    <<: *build_hybrid_dbg_sp_variables
+    WALBERLA_BUILD_WITH_CUDA: "OFF"
+    WALBERLA_ENABLE_GUI: 0
+  only:
+    variables:
+    - $ENABLE_NIGHTLY_BUILDS
+  tags:
+  - docker
+  - intel
 
 intel_17_serial:
-   <<: *build_definition
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/intel:17
-   variables:
-      <<: *build_serial_variables
-      WALBERLA_BUILD_WITH_CUDA: "OFF"
-   only:
-      variables:
-         - $ENABLE_NIGHTLY_BUILDS
-   tags:
-      - docker
-      - intel
+  <<: *build_definition
+  image: i10git.cs.fau.de:5005/walberla/buildenvs/intel:17
+  variables:
+    <<: *build_serial_variables
+    WALBERLA_BUILD_WITH_CUDA: "OFF"
+    WALBERLA_ENABLE_GUI: 0
+  only:
+    variables:
+    - $ENABLE_NIGHTLY_BUILDS
+  tags:
+  - docker
+  - intel
 
 intel_17_mpionly:
-   <<: *build_definition
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/intel:17
-   variables:
-      <<: *build_mpionly_variables
-      WALBERLA_BUILD_WITH_CUDA: "OFF"
-   only:
-      variables:
-         - $ENABLE_NIGHTLY_BUILDS
-   tags:
-      - docker
-      - intel
+  <<: *build_definition
+  image: i10git.cs.fau.de:5005/walberla/buildenvs/intel:17
+  variables:
+    <<: *build_mpionly_variables
+    WALBERLA_BUILD_WITH_CUDA: "OFF"
+    WALBERLA_ENABLE_GUI: 0
+  only:
+    variables:
+    - $ENABLE_NIGHTLY_BUILDS
+  tags:
+  - docker
+  - intel
 
 intel_17_hybrid:
-   <<: *build_definition
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/intel:17
-   variables:
-      <<: *build_hybrid_variables
-      WALBERLA_BUILD_WITH_CUDA: "OFF"
-   except:
-      variables:
-         - $DISABLE_PER_COMMIT_BUILDS
-   tags:
-      - docker
-      - intel
+  <<: *build_definition
+  image: i10git.cs.fau.de:5005/walberla/buildenvs/intel:17
+  variables:
+    <<: *build_hybrid_variables
+    WALBERLA_BUILD_WITH_CUDA: "OFF"
+    WALBERLA_ENABLE_GUI: 0
+  only:
+    variables:
+    - $ENABLE_NIGHTLY_BUILDS
+  tags:
+  - docker
+  - intel
 
 intel_17_serial_dbg:
-   <<: *build_definition
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/intel:17
-   variables:
-      <<: *build_serial_dbg_variables
-      WALBERLA_BUILD_WITH_CUDA: "OFF"
-   except:
-      variables:
-         - $DISABLE_PER_COMMIT_BUILDS
-   tags:
-      - docker
-      - intel
+  <<: *build_definition
+  image: i10git.cs.fau.de:5005/walberla/buildenvs/intel:17
+  variables:
+    <<: *build_serial_dbg_variables
+    WALBERLA_BUILD_WITH_CUDA: "OFF"
+    WALBERLA_ENABLE_GUI: 0
+  only:
+    variables:
+    - $ENABLE_NIGHTLY_BUILDS
+  tags:
+  - docker
+  - intel
 
 intel_17_mpionly_dbg:
-   <<: *build_definition
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/intel:17
-   variables:
-      <<: *build_mpionly_dbg_variables
-      WALBERLA_BUILD_WITH_CUDA: "OFF"
-   only:
-      variables:
-         - $ENABLE_NIGHTLY_BUILDS
-   tags:
-      - docker
-      - intel
+  <<: *build_definition
+  image: i10git.cs.fau.de:5005/walberla/buildenvs/intel:17
+  variables:
+    <<: *build_mpionly_dbg_variables
+    WALBERLA_BUILD_WITH_CUDA: "OFF"
+    WALBERLA_ENABLE_GUI: 0
+  only:
+    variables:
+    - $ENABLE_NIGHTLY_BUILDS
+  tags:
+  - docker
+  - intel
 
 intel_17_hybrid_dbg:
-   <<: *build_definition
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/intel:17
-   variables:
-      <<: *build_hybrid_dbg_variables
-      WALBERLA_BUILD_WITH_CUDA: "OFF"
-   only:
-      variables:
-         - $ENABLE_NIGHTLY_BUILDS
-   tags:
-      - docker
-      - intel
+  <<: *build_definition
+  image: i10git.cs.fau.de:5005/walberla/buildenvs/intel:17
+  variables:
+    <<: *build_hybrid_dbg_variables
+    WALBERLA_BUILD_WITH_CUDA: "OFF"
+    WALBERLA_ENABLE_GUI: 0
+  only:
+    variables:
+    - $ENABLE_NIGHTLY_BUILDS
+  tags:
+  - docker
+  - intel
 
 intel_17_hybrid_dbg_sp:
-   <<: *build_definition
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/intel:17
-   variables:
-      <<: *build_hybrid_dbg_sp_variables
-      WALBERLA_BUILD_WITH_CUDA: "OFF"
-   only:
-      variables:
-         - $ENABLE_NIGHTLY_BUILDS
-   tags:
-      - docker
-      - intel
+  <<: *build_definition
+  image: i10git.cs.fau.de:5005/walberla/buildenvs/intel:17
+  variables:
+    <<: *build_hybrid_dbg_sp_variables
+    WALBERLA_BUILD_WITH_CUDA: "OFF"
+    WALBERLA_ENABLE_GUI: 0
+  only:
+    variables:
+    - $ENABLE_NIGHTLY_BUILDS
+  tags:
+  - docker
+  - intel
 
 intel_18_serial:
-   <<: *build_definition
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/intel:18
-   variables:
-      <<: *build_serial_variables
-      WALBERLA_BUILD_WITH_CUDA: "OFF"
-   only:
-      variables:
-         - $ENABLE_NIGHTLY_BUILDS
-   tags:
-      - docker
-      - intel
+  <<: *build_definition
+  image: i10git.cs.fau.de:5005/walberla/buildenvs/intel:18
+  variables:
+    <<: *build_serial_variables
+    WALBERLA_BUILD_WITH_CUDA: "ON"
+    WALBERLA_ENABLE_GUI: 0
+  only:
+    variables:
+    - $ENABLE_NIGHTLY_BUILDS
+  tags:
+  - cuda
+  - docker
+  - intel
 
 intel_18_mpionly:
-   <<: *build_definition
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/intel:18
-   variables:
-      <<: *build_mpionly_variables
-      WALBERLA_BUILD_WITH_CUDA: "OFF"
-   only:
-      variables:
-         - $ENABLE_NIGHTLY_BUILDS
-   tags:
-      - docker
-      - intel
+  <<: *build_definition
+  image: i10git.cs.fau.de:5005/walberla/buildenvs/intel:18
+  variables:
+    <<: *build_mpionly_variables
+    WALBERLA_BUILD_WITH_CUDA: "ON"
+    WALBERLA_ENABLE_GUI: 0
+  only:
+    variables:
+    - $ENABLE_NIGHTLY_BUILDS
+  tags:
+  - cuda
+  - docker
+  - intel
 
 intel_18_hybrid:
-   <<: *build_definition
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/intel:18
-   variables:
-      <<: *build_hybrid_variables
-      WALBERLA_BUILD_WITH_CUDA: "OFF"
-   only:
-      variables:
-         - $ENABLE_NIGHTLY_BUILDS
-   tags:
-      - docker
-      - intel
+  <<: *build_definition
+  image: i10git.cs.fau.de:5005/walberla/buildenvs/intel:18
+  variables:
+    <<: *build_hybrid_variables
+    WALBERLA_BUILD_WITH_CUDA: "ON"
+    WALBERLA_ENABLE_GUI: 1
+  except:
+    variables:
+    - $DISABLE_PER_COMMIT_BUILDS
+  tags:
+  - cuda
+  - docker
+  - intel
 
 intel_18_serial_dbg:
-   <<: *build_definition
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/intel:18
-   variables:
-      <<: *build_serial_dbg_variables
-      WALBERLA_BUILD_WITH_CUDA: "OFF"
-   only:
-      variables:
-         - $ENABLE_NIGHTLY_BUILDS
-   tags:
-      - docker
-      - intel
+  <<: *build_definition
+  image: i10git.cs.fau.de:5005/walberla/buildenvs/intel:18
+  variables:
+    <<: *build_serial_dbg_variables
+    WALBERLA_BUILD_WITH_CUDA: "ON"
+    WALBERLA_ENABLE_GUI: 0
+  except:
+    variables:
+    - $DISABLE_PER_COMMIT_BUILDS
+  tags:
+  - cuda
+  - docker
+  - intel
 
 intel_18_mpionly_dbg:
-   <<: *build_definition
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/intel:18
-   variables:
-      <<: *build_mpionly_dbg_variables
-      WALBERLA_BUILD_WITH_CUDA: "OFF"
-   only:
-      variables:
-         - $ENABLE_NIGHTLY_BUILDS
-   tags:
-      - docker
-      - intel
+  <<: *build_definition
+  image: i10git.cs.fau.de:5005/walberla/buildenvs/intel:18
+  variables:
+    <<: *build_mpionly_dbg_variables
+    WALBERLA_BUILD_WITH_CUDA: "ON"
+    WALBERLA_ENABLE_GUI: 0
+  only:
+    variables:
+    - $ENABLE_NIGHTLY_BUILDS
+  tags:
+  - cuda
+  - docker
+  - intel
 
 intel_18_hybrid_dbg:
-   <<: *build_definition
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/intel:18
-   variables:
-      <<: *build_hybrid_dbg_variables
-      WALBERLA_BUILD_WITH_CUDA: "OFF"
-   only:
-      variables:
-         - $ENABLE_NIGHTLY_BUILDS
-   tags:
-      - docker
-      - intel
+  <<: *build_definition
+  image: i10git.cs.fau.de:5005/walberla/buildenvs/intel:18
+  variables:
+    <<: *build_hybrid_dbg_variables
+    WALBERLA_BUILD_WITH_CUDA: "ON"
+    WALBERLA_ENABLE_GUI: 0
+  only:
+    variables:
+    - $ENABLE_NIGHTLY_BUILDS
+  tags:
+  - cuda
+  - docker
+  - intel
 
 intel_18_hybrid_dbg_sp:
-   <<: *build_definition
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/intel:18
-   variables:
-      <<: *build_hybrid_dbg_sp_variables
-      WALBERLA_BUILD_WITH_CUDA: "OFF"
-   only:
-      variables:
-         - $ENABLE_NIGHTLY_BUILDS
-   tags:
-      - docker
-      - intel
+  <<: *build_definition
+  image: i10git.cs.fau.de:5005/walberla/buildenvs/intel:18
+  variables:
+    <<: *build_hybrid_dbg_sp_variables
+    WALBERLA_BUILD_WITH_CUDA: "ON"
+    WALBERLA_ENABLE_GUI: 0
+  only:
+    variables:
+    - $ENABLE_NIGHTLY_BUILDS
+  tags:
+  - cuda
+  - docker
+  - intel
 
 intel_19_serial:
-   <<: *build_definition
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/intel:19
-   variables:
-      <<: *build_serial_variables
-      WALBERLA_BUILD_WITH_CUDA: "OFF"
-   only:
-      variables:
-         - $ENABLE_NIGHTLY_BUILDS
-   tags:
-      - docker
-      - intel
+  <<: *build_definition
+  image: i10git.cs.fau.de:5005/walberla/buildenvs/intel:19
+  variables:
+    <<: *build_serial_variables
+    WALBERLA_BUILD_WITH_CUDA: "OFF"
+    WALBERLA_ENABLE_GUI: 0
+  only:
+    variables:
+    - $ENABLE_NIGHTLY_BUILDS
+  tags:
+  - docker
+  - intel
 
 intel_19_mpionly:
-   <<: *build_definition
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/intel:19
-   variables:
-      <<: *build_mpionly_variables
-      WALBERLA_BUILD_WITH_CUDA: "OFF"
-   only:
-      variables:
-         - $ENABLE_NIGHTLY_BUILDS
-   tags:
-      - docker
-      - intel
+  <<: *build_definition
+  image: i10git.cs.fau.de:5005/walberla/buildenvs/intel:19
+  variables:
+    <<: *build_mpionly_variables
+    WALBERLA_BUILD_WITH_CUDA: "OFF"
+    WALBERLA_ENABLE_GUI: 0
+  only:
+    variables:
+    - $ENABLE_NIGHTLY_BUILDS
+  tags:
+  - docker
+  - intel
 
 intel_19_hybrid:
-   <<: *build_definition
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/intel:19
-   variables:
-      <<: *build_hybrid_variables
-      WALBERLA_BUILD_WITH_CUDA: "OFF"
-   except:
-      variables:
-         - $DISABLE_PER_COMMIT_BUILDS
-   tags:
-      - docker
-      - intel
+  <<: *build_definition
+  image: i10git.cs.fau.de:5005/walberla/buildenvs/intel:19
+  variables:
+    <<: *build_hybrid_variables
+    WALBERLA_BUILD_WITH_CUDA: "OFF"
+    WALBERLA_ENABLE_GUI: 0
+  except:
+    variables:
+    - $DISABLE_PER_COMMIT_BUILDS
+  tags:
+  - docker
+  - intel
 
 intel_19_serial_dbg:
-   <<: *build_definition
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/intel:19
-   variables:
-      <<: *build_serial_dbg_variables
-      WALBERLA_BUILD_WITH_CUDA: "OFF"
-   except:
-      variables:
-         - $DISABLE_PER_COMMIT_BUILDS
-   tags:
-      - docker
-      - intel
+  <<: *build_definition
+  image: i10git.cs.fau.de:5005/walberla/buildenvs/intel:19
+  variables:
+    <<: *build_serial_dbg_variables
+    WALBERLA_BUILD_WITH_CUDA: "OFF"
+    WALBERLA_ENABLE_GUI: 0
+  except:
+    variables:
+    - $DISABLE_PER_COMMIT_BUILDS
+  tags:
+  - docker
+  - intel
 
 intel_19_mpionly_dbg:
-   <<: *build_definition
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/intel:19
-   variables:
-      <<: *build_mpionly_dbg_variables
-      WALBERLA_BUILD_WITH_CUDA: "OFF"
-   except:
-      variables:
-         - $DISABLE_PER_COMMIT_BUILDS
-   tags:
-      - docker
-      - intel
+  <<: *build_definition
+  image: i10git.cs.fau.de:5005/walberla/buildenvs/intel:19
+  variables:
+    <<: *build_mpionly_dbg_variables
+    WALBERLA_BUILD_WITH_CUDA: "OFF"
+    WALBERLA_ENABLE_GUI: 0
+  except:
+    variables:
+    - $DISABLE_PER_COMMIT_BUILDS
+  tags:
+  - docker
+  - intel
 
 intel_19_hybrid_dbg:
-   <<: *build_definition
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/intel:19
-   variables:
-      <<: *build_hybrid_dbg_variables
-      WALBERLA_BUILD_WITH_CUDA: "OFF"
-   except:
-      variables:
-         - $DISABLE_PER_COMMIT_BUILDS
-   tags:
-      - docker
-      - intel
+  <<: *build_definition
+  image: i10git.cs.fau.de:5005/walberla/buildenvs/intel:19
+  variables:
+    <<: *build_hybrid_dbg_variables
+    WALBERLA_BUILD_WITH_CUDA: "OFF"
+    WALBERLA_ENABLE_GUI: 0
+  except:
+    variables:
+    - $DISABLE_PER_COMMIT_BUILDS
+  tags:
+  - docker
+  - intel
 
 intel_19_hybrid_dbg_sp:
-   <<: *build_definition
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/intel:19
-   variables:
-      <<: *build_hybrid_dbg_sp_variables
-      WALBERLA_BUILD_WITH_CUDA: "OFF"
-   except:
-      variables:
-         - $DISABLE_PER_COMMIT_BUILDS
-   tags:
-      - docker
-      - intel
+  <<: *build_definition
+  image: i10git.cs.fau.de:5005/walberla/buildenvs/intel:19
+  variables:
+    <<: *build_hybrid_dbg_sp_variables
+    WALBERLA_BUILD_WITH_CUDA: "OFF"
+    WALBERLA_ENABLE_GUI: 0
+  except:
+    variables:
+    - $DISABLE_PER_COMMIT_BUILDS
+  tags:
+  - docker
+  - intel
 
 gcc_5_serial:
-   <<: *build_definition
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc:5
-   variables:
-      <<: *build_serial_variables
-      WALBERLA_BUILD_WITH_CUDA: "ON"
-   only:
-      variables:
-         - $ENABLE_NIGHTLY_BUILDS
-   tags:
-      - cuda
-      - docker
+  <<: *build_definition
+  image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc:5
+  variables:
+    <<: *build_serial_variables
+    WALBERLA_BUILD_WITH_CUDA: "ON"
+    WALBERLA_ENABLE_GUI: 0
+  only:
+    variables:
+    - $ENABLE_NIGHTLY_BUILDS
+  tags:
+  - cuda
+  - docker
 
 gcc_5_mpionly:
-   <<: *build_definition
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc:5
-   variables:
-      <<: *build_mpionly_variables
-      WALBERLA_BUILD_WITH_CUDA: "ON"
-   only:
-      variables:
-         - $ENABLE_NIGHTLY_BUILDS
-   tags:
-      - cuda
-      - docker
+  <<: *build_definition
+  image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc:5
+  variables:
+    <<: *build_mpionly_variables
+    WALBERLA_BUILD_WITH_CUDA: "ON"
+    WALBERLA_ENABLE_GUI: 0
+  only:
+    variables:
+    - $ENABLE_NIGHTLY_BUILDS
+  tags:
+  - cuda
+  - docker
 
 gcc_5_hybrid:
-   <<: *build_definition
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc:5
-   variables:
-      <<: *build_hybrid_variables
-      WALBERLA_BUILD_WITH_CUDA: "ON"
-   except:
-      variables:
-         - $DISABLE_PER_COMMIT_BUILDS
-   tags:
-      - cuda
-      - docker
+  <<: *build_definition
+  image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc:5
+  variables:
+    <<: *build_hybrid_variables
+    WALBERLA_BUILD_WITH_CUDA: "ON"
+    WALBERLA_ENABLE_GUI: 0
+  only:
+    variables:
+    - $ENABLE_NIGHTLY_BUILDS
+  tags:
+  - cuda
+  - docker
 
 gcc_5_serial_dbg:
-   <<: *build_definition
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc:5
-   variables:
-      <<: *build_serial_dbg_variables
-      WALBERLA_BUILD_WITH_CUDA: "ON"
-   except:
-      variables:
-         - $DISABLE_PER_COMMIT_BUILDS
-   tags:
-      - cuda
-      - docker
+  <<: *build_definition
+  image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc:5
+  variables:
+    <<: *build_serial_dbg_variables
+    WALBERLA_BUILD_WITH_CUDA: "ON"
+    WALBERLA_ENABLE_GUI: 0
+  only:
+    variables:
+    - $ENABLE_NIGHTLY_BUILDS
+  tags:
+  - cuda
+  - docker
 
 gcc_5_mpionly_dbg:
-   <<: *build_definition
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc:5
-   variables:
-      <<: *build_mpionly_dbg_variables
-      WALBERLA_BUILD_WITH_CUDA: "ON"
-   only:
-      variables:
-         - $ENABLE_NIGHTLY_BUILDS
-   tags:
-      - cuda
-      - docker
+  <<: *build_definition
+  image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc:5
+  variables:
+    <<: *build_mpionly_dbg_variables
+    WALBERLA_BUILD_WITH_CUDA: "ON"
+    WALBERLA_ENABLE_GUI: 0
+  only:
+    variables:
+    - $ENABLE_NIGHTLY_BUILDS
+  tags:
+  - cuda
+  - docker
 
 gcc_5_hybrid_dbg:
-   <<: *build_definition
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc:5
-   variables:
-      <<: *build_hybrid_dbg_variables
-      WALBERLA_BUILD_WITH_CUDA: "ON"
-   except:
-      variables:
-         - $DISABLE_PER_COMMIT_BUILDS
-   tags:
-      - cuda
-      - docker
+  <<: *build_definition
+  image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc:5
+  variables:
+    <<: *build_hybrid_dbg_variables
+    WALBERLA_BUILD_WITH_CUDA: "ON"
+    WALBERLA_ENABLE_GUI: 0
+  except:
+    variables:
+    - $DISABLE_PER_COMMIT_BUILDS
+  tags:
+  - cuda
+  - docker
 
 gcc_5_hybrid_dbg_sp:
-   <<: *build_definition
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc:5
-   variables:
-      <<: *build_hybrid_dbg_sp_variables
-      WALBERLA_BUILD_WITH_CUDA: "ON"
-   only:
-      variables:
-         - $ENABLE_NIGHTLY_BUILDS
-   tags:
-      - cuda
-      - docker
+  <<: *build_definition
+  image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc:5
+  variables:
+    <<: *build_hybrid_dbg_sp_variables
+    WALBERLA_BUILD_WITH_CUDA: "ON"
+    WALBERLA_ENABLE_GUI: 0
+  only:
+    variables:
+    - $ENABLE_NIGHTLY_BUILDS
+  tags:
+  - cuda
+  - docker
 
 gcc_6_serial:
-   <<: *build_definition
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc:6
-   variables:
-      <<: *build_serial_variables
-      WALBERLA_BUILD_WITH_CUDA: "OFF"
-   only:
-      variables:
-         - $ENABLE_NIGHTLY_BUILDS
-   tags:
-      - docker
+  <<: *build_definition
+  image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc:6
+  variables:
+    <<: *build_serial_variables
+    WALBERLA_BUILD_WITH_CUDA: "OFF"
+    WALBERLA_ENABLE_GUI: 0
+  only:
+    variables:
+    - $ENABLE_NIGHTLY_BUILDS
+  tags:
+  - docker
 
 gcc_6_mpionly:
-   <<: *build_definition
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc:6
-   variables:
-      <<: *build_mpionly_variables
-      WALBERLA_BUILD_WITH_CUDA: "OFF"
-   only:
-      variables:
-         - $ENABLE_NIGHTLY_BUILDS
-   tags:
-      - docker
+  <<: *build_definition
+  image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc:6
+  variables:
+    <<: *build_mpionly_variables
+    WALBERLA_BUILD_WITH_CUDA: "OFF"
+    WALBERLA_ENABLE_GUI: 0
+  only:
+    variables:
+    - $ENABLE_NIGHTLY_BUILDS
+  tags:
+  - docker
 
 gcc_6_hybrid:
-   <<: *build_definition
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc:6
-   variables:
-      <<: *build_hybrid_variables
-      WALBERLA_BUILD_WITH_CUDA: "OFF"
-   only:
-      variables:
-         - $ENABLE_NIGHTLY_BUILDS
-   tags:
-      - docker
+  <<: *build_definition
+  image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc:6
+  variables:
+    <<: *build_hybrid_variables
+    WALBERLA_BUILD_WITH_CUDA: "OFF"
+    WALBERLA_ENABLE_GUI: 0
+  only:
+    variables:
+    - $ENABLE_NIGHTLY_BUILDS
+  tags:
+  - docker
 
 gcc_6_serial_dbg:
-   <<: *build_definition
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc:6
-   variables:
-      <<: *build_serial_dbg_variables
-      WALBERLA_BUILD_WITH_CUDA: "OFF"
-   only:
-      variables:
-         - $ENABLE_NIGHTLY_BUILDS
-   tags:
-      - docker
+  <<: *build_definition
+  image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc:6
+  variables:
+    <<: *build_serial_dbg_variables
+    WALBERLA_BUILD_WITH_CUDA: "OFF"
+    WALBERLA_ENABLE_GUI: 0
+  only:
+    variables:
+    - $ENABLE_NIGHTLY_BUILDS
+  tags:
+  - docker
 
 gcc_6_mpionly_dbg:
-   <<: *build_definition
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc:6
-   variables:
-      <<: *build_mpionly_dbg_variables
-      WALBERLA_BUILD_WITH_CUDA: "OFF"
-   only:
-      variables:
-         - $ENABLE_NIGHTLY_BUILDS
-   tags:
-      - docker
+  <<: *build_definition
+  image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc:6
+  variables:
+    <<: *build_mpionly_dbg_variables
+    WALBERLA_BUILD_WITH_CUDA: "OFF"
+    WALBERLA_ENABLE_GUI: 0
+  only:
+    variables:
+    - $ENABLE_NIGHTLY_BUILDS
+  tags:
+  - docker
 
 gcc_6_hybrid_dbg:
-   <<: *build_definition
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc:6
-   variables:
-      <<: *build_hybrid_dbg_variables
-      WALBERLA_BUILD_WITH_CUDA: "OFF"
-   only:
-      variables:
-         - $ENABLE_NIGHTLY_BUILDS
-   tags:
-      - docker
+  <<: *build_definition
+  image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc:6
+  variables:
+    <<: *build_hybrid_dbg_variables
+    WALBERLA_BUILD_WITH_CUDA: "OFF"
+    WALBERLA_ENABLE_GUI: 0
+  only:
+    variables:
+    - $ENABLE_NIGHTLY_BUILDS
+  tags:
+  - docker
 
 gcc_6_hybrid_dbg_sp:
-   <<: *build_definition
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc:6
-   variables:
-      <<: *build_hybrid_dbg_sp_variables
-      WALBERLA_BUILD_WITH_CUDA: "OFF"
-   only:
-      variables:
-         - $ENABLE_NIGHTLY_BUILDS
-   tags:
-      - docker
+  <<: *build_definition
+  image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc:6
+  variables:
+    <<: *build_hybrid_dbg_sp_variables
+    WALBERLA_BUILD_WITH_CUDA: "OFF"
+    WALBERLA_ENABLE_GUI: 0
+  only:
+    variables:
+    - $ENABLE_NIGHTLY_BUILDS
+  tags:
+  - docker
 
 gcc_7_serial:
-   <<: *build_definition
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc:7
-   variables:
-      <<: *build_serial_variables
-      WALBERLA_BUILD_WITH_CUDA: "OFF"
-   only:
-      variables:
-         - $ENABLE_NIGHTLY_BUILDS
-   tags:
-      - docker
+  <<: *build_definition
+  image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc:7
+  variables:
+    <<: *build_serial_variables
+    WALBERLA_BUILD_WITH_CUDA: "ON"
+    WALBERLA_ENABLE_GUI: 0
+  only:
+    variables:
+    - $ENABLE_NIGHTLY_BUILDS
+  tags:
+  - cuda
+  - docker
 
 gcc_7_mpionly:
-   <<: *build_definition
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc:7
-   variables:
-      <<: *build_mpionly_variables
-      WALBERLA_BUILD_WITH_CUDA: "OFF"
-   only:
-      variables:
-         - $ENABLE_NIGHTLY_BUILDS
-   tags:
-      - docker
+  <<: *build_definition
+  image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc:7
+  variables:
+    <<: *build_mpionly_variables
+    WALBERLA_BUILD_WITH_CUDA: "ON"
+    WALBERLA_ENABLE_GUI: 0
+  only:
+    variables:
+    - $ENABLE_NIGHTLY_BUILDS
+  tags:
+  - cuda
+  - docker
 
 gcc_7_hybrid:
-   <<: *build_definition
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc:7
-   variables:
-      <<: *build_hybrid_variables
-      WALBERLA_BUILD_WITH_CUDA: "OFF"
-   except:
-      variables:
-         - $DISABLE_PER_COMMIT_BUILDS
-   tags:
-      - docker
+  <<: *build_definition
+  image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc:7
+  variables:
+    <<: *build_hybrid_variables
+    WALBERLA_BUILD_WITH_CUDA: "ON"
+    WALBERLA_ENABLE_GUI: 0
+  except:
+    variables:
+    - $DISABLE_PER_COMMIT_BUILDS
+    - $DISABLE_PER_COMMIT_BUILDS
+  tags:
+  - cuda
+  - docker
 
 gcc_7_serial_dbg:
-   <<: *build_definition
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc:7
-   variables:
-      <<: *build_serial_dbg_variables
-      WALBERLA_BUILD_WITH_CUDA: "OFF"
-   except:
-      variables:
-         - $DISABLE_PER_COMMIT_BUILDS
-   tags:
-      - docker
+  <<: *build_definition
+  image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc:7
+  variables:
+    <<: *build_serial_dbg_variables
+    WALBERLA_BUILD_WITH_CUDA: "ON"
+    WALBERLA_ENABLE_GUI: 1
+  except:
+    variables:
+    - $DISABLE_PER_COMMIT_BUILDS
+    - $DISABLE_PER_COMMIT_BUILDS
+  tags:
+  - cuda
+  - docker
 
 gcc_7_mpionly_dbg:
-   <<: *build_definition
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc:7
-   variables:
-      <<: *build_mpionly_dbg_variables
-      WALBERLA_BUILD_WITH_CUDA: "OFF"
-   except:
-      variables:
-         - $DISABLE_PER_COMMIT_BUILDS
-   tags:
-      - docker
+  <<: *build_definition
+  image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc:7
+  variables:
+    <<: *build_mpionly_dbg_variables
+    WALBERLA_BUILD_WITH_CUDA: "ON"
+    WALBERLA_ENABLE_GUI: 0
+  except:
+    variables:
+    - $DISABLE_PER_COMMIT_BUILDS
+  tags:
+  - cuda
+  - docker
 
 gcc_7_hybrid_dbg:
-   <<: *build_definition
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc:7
-   variables:
-      <<: *build_hybrid_dbg_variables
-      WALBERLA_BUILD_WITH_CUDA: "OFF"
-   except:
-      variables:
-         - $DISABLE_PER_COMMIT_BUILDS
-   tags:
-      - docker
+  <<: *build_definition
+  image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc:7
+  variables:
+    <<: *build_hybrid_dbg_variables
+    WALBERLA_BUILD_WITH_CUDA: "ON"
+    WALBERLA_ENABLE_GUI: 0
+  except:
+    variables:
+    - $DISABLE_PER_COMMIT_BUILDS
+  tags:
+  - cuda
+  - docker
 
 gcc_7_hybrid_dbg_sp:
-   <<: *build_definition
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc:7
-   variables:
-      <<: *build_hybrid_dbg_sp_variables
-      WALBERLA_BUILD_WITH_CUDA: "OFF"
-   except:
-      variables:
-         - $DISABLE_PER_COMMIT_BUILDS
-   tags:
-      - docker
+  <<: *build_definition
+  image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc:7
+  variables:
+    <<: *build_hybrid_dbg_sp_variables
+    WALBERLA_BUILD_WITH_CUDA: "ON"
+    WALBERLA_ENABLE_GUI: 0
+  except:
+    variables:
+    - $DISABLE_PER_COMMIT_BUILDS
+  tags:
+  - cuda
+  - docker
 
 clang_3.6_serial:
-   <<: *build_definition
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:3.6
-   variables:
-      <<: *build_serial_variables
-      WALBERLA_BUILD_WITH_CUDA: "ON"
-   only:
-      variables:
-         - $ENABLE_NIGHTLY_BUILDS
-   tags:
-      - cuda
-      - docker
+  <<: *build_definition
+  image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:3.6
+  variables:
+    <<: *build_serial_variables
+    WALBERLA_BUILD_WITH_CUDA: "OFF"
+    WALBERLA_ENABLE_GUI: 0
+  only:
+    variables:
+    - $ENABLE_NIGHTLY_BUILDS
+  tags:
+  - docker
 
 clang_3.6_mpionly:
-   <<: *build_definition
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:3.6
-   variables:
-      <<: *build_mpionly_variables
-      WALBERLA_BUILD_WITH_CUDA: "ON"
-   only:
-      variables:
-         - $ENABLE_NIGHTLY_BUILDS
-   tags:
-      - cuda
-      - docker
+  <<: *build_definition
+  image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:3.6
+  variables:
+    <<: *build_mpionly_variables
+    WALBERLA_BUILD_WITH_CUDA: "OFF"
+    WALBERLA_ENABLE_GUI: 0
+  only:
+    variables:
+    - $ENABLE_NIGHTLY_BUILDS
+  tags:
+  - docker
 
 clang_3.6_serial_dbg:
-   <<: *build_definition
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:3.6
-   variables:
-      <<: *build_serial_dbg_variables
-      WALBERLA_BUILD_WITH_CUDA: "ON"
-   only:
-      variables:
-         - $ENABLE_NIGHTLY_BUILDS
-   tags:
-      - cuda
-      - docker
+  <<: *build_definition
+  image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:3.6
+  variables:
+    <<: *build_serial_dbg_variables
+    WALBERLA_BUILD_WITH_CUDA: "OFF"
+    WALBERLA_ENABLE_GUI: 0
+  only:
+    variables:
+    - $ENABLE_NIGHTLY_BUILDS
+  tags:
+  - docker
 
 clang_3.6_mpionly_dbg:
-   <<: *build_definition
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:3.6
-   variables:
-      <<: *build_mpionly_dbg_variables
-      WALBERLA_BUILD_WITH_CUDA: "ON"
-   except:
-      variables:
-         - $DISABLE_PER_COMMIT_BUILDS
-   tags:
-      - cuda
-      - docker
+  <<: *build_definition
+  image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:3.6
+  variables:
+    <<: *build_mpionly_dbg_variables
+    WALBERLA_BUILD_WITH_CUDA: "OFF"
+    WALBERLA_ENABLE_GUI: 0
+  except:
+    variables:
+    - $DISABLE_PER_COMMIT_BUILDS
+  tags:
+  - docker
 
 clang_3.7_serial:
-   <<: *build_definition
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:3.7
-   variables:
-      <<: *build_serial_variables
-      WALBERLA_BUILD_WITH_CUDA: "ON"
-   only:
-      variables:
-         - $ENABLE_NIGHTLY_BUILDS
-   tags:
-      - cuda
-      - docker
+  <<: *build_definition
+  image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:3.7
+  variables:
+    <<: *build_serial_variables
+    WALBERLA_BUILD_WITH_CUDA: "OFF"
+    WALBERLA_ENABLE_GUI: 0
+  only:
+    variables:
+    - $ENABLE_NIGHTLY_BUILDS
+  tags:
+  - docker
 
 clang_3.7_mpionly:
-   <<: *build_definition
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:3.7
-   variables:
-      <<: *build_mpionly_variables
-      WALBERLA_BUILD_WITH_CUDA: "ON"
-   only:
-      variables:
-         - $ENABLE_NIGHTLY_BUILDS
-   tags:
-      - cuda
-      - docker
+  <<: *build_definition
+  image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:3.7
+  variables:
+    <<: *build_mpionly_variables
+    WALBERLA_BUILD_WITH_CUDA: "OFF"
+    WALBERLA_ENABLE_GUI: 0
+  only:
+    variables:
+    - $ENABLE_NIGHTLY_BUILDS
+  tags:
+  - docker
 
 clang_3.7_serial_dbg:
-   <<: *build_definition
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:3.7
-   variables:
-      <<: *build_serial_dbg_variables
-      WALBERLA_BUILD_WITH_CUDA: "ON"
-   only:
-      variables:
-         - $ENABLE_NIGHTLY_BUILDS
-   tags:
-      - cuda
-      - docker
+  <<: *build_definition
+  image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:3.7
+  variables:
+    <<: *build_serial_dbg_variables
+    WALBERLA_BUILD_WITH_CUDA: "OFF"
+    WALBERLA_ENABLE_GUI: 0
+  only:
+    variables:
+    - $ENABLE_NIGHTLY_BUILDS
+  tags:
+  - docker
 
 clang_3.7_mpionly_dbg:
-   <<: *build_definition
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:3.7
-   variables:
-      <<: *build_mpionly_dbg_variables
-      WALBERLA_BUILD_WITH_CUDA: "ON"
-   only:
-      variables:
-         - $ENABLE_NIGHTLY_BUILDS
-   tags:
-      - cuda
-      - docker
+  <<: *build_definition
+  image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:3.7
+  variables:
+    <<: *build_mpionly_dbg_variables
+    WALBERLA_BUILD_WITH_CUDA: "OFF"
+    WALBERLA_ENABLE_GUI: 0
+  only:
+    variables:
+    - $ENABLE_NIGHTLY_BUILDS
+  tags:
+  - docker
 
 clang_3.8_serial:
-   <<: *build_definition
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:3.8
-   variables:
-      <<: *build_serial_variables
-      WALBERLA_BUILD_WITH_CUDA: "ON"
-   only:
-      variables:
-         - $ENABLE_NIGHTLY_BUILDS
-   tags:
-      - cuda
-      - docker
+  <<: *build_definition
+  image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:3.8
+  variables:
+    <<: *build_serial_variables
+    WALBERLA_BUILD_WITH_CUDA: "OFF"
+    WALBERLA_ENABLE_GUI: 0
+  only:
+    variables:
+    - $ENABLE_NIGHTLY_BUILDS
+  tags:
+  - docker
 
 clang_3.8_mpionly:
-   <<: *build_definition
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:3.8
-   variables:
-      <<: *build_mpionly_variables
-      WALBERLA_BUILD_WITH_CUDA: "ON"
-   only:
-      variables:
-         - $ENABLE_NIGHTLY_BUILDS
-   tags:
-      - cuda
-      - docker
+  <<: *build_definition
+  image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:3.8
+  variables:
+    <<: *build_mpionly_variables
+    WALBERLA_BUILD_WITH_CUDA: "OFF"
+    WALBERLA_ENABLE_GUI: 0
+  only:
+    variables:
+    - $ENABLE_NIGHTLY_BUILDS
+  tags:
+  - docker
 
 clang_3.8_hybrid:
-   <<: *build_definition
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:3.8
-   variables:
-      <<: *build_hybrid_variables
-      WALBERLA_BUILD_WITH_CUDA: "ON"
-   only:
-      variables:
-         - $ENABLE_NIGHTLY_BUILDS
-   tags:
-      - cuda
-      - docker
+  <<: *build_definition
+  image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:3.8
+  variables:
+    <<: *build_hybrid_variables
+    WALBERLA_BUILD_WITH_CUDA: "OFF"
+    WALBERLA_ENABLE_GUI: 0
+  only:
+    variables:
+    - $ENABLE_NIGHTLY_BUILDS
+  tags:
+  - docker
 
 clang_3.8_serial_dbg:
-   <<: *build_definition
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:3.8
-   variables:
-      <<: *build_serial_dbg_variables
-      WALBERLA_BUILD_WITH_CUDA: "ON"
-   only:
-      variables:
-         - $ENABLE_NIGHTLY_BUILDS
-   tags:
-      - cuda
-      - docker
+  <<: *build_definition
+  image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:3.8
+  variables:
+    <<: *build_serial_dbg_variables
+    WALBERLA_BUILD_WITH_CUDA: "OFF"
+    WALBERLA_ENABLE_GUI: 0
+  only:
+    variables:
+    - $ENABLE_NIGHTLY_BUILDS
+  tags:
+  - docker
 
 clang_3.8_mpionly_dbg:
-   <<: *build_definition
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:3.8
-   variables:
-      <<: *build_mpionly_dbg_variables
-      WALBERLA_BUILD_WITH_CUDA: "ON"
-   only:
-      variables:
-         - $ENABLE_NIGHTLY_BUILDS
-   tags:
-      - cuda
-      - docker
+  <<: *build_definition
+  image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:3.8
+  variables:
+    <<: *build_mpionly_dbg_variables
+    WALBERLA_BUILD_WITH_CUDA: "OFF"
+    WALBERLA_ENABLE_GUI: 0
+  only:
+    variables:
+    - $ENABLE_NIGHTLY_BUILDS
+  tags:
+  - docker
 
 clang_3.8_hybrid_dbg:
-   <<: *build_definition
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:3.8
-   variables:
-      <<: *build_hybrid_dbg_variables
-      WALBERLA_BUILD_WITH_CUDA: "ON"
-   only:
-      variables:
-         - $ENABLE_NIGHTLY_BUILDS
-   tags:
-      - cuda
-      - docker
+  <<: *build_definition
+  image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:3.8
+  variables:
+    <<: *build_hybrid_dbg_variables
+    WALBERLA_BUILD_WITH_CUDA: "OFF"
+    WALBERLA_ENABLE_GUI: 0
+  only:
+    variables:
+    - $ENABLE_NIGHTLY_BUILDS
+  tags:
+  - docker
 
 clang_3.8_hybrid_dbg_sp:
-   <<: *build_definition
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:3.8
-   variables:
-      <<: *build_hybrid_dbg_sp_variables
-      WALBERLA_BUILD_WITH_CUDA: "ON"
-   only:
-      variables:
-         - $ENABLE_NIGHTLY_BUILDS
-   tags:
-      - cuda
-      - docker
+  <<: *build_definition
+  image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:3.8
+  variables:
+    <<: *build_hybrid_dbg_sp_variables
+    WALBERLA_BUILD_WITH_CUDA: "OFF"
+    WALBERLA_ENABLE_GUI: 0
+  only:
+    variables:
+    - $ENABLE_NIGHTLY_BUILDS
+  tags:
+  - docker
 
 clang_3.9_serial:
-   <<: *build_definition
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:3.9
-   variables:
-      <<: *build_serial_variables
-      WALBERLA_BUILD_WITH_CUDA: "OFF"
-   only:
-      variables:
-         - $ENABLE_NIGHTLY_BUILDS
-   tags:
-      - docker
+  <<: *build_definition
+  image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:3.9
+  variables:
+    <<: *build_serial_variables
+    WALBERLA_BUILD_WITH_CUDA: "OFF"
+    WALBERLA_ENABLE_GUI: 0
+  only:
+    variables:
+    - $ENABLE_NIGHTLY_BUILDS
+  tags:
+  - docker
 
 clang_3.9_mpionly:
-   <<: *build_definition
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:3.9
-   variables:
-      <<: *build_mpionly_variables
-      WALBERLA_BUILD_WITH_CUDA: "OFF"
-   only:
-      variables:
-         - $ENABLE_NIGHTLY_BUILDS
-   tags:
-      - docker
+  <<: *build_definition
+  image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:3.9
+  variables:
+    <<: *build_mpionly_variables
+    WALBERLA_BUILD_WITH_CUDA: "OFF"
+    WALBERLA_ENABLE_GUI: 0
+  only:
+    variables:
+    - $ENABLE_NIGHTLY_BUILDS
+  tags:
+  - docker
 
 clang_3.9_hybrid:
-   <<: *build_definition
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:3.9
-   variables:
-      <<: *build_hybrid_variables
-      WALBERLA_BUILD_WITH_CUDA: "OFF"
-   only:
-      variables:
-         - $ENABLE_NIGHTLY_BUILDS
-   tags:
-      - docker
+  <<: *build_definition
+  image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:3.9
+  variables:
+    <<: *build_hybrid_variables
+    WALBERLA_BUILD_WITH_CUDA: "OFF"
+    WALBERLA_ENABLE_GUI: 0
+  only:
+    variables:
+    - $ENABLE_NIGHTLY_BUILDS
+  tags:
+  - docker
 
 clang_3.9_serial_dbg:
-   <<: *build_definition
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:3.9
-   variables:
-      <<: *build_serial_dbg_variables
-      WALBERLA_BUILD_WITH_CUDA: "OFF"
-   only:
-      variables:
-         - $ENABLE_NIGHTLY_BUILDS
-   tags:
-      - docker
+  <<: *build_definition
+  image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:3.9
+  variables:
+    <<: *build_serial_dbg_variables
+    WALBERLA_BUILD_WITH_CUDA: "OFF"
+    WALBERLA_ENABLE_GUI: 0
+  only:
+    variables:
+    - $ENABLE_NIGHTLY_BUILDS
+  tags:
+  - docker
 
 clang_3.9_mpionly_dbg:
-   <<: *build_definition
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:3.9
-   variables:
-      <<: *build_mpionly_dbg_variables
-      WALBERLA_BUILD_WITH_CUDA: "OFF"
-   only:
-      variables:
-         - $ENABLE_NIGHTLY_BUILDS
-   tags:
-      - docker
+  <<: *build_definition
+  image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:3.9
+  variables:
+    <<: *build_mpionly_dbg_variables
+    WALBERLA_BUILD_WITH_CUDA: "OFF"
+    WALBERLA_ENABLE_GUI: 0
+  only:
+    variables:
+    - $ENABLE_NIGHTLY_BUILDS
+  tags:
+  - docker
 
 clang_3.9_hybrid_dbg:
-   <<: *build_definition
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:3.9
-   variables:
-      <<: *build_hybrid_dbg_variables
-      WALBERLA_BUILD_WITH_CUDA: "OFF"
-   only:
-      variables:
-         - $ENABLE_NIGHTLY_BUILDS
-   tags:
-      - docker
+  <<: *build_definition
+  image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:3.9
+  variables:
+    <<: *build_hybrid_dbg_variables
+    WALBERLA_BUILD_WITH_CUDA: "OFF"
+    WALBERLA_ENABLE_GUI: 0
+  only:
+    variables:
+    - $ENABLE_NIGHTLY_BUILDS
+  tags:
+  - docker
 
 clang_3.9_hybrid_dbg_sp:
-   <<: *build_definition
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:3.9
-   variables:
-      <<: *build_hybrid_dbg_sp_variables
-      WALBERLA_BUILD_WITH_CUDA: "OFF"
-   only:
-      variables:
-         - $ENABLE_NIGHTLY_BUILDS
-   tags:
-      - docker
+  <<: *build_definition
+  image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:3.9
+  variables:
+    <<: *build_hybrid_dbg_sp_variables
+    WALBERLA_BUILD_WITH_CUDA: "OFF"
+    WALBERLA_ENABLE_GUI: 0
+  only:
+    variables:
+    - $ENABLE_NIGHTLY_BUILDS
+  tags:
+  - docker
 
 clang_4.0_serial:
-   <<: *build_definition
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:4.0
-   variables:
-      <<: *build_serial_variables
-      WALBERLA_BUILD_WITH_CUDA: "OFF"
-   only:
-      variables:
-         - $ENABLE_NIGHTLY_BUILDS
-   tags:
-      - docker
+  <<: *build_definition
+  image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:4.0
+  variables:
+    <<: *build_serial_variables
+    WALBERLA_BUILD_WITH_CUDA: "OFF"
+    WALBERLA_ENABLE_GUI: 0
+  only:
+    variables:
+    - $ENABLE_NIGHTLY_BUILDS
+  tags:
+  - docker
 
 clang_4.0_mpionly:
-   <<: *build_definition
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:4.0
-   variables:
-      <<: *build_mpionly_variables
-      WALBERLA_BUILD_WITH_CUDA: "OFF"
-   only:
-      variables:
-         - $ENABLE_NIGHTLY_BUILDS
-   tags:
-      - docker
+  <<: *build_definition
+  image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:4.0
+  variables:
+    <<: *build_mpionly_variables
+    WALBERLA_BUILD_WITH_CUDA: "OFF"
+    WALBERLA_ENABLE_GUI: 0
+  only:
+    variables:
+    - $ENABLE_NIGHTLY_BUILDS
+  tags:
+  - docker
 
 clang_4.0_hybrid:
-   <<: *build_definition
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:4.0
-   variables:
-      <<: *build_hybrid_variables
-      WALBERLA_BUILD_WITH_CUDA: "OFF"
-   only:
-      variables:
-         - $ENABLE_NIGHTLY_BUILDS
-   tags:
-      - docker
+  <<: *build_definition
+  image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:4.0
+  variables:
+    <<: *build_hybrid_variables
+    WALBERLA_BUILD_WITH_CUDA: "OFF"
+    WALBERLA_ENABLE_GUI: 0
+  only:
+    variables:
+    - $ENABLE_NIGHTLY_BUILDS
+  tags:
+  - docker
 
 clang_4.0_serial_dbg:
-   <<: *build_definition
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:4.0
-   variables:
-      <<: *build_serial_dbg_variables
-      WALBERLA_BUILD_WITH_CUDA: "OFF"
-   only:
-      variables:
-         - $ENABLE_NIGHTLY_BUILDS
-   tags:
-      - docker
+  <<: *build_definition
+  image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:4.0
+  variables:
+    <<: *build_serial_dbg_variables
+    WALBERLA_BUILD_WITH_CUDA: "OFF"
+    WALBERLA_ENABLE_GUI: 0
+  only:
+    variables:
+    - $ENABLE_NIGHTLY_BUILDS
+  tags:
+  - docker
 
 clang_4.0_mpionly_dbg:
-   <<: *build_definition
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:4.0
-   variables:
-      <<: *build_mpionly_dbg_variables
-      WALBERLA_BUILD_WITH_CUDA: "OFF"
-   only:
-      variables:
-         - $ENABLE_NIGHTLY_BUILDS
-   tags:
-      - docker
+  <<: *build_definition
+  image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:4.0
+  variables:
+    <<: *build_mpionly_dbg_variables
+    WALBERLA_BUILD_WITH_CUDA: "OFF"
+    WALBERLA_ENABLE_GUI: 0
+  only:
+    variables:
+    - $ENABLE_NIGHTLY_BUILDS
+  tags:
+  - docker
 
 clang_4.0_hybrid_dbg:
-   <<: *build_definition
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:4.0
-   variables:
-      <<: *build_hybrid_dbg_variables
-      WALBERLA_BUILD_WITH_CUDA: "OFF"
-   only:
-      variables:
-         - $ENABLE_NIGHTLY_BUILDS
-   tags:
-      - docker
+  <<: *build_definition
+  image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:4.0
+  variables:
+    <<: *build_hybrid_dbg_variables
+    WALBERLA_BUILD_WITH_CUDA: "OFF"
+    WALBERLA_ENABLE_GUI: 0
+  only:
+    variables:
+    - $ENABLE_NIGHTLY_BUILDS
+  tags:
+  - docker
 
 clang_4.0_hybrid_dbg_sp:
-   <<: *build_definition
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:4.0
-   variables:
-      <<: *build_hybrid_dbg_sp_variables
-      WALBERLA_BUILD_WITH_CUDA: "OFF"
-   only:
-      variables:
-         - $ENABLE_NIGHTLY_BUILDS
-   tags:
-      - docker
+  <<: *build_definition
+  image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:4.0
+  variables:
+    <<: *build_hybrid_dbg_sp_variables
+    WALBERLA_BUILD_WITH_CUDA: "OFF"
+    WALBERLA_ENABLE_GUI: 0
+  only:
+    variables:
+    - $ENABLE_NIGHTLY_BUILDS
+  tags:
+  - docker
 
 clang_5.0_serial:
-   <<: *build_definition
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:5.0
-   variables:
-      <<: *build_serial_variables
-      WALBERLA_BUILD_WITH_CUDA: "OFF"
-   only:
-      variables:
-         - $ENABLE_NIGHTLY_BUILDS
-   tags:
-      - docker
+  <<: *build_definition
+  image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:5.0
+  variables:
+    <<: *build_serial_variables
+    WALBERLA_BUILD_WITH_CUDA: "OFF"
+    WALBERLA_ENABLE_GUI: 0
+  only:
+    variables:
+    - $ENABLE_NIGHTLY_BUILDS
+  tags:
+  - docker
 
 clang_5.0_mpionly:
-   <<: *build_definition
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:5.0
-   variables:
-      <<: *build_mpionly_variables
-      WALBERLA_BUILD_WITH_CUDA: "OFF"
-   only:
-      variables:
-         - $ENABLE_NIGHTLY_BUILDS
-   tags:
-      - docker
+  <<: *build_definition
+  image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:5.0
+  variables:
+    <<: *build_mpionly_variables
+    WALBERLA_BUILD_WITH_CUDA: "OFF"
+    WALBERLA_ENABLE_GUI: 0
+  only:
+    variables:
+    - $ENABLE_NIGHTLY_BUILDS
+  tags:
+  - docker
 
 clang_5.0_hybrid:
-   <<: *build_definition
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:5.0
-   variables:
-      <<: *build_hybrid_variables
-      WALBERLA_BUILD_WITH_CUDA: "OFF"
-   only:
-      variables:
-         - $ENABLE_NIGHTLY_BUILDS
-   tags:
-      - docker
+  <<: *build_definition
+  image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:5.0
+  variables:
+    <<: *build_hybrid_variables
+    WALBERLA_BUILD_WITH_CUDA: "OFF"
+    WALBERLA_ENABLE_GUI: 0
+  only:
+    variables:
+    - $ENABLE_NIGHTLY_BUILDS
+  tags:
+  - docker
 
 clang_5.0_serial_dbg:
-   <<: *build_definition
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:5.0
-   variables:
-      <<: *build_serial_dbg_variables
-      WALBERLA_BUILD_WITH_CUDA: "OFF"
-   only:
-      variables:
-         - $ENABLE_NIGHTLY_BUILDS
-   tags:
-      - docker
+  <<: *build_definition
+  image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:5.0
+  variables:
+    <<: *build_serial_dbg_variables
+    WALBERLA_BUILD_WITH_CUDA: "OFF"
+    WALBERLA_ENABLE_GUI: 0
+  only:
+    variables:
+    - $ENABLE_NIGHTLY_BUILDS
+  tags:
+  - docker
 
 clang_5.0_mpionly_dbg:
-   <<: *build_definition
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:5.0
-   variables:
-      <<: *build_mpionly_dbg_variables
-      WALBERLA_BUILD_WITH_CUDA: "OFF"
-   only:
-      variables:
-         - $ENABLE_NIGHTLY_BUILDS
-   tags:
-      - docker
+  <<: *build_definition
+  image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:5.0
+  variables:
+    <<: *build_mpionly_dbg_variables
+    WALBERLA_BUILD_WITH_CUDA: "OFF"
+    WALBERLA_ENABLE_GUI: 0
+  only:
+    variables:
+    - $ENABLE_NIGHTLY_BUILDS
+  tags:
+  - docker
 
 clang_5.0_hybrid_dbg:
-   <<: *build_definition
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:5.0
-   variables:
-      <<: *build_hybrid_dbg_variables
-      WALBERLA_BUILD_WITH_CUDA: "OFF"
-   only:
-      variables:
-         - $ENABLE_NIGHTLY_BUILDS
-   tags:
-      - docker
+  <<: *build_definition
+  image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:5.0
+  variables:
+    <<: *build_hybrid_dbg_variables
+    WALBERLA_BUILD_WITH_CUDA: "OFF"
+    WALBERLA_ENABLE_GUI: 0
+  only:
+    variables:
+    - $ENABLE_NIGHTLY_BUILDS
+  tags:
+  - docker
 
 clang_5.0_hybrid_dbg_sp:
-   <<: *build_definition
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:5.0
-   variables:
-      <<: *build_hybrid_dbg_sp_variables
-      WALBERLA_BUILD_WITH_CUDA: "OFF"
-   only:
-      variables:
-         - $ENABLE_NIGHTLY_BUILDS
-   tags:
-      - docker
+  <<: *build_definition
+  image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:5.0
+  variables:
+    <<: *build_hybrid_dbg_sp_variables
+    WALBERLA_BUILD_WITH_CUDA: "OFF"
+    WALBERLA_ENABLE_GUI: 0
+  only:
+    variables:
+    - $ENABLE_NIGHTLY_BUILDS
+  tags:
+  - docker
 
 clang_6.0_serial:
-   <<: *build_definition
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:6.0
-   variables:
-      <<: *build_serial_variables
-      WALBERLA_BUILD_WITH_CUDA: "OFF"
-   only:
-      variables:
-         - $ENABLE_NIGHTLY_BUILDS
-   tags:
-      - docker
+  <<: *build_definition
+  image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:6.0
+  variables:
+    <<: *build_serial_variables
+    WALBERLA_BUILD_WITH_CUDA: "ON"
+    WALBERLA_ENABLE_GUI: 0
+  only:
+    variables:
+    - $ENABLE_NIGHTLY_BUILDS
+  tags:
+  - cuda
+  - docker
 
 clang_6.0_mpionly:
-   <<: *build_definition
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:6.0
-   variables:
-      <<: *build_mpionly_variables
-      WALBERLA_BUILD_WITH_CUDA: "OFF"
-   only:
-      variables:
-         - $ENABLE_NIGHTLY_BUILDS
-   tags:
-      - docker
+  <<: *build_definition
+  image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:6.0
+  variables:
+    <<: *build_mpionly_variables
+    WALBERLA_BUILD_WITH_CUDA: "ON"
+    WALBERLA_ENABLE_GUI: 0
+  only:
+    variables:
+    - $ENABLE_NIGHTLY_BUILDS
+  tags:
+  - cuda
+  - docker
 
 clang_6.0_hybrid:
-   <<: *build_definition
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:6.0
-   variables:
-      <<: *build_hybrid_variables
-      WALBERLA_BUILD_WITH_CUDA: "OFF"
-   only:
-      variables:
-         - $ENABLE_NIGHTLY_BUILDS
-   tags:
-      - docker
+  <<: *build_definition
+  image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:6.0
+  variables:
+    <<: *build_hybrid_variables
+    WALBERLA_BUILD_WITH_CUDA: "ON"
+    WALBERLA_ENABLE_GUI: 0
+  only:
+    variables:
+    - $ENABLE_NIGHTLY_BUILDS
+  tags:
+  - cuda
+  - docker
 
 clang_6.0_serial_dbg:
-   <<: *build_definition
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:6.0
-   variables:
-      <<: *build_serial_dbg_variables
-      WALBERLA_BUILD_WITH_CUDA: "OFF"
-   only:
-      variables:
-         - $ENABLE_NIGHTLY_BUILDS
-   tags:
-      - docker
+  <<: *build_definition
+  image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:6.0
+  variables:
+    <<: *build_serial_dbg_variables
+    WALBERLA_BUILD_WITH_CUDA: "ON"
+    WALBERLA_ENABLE_GUI: 0
+  only:
+    variables:
+    - $ENABLE_NIGHTLY_BUILDS
+  tags:
+  - cuda
+  - docker
 
 clang_6.0_mpionly_dbg:
-   <<: *build_definition
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:6.0
-   variables:
-      <<: *build_mpionly_dbg_variables
-      WALBERLA_BUILD_WITH_CUDA: "OFF"
-   only:
-      variables:
-         - $ENABLE_NIGHTLY_BUILDS
-   tags:
-      - docker
+  <<: *build_definition
+  image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:6.0
+  variables:
+    <<: *build_mpionly_dbg_variables
+    WALBERLA_BUILD_WITH_CUDA: "ON"
+    WALBERLA_ENABLE_GUI: 0
+  only:
+    variables:
+    - $ENABLE_NIGHTLY_BUILDS
+  tags:
+  - cuda
+  - docker
 
 clang_6.0_hybrid_dbg:
-   <<: *build_definition
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:6.0
-   variables:
-      <<: *build_hybrid_dbg_variables
-      WALBERLA_BUILD_WITH_CUDA: "OFF"
-   only:
-      variables:
-         - $ENABLE_NIGHTLY_BUILDS
-   tags:
-      - docker
+  <<: *build_definition
+  image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:6.0
+  variables:
+    <<: *build_hybrid_dbg_variables
+    WALBERLA_BUILD_WITH_CUDA: "ON"
+    WALBERLA_ENABLE_GUI: 0
+  only:
+    variables:
+    - $ENABLE_NIGHTLY_BUILDS
+  tags:
+  - cuda
+  - docker
 
 clang_6.0_hybrid_dbg_sp:
-   <<: *build_definition
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:6.0
-   variables:
-      <<: *build_hybrid_dbg_sp_variables
-      WALBERLA_BUILD_WITH_CUDA: "OFF"
-   only:
-      variables:
-         - $ENABLE_NIGHTLY_BUILDS
-   tags:
-      - docker
+  <<: *build_definition
+  image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:6.0
+  variables:
+    <<: *build_hybrid_dbg_sp_variables
+    WALBERLA_BUILD_WITH_CUDA: "ON"
+    WALBERLA_ENABLE_GUI: 0
+  only:
+    variables:
+    - $ENABLE_NIGHTLY_BUILDS
+  tags:
+  - cuda
+  - docker
 
 clang_7.0_serial:
-   <<: *build_definition
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:7.0
-   variables:
-      <<: *build_serial_variables
-      WALBERLA_BUILD_WITH_CUDA: "OFF"
-   only:
-      variables:
-         - $ENABLE_NIGHTLY_BUILDS
-   tags:
-      - docker
+  <<: *build_definition
+  image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:7.0
+  variables:
+    <<: *build_serial_variables
+    WALBERLA_BUILD_WITH_CUDA: "OFF"
+    WALBERLA_ENABLE_GUI: 0
+  only:
+    variables:
+    - $ENABLE_NIGHTLY_BUILDS
+  tags:
+  - docker
 
 clang_7.0_mpionly:
-   <<: *build_definition
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:7.0
-   variables:
-      <<: *build_mpionly_variables
-      WALBERLA_BUILD_WITH_CUDA: "OFF"
-   only:
-      variables:
-         - $ENABLE_NIGHTLY_BUILDS
-   tags:
-      - docker
+  <<: *build_definition
+  image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:7.0
+  variables:
+    <<: *build_mpionly_variables
+    WALBERLA_BUILD_WITH_CUDA: "OFF"
+    WALBERLA_ENABLE_GUI: 0
+  only:
+    variables:
+    - $ENABLE_NIGHTLY_BUILDS
+  tags:
+  - docker
 
 clang_7.0_hybrid:
-   <<: *build_definition
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:7.0
-   variables:
-      <<: *build_hybrid_variables
-      WALBERLA_BUILD_WITH_CUDA: "OFF"
-   except:
-      variables:
-         - $DISABLE_PER_COMMIT_BUILDS
-   tags:
-      - docker
+  <<: *build_definition
+  image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:7.0
+  variables:
+    <<: *build_hybrid_variables
+    WALBERLA_BUILD_WITH_CUDA: "OFF"
+    WALBERLA_ENABLE_GUI: 0
+  except:
+    variables:
+    - $DISABLE_PER_COMMIT_BUILDS
+  tags:
+  - docker
 
 clang_7.0_serial_dbg:
-   <<: *build_definition
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:7.0
-   variables:
-      <<: *build_serial_dbg_variables
-      WALBERLA_BUILD_WITH_CUDA: "OFF"
-   except:
-      variables:
-         - $DISABLE_PER_COMMIT_BUILDS
-   tags:
-      - docker
+  <<: *build_definition
+  image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:7.0
+  variables:
+    <<: *build_serial_dbg_variables
+    WALBERLA_BUILD_WITH_CUDA: "OFF"
+    WALBERLA_ENABLE_GUI: 0
+  except:
+    variables:
+    - $DISABLE_PER_COMMIT_BUILDS
+  tags:
+  - docker
 
 clang_7.0_mpionly_dbg:
-   <<: *build_definition
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:7.0
-   variables:
-      <<: *build_mpionly_dbg_variables
-      WALBERLA_BUILD_WITH_CUDA: "OFF"
-   except:
-      variables:
-         - $DISABLE_PER_COMMIT_BUILDS
-   tags:
-      - docker
+  <<: *build_definition
+  image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:7.0
+  variables:
+    <<: *build_mpionly_dbg_variables
+    WALBERLA_BUILD_WITH_CUDA: "OFF"
+    WALBERLA_ENABLE_GUI: 0
+  except:
+    variables:
+    - $DISABLE_PER_COMMIT_BUILDS
+  tags:
+  - docker
 
 clang_7.0_hybrid_dbg:
-   <<: *build_definition
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:7.0
-   variables:
-      <<: *build_hybrid_dbg_variables
-      WALBERLA_BUILD_WITH_CUDA: "OFF"
-   except:
-      variables:
-         - $DISABLE_PER_COMMIT_BUILDS
-   tags:
-      - docker
+  <<: *build_definition
+  image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:7.0
+  variables:
+    <<: *build_hybrid_dbg_variables
+    WALBERLA_BUILD_WITH_CUDA: "OFF"
+    WALBERLA_ENABLE_GUI: 0
+  except:
+    variables:
+    - $DISABLE_PER_COMMIT_BUILDS
+  tags:
+  - docker
 
 clang_7.0_hybrid_dbg_sp:
-   <<: *build_definition
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:7.0
-   variables:
-      <<: *build_hybrid_dbg_sp_variables
-      WALBERLA_BUILD_WITH_CUDA: "OFF"
-   except:
-      variables:
-         - $DISABLE_PER_COMMIT_BUILDS
-   tags:
-      - docker
+  <<: *build_definition
+  image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:7.0
+  variables:
+    <<: *build_hybrid_dbg_sp_variables
+    WALBERLA_BUILD_WITH_CUDA: "OFF"
+    WALBERLA_ENABLE_GUI: 0
+  except:
+    variables:
+    - $DISABLE_PER_COMMIT_BUILDS
+  tags:
+  - docker
 
 
 
@@ -1381,24 +1481,24 @@ clang_7.0_hybrid_dbg_sp:
 ###############################################################################
 
 doc:
-   image: walberla/buildenv-ubuntu-basic:16.04
-   script:
-      - cmake --version
-      - doxygen --version
-      - mkdir $CI_PROJECT_DIR/build
-      - cd $CI_PROJECT_DIR/build
-      - cmake ..
-      - cmake . -LAH
-      - make doc
-   except:
-      variables:
-         - $DISABLE_PER_COMMIT_BUILDS
-   tags:
-      - docker
-   artifacts:
-      paths:
-        - build/doc
-      expire_in: 1 weeks
+  image: walberla/buildenv-ubuntu-basic:16.04
+  script:
+  - cmake --version
+  - doxygen --version
+  - mkdir $CI_PROJECT_DIR/build
+  - cd $CI_PROJECT_DIR/build
+  - cmake ..
+  - cmake . -LAH
+  - make doc
+  except:
+    variables:
+    - $DISABLE_PER_COMMIT_BUILDS
+  tags:
+  - docker
+  artifacts:
+    paths:
+    - build/doc
+    expire_in: 1 weeks
 
 
 
@@ -1409,276 +1509,276 @@ doc:
 ###############################################################################
 
 clang-tidy:
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:7.0
-   script:
-      - $CXX --version
-      - cmake --version
-      - mkdir $CI_PROJECT_DIR/build
-      - cd $CI_PROJECT_DIR/build
-      - cmake .. -DCMAKE_EXPORT_COMPILE_COMMANDS=ON -DWALBERLA_BUFFER_DEBUG=ON -DWALBERLA_BUILD_TESTS=ON -DWALBERLA_BUILD_BENCHMARKS=ON -DWALBERLA_BUILD_TUTORIALS=ON -DWALBERLA_BUILD_TOOLS=ON -DWALBERLA_BUILD_WITH_MPI=ON -DWALBERLA_BUILD_WITH_OPENMP=ON -DCMAKE_BUILD_TYPE=Debug -DWALBERLA_BUILD_WITH_METIS=ON -DWALBERLA_BUILD_WITH_PARMETIS=ON -DWALBERLA_BUILD_WITH_OPENMESH=ON -DWALBERLA_DOUBLE_ACCURACY=ON
-      - cmake . -LAH
-      - utilities/filterCompileCommands.py compile_commands.json
-      - run-clang-tidy.py -quiet | tee clang-tidy-output.txt
-   artifacts:
-      paths:
-         - $CI_PROJECT_DIR/build/clang-tidy-output.txt
-   tags:
-      - docker
+  image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:7.0
+  script:
+  - $CXX --version
+  - cmake --version
+  - mkdir $CI_PROJECT_DIR/build
+  - cd $CI_PROJECT_DIR/build
+  - cmake .. -DCMAKE_EXPORT_COMPILE_COMMANDS=ON -DWALBERLA_BUFFER_DEBUG=ON -DWALBERLA_BUILD_TESTS=ON -DWALBERLA_BUILD_BENCHMARKS=ON -DWALBERLA_BUILD_TUTORIALS=ON -DWALBERLA_BUILD_TOOLS=ON -DWALBERLA_BUILD_WITH_MPI=ON -DWALBERLA_BUILD_WITH_OPENMP=ON -DCMAKE_BUILD_TYPE=Debug -DWALBERLA_BUILD_WITH_METIS=ON -DWALBERLA_BUILD_WITH_PARMETIS=ON -DWALBERLA_BUILD_WITH_OPENMESH=ON -DWALBERLA_DOUBLE_ACCURACY=ON
+  - cmake . -LAH
+  - utilities/filterCompileCommands.py compile_commands.json
+  - run-clang-tidy.py -quiet | tee clang-tidy-output.txt
+  artifacts:
+    paths:
+    - $CI_PROJECT_DIR/build/clang-tidy-output.txt
+  tags:
+  - docker
 
 
 cppcheck:
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/cppcheck
-   script:
-      - cppcheck --version
-      - cppcheck . --max-configs=10 --enable=warning --enable=style --enable=performance --enable=portability -i src/gui/extern -i src/geometry/structured/extern -i sqlite3.c -i StackWalker.cpp -I src/ -I tests/ -I apps/ -D WALBERLA_BUILD_WITH_MPI -D WALBERLA_BUILD_WITH_METIS -D WALBERLA_BUILD_WITH_BOOST_THREAD -D WALBERLA_BUILD_WITH_PYTHON --xml 2> report.xml
-      - cppcheck-htmlreport --file=report.xml --report-dir=html_report --source-dir=.
-   artifacts:
-      untracked: true
-   only:
-      variables:
-         - $ENABLE_NIGHTLY_BUILDS
-   tags:
-      - docker
+  image: i10git.cs.fau.de:5005/walberla/buildenvs/cppcheck
+  script:
+  - cppcheck --version
+  - cppcheck . --max-configs=10 --enable=warning --enable=style --enable=performance --enable=portability -i src/gui/extern -i src/geometry/structured/extern -i sqlite3.c -i StackWalker.cpp -I src/ -I tests/ -I apps/ -D WALBERLA_BUILD_WITH_MPI -D WALBERLA_BUILD_WITH_METIS -D WALBERLA_BUILD_WITH_BOOST_THREAD -D WALBERLA_BUILD_WITH_PYTHON --xml 2> report.xml
+  - cppcheck-htmlreport --file=report.xml --report-dir=html_report --source-dir=.
+  artifacts:
+    untracked: true
+  only:
+    variables:
+    - $ENABLE_NIGHTLY_BUILDS
+  tags:
+  - docker
 
 
 coverage:
-   image: walberla/coverage
-   script:
-      - $CXX --version
-      - cmake --version
-      - gcovr --version
-      - mkdir build
-      - cd build
-      - if dpkg --compare-versions `ompi_info | head -2 | tail -1 | sed 's/[^0-9.]*\([0-9.]*\).*/\1/'` ge 1.10; then export MPIEXEC_PREFLAGS="--allow-run-as-root" ; fi
-      - cmake .. -DWALBERLA_BUILD_TESTS=ON -DWALBERLA_BUILD_BENCHMARKS=ON -DWALBERLA_BUILD_TUTORIALS=ON -DWALBERLA_BUILD_WITH_MPI=ON -DWALBERLA_BUILD_WITH_OPENMP=OFF -DCMAKE_BUILD_TYPE=Debug -DMPIEXEC_PREFLAGS=$MPIEXEC_PREFLAGS
-      - cmake . -LAH
-      - make -j 8
-      - ctest -LE longrun --output-on-failure -j 8_Hybrid
-      - cd ..
-      - mkdir coverage
-      - cd coverage
-      - pwd
-      - gcovr -r $CI_PROJECT_DIR -f ".*\\/src\\/.*" -k
-      - gcovr -r $CI_PROJECT_DIR -f ".*\\/src\\/.*" --html --html-details -o coverage.html -g
-   artifacts:
-      paths:
-         - coverage/
-   only:
-      variables:
-         - $ENABLE_NIGHTLY_BUILDS
-   tags:
-      - docker
-   variables:
-      CXXFLAGS: "-fprofile-arcs -ftest-coverage -fPIC -O0"
-      LDFLAGS: "-fprofile-arcs -ftest-coverage -fPIC -O0"
-
+  image: walberla/coverage
+  script:
+  - $CXX --version
+  - cmake --version
+  - gcovr --version
+  - mkdir build
+  - cd build
+  - if dpkg --compare-versions `ompi_info | head -2 | tail -1 | sed 's/[^0-9.]*\([0-9.]*\).*/\1/'` ge 1.10; then export MPIEXEC_PREFLAGS="--allow-run-as-root" ; fi
+  - cmake .. -DWALBERLA_BUILD_TESTS=ON -DWALBERLA_BUILD_BENCHMARKS=ON -DWALBERLA_BUILD_TUTORIALS=ON -DWALBERLA_BUILD_WITH_MPI=ON -DWALBERLA_BUILD_WITH_OPENMP=OFF -DCMAKE_BUILD_TYPE=Debug -DMPIEXEC_PREFLAGS=$MPIEXEC_PREFLAGS
+  - cmake . -LAH
+  - make -j 8
+  - ctest -LE longrun --output-on-failure -j 8_Hybrid
+  - cd ..
+  - mkdir coverage
+  - cd coverage
+  - pwd
+  - gcovr -r $CI_PROJECT_DIR -f ".*\\/src\\/.*" -k
+  - gcovr -r $CI_PROJECT_DIR -f ".*\\/src\\/.*" --html --html-details -o coverage.html -g
+  artifacts:
+    paths:
+    - coverage/
+  only:
+    variables:
+    - $ENABLE_NIGHTLY_BUILDS
+  tags:
+  - docker
+  variables:
+    CXXFLAGS: "-fprofile-arcs -ftest-coverage -fPIC -O0"
+    LDFLAGS: "-fprofile-arcs -ftest-coverage -fPIC -O0"
+
+
+
+    ###############################################################################
+    ##                                                                           ##
+    ##    Windows Builds                                                         ##
+    ##                                                                           ##
+    ###############################################################################
 
 
-###############################################################################
-##                                                                           ##
-##    Windows Builds                                                         ##
-##                                                                           ##
-###############################################################################
-      
-     
 .win_build_template: &win_build_definition
-   tags:
-      - win
-   script:
-      - export PreferredToolArchitecture=x64
-      - export OMP_NUM_THREADS=4
-      - export OMP_WAIT_POLICY="PASSIVE"
-      - export MSMPI_DISABLE_SHM=1
-      - cmake --version
-      - mkdir build
-      - cd build
-      - cmake -LAH -DWALBERLA_BUILD_TESTS=ON -DWALBERLA_BUILD_BENCHMARKS=ON -DWALBERLA_BUILD_TUTORIALS=ON -DWALBERLA_BUILD_WITH_MPI=$WALBERLA_BUILD_WITH_MPI -DWALBERLA_BUILD_WITH_OPENMP=$WALBERLA_BUILD_WITH_OPENMP -DWALBERLA_DOUBLE_ACCURACY=$WALBERLA_DOUBLE_ACCURACY -DWARNING_ERROR=ON -G "$CMAKE_GENERATOR" ..
-      - MSBuild.exe walberla.sln /property:Configuration=$BUILD_CONFIGURATION /verbosity:minimal /maxcpucount:4
-      - ctest -LE $CTEST_EXCLUDE_LABELS -C $BUILD_CONFIGURATION --output-on-failure -j 4
-      
-      
+  tags:
+  - win
+  script:
+  - export PreferredToolArchitecture=x64
+  - export OMP_NUM_THREADS=4
+  - export OMP_WAIT_POLICY="PASSIVE"
+  - export MSMPI_DISABLE_SHM=1
+  - cmake --version
+  - mkdir build
+  - cd build
+  - cmake -LAH -DWALBERLA_BUILD_TESTS=ON -DWALBERLA_BUILD_BENCHMARKS=ON -DWALBERLA_BUILD_TUTORIALS=ON -DWALBERLA_BUILD_WITH_MPI=$WALBERLA_BUILD_WITH_MPI -DWALBERLA_BUILD_WITH_OPENMP=$WALBERLA_BUILD_WITH_OPENMP -DWALBERLA_DOUBLE_ACCURACY=$WALBERLA_DOUBLE_ACCURACY -DWARNING_ERROR=ON -G "$CMAKE_GENERATOR" ..
+  - MSBuild.exe walberla.sln /property:Configuration=$BUILD_CONFIGURATION /verbosity:minimal /maxcpucount:4
+  - ctest -LE $CTEST_EXCLUDE_LABELS -C $BUILD_CONFIGURATION --output-on-failure -j 4
+
+
 msvc-14_Hybrid_Dbg:
-   <<: *win_build_definition
-   variables:
-      CMAKE_GENERATOR: "Visual Studio 14 2015 Win64"
-      BUILD_CONFIGURATION: "DebugOptimized"
-      CTEST_EXCLUDE_LABELS: "longrun"
-      WALBERLA_BUILD_WITH_MPI: "ON"
-      WALBERLA_BUILD_WITH_OPENMP: "ON"
-      WALBERLA_DOUBLE_ACCURACY: "ON"
-   except:
-      variables:
-         - $DISABLE_PER_COMMIT_BUILDS
-      
+  <<: *win_build_definition
+  variables:
+    CMAKE_GENERATOR: "Visual Studio 14 2015 Win64"
+    BUILD_CONFIGURATION: "DebugOptimized"
+    CTEST_EXCLUDE_LABELS: "longrun"
+    WALBERLA_BUILD_WITH_MPI: "ON"
+    WALBERLA_BUILD_WITH_OPENMP: "ON"
+    WALBERLA_DOUBLE_ACCURACY: "ON"
+  except:
+    variables:
+    - $DISABLE_PER_COMMIT_BUILDS
+
 msvc-14_Hybrid_SP_Dbg:
-   <<: *win_build_definition
-   variables:
-      CMAKE_GENERATOR: "Visual Studio 14 2015 Win64"
-      BUILD_CONFIGURATION: "DebugOptimized"
-      CTEST_EXCLUDE_LABELS: "longrun"
-      WALBERLA_BUILD_WITH_MPI: "ON"
-      WALBERLA_BUILD_WITH_OPENMP: "ON"
-      WALBERLA_DOUBLE_ACCURACY: "OFF"
-   only:
-      variables:
-         - $ENABLE_NIGHTLY_BUILDS
-      
+  <<: *win_build_definition
+  variables:
+    CMAKE_GENERATOR: "Visual Studio 14 2015 Win64"
+    BUILD_CONFIGURATION: "DebugOptimized"
+    CTEST_EXCLUDE_LABELS: "longrun"
+    WALBERLA_BUILD_WITH_MPI: "ON"
+    WALBERLA_BUILD_WITH_OPENMP: "ON"
+    WALBERLA_DOUBLE_ACCURACY: "OFF"
+  only:
+    variables:
+    - $ENABLE_NIGHTLY_BUILDS
+
 msvc-14_Hybrid:
-   <<: *win_build_definition
-   variables:
-      CMAKE_GENERATOR: "Visual Studio 14 2015 Win64"
-      BUILD_CONFIGURATION: "Release"
-      CTEST_EXCLUDE_LABELS: "longrun"
-      WALBERLA_BUILD_WITH_MPI: "ON"
-      WALBERLA_BUILD_WITH_OPENMP: "ON"
-      WALBERLA_DOUBLE_ACCURACY: "ON"
-   only:
-      variables:
-         - $ENABLE_NIGHTLY_BUILDS
-      
+  <<: *win_build_definition
+  variables:
+    CMAKE_GENERATOR: "Visual Studio 14 2015 Win64"
+    BUILD_CONFIGURATION: "Release"
+    CTEST_EXCLUDE_LABELS: "longrun"
+    WALBERLA_BUILD_WITH_MPI: "ON"
+    WALBERLA_BUILD_WITH_OPENMP: "ON"
+    WALBERLA_DOUBLE_ACCURACY: "ON"
+  only:
+    variables:
+    - $ENABLE_NIGHTLY_BUILDS
+
 msvc-14_Serial_Dbg:
-   <<: *win_build_definition
-   variables:
-      CMAKE_GENERATOR: "Visual Studio 14 2015 Win64"
-      BUILD_CONFIGURATION: "DebugOptimized"
-      CTEST_EXCLUDE_LABELS: "longrun"
-      WALBERLA_BUILD_WITH_MPI: "OFF"
-      WALBERLA_BUILD_WITH_OPENMP: "OFF"
-      WALBERLA_DOUBLE_ACCURACY: "ON"
-   only:
-      variables:
-         - $ENABLE_NIGHTLY_BUILDS
-      
+  <<: *win_build_definition
+  variables:
+    CMAKE_GENERATOR: "Visual Studio 14 2015 Win64"
+    BUILD_CONFIGURATION: "DebugOptimized"
+    CTEST_EXCLUDE_LABELS: "longrun"
+    WALBERLA_BUILD_WITH_MPI: "OFF"
+    WALBERLA_BUILD_WITH_OPENMP: "OFF"
+    WALBERLA_DOUBLE_ACCURACY: "ON"
+  only:
+    variables:
+    - $ENABLE_NIGHTLY_BUILDS
+
 msvc-14_Serial:
-   <<: *win_build_definition
-   variables:
-      CMAKE_GENERATOR: "Visual Studio 14 2015 Win64"
-      BUILD_CONFIGURATION: "Release"
-      CTEST_EXCLUDE_LABELS: "longrun"
-      WALBERLA_BUILD_WITH_MPI: "OFF"
-      WALBERLA_BUILD_WITH_OPENMP: "OFF"
-      WALBERLA_DOUBLE_ACCURACY: "ON"
-   only:
-      variables:
-         - $ENABLE_NIGHTLY_BUILDS
-      
+  <<: *win_build_definition
+  variables:
+    CMAKE_GENERATOR: "Visual Studio 14 2015 Win64"
+    BUILD_CONFIGURATION: "Release"
+    CTEST_EXCLUDE_LABELS: "longrun"
+    WALBERLA_BUILD_WITH_MPI: "OFF"
+    WALBERLA_BUILD_WITH_OPENMP: "OFF"
+    WALBERLA_DOUBLE_ACCURACY: "ON"
+  only:
+    variables:
+    - $ENABLE_NIGHTLY_BUILDS
+
 msvc-14_MpiOnly_Dbg:
-   <<: *win_build_definition
-   variables:
-      CMAKE_GENERATOR: "Visual Studio 14 2015 Win64"
-      BUILD_CONFIGURATION: "DebugOptimized"
-      CTEST_EXCLUDE_LABELS: "longrun"
-      WALBERLA_BUILD_WITH_MPI: "ON"
-      WALBERLA_BUILD_WITH_OPENMP: "OFF"
-      WALBERLA_DOUBLE_ACCURACY: "ON"
-   only:
-      variables:
-         - $ENABLE_NIGHTLY_BUILDS
-      
+  <<: *win_build_definition
+  variables:
+    CMAKE_GENERATOR: "Visual Studio 14 2015 Win64"
+    BUILD_CONFIGURATION: "DebugOptimized"
+    CTEST_EXCLUDE_LABELS: "longrun"
+    WALBERLA_BUILD_WITH_MPI: "ON"
+    WALBERLA_BUILD_WITH_OPENMP: "OFF"
+    WALBERLA_DOUBLE_ACCURACY: "ON"
+  only:
+    variables:
+    - $ENABLE_NIGHTLY_BUILDS
+
 msvc-14_MpiOnly:
-   <<: *win_build_definition
-   variables:
-      CMAKE_GENERATOR: "Visual Studio 14 2015 Win64"
-      BUILD_CONFIGURATION: "Release"
-      CTEST_EXCLUDE_LABELS: "longrun"
-      WALBERLA_BUILD_WITH_MPI: "ON"
-      WALBERLA_BUILD_WITH_OPENMP: "OFF"
-      WALBERLA_DOUBLE_ACCURACY: "ON"
-   only:
-      variables:
-         - $ENABLE_NIGHTLY_BUILDS
-      
-      
+  <<: *win_build_definition
+  variables:
+    CMAKE_GENERATOR: "Visual Studio 14 2015 Win64"
+    BUILD_CONFIGURATION: "Release"
+    CTEST_EXCLUDE_LABELS: "longrun"
+    WALBERLA_BUILD_WITH_MPI: "ON"
+    WALBERLA_BUILD_WITH_OPENMP: "OFF"
+    WALBERLA_DOUBLE_ACCURACY: "ON"
+  only:
+    variables:
+    - $ENABLE_NIGHTLY_BUILDS
+
+
 msvc-14.1_Hybrid_Dbg:
-   <<: *win_build_definition
-   variables:
-      CMAKE_GENERATOR: "Visual Studio 15 2017 Win64"
-      BUILD_CONFIGURATION: "DebugOptimized"
-      CTEST_EXCLUDE_LABELS: "longrun"
-      WALBERLA_BUILD_WITH_MPI: "ON"
-      WALBERLA_BUILD_WITH_OPENMP: "ON"
-      WALBERLA_DOUBLE_ACCURACY: "ON"
-   except:
-      variables:
-         - $DISABLE_PER_COMMIT_BUILDS
-      
+  <<: *win_build_definition
+  variables:
+    CMAKE_GENERATOR: "Visual Studio 15 2017 Win64"
+    BUILD_CONFIGURATION: "DebugOptimized"
+    CTEST_EXCLUDE_LABELS: "longrun"
+    WALBERLA_BUILD_WITH_MPI: "ON"
+    WALBERLA_BUILD_WITH_OPENMP: "ON"
+    WALBERLA_DOUBLE_ACCURACY: "ON"
+  except:
+    variables:
+    - $DISABLE_PER_COMMIT_BUILDS
+
 msvc-14.1_Hybrid_SP_Dbg:
-   <<: *win_build_definition
-   variables:
-      CMAKE_GENERATOR: "Visual Studio 15 2017 Win64"
-      BUILD_CONFIGURATION: "DebugOptimized"
-      CTEST_EXCLUDE_LABELS: "longrun"
-      WALBERLA_BUILD_WITH_MPI: "ON"
-      WALBERLA_BUILD_WITH_OPENMP: "ON"
-      WALBERLA_DOUBLE_ACCURACY: "OFF"
-   except:
-      variables:
-         - $DISABLE_PER_COMMIT_BUILDS
-      
+  <<: *win_build_definition
+  variables:
+    CMAKE_GENERATOR: "Visual Studio 15 2017 Win64"
+    BUILD_CONFIGURATION: "DebugOptimized"
+    CTEST_EXCLUDE_LABELS: "longrun"
+    WALBERLA_BUILD_WITH_MPI: "ON"
+    WALBERLA_BUILD_WITH_OPENMP: "ON"
+    WALBERLA_DOUBLE_ACCURACY: "OFF"
+  except:
+    variables:
+    - $DISABLE_PER_COMMIT_BUILDS
+
 msvc-14.1_Hybrid:
-   <<: *win_build_definition
-   variables:
-      CMAKE_GENERATOR: "Visual Studio 15 2017 Win64"
-      BUILD_CONFIGURATION: "Release"
-      CTEST_EXCLUDE_LABELS: "longrun"
-      WALBERLA_BUILD_WITH_MPI: "ON"
-      WALBERLA_BUILD_WITH_OPENMP: "ON"
-      WALBERLA_DOUBLE_ACCURACY: "ON"
-   except:
-      variables:
-         - $DISABLE_PER_COMMIT_BUILDS
-      
+  <<: *win_build_definition
+  variables:
+    CMAKE_GENERATOR: "Visual Studio 15 2017 Win64"
+    BUILD_CONFIGURATION: "Release"
+    CTEST_EXCLUDE_LABELS: "longrun"
+    WALBERLA_BUILD_WITH_MPI: "ON"
+    WALBERLA_BUILD_WITH_OPENMP: "ON"
+    WALBERLA_DOUBLE_ACCURACY: "ON"
+  except:
+    variables:
+    - $DISABLE_PER_COMMIT_BUILDS
+
 msvc-14.1_Serial_Dbg:
-   <<: *win_build_definition
-   variables:
-      CMAKE_GENERATOR: "Visual Studio 15 2017 Win64"
-      BUILD_CONFIGURATION: "DebugOptimized"
-      CTEST_EXCLUDE_LABELS: "longrun"
-      WALBERLA_BUILD_WITH_MPI: "OFF"
-      WALBERLA_BUILD_WITH_OPENMP: "OFF"
-      WALBERLA_DOUBLE_ACCURACY: "ON"
-   except:
-      variables:
-         - $DISABLE_PER_COMMIT_BUILDS
-      
+  <<: *win_build_definition
+  variables:
+    CMAKE_GENERATOR: "Visual Studio 15 2017 Win64"
+    BUILD_CONFIGURATION: "DebugOptimized"
+    CTEST_EXCLUDE_LABELS: "longrun"
+    WALBERLA_BUILD_WITH_MPI: "OFF"
+    WALBERLA_BUILD_WITH_OPENMP: "OFF"
+    WALBERLA_DOUBLE_ACCURACY: "ON"
+  except:
+    variables:
+    - $DISABLE_PER_COMMIT_BUILDS
+
 msvc-14.1_Serial:
-   <<: *win_build_definition
-   variables:
-      CMAKE_GENERATOR: "Visual Studio 15 2017 Win64"
-      BUILD_CONFIGURATION: "Release"
-      CTEST_EXCLUDE_LABELS: "longrun"
-      WALBERLA_BUILD_WITH_MPI: "OFF"
-      WALBERLA_BUILD_WITH_OPENMP: "OFF"
-      WALBERLA_DOUBLE_ACCURACY: "ON"
-   only:
-      variables:
-         - $ENABLE_NIGHTLY_BUILDS
-      
+  <<: *win_build_definition
+  variables:
+    CMAKE_GENERATOR: "Visual Studio 15 2017 Win64"
+    BUILD_CONFIGURATION: "Release"
+    CTEST_EXCLUDE_LABELS: "longrun"
+    WALBERLA_BUILD_WITH_MPI: "OFF"
+    WALBERLA_BUILD_WITH_OPENMP: "OFF"
+    WALBERLA_DOUBLE_ACCURACY: "ON"
+  only:
+    variables:
+    - $ENABLE_NIGHTLY_BUILDS
+
 msvc-14.1_MpiOnly_Dbg:
-   <<: *win_build_definition
-   variables:
-      CMAKE_GENERATOR: "Visual Studio 15 2017 Win64"
-      BUILD_CONFIGURATION: "DebugOptimized"
-      CTEST_EXCLUDE_LABELS: "longrun"
-      WALBERLA_BUILD_WITH_MPI: "ON"
-      WALBERLA_BUILD_WITH_OPENMP: "OFF"
-      WALBERLA_DOUBLE_ACCURACY: "ON"
-   except:
-      variables:
-         - $DISABLE_PER_COMMIT_BUILDS
-      
+  <<: *win_build_definition
+  variables:
+    CMAKE_GENERATOR: "Visual Studio 15 2017 Win64"
+    BUILD_CONFIGURATION: "DebugOptimized"
+    CTEST_EXCLUDE_LABELS: "longrun"
+    WALBERLA_BUILD_WITH_MPI: "ON"
+    WALBERLA_BUILD_WITH_OPENMP: "OFF"
+    WALBERLA_DOUBLE_ACCURACY: "ON"
+  except:
+    variables:
+    - $DISABLE_PER_COMMIT_BUILDS
+
 msvc-14.1_MpiOnly:
-   <<: *win_build_definition
-   variables:
-      CMAKE_GENERATOR: "Visual Studio 15 2017 Win64"
-      BUILD_CONFIGURATION: "Release"
-      CTEST_EXCLUDE_LABELS: "longrun"
-      WALBERLA_BUILD_WITH_MPI: "ON"
-      WALBERLA_BUILD_WITH_OPENMP: "OFF"
-      WALBERLA_DOUBLE_ACCURACY: "ON"
-   only:
-      variables:
-         - $ENABLE_NIGHTLY_BUILDS
+  <<: *win_build_definition
+  variables:
+    CMAKE_GENERATOR: "Visual Studio 15 2017 Win64"
+    BUILD_CONFIGURATION: "Release"
+    CTEST_EXCLUDE_LABELS: "longrun"
+    WALBERLA_BUILD_WITH_MPI: "ON"
+    WALBERLA_BUILD_WITH_OPENMP: "OFF"
+    WALBERLA_DOUBLE_ACCURACY: "ON"
+  only:
+    variables:
+    - $ENABLE_NIGHTLY_BUILDS
 
 
 ###############################################################################
@@ -1689,73 +1789,73 @@ msvc-14.1_MpiOnly:
 
 
 .mac_build_template: &mac_build_definition
-   script:
-      - export NUM_CORES=$(system_profiler SPHardwareDataType | grep 'Total Number of Cores' | awk '{print $5}')
-      - export MAX_BUILD_CORES=$(( $(system_profiler SPHardwareDataType | grep 'Memory' | awk '{print $2}') / 4 ))
-      - "[[ $MAX_BUILD_CORES -lt $NUM_CORES ]] && export NUM_BUILD_CORES=$MAX_BUILD_CORES || export NUM_BUILD_CORES=$NUM_CORES"
-      - c++ --version
-      - cmake --version
-      - mpirun --version
-      - mkdir build
-      - cd build
-      - cmake .. -DWALBERLA_BUILD_TESTS=ON -DWALBERLA_BUILD_BENCHMARKS=ON -DWALBERLA_BUILD_TUTORIALS=ON -DWALBERLA_BUILD_TOOLS=ON -DWALBERLA_BUILD_WITH_MPI=$WALBERLA_BUILD_WITH_MPI -DWALBERLA_BUILD_WITH_PYTHON=$WALBERLA_BUILD_WITH_PYTHON -DWALBERLA_BUILD_WITH_OPENMP=$WALBERLA_BUILD_WITH_OPENMP -DWALBERLA_BUILD_WITH_CUDA=$WALBERLA_BUILD_WITH_CUDA -DCMAKE_BUILD_TYPE=$CMAKE_BUILD_TYPE -DWARNING_ERROR=ON
-      - cmake . -LAH
-      - make -j $NUM_BUILD_CORES -l $NUM_CORES
-      - ctest -LE "$CTEST_EXCLUDE_LABELS|cuda" -C $CMAKE_BUILD_TYPE --output-on-failure -j $NUM_CORES
-   tags:
-      - mac
+  script:
+  - export NUM_CORES=$(system_profiler SPHardwareDataType | grep 'Total Number of Cores' | awk '{print $5}')
+  - export MAX_BUILD_CORES=$(( $(system_profiler SPHardwareDataType | grep 'Memory' | awk '{print $2}') / 4 ))
+  - "[[ $MAX_BUILD_CORES -lt $NUM_CORES ]] && export NUM_BUILD_CORES=$MAX_BUILD_CORES || export NUM_BUILD_CORES=$NUM_CORES"
+  - c++ --version
+  - cmake --version
+  - mpirun --version
+  - mkdir build
+  - cd build
+  - cmake .. -DWALBERLA_BUILD_TESTS=ON -DWALBERLA_BUILD_BENCHMARKS=ON -DWALBERLA_BUILD_TUTORIALS=ON -DWALBERLA_BUILD_TOOLS=ON -DWALBERLA_BUILD_WITH_MPI=$WALBERLA_BUILD_WITH_MPI -DWALBERLA_BUILD_WITH_PYTHON=$WALBERLA_BUILD_WITH_PYTHON -DWALBERLA_BUILD_WITH_OPENMP=$WALBERLA_BUILD_WITH_OPENMP -DWALBERLA_BUILD_WITH_CUDA=$WALBERLA_BUILD_WITH_CUDA -DCMAKE_BUILD_TYPE=$CMAKE_BUILD_TYPE -DWARNING_ERROR=ON
+  - cmake . -LAH
+  - make -j $NUM_BUILD_CORES -l $NUM_CORES
+  - ctest -LE "$CTEST_EXCLUDE_LABELS|cuda" -C $CMAKE_BUILD_TYPE --output-on-failure -j $NUM_CORES
+  tags:
+  - mac
 
 mac_Serial_Dbg:
-   <<: *mac_build_definition
-   variables:
-      CMAKE_BUILD_TYPE: "DebugOptimized"
-      CTEST_EXCLUDE_LABELS: "longrun"
-      WALBERLA_BUILD_WITH_MPI: "OFF"
-      WALBERLA_BUILD_WITH_OPENMP: "OFF"
-      WALBERLA_BUILD_WITH_PYTHON: "ON"
-      WALBERLA_BUILD_WITH_CUDA: "ON"
-   except:
-      variables:
-         - $DISABLE_PER_COMMIT_BUILDS
+  <<: *mac_build_definition
+  variables:
+    CMAKE_BUILD_TYPE: "DebugOptimized"
+    CTEST_EXCLUDE_LABELS: "longrun"
+    WALBERLA_BUILD_WITH_MPI: "OFF"
+    WALBERLA_BUILD_WITH_OPENMP: "OFF"
+    WALBERLA_BUILD_WITH_PYTHON: "ON"
+    WALBERLA_BUILD_WITH_CUDA: "ON"
+  except:
+    variables:
+    - $DISABLE_PER_COMMIT_BUILDS
 
 mac_Serial:
-   <<: *mac_build_definition
-   variables:
-      CMAKE_BUILD_TYPE: "Release"
-      CTEST_EXCLUDE_LABELS: "longrun"
-      WALBERLA_BUILD_WITH_MPI: "OFF"
-      WALBERLA_BUILD_WITH_OPENMP: "OFF"
-      WALBERLA_BUILD_WITH_PYTHON: "ON"
-      WALBERLA_BUILD_WITH_CUDA: "ON"
-   except:
-      variables:
-         - $DISABLE_PER_COMMIT_BUILDS
+  <<: *mac_build_definition
+  variables:
+    CMAKE_BUILD_TYPE: "Release"
+    CTEST_EXCLUDE_LABELS: "longrun"
+    WALBERLA_BUILD_WITH_MPI: "OFF"
+    WALBERLA_BUILD_WITH_OPENMP: "OFF"
+    WALBERLA_BUILD_WITH_PYTHON: "ON"
+    WALBERLA_BUILD_WITH_CUDA: "ON"
+  except:
+    variables:
+    - $DISABLE_PER_COMMIT_BUILDS
 
 mac_MpiOnly_Dbg:
-   <<: *mac_build_definition
-   variables:
-      CMAKE_BUILD_TYPE: "DebugOptimized"
-      CTEST_EXCLUDE_LABELS: "longrun"
-      WALBERLA_BUILD_WITH_MPI: "ON"
-      WALBERLA_BUILD_WITH_OPENMP: "OFF"
-      WALBERLA_BUILD_WITH_PYTHON: "ON"
-      WALBERLA_BUILD_WITH_CUDA: "ON"
-   except:
-      variables:
-         - $DISABLE_PER_COMMIT_BUILDS
+  <<: *mac_build_definition
+  variables:
+    CMAKE_BUILD_TYPE: "DebugOptimized"
+    CTEST_EXCLUDE_LABELS: "longrun"
+    WALBERLA_BUILD_WITH_MPI: "ON"
+    WALBERLA_BUILD_WITH_OPENMP: "OFF"
+    WALBERLA_BUILD_WITH_PYTHON: "ON"
+    WALBERLA_BUILD_WITH_CUDA: "ON"
+  except:
+    variables:
+    - $DISABLE_PER_COMMIT_BUILDS
 
 mac_MpiOnly:
-   <<: *mac_build_definition
-   variables:
-      CMAKE_BUILD_TYPE: "Release"
-      CTEST_EXCLUDE_LABELS: "longrun"
-      WALBERLA_BUILD_WITH_MPI: "ON"
-      WALBERLA_BUILD_WITH_OPENMP: "OFF"
-      WALBERLA_BUILD_WITH_PYTHON: "ON"
-      WALBERLA_BUILD_WITH_CUDA: "ON"
-   except:
-      variables:
-         - $DISABLE_PER_COMMIT_BUILDS
+  <<: *mac_build_definition
+  variables:
+    CMAKE_BUILD_TYPE: "Release"
+    CTEST_EXCLUDE_LABELS: "longrun"
+    WALBERLA_BUILD_WITH_MPI: "ON"
+    WALBERLA_BUILD_WITH_OPENMP: "OFF"
+    WALBERLA_BUILD_WITH_PYTHON: "ON"
+    WALBERLA_BUILD_WITH_CUDA: "ON"
+  except:
+    variables:
+    - $DISABLE_PER_COMMIT_BUILDS
 
 
 ###############################################################################
@@ -1765,53 +1865,53 @@ mac_MpiOnly:
 ###############################################################################
 
 .conda-deploy: &conda_deploy_definition
-   stage: deploy
-   before_script:
-      - conda install -y conda-build anaconda-client
-      - anaconda login --username $CONDA_DEPLOY_USER --password $CONDA_DEPLOY_PASSWORD --hostname $CI_JOB_ID
-      - conda config --set anaconda_upload yes
-      - conda config --add channels lssfau
-   after_script:
-      - anaconda logout
-   dependencies: []
-   when: manual
-   only:
-      - master@walberla/walberla   
-      - tags@walberla/walberla
+  stage: deploy
+  before_script:
+  - conda install -y conda-build anaconda-client
+  - anaconda login --username $CONDA_DEPLOY_USER --password $CONDA_DEPLOY_PASSWORD --hostname $CI_JOB_ID
+  - conda config --set anaconda_upload yes
+  - conda config --add channels lssfau
+  after_script:
+  - anaconda logout
+  dependencies: []
+  when: manual
+  only:
+  - master@walberla/walberla
+  - tags@walberla/walberla
 
 conda-py36-win:
-   <<: *conda_deploy_definition
-   tags:
-      - win
-   script:
-      - conda build --python=3.6 --user=lssfau utilities\\conda\\walberla
-      
+  <<: *conda_deploy_definition
+  tags:
+  - win
+  script:
+  - conda build --python=3.6 --user=lssfau utilities\\conda\\walberla
+
 conda-py35-win:
-   <<: *conda_deploy_definition
-   tags:
-      - win
-   script:
-      - conda build --python=3.5 --user=lssfau utilities\\conda\\walberla
+  <<: *conda_deploy_definition
+  tags:
+  - win
+  script:
+  - conda build --python=3.5 --user=lssfau utilities\\conda\\walberla
 
 conda-py36-linux:
-   <<: *conda_deploy_definition
-   tags:
-      - docker
-   image: continuumio/miniconda3
-   script:
-      - apt-get update
-      - apt-get install -y build-essential
-      - conda build --python=3.6 --user=lssfau utilities/conda/walberla
-      
+  <<: *conda_deploy_definition
+  tags:
+  - docker
+  image: continuumio/miniconda3
+  script:
+  - apt-get update
+  - apt-get install -y build-essential
+  - conda build --python=3.6 --user=lssfau utilities/conda/walberla
+
 conda-py35-linux:
-   <<: *conda_deploy_definition
-   tags:
-      - docker
-   image: continuumio/miniconda3
-   script:
-      - apt-get update
-      - apt-get install -y build-essential
-      - conda build --python=3.5 --user=lssfau utilities/conda/walberla
+  <<: *conda_deploy_definition
+  tags:
+  - docker
+  image: continuumio/miniconda3
+  script:
+  - apt-get update
+  - apt-get install -y build-essential
+  - conda build --python=3.5 --user=lssfau utilities/conda/walberla
 
 
 ###############################################################################
@@ -1821,55 +1921,55 @@ conda-py35-linux:
 ###############################################################################
 
 .benchmark_template: &benchmark_definition
-   script:
-      - apt-get update --fix-missing
-      - apt-get install -y python3-influxdb python3-git
-      - $CXX --version
-      - cmake --version
-      - ccache --version
-      - mpirun --version
-      - export CCACHE_BASEDIR=$CI_PROJECT_DIR
-      - mkdir $CI_PROJECT_DIR/build
-      - cd $CI_PROJECT_DIR/build
-      - cmake .. -DWALBERLA_BUFFER_DEBUG=OFF -DWALBERLA_BUILD_TESTS=OFF -DWALBERLA_BUILD_BENCHMARKS=ON -DWALBERLA_BUILD_TUTORIALS=OFF -DWALBERLA_BUILD_TOOLS=OFF -DWALBERLA_BUILD_WITH_MPI=ON -DWALBERLA_BUILD_WITH_CUDA=OFF -DWALBERLA_BUILD_WITH_PYTHON=OFF -DWALBERLA_BUILD_WITH_OPENMP=OFF -DCMAKE_BUILD_TYPE=RELEASE -DMPIEXEC_PREFLAGS=$MPIEXEC_PREFLAGS -DWALBERLA_DOUBLE_ACCURACY=ON -DWARNING_ERROR=ON -DWALBERLA_BUILD_WITH_METIS=OFF -DWALBERLA_BUILD_WITH_PARMETIS=OFF -DWALBERLA_OPTIMIZE_FOR_LOCALHOST=ON -DWALBERLA_BUILD_WITH_FASTMATH=ON -DWALBERLA_BUILD_WITH_LTO=ON
-      - cmake . -LAH
-      - cd apps/benchmarks/PeriodicGranularGas
-      - make -j 20
-      - export PATH=$PATH:/usr/local/likwid/bin
-      - likwid-setFrequencies -t 0
-      - likwid-setFrequencies -g performance
-      - likwid-setFrequencies -f 3.3 # set frequency to 3.3
-      - mpirun --allow-run-as-root -np 8 --map-by core --bind-to core --report-bindings ./PeriodicGranularGas PeriodicGranularGas.cfg --DEM --syncNextNeighbor | tee PeriodicGranularGas_DEM_NN.txt
-      - mpirun --allow-run-as-root -np 8 --map-by core --bind-to core --report-bindings ./PeriodicGranularGas PeriodicGranularGas.cfg --DEM --syncShadowOwners | tee PeriodicGranularGas_DEM_SO.txt
-      - mpirun --allow-run-as-root -np 8 --map-by core --bind-to core --report-bindings ./PeriodicGranularGas PeriodicGranularGas.cfg --HCSITS --syncNextNeighbor --InelasticFrictionlessContact | tee PeriodicGranularGas_HCSITS_NN_IFC.txt
-      - mpirun --allow-run-as-root -np 8 --map-by core --bind-to core --report-bindings ./PeriodicGranularGas PeriodicGranularGas.cfg --HCSITS --syncNextNeighbor --ApproximateInelasticCoulombContactByDecoupling | tee PeriodicGranularGas_HCSITS_NN_AICCBD.txt
-      - mpirun --allow-run-as-root -np 8 --map-by core --bind-to core --report-bindings ./PeriodicGranularGas PeriodicGranularGas.cfg --HCSITS --syncNextNeighbor --InelasticCoulombContactByDecoupling | tee PeriodicGranularGas_HCSITS_NN_ICCBD.txt
-      - mpirun --allow-run-as-root -np 8 --map-by core --bind-to core --report-bindings ./PeriodicGranularGas PeriodicGranularGas.cfg --HCSITS --syncNextNeighbor --InelasticGeneralizedMaximumDissipationContact | tee PeriodicGranularGas_HCSITS_NN_IGMDC.txt
-      - mpirun --allow-run-as-root -np 8 --map-by core --bind-to core --report-bindings ./PeriodicGranularGas PeriodicGranularGas.cfg --HCSITS --syncShadowOwners --InelasticFrictionlessContact | tee PeriodicGranularGas_HCSITS_SO_IFC.txt
-      - python3 upload.py
-   only:
-      variables:
-         - $ENABLE_BENCHMARKS
-   tags:
-      - docker-benchmark
-   artifacts:
-      paths:
-         - $CI_PROJECT_DIR/build/apps/benchmarks/PeriodicGranularGas/PeriodicGranularGas_DEM_NN.txt
-         - $CI_PROJECT_DIR/build/apps/benchmarks/PeriodicGranularGas/PeriodicGranularGas_DEM_SO.txt
-         - $CI_PROJECT_DIR/build/apps/benchmarks/PeriodicGranularGas/PeriodicGranularGas_HCSITS_NN_IFC.txt
-         - $CI_PROJECT_DIR/build/apps/benchmarks/PeriodicGranularGas/PeriodicGranularGas_HCSITS_NN_AICCBD.txt
-         - $CI_PROJECT_DIR/build/apps/benchmarks/PeriodicGranularGas/PeriodicGranularGas_HCSITS_NN_ICCBD.txt
-         - $CI_PROJECT_DIR/build/apps/benchmarks/PeriodicGranularGas/PeriodicGranularGas_HCSITS_NN_IGMDC.txt
-         - $CI_PROJECT_DIR/build/apps/benchmarks/PeriodicGranularGas/PeriodicGranularGas_HCSITS_SO_IFC.txt
+  script:
+  - apt-get update --fix-missing
+  - apt-get install -y python3-influxdb python3-git
+  - $CXX --version
+  - cmake --version
+  - ccache --version
+  - mpirun --version
+  - export CCACHE_BASEDIR=$CI_PROJECT_DIR
+  - mkdir $CI_PROJECT_DIR/build
+  - cd $CI_PROJECT_DIR/build
+  - cmake .. -DWALBERLA_BUFFER_DEBUG=OFF -DWALBERLA_BUILD_TESTS=OFF -DWALBERLA_BUILD_BENCHMARKS=ON -DWALBERLA_BUILD_TUTORIALS=OFF -DWALBERLA_BUILD_TOOLS=OFF -DWALBERLA_BUILD_WITH_MPI=ON -DWALBERLA_BUILD_WITH_CUDA=OFF -DWALBERLA_BUILD_WITH_PYTHON=OFF -DWALBERLA_BUILD_WITH_OPENMP=OFF -DCMAKE_BUILD_TYPE=RELEASE -DMPIEXEC_PREFLAGS=$MPIEXEC_PREFLAGS -DWALBERLA_DOUBLE_ACCURACY=ON -DWARNING_ERROR=ON -DWALBERLA_BUILD_WITH_METIS=OFF -DWALBERLA_BUILD_WITH_PARMETIS=OFF -DWALBERLA_OPTIMIZE_FOR_LOCALHOST=ON -DWALBERLA_BUILD_WITH_FASTMATH=ON -DWALBERLA_BUILD_WITH_LTO=ON
+  - cmake . -LAH
+  - cd apps/benchmarks/PeriodicGranularGas
+  - make -j 20
+  - export PATH=$PATH:/usr/local/likwid/bin
+  - likwid-setFrequencies -t 0
+  - likwid-setFrequencies -g performance
+  - likwid-setFrequencies -f 3.3 # set frequency to 3.3
+  - mpirun --allow-run-as-root -np 8 --map-by core --bind-to core --report-bindings ./PeriodicGranularGas PeriodicGranularGas.cfg --DEM --syncNextNeighbor | tee PeriodicGranularGas_DEM_NN.txt
+  - mpirun --allow-run-as-root -np 8 --map-by core --bind-to core --report-bindings ./PeriodicGranularGas PeriodicGranularGas.cfg --DEM --syncShadowOwners | tee PeriodicGranularGas_DEM_SO.txt
+  - mpirun --allow-run-as-root -np 8 --map-by core --bind-to core --report-bindings ./PeriodicGranularGas PeriodicGranularGas.cfg --HCSITS --syncNextNeighbor --InelasticFrictionlessContact | tee PeriodicGranularGas_HCSITS_NN_IFC.txt
+  - mpirun --allow-run-as-root -np 8 --map-by core --bind-to core --report-bindings ./PeriodicGranularGas PeriodicGranularGas.cfg --HCSITS --syncNextNeighbor --ApproximateInelasticCoulombContactByDecoupling | tee PeriodicGranularGas_HCSITS_NN_AICCBD.txt
+  - mpirun --allow-run-as-root -np 8 --map-by core --bind-to core --report-bindings ./PeriodicGranularGas PeriodicGranularGas.cfg --HCSITS --syncNextNeighbor --InelasticCoulombContactByDecoupling | tee PeriodicGranularGas_HCSITS_NN_ICCBD.txt
+  - mpirun --allow-run-as-root -np 8 --map-by core --bind-to core --report-bindings ./PeriodicGranularGas PeriodicGranularGas.cfg --HCSITS --syncNextNeighbor --InelasticGeneralizedMaximumDissipationContact | tee PeriodicGranularGas_HCSITS_NN_IGMDC.txt
+  - mpirun --allow-run-as-root -np 8 --map-by core --bind-to core --report-bindings ./PeriodicGranularGas PeriodicGranularGas.cfg --HCSITS --syncShadowOwners --InelasticFrictionlessContact | tee PeriodicGranularGas_HCSITS_SO_IFC.txt
+  - python3 upload.py
+  only:
+    variables:
+    - $ENABLE_BENCHMARKS
+  tags:
+  - docker-benchmark
+  artifacts:
+    paths:
+    - $CI_PROJECT_DIR/build/apps/benchmarks/PeriodicGranularGas/PeriodicGranularGas_DEM_NN.txt
+    - $CI_PROJECT_DIR/build/apps/benchmarks/PeriodicGranularGas/PeriodicGranularGas_DEM_SO.txt
+    - $CI_PROJECT_DIR/build/apps/benchmarks/PeriodicGranularGas/PeriodicGranularGas_HCSITS_NN_IFC.txt
+    - $CI_PROJECT_DIR/build/apps/benchmarks/PeriodicGranularGas/PeriodicGranularGas_HCSITS_NN_AICCBD.txt
+    - $CI_PROJECT_DIR/build/apps/benchmarks/PeriodicGranularGas/PeriodicGranularGas_HCSITS_NN_ICCBD.txt
+    - $CI_PROJECT_DIR/build/apps/benchmarks/PeriodicGranularGas/PeriodicGranularGas_HCSITS_NN_IGMDC.txt
+    - $CI_PROJECT_DIR/build/apps/benchmarks/PeriodicGranularGas/PeriodicGranularGas_HCSITS_SO_IFC.txt
 
 benchmark_intel17:
-   <<: *benchmark_definition
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/intel:17
+  <<: *benchmark_definition
+  image: i10git.cs.fau.de:5005/walberla/buildenvs/intel:17
 
 benchmark_gcc7:
-   <<: *benchmark_definition
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc:7
+  <<: *benchmark_definition
+  image: i10git.cs.fau.de:5005/walberla/buildenvs/gcc:7
 
 benchmark_clang6:
-   <<: *benchmark_definition
-   image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:6.0
\ No newline at end of file
+  <<: *benchmark_definition
+  image: i10git.cs.fau.de:5005/walberla/buildenvs/clang:6.0
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 869cb9f0144ac8830e2d84bdfec4a7fb0b1bdbae..b97052f4d570e1b108b0107df78a90b69bc9f060 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1086,17 +1086,8 @@ if ( WALBERLA_BUILD_WITH_CUDA )
 
         list( APPEND CUDA_NVCC_FLAGS "-Wno-deprecated-gpu-targets")
 
-        # FindCUDA does not respect system includes i.e. there are also warnings for boost etc reported (as of cmake 3.5.1)
-        # if all includes are added to the flags manually as sytem includes they occur double on the command line
-        # but the compiler seems to note the "isystem" not the "-I"
-        # it is also not possible to get all system include directories - so as a workaround we at least add boost here
-        # as system include
-        foreach( boostInclude ${Boost_INCLUDE_DIRS} AND NOT WALBERLA_CXX_COMPILER_IS_MSVC )
-            list( APPEND CUDA_NVCC_FLAGS "-isystem ${boostInclude}" )
-        endforeach()
-
         if ( NOT "${CUDA_NVCC_FLAGS}" MATCHES "-std=" AND NOT WALBERLA_CXX_COMPILER_IS_MSVC )
-            list ( APPEND CUDA_NVCC_FLAGS "-std=c++11" )
+            list ( APPEND CUDA_NVCC_FLAGS "-std=c++14" )
         endif ()
 
         # Bug with gcc5 and cuda7.5:
diff --git a/python/waLBerla/tools/config.py b/python/waLBerla/tools/config.py
index f2997aa5a88d78350f0b159820573c1be9691f4e..7587afb38488c99b8593f3706224c3b6445b158b 100644
--- a/python/waLBerla/tools/config.py
+++ b/python/waLBerla/tools/config.py
@@ -1,8 +1,9 @@
 from __future__ import print_function, absolute_import, division, unicode_literals
 import numpy as np
 
+
 def _comment_replacer(match):
-    start,mid,end = match.group(1,2,3)
+    start, mid, end = match.group(1, 2, 3)
     if mid is None:
         # single line comment
         return ''
@@ -16,68 +17,71 @@ def _comment_replacer(match):
         # multi line comment without line break
         return ' '
 
+
 def _remove_comments(text):
     import re
     comment_re = re.compile(
         r'(^)?[^\S\n]*/(?:\*(.*?)\*/[^\S\n]*|/[^\n]*)($)?',
         re.DOTALL | re.MULTILINE
     )
-    return comment_re.sub( _comment_replacer, text)
+    return comment_re.sub(_comment_replacer, text)
+
 
-def __parseNestedList( value,  dtype = float):
+def __parse_nested_list(value, dtype=float):
     from pyparsing import Word, Group, Forward, OneOrMore, Optional, alphanums, Suppress
-    number = Word( alphanums + ".e-" ).setParseAction( lambda s,l,t: dtype(t[0]) )
+    number = Word(alphanums + ".e-").setParseAction(lambda s, l, t: dtype(t[0]))
     arr = Forward()
     element = number | arr
-    arr << Group(Suppress('[') + ( OneOrMore(element + Optional(Suppress(",")) ) ) + Suppress(']') )
-    return arr.parseString(value, parseAll = True).asList()[0]
+    arr << Group(Suppress('[') + (OneOrMore(element + Optional(Suppress(",")))) + Suppress(']'))
+    return arr.parseString(value, parseAll=True).asList()[0]
 
-def __convertValue(value):
-    def tryType( thetype, value ):
+
+def __convert_value(value):
+    def try_type(thetype, value):
         try:
             return thetype(value)
         except ValueError:
             return None
-    val = tryType(int, value)
+
+    val = try_type(int, value)
     if val: return val
-    val = tryType(float, value)
+    val = try_type(float, value)
     if val: return val
 
     if value == "True": return True
-    if value == "False" : return False
+    if value == "False": return False
 
     value = value.strip()
     if value[0] == '[' and value[-1] == "]":
-        return np.array( __parseNestedList(value) )
+        return np.array(__parse_nested_list(value))
     if value[0] == '<' and value[-1] == ">":
-        return tuple( [__convertValue(s) for s in value[1:-1].split(",") ] )
+        return tuple([__convert_value(s) for s in value[1:-1].split(",")])
     return value
 
-def fromPrm( fileAsString ):
+
+def fromPrm(fileAsString):
     """Parses a prm file to a nested python dict """
     from pyparsing import Word, Group, Forward, Dict, ZeroOrMore, Optional, alphanums, Suppress
 
     # Grammar
-    identifier     = Word( alphanums +"_-" )
-    value          = Word( alphanums + ".e-,<>[] \n" ).setParseAction( lambda s,l,t: __convertValue(t[0]) )
-    key_value_pair = Group ( identifier + Optional(value, default="") + Suppress(";") )
-    block          = Forward()
-    block_content  = Dict( ZeroOrMore( key_value_pair | block ) )
-    block         << Group( identifier + Suppress("{") + block_content + Suppress("}") )
-
-    return block_content.parseString( _remove_comments(fileAsString) , parseAll = True ).asDict()
-
+    identifier = Word(alphanums + "_-")
+    value = Word(alphanums + ".e-,<>_[] \n").setParseAction(lambda s, l, t: __convert_value(t[0]))
+    key_value_pair = Group(identifier + Optional(value, default="") + Suppress(";"))
+    block = Forward()
+    block_content = Dict(ZeroOrMore(key_value_pair | block))
+    block << Group(identifier + Suppress("{") + block_content + Suppress("}"))
 
+    return block_content.parseString(_remove_comments(fileAsString), parseAll=True).asDict()
 
 
 def __format(value, level, key=""):
     if type(value) is float:
         return "%.10g" % value
     else:
-        return str(value).replace("\n", "\n" + "\t"*level + " " * len(key) + " "  )
+        return str(value).replace("\n", "\n" + "\t" * level + " " * len(key) + " ")
 
 
-def toPrm( configDict, level = 0 ):
+def toPrm(configDict, level=0):
     """Returns a prm string from a nested python dict - Inverse of parse"""
     result = ""
     for key, value in sorted(configDict.items()):
@@ -87,28 +91,26 @@ def toPrm( configDict, level = 0 ):
             else:
                 result += "\t" * level + str(key) + "\n"
                 result += "\t" * level + "{\n"
-                result += toPrm(value, level + 1) 
+                result += toPrm(value, level + 1)
                 result += "\t" * level + "}\n"
-        elif ( type(value) is list ) and len( value ) > 0 and type(value[0]) is dict:
+        elif (type(value) is list) and len(value) > 0 and type(value[0]) is dict:
             for e in value:
                 result += "\t" * level + str(key) + "\n"
                 result += "\t" * level + "{\n"
-                result += toPrm( e, level + 1) 
+                result += toPrm(e, level + 1)
                 result += "\t" * level + "}\n"
-        elif ( type(value) is tuple ) :
+        elif type(value) is tuple:
             result += "\t" * level + str(key) + " "
-            result += "< " + ",".join ( [ __format(v,level) for v in value ] ) + " >;\n"
-        elif ( type(value) is float ):
-            result += "\t" * level + str(key) + " " +  __format(value,level) + ";\n"
+            result += "< " + ",".join([__format(v, level) for v in value]) + " >;\n"
+        elif type(value) is float:
+            result += "\t" * level + str(key) + " " + __format(value, level) + ";\n"
         else:
-            result += "\t" * level + str(key) + " " + __format(value,level,key) + ";\n"
+            result += "\t" * level + str(key) + " " + __format(value, level, key) + ";\n"
 
     return result
 
 
-
 if __name__ == "__main__":
-    
     test = """
     blockId1 { 
         firstKey 5; // first key
@@ -130,8 +132,8 @@ if __name__ == "__main__":
     outerKey  hallo;
     """
 
-    res = fromPrm( test )
+    res = fromPrm(test)
     assert res['blockId1']['firstKey'] == 5
-    assert res['blockId1']['myVector3'] == ( 1.0, 2, 3)
+    assert res['blockId1']['myVector3'] == (1.0, 2, 3)
     assert res['blockId1']['keyWithoutValue'] == ''
-    assert (res['blockId1']['myArray'] == np.array( [ [1,2], [3,4] ] )).all()
\ No newline at end of file
+    assert (res['blockId1']['myArray'] == np.array([[1, 2], [3, 4]])).all()
diff --git a/src/gui/Gui.cpp b/src/gui/Gui.cpp
index 49729ba27e8415e94dfdf2865c2cab9b2621bc07..3a4f374128ed58a53f096514c200a6df3075dad6 100644
--- a/src/gui/Gui.cpp
+++ b/src/gui/Gui.cpp
@@ -158,7 +158,7 @@ DisplayAdaptor * GUI::findDisplayAdaptorForBlockID ( ConstBlockDataID bdId ) con
 }
 
 
-void GUI::registerPropertyTree( const shared_ptr<PropertyTree> propertyTree ) {
+void GUI::registerPropertyTree( const shared_ptr<PropertyTree>& propertyTree ) {
    pImpl->propertyTrees_.push_back( propertyTree );
 }
 
diff --git a/src/simd/AVX2.h b/src/simd/AVX2.h
index 552cbb645b1f56daf13c5be564f61894861a1815..20fe0d4f3f6e2663d2b0ca1f30a74aa90382d2af 100644
--- a/src/simd/AVX2.h
+++ b/src/simd/AVX2.h
@@ -25,7 +25,7 @@
 #include "immintrin.h"
 
 #include "waLBerlaDefinitions.h"
-
+#include "core/DataTypes.h"
 #include "IntelVecTypesCppOperators.h"