Merge branch 'development' of magit1.mpie.de:damask/DAMASK into development

installation/mods_MarcMentat/2016/Marc_tools/include_linux64

@@ -472,20 +472,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
+if test -n "$DAMASK_USER"; then
-for arg in "$@"
+  DAMASK_ROOT=`dirname $DAMASK_USER`/..
-do
+  read DAMASKVERSION < $DAMASK_ROOT/VERSION
-  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"'"
+else
+  DAMASKVERSION='NA'
+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 \

installation/mods_MarcMentat/2016/Marc_tools/run_damask

@@ -299,7 +299,23 @@ 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
+
 #
 
 #

installation/mods_MarcMentat/2016/Marc_tools/run_damask_h

@@ -299,7 +299,23 @@ 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
+
 #
 
 #

installation/mods_MarcMentat/2016/Marc_tools/run_damask_hmp

@@ -299,7 +299,23 @@ 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
+
 #
 
 #

installation/mods_MarcMentat/2016/Marc_tools/run_damask_l

@@ -299,7 +299,23 @@ 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
+
 #
 
 #

installation/mods_MarcMentat/2016/Marc_tools/run_damask_lmp

@@ -299,7 +299,23 @@ 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
+
 #
 
 #

installation/mods_MarcMentat/2016/Marc_tools/run_damask_mp

@@ -299,7 +299,23 @@ 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
+
 #
 
 #