From 676ecb2ade56ac203a372e21d102f1ddaa58fa26 Mon Sep 17 00:00:00 2001
From: Franz Roters <f.roters@mpie.de>
Date: Fri, 6 Jan 2017 16:14:35 +0100
Subject: [PATCH] correctly determine DAMASK version

---
 .../2015/Marc_tools/include_linux64           | 21 +++++++------------
 .../2015/Marc_tools/run_damask                | 14 +++++++++++++
 .../2015/Marc_tools/run_damask_h              | 14 +++++++++++++
 .../2015/Marc_tools/run_damask_hmp            | 14 +++++++++++++
 .../2015/Marc_tools/run_damask_l              | 14 +++++++++++++
 .../2015/Marc_tools/run_damask_lmp            | 14 +++++++++++++
 .../2015/Marc_tools/run_damask_mp             | 14 +++++++++++++
 7 files changed, 91 insertions(+), 14 deletions(-)

diff --git a/installation/mods_MarcMentat/2015/Marc_tools/include_linux64 b/installation/mods_MarcMentat/2015/Marc_tools/include_linux64
index 9b1e2bec7..0a315f85b 100644
--- a/installation/mods_MarcMentat/2015/Marc_tools/include_linux64
+++ b/installation/mods_MarcMentat/2015/Marc_tools/include_linux64
@@ -442,20 +442,13 @@ FORTNA="$FCOMP $FORT_OPT -fno-alias -O3 $I8FFLAGS -I$MARC_SOURCE/common \
  -I$MARC_SOURCE/${BCS_DIR}/common -I$MARC_SOURCE/mumpssolver/include $I8DEFINES -DLinux -DLINUX -DLinux_intel $FDEFINES $DDM"
 
 # determine DAMASK version
-HIT=0
-for arg in "$@"
-do
-  if [ $HIT = 1 ]
-  then
-   DAMASKPATH=`dirname $arg`
-   break
-  elif [ ${arg:0:2} = -u -o ${arg:0:2} = -U ]
-  then 
-    HIT=1
-  fi
-done
-read DAMASKVERSION < $DAMASKPATH/../VERSION
-DAMASKVERSION="'"$DAMASKVERSION"'"
+if test -n "$DAMASK_USER"; then
+  DAMASKROOT=`dirname $DAMASK_USER`/..
+  read DAMASKVERSION < $DAMASKROOT/VERSION
+  DAMASKVERSION="'"$DAMASKVERSION"'"
+else
+  DAMASKVERSION="'N/A'"
+fi
 
 # DAMASK compiler calls: additional flags are in line 2 OpenMP flags in line 3
 DFORTLOW="$FCOMP $FORT_OPT $PROFILE -O0 $I8FFLAGS -I$MARC_SOURCE/common \
diff --git a/installation/mods_MarcMentat/2015/Marc_tools/run_damask b/installation/mods_MarcMentat/2015/Marc_tools/run_damask
index 5286ccfa0..ef792247a 100644
--- a/installation/mods_MarcMentat/2015/Marc_tools/run_damask
+++ b/installation/mods_MarcMentat/2015/Marc_tools/run_damask
@@ -299,6 +299,20 @@ fi
 
 . "$DIR/getarch"
 
+# getting user subroutine file name
+found=0
+for i in "$@"; do
+  if test $found = 1; then
+    DAMASK_USER=$i
+    found=0
+  fi
+  case $i in
+    -u* | -U*)
+      found=1
+    ;;
+  esac
+done
+# sourcing include_linux64 (needs DAMASK_USER to be set)
 . $MARC_INCLUDE
 #
 
diff --git a/installation/mods_MarcMentat/2015/Marc_tools/run_damask_h b/installation/mods_MarcMentat/2015/Marc_tools/run_damask_h
index 5ed49f3a2..b77e80157 100644
--- a/installation/mods_MarcMentat/2015/Marc_tools/run_damask_h
+++ b/installation/mods_MarcMentat/2015/Marc_tools/run_damask_h
@@ -299,6 +299,20 @@ fi
 
 . "$DIR/getarch"
 
