From f34111cf31992d2507333526de9b88d4ef4ec7f2 Mon Sep 17 00:00:00 2001 From: Philip Eisenlohr Date: Tue, 18 Dec 2018 09:11:44 -0500 Subject: [PATCH 1/4] [skip ci] env/DAMASK.xxx now reports current repository branch of DAMASK_ROOT --- env/DAMASK.csh | 7 ++++++- env/DAMASK.sh | 7 +++++-- env/DAMASK.zsh | 7 +++++-- 3 files changed, 16 insertions(+), 5 deletions(-) diff --git a/env/DAMASK.csh b/env/DAMASK.csh index 2e1dc979c..6b6c58d9d 100644 --- a/env/DAMASK.csh +++ b/env/DAMASK.csh @@ -7,6 +7,11 @@ set DAMASK_ROOT=`python -c "import os,sys; print(os.path.realpath(os.path.expand source $DAMASK_ROOT/CONFIG +# add BRANCH if DAMASK_ROOT is a git repository +cd $DAMASK_ROOT >/dev/null +set BRANCH = `git branch 2>/dev/null| grep -E '^\* ')` +cd - >/dev/null + # if DAMASK_BIN is present if ( $?DAMASK_BIN) then set path = ($DAMASK_BIN $path) @@ -41,7 +46,7 @@ if ( $?prompt ) then echo https://damask.mpie.de echo echo Using environment with ... - echo "DAMASK $DAMASK_ROOT" + echo "DAMASK $DAMASK_ROOT $BRANCH" echo "Spectral Solver $SOLVER" echo "Post Processing $PROCESSING" if ( $?PETSC_DIR) then diff --git a/env/DAMASK.sh b/env/DAMASK.sh index e790ae3cc..bd26a3ebb 100644 --- a/env/DAMASK.sh +++ b/env/DAMASK.sh @@ -30,6 +30,9 @@ set() { source $DAMASK_ROOT/CONFIG unset -f set +# add BRANCH if DAMASK_ROOT is a git repository +cd $DAMASK_ROOT >/dev/null; BRANCH=$(git branch 2>/dev/null| grep -E '^\* '); cd - >/dev/null + # add DAMASK_BIN if present [ "x$DAMASK_BIN" != "x" ] && PATH=$DAMASK_BIN:$PATH @@ -59,7 +62,7 @@ if [ ! -z "$PS1" ]; then echo https://damask.mpie.de echo echo Using environment with ... - echo "DAMASK $DAMASK_ROOT" + echo "DAMASK $DAMASK_ROOT $BRANCH" echo "Spectral Solver $SOLVER" echo "Post Processing $PROCESSING" if [ "x$PETSC_DIR" != "x" ]; then @@ -94,7 +97,7 @@ fi export DAMASK_NUM_THREADS export PYTHONPATH=$DAMASK_ROOT/lib:$PYTHONPATH -for var in BASE STAT SOLVER PROCESSING FREE DAMASK_BIN; do +for var in BASE STAT SOLVER PROCESSING FREE DAMASK_BIN BRANCH; do unset "${var}" done for var in DAMASK MSC; do diff --git a/env/DAMASK.zsh b/env/DAMASK.zsh index dbfde767d..ae34fdfd2 100644 --- a/env/DAMASK.zsh +++ b/env/DAMASK.zsh @@ -21,6 +21,9 @@ set() { source $DAMASK_ROOT/CONFIG unset -f set +# add BRANCH if DAMASK_ROOT is a git repository +cd $DAMASK_ROOT >/dev/null; BRANCH=$(git branch 2>/dev/null| grep -E '^\* '); cd - >/dev/null + # add DAMASK_BIN if present [ "x$DAMASK_BIN != x" ] && PATH=$DAMASK_BIN:$PATH @@ -50,7 +53,7 @@ if [ ! -z "$PS1" ]; then echo https://damask.mpie.de echo echo "Using environment with ..." - echo "DAMASK $DAMASK_ROOT" + echo "DAMASK $DAMASK_ROOT $BRANCH" echo "Spectral Solver $SOLVER" echo "Post Processing $PROCESSING" if [ "x$PETSC_DIR" != "x" ]; then @@ -87,7 +90,7 @@ fi export DAMASK_NUM_THREADS export PYTHONPATH=$DAMASK_ROOT/lib:$PYTHONPATH -for var in BASE STAT SOLVER PROCESSING FREE DAMASK_BIN; do +for var in BASE STAT SOLVER PROCESSING FREE DAMASK_BIN BRANCH; do unset "${var}" done for var in DAMASK MSC; do From 576c4492d49c1456188ca7c2cf290bf821d20b0d Mon Sep 17 00:00:00 2001 From: Philip Eisenlohr Date: Tue, 18 Dec 2018 09:24:25 -0500 Subject: [PATCH 2/4] [skip ci] bugfix for DAMASK_BIN==empty check; [ logical ] --> [[ logical ]] to align with bash syntax --- env/DAMASK.zsh | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/env/DAMASK.zsh b/env/DAMASK.zsh index ae34fdfd2..4d5a1e47d 100644 --- a/env/DAMASK.zsh +++ b/env/DAMASK.zsh @@ -25,15 +25,15 @@ unset -f set cd $DAMASK_ROOT >/dev/null; BRANCH=$(git branch 2>/dev/null| grep -E '^\* '); cd - >/dev/null # add DAMASK_BIN if present -[ "x$DAMASK_BIN != x" ] && PATH=$DAMASK_BIN:$PATH +[[ "x$DAMASK_BIN" != "x" ]] && PATH=$DAMASK_BIN:$PATH SOLVER=$(which DAMASK_spectral || true 2>/dev/null) -[ "x$SOLVER" = "x" ] && SOLVER=$(blink 'Not found!') +[[ "x$SOLVER" == "x" ]] && SOLVER=$(blink 'Not found!') PROCESSING=$(which postResults || true 2>/dev/null) -[ "x$PROCESSING" = "x" ] && PROCESSING=$(blink 'Not found!') +[[ "x$PROCESSING" == "x" ]] && PROCESSING=$(blink 'Not found!') -[ "x$DAMASK_NUM_THREADS" = "x" ] && DAMASK_NUM_THREADS=1 +[[ "x$DAMASK_NUM_THREADS" == "x" ]] && DAMASK_NUM_THREADS=1 # currently, there is no information that unlimited causes problems # still, http://software.intel.com/en-us/forums/topic/501500 suggest to fix it @@ -56,13 +56,13 @@ if [ ! -z "$PS1" ]; then echo "DAMASK $DAMASK_ROOT $BRANCH" echo "Spectral Solver $SOLVER" echo "Post Processing $PROCESSING" - if [ "x$PETSC_DIR" != "x" ]; then + if [ "x$PETSC_DIR" != "x" ]; then echo -n "PETSc location " [ -d $PETSC_DIR ] && echo $PETSC_DIR || blink $PETSC_DIR [[ $(canonicalPath "$PETSC_DIR") == $PETSC_DIR ]] \ || echo " ~~> "$(canonicalPath "$PETSC_DIR") fi - [[ "x$PETSC_ARCH" == "x" ]] \ + [[ "x$PETSC_ARCH" == "x" ]] \ || echo "PETSc architecture $PETSC_ARCH" echo -n "MSC.Marc/Mentat " [ -d $MSC_ROOT ] && echo $MSC_ROOT || blink $MSC_ROOT From 7df6dfbf3fdb07bc55e3fc7518d7068a14d22852 Mon Sep 17 00:00:00 2001 From: Philip Eisenlohr Date: Tue, 18 Dec 2018 15:10:26 -0500 Subject: [PATCH 3/4] renamed "showTable" to "viewTable" to avoid clashing with astropy.table module --- processing/post/{showTable.py => viewTable.py} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename processing/post/{showTable.py => viewTable.py} (100%) diff --git a/processing/post/showTable.py b/processing/post/viewTable.py similarity index 100% rename from processing/post/showTable.py rename to processing/post/viewTable.py From 6fe17e05f6fb9b8e8e6644ff8670dc079c22ebe4 Mon Sep 17 00:00:00 2001 From: Test User Date: Thu, 20 Dec 2018 07:37:39 +0100 Subject: [PATCH 4/4] [skip ci] updated version information after successful test of v2.0.2-1190-g7df6dfbf --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 99b9812a2..23cc93ef2 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -v2.0.2-1137-g4dd064a2 +v2.0.2-1190-g7df6dfbf