Fix bug in compiler selection.
This commit is contained in:
parent
fd85082f18
commit
b6049c4e44
1 changed files with 8 additions and 9 deletions
17
sit
17
sit
|
@ -132,15 +132,6 @@ else
|
||||||
fi
|
fi
|
||||||
MPI_DIR=$MPICH_DIR
|
MPI_DIR=$MPICH_DIR
|
||||||
;;
|
;;
|
||||||
laki|vulcan|*)
|
|
||||||
if [ -z "$COMPILER_VERSION" ] ; then
|
|
||||||
COMPILER_MODULE=compiler/${COMPILER}
|
|
||||||
else
|
|
||||||
COMPILER_MODULE=compiler/${COMPILER}/${COMPILER_VERSION}
|
|
||||||
fi
|
|
||||||
echo "Loading compiler module ${COMPILER_MODULE}"
|
|
||||||
module load ${COMPILER_MODULE}
|
|
||||||
;;
|
|
||||||
hawk)
|
hawk)
|
||||||
if [ -z "$COMPILER_VERSION" ] ; then
|
if [ -z "$COMPILER_VERSION" ] ; then
|
||||||
COMPILER_MODULE=${COMPILER}
|
COMPILER_MODULE=${COMPILER}
|
||||||
|
@ -150,6 +141,14 @@ else
|
||||||
echo "Loading compiler module ${COMPILER_MODULE}"
|
echo "Loading compiler module ${COMPILER_MODULE}"
|
||||||
module load ${COMPILER_MODULE}
|
module load ${COMPILER_MODULE}
|
||||||
;;
|
;;
|
||||||
|
laki|vulcan|*)
|
||||||
|
if [ -z "$COMPILER_VERSION" ] ; then
|
||||||
|
COMPILER_MODULE=compiler/${COMPILER}
|
||||||
|
else
|
||||||
|
COMPILER_MODULE=compiler/${COMPILER}/${COMPILER_VERSION}
|
||||||
|
fi
|
||||||
|
echo "Loading compiler module ${COMPILER_MODULE}"
|
||||||
|
module load ${COMPILER_MODULE}
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
fi
|
fi
|
||||||
|
|
Loading…
Reference in a new issue