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

2017-01-24 09:37:02 -05:00 · 2017-01-24 09:37:02 -05:00 · 4dc5f4e773
parent 746cb9c306 6748b32eb7
commit 4dc5f4e773
9 changed files with 104 additions and 27 deletions
--- a/2
+++ b/2
@ -1 +1 @@
-v2.0.1-345-g52964fe
+v2.0.1-352-g676ecb2
--- 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 \
--- 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
 #

--- 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
 #

--- 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
 #

--- 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
 #

--- 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
 #

--- 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
 #

--- a/installation/mods_MarcMentat/2016/Marc_tools/include_linux64
+++ b/installation/mods_MarcMentat/2016/Marc_tools/include_linux64
@ -452,10 +452,10 @@ fi
 FORT_OPT="-c -assume byterecl -stand f08 -standard-semantics -safe_cray_ptr -mp1 -WB -fp-model source"
 if test "$MTHREAD" = "OPENMP"
 then
-  FORT_OPT=" $FORT_OPT -openmp"
+  FORT_OPT=" $FORT_OPT -qopenmp"
  if test "$OMP_COMPAT" = "YES"
  then
-    FORT_OPT=" $FORT_OPT -openmp-threadprivate=compat"
+    FORT_OPT=" $FORT_OPT -qopenmp-threadprivate=compat"
  fi
 else
 #  FORT_OPT=" $FORT_OPT -auto "
@ -473,11 +473,11 @@ FORTNA="$FCOMP $FORT_OPT -fno-alias -O3 $I8FFLAGS -I$MARC_SOURCE/common \

 # determine DAMASK version
 if test -n "$DAMASK_USER"; then
-  DAMASK_ROOT=`dirname $DAMASK_USER`/..
-  read DAMASKVERSION < $DAMASK_ROOT/VERSION
+  DAMASKROOT=`dirname $DAMASK_USER`/..
+  read DAMASKVERSION < $DAMASKROOT/VERSION
  DAMASKVERSION="'"$DAMASKVERSION"'"
 else
-  DAMASKVERSION='NA'
+  DAMASKVERSION="'N/A'"
 fi

 # DAMASK compiler calls: additional flags are in line 2 OpenMP flags in line 3
@ -486,21 +486,21 @@ DFORTLOW="$FCOMP $FORT_OPT $PROFILE -O0 $I8FFLAGS -I$MARC_SOURCE/common \
 -I$MARC_SOURCE/${BCS_DIR}/common -I$MARC_SOURCE/mumpssolver/include $I8DEFINES -DLinux -DLINUX -DLinux_intel $FDEFINES $DDM $SOLVERFLAGS"
 DFORTLOWMP="$FCOMP -c -assume byterecl -stand f08 -standard-semantics -safe_cray_ptr $PROFILE -zero -mp1 -WB  -O0 $I8FFLAGS -I$MARC_SOURCE/common \
 -fpp -ftz -diag-disable 5268 -warn declarations -warn general -warn usage -warn interfaces -warn ignore_loc -warn alignments -DMarc4DAMASK=2016 -DDAMASKVERSION=$DAMASKVERSION \
- -openmp -openmp_report2 -openmp-threadprivate=compat\
+ -qopenmp -qopenmp-threadprivate=compat\
 -I$MARC_SOURCE/${BCS_DIR}/common -I$MARC_SOURCE/mumpssolver/include $I8DEFINES -DLinux -DLINUX -DLinux_intel $FDEFINES $DDM $SOLVERFLAGS"
 DFORTRAN="$FCOMP $FORT_OPT $PROFILE -O1 $I8FFLAGS -I$MARC_SOURCE/common \
 -fpp -ftz -diag-enable sc3 -diag-disable 5268 -warn declarations -warn general -warn usage -warn interfaces -warn ignore_loc -warn alignments -DMarc4DAMASK=2016 -DDAMASKVERSION=$DAMASKVERSION \
 -I$MARC_SOURCE/${BCS_DIR}/common -I$MARC_SOURCE/mumpssolver/include $I8DEFINES -DLinux -DLINUX -DLinux_intel $FDEFINES $DDM $SOLVERFLAGS"
 DFORTRANMP="$FCOMP -c -assume byterecl -stand f08 -standard-semantics -safe_cray_ptr $PROFILE -zero -mp1 -WB  -O1 $I8FFLAGS -I$MARC_SOURCE/common \
 -fpp -ftz -diag-disable 5268 -warn declarations -warn general -warn usage -warn interfaces -warn ignore_loc -warn alignments -DMarc4DAMASK=2016 -DDAMASKVERSION=$DAMASKVERSION \
- -openmp -openmp_report2 -openmp-threadprivate=compat\
+ -qopenmp -qopenmp-threadprivate=compat\
 -I$MARC_SOURCE/${BCS_DIR}/common -I$MARC_SOURCE/mumpssolver/include $I8DEFINES -DLinux -DLINUX -DLinux_intel $FDEFINES $DDM $SOLVERFLAGS"
 DFORTHIGH="$FCOMP $FORT_OPT $PROFILE -fno-alias -O2 $I8FFLAGS -I$MARC_SOURCE/common \
 -fpp -ftz -diag-enable sc3 -diag-disable 5268 -warn declarations -warn general -warn usage -warn interfaces -warn ignore_loc -warn alignments -DMarc4DAMASK=2016 -DDAMASKVERSION=$DAMASKVERSION \
 -I$MARC_SOURCE/${BCS_DIR}/common -I$MARC_SOURCE/mumpssolver/include $I8DEFINES -DLinux -DLINUX -DLinux_intel $FDEFINES $DDM $SOLVERFLAGS"
 DFORTHIGHMP="$FCOMP -c -assume byterecl -stand f08 -standard-semantics -safe_cray_ptr $PROFILE -zero -mp1 -WB  -fno-alias -O2 $I8FFLAGS -I$MARC_SOURCE/common \
 -fpp -ftz -diag-disable 5268 -warn declarations -warn general -warn usage -warn interfaces -warn ignore_loc -warn alignments -DMarc4DAMASK=2016 -DDAMASKVERSION=$DAMASKVERSION \
- -openmp -openmp_report2 -openmp-threadprivate=compat\
+ -qopenmp -qopenmp-threadprivate=compat\
 -I$MARC_SOURCE/${BCS_DIR}/common -I$MARC_SOURCE/mumpssolver/include $I8DEFINES -DLinux -DLINUX -DLinux_intel $FDEFINES $DDM $SOLVERFLAGS"

 if test "$MARCDEBUG" = "ON"
