From f24a5e9b30544f70c2f7b8cc3bba043765ff1537 Mon Sep 17 00:00:00 2001
From: Lars Bilke <lars.bilke@ufz.de>
Date: Mon, 25 Feb 2019 15:30:38 +0100
Subject: [PATCH] [eve] Updated VTK module for CentOS 7.
---
scripts/env/envinf1/cli.sh | 4 ++--
scripts/env/envinf1/mpi.sh | 8 +++++++-
scripts/env/envinf1/petsc.sh | 7 ++++++-
3 files changed, 15 insertions(+), 4 deletions(-)
diff --git a/scripts/env/envinf1/cli.sh b/scripts/env/envinf1/cli.sh
index e79a200418f..122391701c3 100644
--- a/scripts/env/envinf1/cli.sh
+++ b/scripts/env/envinf1/cli.sh
@@ -2,13 +2,13 @@ module use /global/apps/modulefiles
module load cmake
module load gcc/6.2.0-1
-module load ninja/1.8.2
+module load ninja/1.9.0
module load git
# Libraries
module load boost/1.62.0-1
module load eigen/3.3.4-1-cmake
-module load vtk/8.1.1_gcc-6.2.0_openmpi-1.8.8
+module load vtk/8.2.0/serial
# Tools
module load coreutils/8.21-1
diff --git a/scripts/env/envinf1/mpi.sh b/scripts/env/envinf1/mpi.sh
index f03066b37a8..677fe1bceea 100644
--- a/scripts/env/envinf1/mpi.sh
+++ b/scripts/env/envinf1/mpi.sh
@@ -1,2 +1,8 @@
-DIR=$( cd $(dirname "${BASH_SOURCE[0]}") ; pwd -P )
+if [ -n "$ZSH_VERSION" ]; then
+ DIR=$( cd $(dirname "${(%):-%x}") ; pwd -P )
+else
+ DIR=$( cd $(dirname "${BASH_SOURCE[0]}") ; pwd -P )
+fi
+
source $DIR/cli.sh
+module load vtk/8.2.0/openmpi-1.8.8
diff --git a/scripts/env/envinf1/petsc.sh b/scripts/env/envinf1/petsc.sh
index 4c998c33114..3034a713cc0 100644
--- a/scripts/env/envinf1/petsc.sh
+++ b/scripts/env/envinf1/petsc.sh
@@ -1,3 +1,8 @@
-DIR=$( cd $(dirname "${BASH_SOURCE[0]}") ; pwd -P )
+if [ -n "$ZSH_VERSION" ]; then
+ DIR=$( cd $(dirname "${(%):-%x}") ; pwd -P )
+else
+ DIR=$( cd $(dirname "${BASH_SOURCE[0]}") ; pwd -P )
+fi
+
source $DIR/mpi.sh
module load petsc/3.7.6_maint_gcc6.2.0_openmpi_gcc_1.8.8-1
--
GitLab