diff --git a/src/configure b/src/configure index 8f6ce93178628910eadcf35b96eef86b1879b564..3072871968dc81379084782bcbf87192777a65cf 100755 --- a/src/configure +++ b/src/configure @@ -36,6 +36,19 @@ cd ${LOCAL}/conf TARG=$(uname -s -n) # case "$TARG" in +'Linux'*'occigen'*) + export ARCH=${ARCH:-LXifort} + export VER_MPI=${VER_MPI:-MPIINTEL} + export OPTLEVEL=${OPTLEVEL:-O2} + export VER_CDF=${VER_CDF:-CDFAUTO} + export MNHENV=${MNHENV:-" +ulimit -s unlimited +module purge +module load intel/17.0 intelmpi/2017.0.098 +export SLURM_CPU_BIND=none +export I_MPI_PIN_PROCESSOR_LIST=all:map=spread +"} + ;; 'Linux service'*) export ARCH=${ARCH:-LXifort} export VER_MPI=${VER_MPI:-MPIICE} @@ -267,20 +280,6 @@ export I_MPI_PIN_PROCESSOR_LIST=all:map=spread "} ;; -'Linux occigen'*) - export ARCH=${ARCH:-LXifort} - export VER_MPI=${VER_MPI:-MPIINTEL} - export OPTLEVEL=${OPTLEVEL:-O2} - export VER_CDF=${VER_CDF:-CDFAUTO} - export MNHENV=${MNHENV:-" -ulimit -s unlimited -module load intel/15.0.3.187 -module load intelmpi/5.0.1.035 -export SLURM_CPU_BIND=none -export I_MPI_PIN_PROCESSOR_LIST=all:map=spread -"} - ;; - Linux*) export ARCH=${ARCH:-LXgfortran} export VER_MPI=${VER_MPI:-MPIVIDE}