@ -520,21 +520,21 @@ then
   -I$MARC_SOURCE/${BCS_DIR}/common -I$MARC_SOURCE/mumpssolver/include $I8DEFINES -DLinux -DLINUX -DLinux_intel $FDEFINES $DDM $SOLVERFLAGS"
  DFORTLOWMP="$FCOMP -c -assume byterecl -stand f08 -standard-semantics -safe_cray_ptr $PROFILE -zero -mp1 -WB  $I8FFLAGS -I$MARC_SOURCE/common \
   -fpp -ftz -diag-disable 5268 -warn declarations -warn general -warn usage -warn interfaces -warn ignore_loc -warn alignments -DMarc4DAMASK=2016 -DDAMASKVERSION=$DAMASKVERSION \
-   -openmp -openmp_report2 -openmp-threadprivate=compat\
+   -qopenmp -qopenmp-threadprivate=compat\
   -I$MARC_SOURCE/${BCS_DIR}/common -I$MARC_SOURCE/mumpssolver/include $I8DEFINES -DLinux -DLINUX -DLinux_intel $FDEFINES $DDM $SOLVERFLAGS"
  DFORTRAN="$FCOMP $FORT_OPT $PROFILE $I8FFLAGS -I$MARC_SOURCE/common \
   -fpp -ftz -diag-enable sc3 -diag-disable 5268 -warn declarations -warn general -warn usage -warn interfaces -warn ignore_loc -warn alignments -DMarc4DAMASK=2016 -DDAMASKVERSION=$DAMASKVERSION \
   -I$MARC_SOURCE/${BCS_DIR}/common -I$MARC_SOURCE/mumpssolver/include $I8DEFINES  -DLinux -DLINUX -DLinux_intel $FDEFINES $DDM $SOLVERFLAGS"
  DFORTRANMP="$FCOMP -c -assume byterecl -stand f08 -standard-semantics -safe_cray_ptr $PROFILE -zero -mp1 -WB  $I8FFLAGS -I$MARC_SOURCE/common \
   -fpp -ftz -diag-disable 5268 -warn declarations -warn general -warn usage -warn interfaces -warn ignore_loc -warn alignments -DMarc4DAMASK=2016 -DDAMASKVERSION=$DAMASKVERSION \
-   -openmp -openmp_report2 -openmp-threadprivate=compat\
+   -qopenmp -qopenmp-threadprivate=compat\
   -I$MARC_SOURCE/${BCS_DIR}/common -I$MARC_SOURCE/mumpssolver/include $I8DEFINES  -DLinux -DLINUX -DLinux_intel $FDEFINES $DDM $SOLVERFLAGS"
  DFORTHIGH="$FCOMP $FORT_OPT $PROFILE -fno-alias $I8FFLAGS -I$MARC_SOURCE/common \
   -fpp -ftz -diag-enable sc3 -diag-disable 5268 -warn declarations -warn general -warn usage -warn interfaces -warn ignore_loc -warn alignments -DMarc4DAMASK=2016 -DDAMASKVERSION=$DAMASKVERSION \
   -I$MARC_SOURCE/${BCS_DIR}/common -I$MARC_SOURCE/mumpssolver/include $I8DEFINES -DLinux -DLINUX -DLinux_intel $FDEFINES $DDM $SOLVERFLAGS"
  DFORTHIGHMP="$FCOMP -c -assume byterecl -stand f08 -standard-semantics -safe_cray_ptr $PROFILE -zero -mp1 -WB  -fno-alias $I8FFLAGS -I$MARC_SOURCE/common \
   -fpp -ftz -diag-disable 5268 -warn declarations -warn general -warn usage -warn interfaces -warn ignore_loc -warn alignments -DMarc4DAMASK=2016 -DDAMASKVERSION=$DAMASKVERSION \
-   -openmp -openmp_report2 -openmp-threadprivate=compat\
+   -qopenmp -qopenmp-threadprivate=compat\
   -I$MARC_SOURCE/${BCS_DIR}/common -I$MARC_SOURCE/mumpssolver/include $I8DEFINES -DLinux -DLINUX -DLinux_intel $FDEFINES $DDM $SOLVERFLAGS"

 fi
@ -719,7 +719,7 @@ else
 SFLIB=" "
 fi

-OPENMP="-openmp"
+OPENMP="-qopenmp"

 SYSLIBS=" $OPENMP -lpthread "