+# getting user subroutine file name
+found=0
+for i in "$@"; do
+  if test $found = 1; then
+    DAMASK_USER=$i
+    found=0
+  fi
+  case $i in
+    -u* | -U*)
+      found=1
+    ;;
+  esac
+done
+# sourcing include_linux64 (needs DAMASK_USER to be set)
 . $MARC_INCLUDE
 #
 
diff --git a/installation/mods_MarcMentat/2015/Marc_tools/run_damask_hmp b/installation/mods_MarcMentat/2015/Marc_tools/run_damask_hmp
index 3e3053f04..270e78f17 100644
--- a/installation/mods_MarcMentat/2015/Marc_tools/run_damask_hmp
+++ b/installation/mods_MarcMentat/2015/Marc_tools/run_damask_hmp
@@ -299,6 +299,20 @@ fi
 
 . "$DIR/getarch"
 
+# getting user subroutine file name
+found=0
+for i in "$@"; do
+  if test $found = 1; then
+    DAMASK_USER=$i
+    found=0
+  fi
+  case $i in
+    -u* | -U*)
+      found=1
+    ;;
+  esac
+done
+# sourcing include_linux64 (needs DAMASK_USER to be set)
 . $MARC_INCLUDE
 #
 
diff --git a/installation/mods_MarcMentat/2015/Marc_tools/run_damask_l b/installation/mods_MarcMentat/2015/Marc_tools/run_damask_l
index 86d5464bd..87c63f05a 100644
--- a/installation/mods_MarcMentat/2015/Marc_tools/run_damask_l
+++ b/installation/mods_MarcMentat/2015/Marc_tools/run_damask_l
@@ -299,6 +299,20 @@ fi
 
 . "$DIR/getarch"
 
+# getting user subroutine file name
+found=0
+for i in "$@"; do
+  if test $found = 1; then
+    DAMASK_USER=$i
+    found=0
+  fi
+  case $i in
+    -u* | -U*)
+      found=1
+    ;;
+  esac
+done
+# sourcing include_linux64 (needs DAMASK_USER to be set)
 . $MARC_INCLUDE
 #
 
diff --git a/installation/mods_MarcMentat/2015/Marc_tools/run_damask_lmp b/installation/mods_MarcMentat/2015/Marc_tools/run_damask_lmp
index 5fe65b829..9c10c5229 100644
--- a/installation/mods_MarcMentat/2015/Marc_tools/run_damask_lmp
+++ b/installation/mods_MarcMentat/2015/Marc_tools/run_damask_lmp
@@ -299,6 +299,20 @@ fi
 
 . "$DIR/getarch"
 
+# getting user subroutine file name
+found=0
+for i in "$@"; do
+  if test $found = 1; then
+    DAMASK_USER=$i
+    found=0
+  fi
+  case $i in
+    -u* | -U*)
+      found=1
+    ;;
+  esac
+done
+# sourcing include_linux64 (needs DAMASK_USER to be set)
 . $MARC_INCLUDE
 #
 
diff --git a/installation/mods_MarcMentat/2015/Marc_tools/run_damask_mp b/installation/mods_MarcMentat/2015/Marc_tools/run_damask_mp
index 1e3eadf37..5f34b18f5 100644
--- a/installation/mods_MarcMentat/2015/Marc_tools/run_damask_mp
+++ b/installation/mods_MarcMentat/2015/Marc_tools/run_damask_mp
@@ -299,6 +299,20 @@ fi
 
 . "$DIR/getarch"
 
+# getting user subroutine file name
+found=0
+for i in "$@"; do
+  if test $found = 1; then
+    DAMASK_USER=$i
+    found=0
+  fi
+  case $i in
+    -u* | -U*)
+      found=1
+    ;;
+  esac
+done
+# sourcing include_linux64 (needs DAMASK_USER to be set)
 . $MARC_INCLUDE
 #