hpcchris/sit
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Indentation

Browse source
This commit is contained in:
Christoph Niethammer 2016-05-02 08:55:19 +00:00
parent f319c0c474
commit 6fc26df120
1 changed files with 4 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
sit
View file

@ -35,9 +35,9 @@ function usage() {
# sit action to be performed # sit action to be performed
sit_action=$2 sit_action=$2
if [[ -n $sit_action ]] ; then if [[ -n $sit_action ]] ; then
echo "Performing action: $sit_action" echo "Performing action: $sit_action"
else else
sit_action="all" sit_action="all"
fi fi
# Reading in user configuration file if it exists # Reading in user configuration file if it exists
@ -50,14 +50,12 @@ if [[ -e $SIT_CONFIG_FILE ]] ; then
fi fi
source "$SIT_PATH/functions.sh" source "$SIT_PATH/functions.sh"
# identify platform manually if no environment variable was set # identify platform manually if no environment variable was set
PLATFORM=${PLATFORM:=$SITE_PLATFORM_NAME} PLATFORM=${PLATFORM:=$SITE_PLATFORM_NAME}
if [ -z $PLATFORM ]; then if [ -z $PLATFORM ]; then
sit_info "Unknown platform using default platform '${DEFAULT_PLATFORM}' configuration" sit_info "Unknown platform using default platform '${DEFAULT_PLATFORM}' configuration"
PLATFORM="${DEFAULT_PLATFORM}" PLATFORM="${DEFAULT_PLATFORM}"
fi fi
sit_info "Platform: $PLATFORM" sit_info "Platform: $PLATFORM"
# compiler to use # compiler to use
@ -89,9 +87,8 @@ else
else else
module swap $COMPILER $COMPILER/$COMPILER_VERSION module swap $COMPILER $COMPILER/$COMPILER_VERSION
fi fi
# adjust MPICH and libsci versions to match compiler # adjust MPICH and libsci versions to match compiler
module load cray-mpich-compat/v7 \ module load cray-mpich-compat/v7 || module load cray-mpich-compat/v6
|| module load cray-mpich-compat/v6
fi fi
MPI_DIR=$MPICH_DIR MPI_DIR=$MPICH_DIR
;; ;;