From 65ff21577b0af12dfddb37eb727ec05cca56f0f4 Mon Sep 17 00:00:00 2001 From: Philip Eisenlohr Date: Fri, 30 Nov 2018 10:35:01 -0500 Subject: [PATCH] consistent output across all env/DAMASK scripts --- env/DAMASK.csh | 3 ++- env/DAMASK.sh | 1 + env/DAMASK.zsh | 1 + 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/env/DAMASK.csh b/env/DAMASK.csh index 07b4b6817..2e1dc979c 100644 --- a/env/DAMASK.csh +++ b/env/DAMASK.csh @@ -44,7 +44,6 @@ if ( $?prompt ) then echo "DAMASK $DAMASK_ROOT" echo "Spectral Solver $SOLVER" echo "Post Processing $PROCESSING" - echo "Multithreading DAMASK_NUM_THREADS=$DAMASK_NUM_THREADS" if ( $?PETSC_DIR) then echo "PETSc location $PETSC_DIR" endif @@ -52,8 +51,10 @@ if ( $?prompt ) then echo "MSC.Marc/Mentat $MSC_ROOT" endif echo + echo "Multithreading DAMASK_NUM_THREADS=$DAMASK_NUM_THREADS" echo `limit datasize` echo `limit stacksize` + echo endif setenv DAMASK_NUM_THREADS $DAMASK_NUM_THREADS diff --git a/env/DAMASK.sh b/env/DAMASK.sh index 663e9a4b3..e790ae3cc 100644 --- a/env/DAMASK.sh +++ b/env/DAMASK.sh @@ -88,6 +88,7 @@ if [ ! -z "$PS1" ]; then size=$(( 1024*$(ulimit -s) )); \ print('{:.4g} {}'.format(size / (1 << ((int(math.log(size,2) / 10) if size else 0) * 10)), \ ['bytes','KiB','MiB','GiB','TiB','EiB','ZiB'][int(math.log(size,2) / 10) if size else 0]))") + echo fi export DAMASK_NUM_THREADS diff --git a/env/DAMASK.zsh b/env/DAMASK.zsh index 43f682865..dbfde767d 100644 --- a/env/DAMASK.zsh +++ b/env/DAMASK.zsh @@ -81,6 +81,7 @@ if [ ! -z "$PS1" ]; then size=$(( 1024*$(ulimit -s) )); \ print('{:.4g} {}'.format(size / (1 << ((int(math.log(size,2) / 10) if size else 0) * 10)), \ ['bytes','KiB','MiB','GiB','TiB','EiB','ZiB'][int(math.log(size,2) / 10) if size else 0]))") + echo fi export DAMASK_NUM_THREADS