From 9dd121df7cb2d0259cf010b4979f16beddbbd336 Mon Sep 17 00:00:00 2001 From: Lars Bilke <lars.bilke@ufz.de> Date: Fri, 17 May 2019 08:49:37 +0200 Subject: [PATCH] Deleted env scripts for envinf1. --- scripts/env/envinf1/cli.sh | 15 --------------- scripts/env/envinf1/conan.sh | 12 ------------ scripts/env/envinf1/gui.sh | 3 --- scripts/env/envinf1/mpi.sh | 8 -------- scripts/env/envinf1/petsc.sh | 16 ---------------- 5 files changed, 54 deletions(-) delete mode 100644 scripts/env/envinf1/cli.sh delete mode 100644 scripts/env/envinf1/conan.sh delete mode 100644 scripts/env/envinf1/gui.sh delete mode 100644 scripts/env/envinf1/mpi.sh delete mode 100644 scripts/env/envinf1/petsc.sh diff --git a/scripts/env/envinf1/cli.sh b/scripts/env/envinf1/cli.sh deleted file mode 100644 index 6ff9e0b9651..00000000000 --- a/scripts/env/envinf1/cli.sh +++ /dev/null @@ -1,15 +0,0 @@ -module use /global/apps/modulefiles - -module load cmake -module load gcc/6.2.0-1 -module load ninja/1.8.2 -module load git/2.20.1 - -# 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 - -# Tools -module load coreutils/8.21-1 -module load ccache/3.3.3 diff --git a/scripts/env/envinf1/conan.sh b/scripts/env/envinf1/conan.sh deleted file mode 100644 index 12e51a7e709..00000000000 --- a/scripts/env/envinf1/conan.sh +++ /dev/null @@ -1,12 +0,0 @@ -module () { eval `/usr/local/modules/3.2.10-1/Modules/3.2.10/bin/modulecmd sh $*`; } -export MODULEPATH=$MODULEPATH:/global/apps/modulefiles - -module load python/2 -module load cmake/3.6.2-1 -module load gcc/6.2.0-1 - -# Tools -module load coreutils/8.21-1 -module load ccache/3.3.3 - -source /global/apps/ogs/virtualenv/conan/bin/activate diff --git a/scripts/env/envinf1/gui.sh b/scripts/env/envinf1/gui.sh deleted file mode 100644 index e61032e558d..00000000000 --- a/scripts/env/envinf1/gui.sh +++ /dev/null @@ -1,3 +0,0 @@ -DIR=$( cd $(dirname "${BASH_SOURCE[0]}") ; pwd -P ) -source $DIR/cli.sh -module load shapelib/1.3.0_gcc_6.2.0 diff --git a/scripts/env/envinf1/mpi.sh b/scripts/env/envinf1/mpi.sh deleted file mode 100644 index 44b2e976dd0..00000000000 --- a/scripts/env/envinf1/mpi.sh +++ /dev/null @@ -1,8 +0,0 @@ -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.1.1_gcc-6.2.0_openmpi-1.8.8 diff --git a/scripts/env/envinf1/petsc.sh b/scripts/env/envinf1/petsc.sh deleted file mode 100644 index 7c2b3abf2ae..00000000000 --- a/scripts/env/envinf1/petsc.sh +++ /dev/null @@ -1,16 +0,0 @@ -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 - -echo -e "Note: If you want to run a simulation on the cluster be aware of the "\ - "mixed CPU architecture. There are Sandy-Bridge-based nodes (orte-28, "\ - "frontend2, envinf1) as well as Skylake-based nodes (orte-40, frontend1)"\ - ".\nConsider setting CMake-option OGS_CPU_ARCHITECTURE to:\n\n"\ - " -DOGS_CPU_ARCHITECTURE=sandybridge\n"\ - " -- OR --\n"\ - " -DOGS_CPU_ARCHITECTURE=skylake-avx512" -- GitLab