diff --git a/sit b/sit index 0add6cf..85fd0cd 100755 --- a/sit +++ b/sit @@ -102,7 +102,7 @@ fi if [ "$COMPILER" == "system" ] ; then echo "Using system default compiler" COMPILER="" # prevent any compiler specs in the prefix -else +else case $PLATFORM in hazelhen) module swap $(module list -l 2>&1 | awk '/^PrgEnv-/{print $1}') PrgEnv-${COMPILER} @@ -134,7 +134,7 @@ if [ ! -z "${COMPILER}" ] ; then COMPILER_VERSION=$(eval "$COMPILER_VERSION_CMD") fi # make the compiler variables CC, CXX, FC and F77 available -if [ ! -z "$COMPILER_OPTS" ] ; then +if [ ! -z "$COMPILER_OPTS" ] ; then echo "Compiler env: ${COMPILER_OPTS}" export ${COMPILER_OPTS} fi @@ -142,7 +142,7 @@ if [ ! -z $COMPILER ] ; then echo "Using compiler: $COMPILER version: $COMPILER_VERSION" fi -if [ ! -z "$MPI" ] ; then +if [ ! -z "$MPI" ] ; then MPI_MODULE="mpi/$MPI" if [ ! -z "$MPI_VERSION" ] ; then MPI_VERSION_NUM=${MPI_VERSION%%-*} @@ -154,7 +154,7 @@ if [ ! -z "$MPI" ] ; then MPI_MODULE=${MPI_MODULE}${MPI_VERSION_NUM:+"/${MPI_VERSION_NUM}-$COMPILER-$COMPILER_VERSION"} ;; esac - fi + fi echo "Loading MPI module ${MPI_MODULE}" module load $MPI_MODULE @@ -211,8 +211,8 @@ BUILDDIR=${WORKDIR}/build LOGDIR=${WORKDIR} -# source the package class file a second time, so we can modify variables -# using their default values. (Defaults depend on other vairables in +# source the package class file a second time, so we can modify variables +# using their default values. (Defaults depend on other vairables in # the class file like CATEGORY or PACKAGE) source $SCLASS_DIR/$sit_classfile