Switch test env to prod env

GridTools · Jun 19, 2019 · 59733e8 · 59733e8
1 parent ad5c37f
commit 59733e8
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/tools/cscs-scripts/env_kesch-test.sh → tools/cscs-scripts/env_kesch-old.sh b/tools/cscs-scripts/env_kesch-test.sh → tools/cscs-scripts/env_kesch-old.sh
@@ -71,23 +71,13 @@ module load cmake/3.9.1
 
 if [ "$FC_COMPILER" = "pgfortran" ]; then
 
-module unuse /apps/escha/UES/generic/modulefiles:/apps/escha/UES/PrgEnv-gnu-17.02/modulefiles:/apps/escha/UES/PrgEnv-cray-17.06/modulefiles:/apps/escha/UES/experimental/modulefiles
-module use /apps/escha/UES/jenkins/RH7.4/gnu_PE17.02/easybuild/modules/all
-module use /apps/escha/UES/jenkins/RH7.4/generic/easybuild/modules/all
-module use /apps/escha/UES/jenkins/RH7.4/cray_PE17.06/easybuild/modules/all
-
     module load craype-haswell
     module load craype-accel-nvidia35
     module switch mvapich2_cce/2.2rc1.0.3_cuda80 mvapich2gdr_gnu/2.2_cuda_8.0
     module load PrgEnv-pgi/17.10
     module load gcc/5.4.0-2.26
 
 elif [ "$FC_COMPILER" = "ftn" ]; then
-module unuse /apps/escha/UES/generic/modulefiles:/apps/escha/UES/PrgEnv-gnu-17.02/modulefiles:/apps/escha/UES/PrgEnv-cray-17.06/modulefiles:/apps/escha/UES/experimental/modulefiles
-module use /apps/escha/UES/jenkins/RH7.4/gnu_PE17.02/easybuild/modules/all
-module use /apps/escha/UES/jenkins/RH7.4/generic/easybuild/modules/all
-module use /apps/escha/UES/jenkins/RH7.4/cray_PE17.06/easybuild/modules/all
-
     module load craype-haswell
     module load PrgEnv-cray
     module load craype-accel-nvidia35

diff --git a/tools/cscs-scripts/env_kesch.sh b/tools/cscs-scripts/env_kesch.sh
@@ -71,13 +71,23 @@ module load cmake/3.9.1
 
 if [ "$FC_COMPILER" = "pgfortran" ]; then
 
+module unuse /apps/escha/UES/generic/modulefiles:/apps/escha/UES/PrgEnv-gnu-17.02/modulefiles:/apps/escha/UES/PrgEnv-cray-17.06/modulefiles:/apps/escha/UES/experimental/modulefiles
+module use /apps/escha/UES/jenkins/RH7.4/gnu_PE17.02/easybuild/modules/all
+module use /apps/escha/UES/jenkins/RH7.4/generic/easybuild/modules/all
+module use /apps/escha/UES/jenkins/RH7.4/cray_PE17.06/easybuild/modules/all
+
     module load craype-haswell
     module load craype-accel-nvidia35
     module switch mvapich2_cce/2.2rc1.0.3_cuda80 mvapich2gdr_gnu/2.2_cuda_8.0
     module load PrgEnv-pgi/17.10
     module load gcc/5.4.0-2.26
 
 elif [ "$FC_COMPILER" = "ftn" ]; then
+module unuse /apps/escha/UES/generic/modulefiles:/apps/escha/UES/PrgEnv-gnu-17.02/modulefiles:/apps/escha/UES/PrgEnv-cray-17.06/modulefiles:/apps/escha/UES/experimental/modulefiles
+module use /apps/escha/UES/jenkins/RH7.4/gnu_PE17.02/easybuild/modules/all
+module use /apps/escha/UES/jenkins/RH7.4/generic/easybuild/modules/all
+module use /apps/escha/UES/jenkins/RH7.4/cray_PE17.06/easybuild/modules/all
+
     module load craype-haswell
     module load PrgEnv-cray
     module load craype-accel-nvidia35