From 2296929344948406032843f030384ca4edd36286 Mon Sep 17 00:00:00 2001 From: Philip Eisenlohr Date: Tue, 8 Mar 2016 18:38:56 -0500 Subject: [PATCH 1/2] added symlink info for PETSC_DIR (if present) --- DAMASK_env.sh | 3 ++- DAMASK_env.zsh | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/DAMASK_env.sh b/DAMASK_env.sh index bfb5c12df..ad3c59dea 100644 --- a/DAMASK_env.sh +++ b/DAMASK_env.sh @@ -53,7 +53,8 @@ if [ ! -z "$PS1" ]; then [[ "x$SOLVER" != "x" ]] && echo "Spectral Solver $SOLVER" [[ "x$PROCESSING" != "x" ]] && echo "Post Processing $PROCESSING" echo "Multithreading DAMASK_NUM_THREADS=$DAMASK_NUM_THREADS" - [[ "x$PETSC_DIR" != "x" ]] && echo "PETSc location $PETSC_DIR" + [[ "x$PETSC_DIR" != "x" ]] && echo "PETSc location $PETSC_DIR" && \ + [[ `readlink -f $PETSC_DIR` == $PETSC_DIR ]] || echo " ~~> "`readlink -f $PETSC_DIR` [[ "x$PETSC_ARCH" != "x" ]] && echo "PETSc architecture $PETSC_ARCH" echo "MSC.Marc/Mentat $MSC_ROOT" echo diff --git a/DAMASK_env.zsh b/DAMASK_env.zsh index 521bfe8e1..5cf5b30f8 100644 --- a/DAMASK_env.zsh +++ b/DAMASK_env.zsh @@ -51,7 +51,8 @@ if [ ! -z "$PS1" ]; then [[ "x$SOLVER" != "x" ]] && echo "Spectral Solver $SOLVER" [[ "x$PROCESSING" != "x" ]] && echo "Post Processing $PROCESSING" echo "Multithreading DAMASK_NUM_THREADS=$DAMASK_NUM_THREADS" - [[ "x$PETSC_DIR" != "x" ]] && echo "PETSc location $PETSC_DIR" + [[ "x$PETSC_DIR" != "x" ]] && echo "PETSc location $PETSC_DIR" && \ + [[ `readlink -f $PETSC_DIR` == $PETSC_DIR ]] || echo " ~~> "`readlink -f $PETSC_DIR` [[ "x$PETSC_ARCH" != "x" ]] && echo "PETSc architecture $PETSC_ARCH" echo "MSC.Marc/Mentat $MSC_ROOT" echo From bb9ee3910fac62010ab646cf3aaa841d0ccf6d7e Mon Sep 17 00:00:00 2001 From: Test User Date: Wed, 9 Mar 2016 16:12:54 +0100 Subject: [PATCH 2/2] updated version information after successful test of v2.0.0-7-g2296929 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 2bc4b2cfc..4c6293bf0 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -v2.0.0-3-g618e352 +v2.0.0-7-g2296929