From 6df66c6349a81411e75e1a13a3198df325331810 Mon Sep 17 00:00:00 2001
From: Martin	Diehl <m.diehl@mpie.de>
Date: Wed, 7 May 2014 14:29:53 +0000
Subject: [PATCH] updated Marc run_damask scripts, linking against BLAS is done
 by Marc anyway, removed. renamed extension of original files from org to more
 explicit original

---
 .../{comp_user.org => comp_user.original}     |  0
 ...e_linux64.org => include_linux64.original} |  0
 .../2010.2/Marc_tools/run_damask              | 10 ++---
 .../2010.2/Marc_tools/run_damask_h            | 10 ++---
 .../2010.2/Marc_tools/run_damask_hmp          | 10 ++---
 .../2010.2/Marc_tools/run_damask_l            | 10 ++---
 .../2010.2/Marc_tools/run_damask_lmp          | 10 ++---
 .../2010.2/Marc_tools/run_damask_mp           | 10 ++---
 .../{run_marc.org => run_marc.original}       |  0
 .../{comp_user.org => comp_user.original}     |  0
 ...e_linux64.org => include_linux64.original} |  0
 .../2010/Marc_tools/run_damask                | 10 ++---
 .../2010/Marc_tools/run_damask_h              | 10 ++---
 .../2010/Marc_tools/run_damask_hmp            | 10 ++---
 .../2010/Marc_tools/run_damask_l              | 10 ++---
 .../2010/Marc_tools/run_damask_lmp            | 10 ++---
 .../2010/Marc_tools/run_damask_mp             | 10 ++---
 .../{run_marc.org => run_marc.original}       |  0
 .../{comp_user.org => comp_user.original}     |  0
 ...e_linux64.org => include_linux64.original} |  0
 .../2011/Marc_tools/run_damask                | 10 ++---
 .../2011/Marc_tools/run_damask_h              | 10 ++---
 .../2011/Marc_tools/run_damask_hmp            | 10 ++---
 .../2011/Marc_tools/run_damask_l              | 10 ++---
 .../2011/Marc_tools/run_damask_lmp            | 10 ++---
 .../2011/Marc_tools/run_damask_mp             | 10 ++---
 .../{run_marc.org => run_marc.original}       |  0
 .../{comp_user.org => comp_user.original}     |  0
 ...e_linux64.org => include_linux64.original} |  0
 .../2012/Marc_tools/run_damask                | 10 ++---
 .../2012/Marc_tools/run_damask_h              | 10 ++---
 .../2012/Marc_tools/run_damask_hmp            | 10 ++---
 .../2012/Marc_tools/run_damask_l              | 10 ++---
 .../2012/Marc_tools/run_damask_lmp            | 10 ++---
 .../2012/Marc_tools/run_damask_mp             | 10 ++---
 .../{run_marc.org => run_marc.original}       |  0
 .../{comp_user.org => comp_user.original}     |  0
 .../2013.1/Marc_tools/include_linux64         | 14 +++---
 ...e_linux64.org => include_linux64.original} |  0
 .../2013.1/Marc_tools/run_damask              | 10 ++---
 .../2013.1/Marc_tools/run_damask_h            | 10 ++---
 .../2013.1/Marc_tools/run_damask_hmp          | 10 ++---
 .../2013.1/Marc_tools/run_damask_l            | 10 ++---
 .../2013.1/Marc_tools/run_damask_lmp          | 10 ++---
 .../2013.1/Marc_tools/run_damask_mp           | 10 ++---
 .../{run_marc.org => run_marc.original}       |  0
 .../{comp_user.org => comp_user.original}     |  0
 ...e_linux64.org => include_linux64.original} |  0
 .../2013/Marc_tools/run_damask                | 10 ++---
 .../2013/Marc_tools/run_damask_h              | 10 ++---
 .../2013/Marc_tools/run_damask_hmp            | 10 ++---
 .../2013/Marc_tools/run_damask_l              | 10 ++---
 .../2013/Marc_tools/run_damask_lmp            | 10 ++---
 .../2013/Marc_tools/run_damask_mp             | 10 ++---
 .../{run_marc.org => run_marc.original}       |  0
 .../apply_DAMASK_modifications.sh             | 43 +------------------
 lib/damask/solver/marc.py                     |  8 +---
 57 files changed, 190 insertions(+), 235 deletions(-)
 rename installation/mods_MarcMentat/2010.2/Marc_tools/{comp_user.org => comp_user.original} (100%)
 rename installation/mods_MarcMentat/2010.2/Marc_tools/{include_linux64.org => include_linux64.original} (100%)
 rename installation/mods_MarcMentat/2010.2/Marc_tools/{run_marc.org => run_marc.original} (100%)
 rename installation/mods_MarcMentat/2010/Marc_tools/{comp_user.org => comp_user.original} (100%)
 rename installation/mods_MarcMentat/2010/Marc_tools/{include_linux64.org => include_linux64.original} (100%)
 rename installation/mods_MarcMentat/2010/Marc_tools/{run_marc.org => run_marc.original} (100%)
 rename installation/mods_MarcMentat/2011/Marc_tools/{comp_user.org => comp_user.original} (100%)
 rename installation/mods_MarcMentat/2011/Marc_tools/{include_linux64.org => include_linux64.original} (100%)
 rename installation/mods_MarcMentat/2011/Marc_tools/{run_marc.org => run_marc.original} (100%)
 rename installation/mods_MarcMentat/2012/Marc_tools/{comp_user.org => comp_user.original} (100%)
 rename installation/mods_MarcMentat/2012/Marc_tools/{include_linux64.org => include_linux64.original} (100%)
 rename installation/mods_MarcMentat/2012/Marc_tools/{run_marc.org => run_marc.original} (100%)
 rename installation/mods_MarcMentat/2013.1/Marc_tools/{comp_user.org => comp_user.original} (100%)
 rename installation/mods_MarcMentat/2013.1/Marc_tools/{include_linux64.org => include_linux64.original} (100%)
 rename installation/mods_MarcMentat/2013.1/Marc_tools/{run_marc.org => run_marc.original} (100%)
 rename installation/mods_MarcMentat/2013/Marc_tools/{comp_user.org => comp_user.original} (100%)
 rename installation/mods_MarcMentat/2013/Marc_tools/{include_linux64.org => include_linux64.original} (100%)
 rename installation/mods_MarcMentat/2013/Marc_tools/{run_marc.org => run_marc.original} (100%)

diff --git a/installation/mods_MarcMentat/2010.2/Marc_tools/comp_user.org b/installation/mods_MarcMentat/2010.2/Marc_tools/comp_user.original
similarity index 100%
rename from installation/mods_MarcMentat/2010.2/Marc_tools/comp_user.org
rename to installation/mods_MarcMentat/2010.2/Marc_tools/comp_user.original
diff --git a/installation/mods_MarcMentat/2010.2/Marc_tools/include_linux64.org b/installation/mods_MarcMentat/2010.2/Marc_tools/include_linux64.original
similarity index 100%
rename from installation/mods_MarcMentat/2010.2/Marc_tools/include_linux64.org
rename to installation/mods_MarcMentat/2010.2/Marc_tools/include_linux64.original
diff --git a/installation/mods_MarcMentat/2010.2/Marc_tools/run_damask b/installation/mods_MarcMentat/2010.2/Marc_tools/run_damask
index c8d2fdd9f..edfe47ff4 100644
--- a/installation/mods_MarcMentat/2010.2/Marc_tools/run_damask
+++ b/installation/mods_MarcMentat/2010.2/Marc_tools/run_damask
@@ -1856,8 +1856,8 @@ fi
 #
 # user subroutine used
 #
-# add BLAS options for linking
-  BLAS="%BLAS%"
+# add DAMASK options for linking
+  DAMASK=""
 
   
   if test "$user"
@@ -2835,7 +2835,7 @@ then
     $TKLIBS  \
     $MRCLIBS     \
     $METISLIBS \
-    $BLAS   \
+    $DAMASK   \
     $SYSLIBS  \
     $SECLIBS      || \
     {
@@ -3127,7 +3127,7 @@ then
   $TKLIBS  \
   $MRCLIBS     \
   $METISLIBS \
-  $BLAS   \
+  $DAMASK   \
   $SYSLIBS  \
   $SECLIBS    || \
   {
@@ -3418,7 +3418,7 @@ then
   $TKLIBS  \
   $MRCLIBS     \
   $METISLIBS \
-  $BLAS   \
+  $DAMASK   \
   $SYSLIBS \
   $SECLIBS         || \
   {
diff --git a/installation/mods_MarcMentat/2010.2/Marc_tools/run_damask_h b/installation/mods_MarcMentat/2010.2/Marc_tools/run_damask_h
index bb6b5e5cb..f0d843523 100644
--- a/installation/mods_MarcMentat/2010.2/Marc_tools/run_damask_h
+++ b/installation/mods_MarcMentat/2010.2/Marc_tools/run_damask_h
@@ -1856,8 +1856,8 @@ fi
 #
 # user subroutine used
 #
-# add BLAS options for linking
-  BLAS="%BLAS%"
+# add DAMASK options for linking
+  DAMASK=""
 
   
   if test "$user"
@@ -2835,7 +2835,7 @@ then
     $TKLIBS  \
     $MRCLIBS     \
     $METISLIBS \
-    $BLAS   \
+    $DAMASK   \
     $SYSLIBS  \
     $SECLIBS      || \
     {
@@ -3127,7 +3127,7 @@ then
   $TKLIBS  \
   $MRCLIBS     \
   $METISLIBS \
-  $BLAS   \
+  $DAMASK   \
   $SYSLIBS  \
   $SECLIBS    || \
   {
@@ -3418,7 +3418,7 @@ then
   $TKLIBS  \
   $MRCLIBS     \
   $METISLIBS \
-  $BLAS   \
+  $DAMASK   \
   $SYSLIBS \
   $SECLIBS         || \
   {
diff --git a/installation/mods_MarcMentat/2010.2/Marc_tools/run_damask_hmp b/installation/mods_MarcMentat/2010.2/Marc_tools/run_damask_hmp
index 27b563d62..9073168ec 100644
--- a/installation/mods_MarcMentat/2010.2/Marc_tools/run_damask_hmp
+++ b/installation/mods_MarcMentat/2010.2/Marc_tools/run_damask_hmp
@@ -1856,8 +1856,8 @@ fi
 #
 # user subroutine used
 #
-# add BLAS options for linking
-  BLAS="%BLAS%"
+# add DAMASK options for linking
+  DAMASK=""
 
   
   if test "$user"
@@ -2835,7 +2835,7 @@ then
     $TKLIBS  \
     $MRCLIBS     \
     $METISLIBS \
-    $BLAS   \
+    $DAMASK   \
     $SYSLIBS  \
     $SECLIBS      || \
     {
@@ -3127,7 +3127,7 @@ then
   $TKLIBS  \
   $MRCLIBS     \
   $METISLIBS \
-  $BLAS   \
+  $DAMASK   \
   $SYSLIBS  \
   $SECLIBS    || \
   {
@@ -3418,7 +3418,7 @@ then
   $TKLIBS  \
   $MRCLIBS     \
   $METISLIBS \
-  $BLAS   \
+  $DAMASK   \
   $SYSLIBS \
   $SECLIBS         || \
   {
diff --git a/installation/mods_MarcMentat/2010.2/Marc_tools/run_damask_l b/installation/mods_MarcMentat/2010.2/Marc_tools/run_damask_l
index 05d6edcdb..c9b353a88 100644
--- a/installation/mods_MarcMentat/2010.2/Marc_tools/run_damask_l
+++ b/installation/mods_MarcMentat/2010.2/Marc_tools/run_damask_l
@@ -1856,8 +1856,8 @@ fi
 #
 # user subroutine used
 #
-# add BLAS options for linking
-  BLAS="%BLAS%"
+# add DAMASK options for linking
+  DAMASK=""
 
   
   if test "$user"
@@ -2835,7 +2835,7 @@ then
     $TKLIBS  \
     $MRCLIBS     \
     $METISLIBS \
-    $BLAS   \
+    $DAMASK   \
     $SYSLIBS  \
     $SECLIBS      || \
     {
@@ -3127,7 +3127,7 @@ then
   $TKLIBS  \
   $MRCLIBS     \
   $METISLIBS \
-  $BLAS   \
+  $DAMASK   \
   $SYSLIBS  \
   $SECLIBS    || \
   {
@@ -3418,7 +3418,7 @@ then
   $TKLIBS  \
   $MRCLIBS     \
   $METISLIBS \
-  $BLAS   \
+  $DAMASK   \
   $SYSLIBS \
   $SECLIBS         || \
   {
diff --git a/installation/mods_MarcMentat/2010.2/Marc_tools/run_damask_lmp b/installation/mods_MarcMentat/2010.2/Marc_tools/run_damask_lmp
index d627a2a92..5678c63ad 100644
--- a/installation/mods_MarcMentat/2010.2/Marc_tools/run_damask_lmp
+++ b/installation/mods_MarcMentat/2010.2/Marc_tools/run_damask_lmp
@@ -1856,8 +1856,8 @@ fi
 #
 # user subroutine used
 #
-# add BLAS options for linking
-  BLAS="%BLAS%"
+# add DAMASK options for linking
+  DAMASK=""
 
   
   if test "$user"
@@ -2835,7 +2835,7 @@ then
     $TKLIBS  \
     $MRCLIBS     \
     $METISLIBS \
-    $BLAS   \
+    $DAMASK   \
     $SYSLIBS  \
     $SECLIBS      || \
     {
@@ -3127,7 +3127,7 @@ then
   $TKLIBS  \
   $MRCLIBS     \
   $METISLIBS \
-  $BLAS   \
+  $DAMASK   \
   $SYSLIBS  \
   $SECLIBS    || \
   {
@@ -3418,7 +3418,7 @@ then
   $TKLIBS  \
   $MRCLIBS     \
   $METISLIBS \
-  $BLAS   \
+  $DAMASK   \
   $SYSLIBS \
   $SECLIBS         || \
   {
diff --git a/installation/mods_MarcMentat/2010.2/Marc_tools/run_damask_mp b/installation/mods_MarcMentat/2010.2/Marc_tools/run_damask_mp
index 13bf30991..739e330a8 100644
--- a/installation/mods_MarcMentat/2010.2/Marc_tools/run_damask_mp
+++ b/installation/mods_MarcMentat/2010.2/Marc_tools/run_damask_mp
@@ -1856,8 +1856,8 @@ fi
 #
 # user subroutine used
 #
-# add BLAS options for linking
-  BLAS="%BLAS%"
+# add DAMASK options for linking
+  DAMASK=""
 
   
   if test "$user"
@@ -2835,7 +2835,7 @@ then
     $TKLIBS  \
     $MRCLIBS     \
     $METISLIBS \
-    $BLAS   \
+    $DAMASK   \
     $SYSLIBS  \
     $SECLIBS      || \
     {
@@ -3127,7 +3127,7 @@ then
   $TKLIBS  \
   $MRCLIBS     \
   $METISLIBS \
-  $BLAS   \
+  $DAMASK   \
   $SYSLIBS  \
   $SECLIBS    || \
   {
@@ -3418,7 +3418,7 @@ then
   $TKLIBS  \
   $MRCLIBS     \
   $METISLIBS \
-  $BLAS   \
+  $DAMASK   \
   $SYSLIBS \
   $SECLIBS         || \
   {
diff --git a/installation/mods_MarcMentat/2010.2/Marc_tools/run_marc.org b/installation/mods_MarcMentat/2010.2/Marc_tools/run_marc.original
similarity index 100%
rename from installation/mods_MarcMentat/2010.2/Marc_tools/run_marc.org
rename to installation/mods_MarcMentat/2010.2/Marc_tools/run_marc.original
diff --git a/installation/mods_MarcMentat/2010/Marc_tools/comp_user.org b/installation/mods_MarcMentat/2010/Marc_tools/comp_user.original
similarity index 100%
rename from installation/mods_MarcMentat/2010/Marc_tools/comp_user.org
rename to installation/mods_MarcMentat/2010/Marc_tools/comp_user.original
diff --git a/installation/mods_MarcMentat/2010/Marc_tools/include_linux64.org b/installation/mods_MarcMentat/2010/Marc_tools/include_linux64.original
similarity index 100%
rename from installation/mods_MarcMentat/2010/Marc_tools/include_linux64.org
rename to installation/mods_MarcMentat/2010/Marc_tools/include_linux64.original
diff --git a/installation/mods_MarcMentat/2010/Marc_tools/run_damask b/installation/mods_MarcMentat/2010/Marc_tools/run_damask
index 4f536ad37..9228e0088 100644
--- a/installation/mods_MarcMentat/2010/Marc_tools/run_damask
+++ b/installation/mods_MarcMentat/2010/Marc_tools/run_damask
@@ -1817,8 +1817,8 @@ fi
 #
 # user subroutine used
 #
-# add BLAS options for linking
-  BLAS="%BLAS%"
+# add DAMASK options for linking
+  DAMASK=""
 
   
   if test "$user"
@@ -2771,7 +2771,7 @@ then
     $TKLIBS  \
     $MRCLIBS     \
     $METISLIBS \
-    $BLAS   \
+    $DAMASK   \
     $SYSLIBS          || \
     {
     echo "$0: link failed for ${user:+$userobj }$objs"
@@ -3062,7 +3062,7 @@ then
   $TKLIBS  \
   $MRCLIBS     \
   $METISLIBS \
-  $BLAS   \
+  $DAMASK   \
   $SYSLIBS          || \
   {
     echo "$0: link failed for ${user:+$userobj }$objs"
@@ -3352,7 +3352,7 @@ then
   $TKLIBS  \
   $MRCLIBS     \
   $METISLIBS \
-  $BLAS   \
+  $DAMASK   \
   $SYSLIBS          || \
   {
     echo "$0: link failed for ${user:+$userobj }$objs"
diff --git a/installation/mods_MarcMentat/2010/Marc_tools/run_damask_h b/installation/mods_MarcMentat/2010/Marc_tools/run_damask_h
index 996cf79c8..e3b7facb6 100644
--- a/installation/mods_MarcMentat/2010/Marc_tools/run_damask_h
+++ b/installation/mods_MarcMentat/2010/Marc_tools/run_damask_h
@@ -1817,8 +1817,8 @@ fi
 #
 # user subroutine used
 #
-# add BLAS options for linking
-  BLAS="%BLAS%"
+# add DAMASK options for linking
+  DAMASK=""
 
   if test "$user"
   then
@@ -2770,7 +2770,7 @@ then
     $TKLIBS  \
     $MRCLIBS     \
     $METISLIBS \
-    $BLAS   \
+    $DAMASK   \
     $SYSLIBS          || \
     {
     echo "$0: link failed for ${user:+$userobj }$objs"
@@ -3061,7 +3061,7 @@ then
   $TKLIBS  \
   $MRCLIBS     \
   $METISLIBS \
-  $BLAS   \
+  $DAMASK   \
   $SYSLIBS          || \
   {
     echo "$0: link failed for ${user:+$userobj }$objs"
@@ -3351,7 +3351,7 @@ then
   $TKLIBS  \
   $MRCLIBS     \
   $METISLIBS \
-  $BLAS   \
+  $DAMASK   \
   $SYSLIBS          || \
   {
     echo "$0: link failed for ${user:+$userobj }$objs"
diff --git a/installation/mods_MarcMentat/2010/Marc_tools/run_damask_hmp b/installation/mods_MarcMentat/2010/Marc_tools/run_damask_hmp
index 940b2571c..e63a69c42 100644
--- a/installation/mods_MarcMentat/2010/Marc_tools/run_damask_hmp
+++ b/installation/mods_MarcMentat/2010/Marc_tools/run_damask_hmp
@@ -1817,8 +1817,8 @@ fi
 #
 # user subroutine used
 #
-# add BLAS options for linking
-  BLAS="%BLAS%"
+# add DAMASK options for linking
+  DAMASK=""
 
   
   if test "$user"
@@ -2771,7 +2771,7 @@ then
     $TKLIBS  \
     $MRCLIBS     \
     $METISLIBS \
-    $BLAS   \
+    $DAMASK   \
     $SYSLIBS          || \
     {
     echo "$0: link failed for ${user:+$userobj }$objs"
@@ -3062,7 +3062,7 @@ then
   $TKLIBS  \
   $MRCLIBS     \
   $METISLIBS \
-  $BLAS   \
+  $DAMASK   \
   $SYSLIBS          || \
   {
     echo "$0: link failed for ${user:+$userobj }$objs"
@@ -3352,7 +3352,7 @@ then
   $TKLIBS  \
   $MRCLIBS     \
   $METISLIBS \
-  $BLAS   \
+  $DAMASK   \
   $SYSLIBS          || \
   {
     echo "$0: link failed for ${user:+$userobj }$objs"
diff --git a/installation/mods_MarcMentat/2010/Marc_tools/run_damask_l b/installation/mods_MarcMentat/2010/Marc_tools/run_damask_l
index 08585a64d..9eca89826 100644
--- a/installation/mods_MarcMentat/2010/Marc_tools/run_damask_l
+++ b/installation/mods_MarcMentat/2010/Marc_tools/run_damask_l
@@ -1817,8 +1817,8 @@ fi
 #
 # user subroutine used
 #
-# add BLAS options for linking
-  BLAS="%BLAS%"
+# add DAMASK options for linking
+  DAMASK=""
 
   
   if test "$user"
@@ -2771,7 +2771,7 @@ then
     $TKLIBS  \
     $MRCLIBS     \
     $METISLIBS \
-    $BLAS   \
+    $DAMASK   \
     $SYSLIBS          || \
     {
     echo "$0: link failed for ${user:+$userobj }$objs"
@@ -3062,7 +3062,7 @@ then
   $TKLIBS  \
   $MRCLIBS     \
   $METISLIBS \
-  $BLAS   \
+  $DAMASK   \
   $SYSLIBS          || \
   {
     echo "$0: link failed for ${user:+$userobj }$objs"
@@ -3352,7 +3352,7 @@ then
   $TKLIBS  \
   $MRCLIBS     \
   $METISLIBS \
-  $BLAS   \
+  $DAMASK   \
   $SYSLIBS          || \
   {
     echo "$0: link failed for ${user:+$userobj }$objs"
diff --git a/installation/mods_MarcMentat/2010/Marc_tools/run_damask_lmp b/installation/mods_MarcMentat/2010/Marc_tools/run_damask_lmp
index cfd1162ba..68d308722 100644
--- a/installation/mods_MarcMentat/2010/Marc_tools/run_damask_lmp
+++ b/installation/mods_MarcMentat/2010/Marc_tools/run_damask_lmp
@@ -1817,8 +1817,8 @@ fi
 #
 # user subroutine used
 #
-# add BLAS options for linking
-  BLAS="%BLAS%"
+# add DAMASK options for linking
+  DAMASK=""
 
   
   if test "$user"
@@ -2771,7 +2771,7 @@ then
     $TKLIBS  \
     $MRCLIBS     \
     $METISLIBS \
-    $BLAS   \
+    $DAMASK   \
     $SYSLIBS          || \
     {
     echo "$0: link failed for ${user:+$userobj }$objs"
@@ -3062,7 +3062,7 @@ then
   $TKLIBS  \
   $MRCLIBS     \
   $METISLIBS \
-  $BLAS   \
+  $DAMASK   \
   $SYSLIBS          || \
   {
     echo "$0: link failed for ${user:+$userobj }$objs"
@@ -3352,7 +3352,7 @@ then
   $TKLIBS  \
   $MRCLIBS     \
   $METISLIBS \
-  $BLAS   \
+  $DAMASK   \
   $SYSLIBS          || \
   {
     echo "$0: link failed for ${user:+$userobj }$objs"
diff --git a/installation/mods_MarcMentat/2010/Marc_tools/run_damask_mp b/installation/mods_MarcMentat/2010/Marc_tools/run_damask_mp
index 821336c50..75ae02559 100644
--- a/installation/mods_MarcMentat/2010/Marc_tools/run_damask_mp
+++ b/installation/mods_MarcMentat/2010/Marc_tools/run_damask_mp
@@ -1817,8 +1817,8 @@ fi
 #
 # user subroutine used
 #
-# add BLAS options for linking
-  BLAS="%BLAS%"
+# add DAMASK options for linking
+  DAMASK=""
 
   if test "$user"
   then
@@ -2770,7 +2770,7 @@ then
     $TKLIBS  \
     $MRCLIBS     \
     $METISLIBS \
-    $BLAS   \
+    $DAMASK   \
     $SYSLIBS          || \
     {
     echo "$0: link failed for ${user:+$userobj }$objs"
@@ -3061,7 +3061,7 @@ then
   $TKLIBS  \
   $MRCLIBS     \
   $METISLIBS \
-  $BLAS   \
+  $DAMASK   \
   $SYSLIBS          || \
   {
     echo "$0: link failed for ${user:+$userobj }$objs"
@@ -3351,7 +3351,7 @@ then
   $TKLIBS  \
   $MRCLIBS     \
   $METISLIBS \
-  $BLAS   \
+  $DAMASK   \
   $SYSLIBS          || \
   {
     echo "$0: link failed for ${user:+$userobj }$objs"
diff --git a/installation/mods_MarcMentat/2010/Marc_tools/run_marc.org b/installation/mods_MarcMentat/2010/Marc_tools/run_marc.original
similarity index 100%
rename from installation/mods_MarcMentat/2010/Marc_tools/run_marc.org
rename to installation/mods_MarcMentat/2010/Marc_tools/run_marc.original
diff --git a/installation/mods_MarcMentat/2011/Marc_tools/comp_user.org b/installation/mods_MarcMentat/2011/Marc_tools/comp_user.original
similarity index 100%
rename from installation/mods_MarcMentat/2011/Marc_tools/comp_user.org
rename to installation/mods_MarcMentat/2011/Marc_tools/comp_user.original
diff --git a/installation/mods_MarcMentat/2011/Marc_tools/include_linux64.org b/installation/mods_MarcMentat/2011/Marc_tools/include_linux64.original
similarity index 100%
rename from installation/mods_MarcMentat/2011/Marc_tools/include_linux64.org
rename to installation/mods_MarcMentat/2011/Marc_tools/include_linux64.original
diff --git a/installation/mods_MarcMentat/2011/Marc_tools/run_damask b/installation/mods_MarcMentat/2011/Marc_tools/run_damask
index 0b63bb720..7c58c5326 100644
--- a/installation/mods_MarcMentat/2011/Marc_tools/run_damask
+++ b/installation/mods_MarcMentat/2011/Marc_tools/run_damask
@@ -1856,8 +1856,8 @@ fi
 #
 # user subroutine used
 #
-# add BLAS options for linking
-  BLAS="%BLAS%"
+# add DAMASK options for linking
+  DAMASK=""
   
   if test "$user"
   then
@@ -2834,7 +2834,7 @@ then
     $TKLIBS  \
     $MRCLIBS     \
     $METISLIBS \
-    $BLAS   \
+    $DAMASK   \
     $SYSLIBS  \
     $SECLIBS      || \
     {
@@ -3126,7 +3126,7 @@ then
   $TKLIBS  \
   $MRCLIBS     \
   $METISLIBS \
-  $BLAS   \
+  $DAMASK   \
   $SYSLIBS  \
   $SECLIBS    || \
   {
@@ -3417,7 +3417,7 @@ then
   $TKLIBS  \
   $MRCLIBS     \
   $METISLIBS \
-  $BLAS   \
+  $DAMASK   \
   $SYSLIBS \
   $SECLIBS         || \
   {
diff --git a/installation/mods_MarcMentat/2011/Marc_tools/run_damask_h b/installation/mods_MarcMentat/2011/Marc_tools/run_damask_h
index b77cd72eb..3f24d83d6 100644
--- a/installation/mods_MarcMentat/2011/Marc_tools/run_damask_h
+++ b/installation/mods_MarcMentat/2011/Marc_tools/run_damask_h
@@ -1856,8 +1856,8 @@ fi
 #
 # user subroutine used
 #
-# add BLAS options for linking
-  BLAS="%BLAS%"
+# add DAMASK options for linking
+  DAMASK=""
 
   
   if test "$user"
@@ -2835,7 +2835,7 @@ then
     $TKLIBS  \
     $MRCLIBS     \
     $METISLIBS \
-    $BLAS   \
+    $DAMASK   \
     $SYSLIBS  \
     $SECLIBS      || \
     {
@@ -3127,7 +3127,7 @@ then
   $TKLIBS  \
   $MRCLIBS     \
   $METISLIBS \
-  $BLAS   \
+  $DAMASK   \
   $SYSLIBS  \
   $SECLIBS    || \
   {
@@ -3418,7 +3418,7 @@ then
   $TKLIBS  \
   $MRCLIBS     \
   $METISLIBS \
-  $BLAS   \
+  $DAMASK   \
   $SYSLIBS \
   $SECLIBS         || \
   {
diff --git a/installation/mods_MarcMentat/2011/Marc_tools/run_damask_hmp b/installation/mods_MarcMentat/2011/Marc_tools/run_damask_hmp
index bad252b86..de1ef519a 100644
--- a/installation/mods_MarcMentat/2011/Marc_tools/run_damask_hmp
+++ b/installation/mods_MarcMentat/2011/Marc_tools/run_damask_hmp
@@ -1856,8 +1856,8 @@ fi
 #
 # user subroutine used
 #
-# add BLAS options for linking
-  BLAS="%BLAS%"
+# add DAMASK options for linking
+  DAMASK=""
   
   if test "$user"
   then
@@ -2834,7 +2834,7 @@ then
     $TKLIBS  \
     $MRCLIBS     \
     $METISLIBS \
-    $BLAS   \
+    $DAMASK   \
     $SYSLIBS  \
     $SECLIBS      || \
     {
@@ -3126,7 +3126,7 @@ then
   $TKLIBS  \
   $MRCLIBS     \
   $METISLIBS \
-  $BLAS   \
+  $DAMASK   \
   $SYSLIBS  \
   $SECLIBS    || \
   {
@@ -3417,7 +3417,7 @@ then
   $TKLIBS  \
   $MRCLIBS     \
   $METISLIBS \
-  $BLAS   \
+  $DAMASK   \
   $SYSLIBS \
   $SECLIBS         || \
   {
diff --git a/installation/mods_MarcMentat/2011/Marc_tools/run_damask_l b/installation/mods_MarcMentat/2011/Marc_tools/run_damask_l
index 310754adc..6afe0819d 100644
--- a/installation/mods_MarcMentat/2011/Marc_tools/run_damask_l
+++ b/installation/mods_MarcMentat/2011/Marc_tools/run_damask_l
@@ -1856,8 +1856,8 @@ fi
 #
 # user subroutine used
 #
-# add BLAS options for linking
-  BLAS="%BLAS%"
+# add DAMASK options for linking
+  DAMASK=""
   
   if test "$user"
   then
@@ -2834,7 +2834,7 @@ then
     $TKLIBS  \
     $MRCLIBS     \
     $METISLIBS \
-    $BLAS   \
+    $DAMASK   \
     $SYSLIBS  \
     $SECLIBS      || \
     {
@@ -3126,7 +3126,7 @@ then
   $TKLIBS  \
   $MRCLIBS     \
   $METISLIBS \
-  $BLAS   \
+  $DAMASK   \
   $SYSLIBS  \
   $SECLIBS    || \
   {
@@ -3417,7 +3417,7 @@ then
   $TKLIBS  \
   $MRCLIBS     \
   $METISLIBS \
-  $BLAS   \
+  $DAMASK   \
   $SYSLIBS \
   $SECLIBS         || \
   {
diff --git a/installation/mods_MarcMentat/2011/Marc_tools/run_damask_lmp b/installation/mods_MarcMentat/2011/Marc_tools/run_damask_lmp
index e0d65ca8d..d9f23dc7b 100644
--- a/installation/mods_MarcMentat/2011/Marc_tools/run_damask_lmp
+++ b/installation/mods_MarcMentat/2011/Marc_tools/run_damask_lmp
@@ -1856,8 +1856,8 @@ fi
 #
 # user subroutine used
 #
-# add BLAS options for linking
-  BLAS="%BLAS%"
+# add DAMASK options for linking
+  DAMASK=""
   
   if test "$user"
   then
@@ -2834,7 +2834,7 @@ then
     $TKLIBS  \
     $MRCLIBS     \
     $METISLIBS \
-    $BLAS   \
+    $DAMASK   \
     $SYSLIBS  \
     $SECLIBS      || \
     {
@@ -3126,7 +3126,7 @@ then
   $TKLIBS  \
   $MRCLIBS     \
   $METISLIBS \
-  $BLAS   \
+  $DAMASK   \
   $SYSLIBS  \
   $SECLIBS    || \
   {
@@ -3417,7 +3417,7 @@ then
   $TKLIBS  \
   $MRCLIBS     \
   $METISLIBS \
-  $BLAS   \
+  $DAMASK   \
   $SYSLIBS \
   $SECLIBS         || \
   {
diff --git a/installation/mods_MarcMentat/2011/Marc_tools/run_damask_mp b/installation/mods_MarcMentat/2011/Marc_tools/run_damask_mp
index 9b518b74a..8a0ed187e 100644
--- a/installation/mods_MarcMentat/2011/Marc_tools/run_damask_mp
+++ b/installation/mods_MarcMentat/2011/Marc_tools/run_damask_mp
@@ -1856,8 +1856,8 @@ fi
 #
 # user subroutine used
 #
-# add BLAS options for linking
-  BLAS="%BLAS%"
+# add DAMASK options for linking
+  DAMASK=""
 
   
   if test "$user"
@@ -2835,7 +2835,7 @@ then
     $TKLIBS  \
     $MRCLIBS     \
     $METISLIBS \
-    $BLAS   \
+    $DAMASK   \
     $SYSLIBS  \
     $SECLIBS      || \
     {
@@ -3127,7 +3127,7 @@ then
   $TKLIBS  \
   $MRCLIBS     \
   $METISLIBS \
-  $BLAS   \
+  $DAMASK   \
   $SYSLIBS  \
   $SECLIBS    || \
   {
@@ -3418,7 +3418,7 @@ then
   $TKLIBS  \
   $MRCLIBS     \
   $METISLIBS \
-  $BLAS   \
+  $DAMASK   \
   $SYSLIBS \
   $SECLIBS         || \
   {
diff --git a/installation/mods_MarcMentat/2011/Marc_tools/run_marc.org b/installation/mods_MarcMentat/2011/Marc_tools/run_marc.original
similarity index 100%
rename from installation/mods_MarcMentat/2011/Marc_tools/run_marc.org
rename to installation/mods_MarcMentat/2011/Marc_tools/run_marc.original
diff --git a/installation/mods_MarcMentat/2012/Marc_tools/comp_user.org b/installation/mods_MarcMentat/2012/Marc_tools/comp_user.original
similarity index 100%
rename from installation/mods_MarcMentat/2012/Marc_tools/comp_user.org
rename to installation/mods_MarcMentat/2012/Marc_tools/comp_user.original
diff --git a/installation/mods_MarcMentat/2012/Marc_tools/include_linux64.org b/installation/mods_MarcMentat/2012/Marc_tools/include_linux64.original
similarity index 100%
rename from installation/mods_MarcMentat/2012/Marc_tools/include_linux64.org
rename to installation/mods_MarcMentat/2012/Marc_tools/include_linux64.original
diff --git a/installation/mods_MarcMentat/2012/Marc_tools/run_damask b/installation/mods_MarcMentat/2012/Marc_tools/run_damask
index 727ae7659..789ce4215 100644
--- a/installation/mods_MarcMentat/2012/Marc_tools/run_damask
+++ b/installation/mods_MarcMentat/2012/Marc_tools/run_damask
@@ -1921,8 +1921,8 @@ fi
 #
 # user subroutine used
 #
-# add BLAS options for linking
-  BLAS="%BLAS%"
+# add DAMASK options for linking
+  DAMASK=""
   
   if test "$user"
   then
@@ -2898,7 +2898,7 @@ then
     $TKLIBS  \
     $MRCLIBS     \
     $METISLIBS \
-    $BLAS   \
+    $DAMASK   \
     $SYSLIBS  \
     $SECLIBS      || \
     {
@@ -3191,7 +3191,7 @@ then
   $TKLIBS  \
   $MRCLIBS     \
   $METISLIBS \
-  $BLAS   \
+  $DAMASK   \
   $SYSLIBS  \
   $SECLIBS    || \
   {
@@ -3483,7 +3483,7 @@ then
   $TKLIBS  \
   $MRCLIBS     \
   $METISLIBS \
-  $BLAS   \
+  $DAMASK   \
   $SYSLIBS \
   $SECLIBS         || \
   {
diff --git a/installation/mods_MarcMentat/2012/Marc_tools/run_damask_h b/installation/mods_MarcMentat/2012/Marc_tools/run_damask_h
index 0501656b2..d7f3e4ead 100644
--- a/installation/mods_MarcMentat/2012/Marc_tools/run_damask_h
+++ b/installation/mods_MarcMentat/2012/Marc_tools/run_damask_h
@@ -1921,8 +1921,8 @@ fi
 #
 # user subroutine used
 #
-# add BLAS options for linking
-  BLAS="%BLAS%"
+# add DAMASK options for linking
+  DAMASK=""
   
   if test "$user"
   then
@@ -2898,7 +2898,7 @@ then
     $TKLIBS  \
     $MRCLIBS     \
     $METISLIBS \
-    $BLAS   \
+    $DAMASK   \
     $SYSLIBS  \
     $SECLIBS      || \
     {
@@ -3191,7 +3191,7 @@ then
   $TKLIBS  \
   $MRCLIBS     \
   $METISLIBS \
-  $BLAS   \
+  $DAMASK   \
   $SYSLIBS  \
   $SECLIBS    || \
   {
@@ -3483,7 +3483,7 @@ then
   $TKLIBS  \
   $MRCLIBS     \
   $METISLIBS \
-  $BLAS   \
+  $DAMASK   \
   $SYSLIBS \
   $SECLIBS         || \
   {
diff --git a/installation/mods_MarcMentat/2012/Marc_tools/run_damask_hmp b/installation/mods_MarcMentat/2012/Marc_tools/run_damask_hmp
index 82d8796a6..1d71a2944 100644
--- a/installation/mods_MarcMentat/2012/Marc_tools/run_damask_hmp
+++ b/installation/mods_MarcMentat/2012/Marc_tools/run_damask_hmp
@@ -1921,8 +1921,8 @@ fi
 #
 # user subroutine used
 #
-# add BLAS options for linking
-  BLAS="%BLAS%"
+# add DAMASK options for linking
+  DAMASK=""
   
   if test "$user"
   then
@@ -2898,7 +2898,7 @@ then
     $TKLIBS  \
     $MRCLIBS     \
     $METISLIBS \
-    $BLAS   \
+    $DAMASK   \
     $SYSLIBS  \
     $SECLIBS      || \
     {
@@ -3191,7 +3191,7 @@ then
   $TKLIBS  \
   $MRCLIBS     \
   $METISLIBS \
-  $BLAS   \
+  $DAMASK   \
   $SYSLIBS  \
   $SECLIBS    || \
   {
@@ -3483,7 +3483,7 @@ then
   $TKLIBS  \
   $MRCLIBS     \
   $METISLIBS \
-  $BLAS   \
+  $DAMASK   \
   $SYSLIBS \
   $SECLIBS         || \
   {
diff --git a/installation/mods_MarcMentat/2012/Marc_tools/run_damask_l b/installation/mods_MarcMentat/2012/Marc_tools/run_damask_l
index d4e0b649d..1f59b49ce 100644
--- a/installation/mods_MarcMentat/2012/Marc_tools/run_damask_l
+++ b/installation/mods_MarcMentat/2012/Marc_tools/run_damask_l
@@ -1921,8 +1921,8 @@ fi
 #
 # user subroutine used
 #
-# add BLAS options for linking
-  BLAS="%BLAS%"
+# add DAMASK options for linking
+  DAMASK=""
   
   if test "$user"
   then
@@ -2898,7 +2898,7 @@ then
     $TKLIBS  \
     $MRCLIBS     \
     $METISLIBS \
-    $BLAS   \
+    $DAMASK   \
     $SYSLIBS  \
     $SECLIBS      || \
     {
@@ -3191,7 +3191,7 @@ then
   $TKLIBS  \
   $MRCLIBS     \
   $METISLIBS \
-  $BLAS   \
+  $DAMASK   \
   $SYSLIBS  \
   $SECLIBS    || \
   {
@@ -3483,7 +3483,7 @@ then
   $TKLIBS  \
   $MRCLIBS     \
   $METISLIBS \
-  $BLAS   \
+  $DAMASK   \
   $SYSLIBS \
   $SECLIBS         || \
   {
diff --git a/installation/mods_MarcMentat/2012/Marc_tools/run_damask_lmp b/installation/mods_MarcMentat/2012/Marc_tools/run_damask_lmp
index 68383210d..10b141e01 100644
--- a/installation/mods_MarcMentat/2012/Marc_tools/run_damask_lmp
+++ b/installation/mods_MarcMentat/2012/Marc_tools/run_damask_lmp
@@ -1921,8 +1921,8 @@ fi
 #
 # user subroutine used
 #
-# add BLAS options for linking
-  BLAS="%BLAS%"
+# add DAMASK options for linking
+  DAMASK=""
   
   if test "$user"
   then
@@ -2898,7 +2898,7 @@ then
     $TKLIBS  \
     $MRCLIBS     \
     $METISLIBS \
-    $BLAS   \
+    $DAMASK   \
     $SYSLIBS  \
     $SECLIBS      || \
     {
@@ -3191,7 +3191,7 @@ then
   $TKLIBS  \
   $MRCLIBS     \
   $METISLIBS \
-  $BLAS   \
+  $DAMASK   \
   $SYSLIBS  \
   $SECLIBS    || \
   {
@@ -3483,7 +3483,7 @@ then
   $TKLIBS  \
   $MRCLIBS     \
   $METISLIBS \
-  $BLAS   \
+  $DAMASK   \
   $SYSLIBS \
   $SECLIBS         || \
   {
diff --git a/installation/mods_MarcMentat/2012/Marc_tools/run_damask_mp b/installation/mods_MarcMentat/2012/Marc_tools/run_damask_mp
index 6e9c880b9..9cb386a7d 100644
--- a/installation/mods_MarcMentat/2012/Marc_tools/run_damask_mp
+++ b/installation/mods_MarcMentat/2012/Marc_tools/run_damask_mp
@@ -1921,8 +1921,8 @@ fi
 #
 # user subroutine used
 #
-# add BLAS options for linking
-  BLAS="%BLAS%"
+# add DAMASK options for linking
+  DAMASK=""
   
   if test "$user"
   then
@@ -2898,7 +2898,7 @@ then
     $TKLIBS  \
     $MRCLIBS     \
     $METISLIBS \
-    $BLAS   \
+    $DAMASK   \
     $SYSLIBS  \
     $SECLIBS      || \
     {
@@ -3191,7 +3191,7 @@ then
   $TKLIBS  \
   $MRCLIBS     \
   $METISLIBS \
-  $BLAS   \
+  $DAMASK   \
   $SYSLIBS  \
   $SECLIBS    || \
   {
@@ -3483,7 +3483,7 @@ then
   $TKLIBS  \
   $MRCLIBS     \
   $METISLIBS \
-  $BLAS   \
+  $DAMASK   \
   $SYSLIBS \
   $SECLIBS         || \
   {
diff --git a/installation/mods_MarcMentat/2012/Marc_tools/run_marc.org b/installation/mods_MarcMentat/2012/Marc_tools/run_marc.original
similarity index 100%
rename from installation/mods_MarcMentat/2012/Marc_tools/run_marc.org
rename to installation/mods_MarcMentat/2012/Marc_tools/run_marc.original
diff --git a/installation/mods_MarcMentat/2013.1/Marc_tools/comp_user.org b/installation/mods_MarcMentat/2013.1/Marc_tools/comp_user.original
similarity index 100%
rename from installation/mods_MarcMentat/2013.1/Marc_tools/comp_user.org
rename to installation/mods_MarcMentat/2013.1/Marc_tools/comp_user.original
diff --git a/installation/mods_MarcMentat/2013.1/Marc_tools/include_linux64 b/installation/mods_MarcMentat/2013.1/Marc_tools/include_linux64
index 3205d0c2c..ae4e13b30 100644
--- a/installation/mods_MarcMentat/2013.1/Marc_tools/include_linux64
+++ b/installation/mods_MarcMentat/2013.1/Marc_tools/include_linux64
@@ -410,7 +410,7 @@ then
 PROFILE="-prof-gen=srcpos"
 fi
 
-FORT_OPT="-c -assume byterecl -safe_cray_ptr -mp1 -WB -shared-intel"
+FORT_OPT="-c -assume byterecl -safe_cray_ptr -mp1 -WB"
 if test "$MTHREAD" = "OPENMP"
 then
   FORT_OPT=" $FORT_OPT -openmp"
@@ -436,21 +436,21 @@ FORTNA="$FCOMP $FORT_OPT -fno-alias -O3 $I8FFLAGS -I$MARC_SOURCE/common \
 DFORTLOW="$FCOMP $FORT_OPT $PROFILE -O0 $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=2013.1 \
  -I$MARC_SOURCE/${BCS_DIR}/common -I$MARC_SOURCE/mumpssolver/include $I8DEFINES -DLinux -DLINUX -DLinux_intel $FDEFINES $DDM $SOLVERFLAGS"
-DFORTLOWMP="$FCOMP -c -assume byterecl -safe_cray_ptr $PROFILE -zero -mp1 -WB -shared-intel -O0 $I8FFLAGS -I$MARC_SOURCE/common \
+DFORTLOWMP="$FCOMP -c -assume byterecl -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=2013.1 \
  -openmp -openmp_report2 -openmp-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=2013.1 \
  -I$MARC_SOURCE/${BCS_DIR}/common -I$MARC_SOURCE/mumpssolver/include $I8DEFINES -DLinux -DLINUX -DLinux_intel $FDEFINES $DDM $SOLVERFLAGS"
-DFORTRANMP="$FCOMP -c -assume byterecl -safe_cray_ptr $PROFILE -zero -mp1 -WB -shared-intel -O1 $I8FFLAGS -I$MARC_SOURCE/common \
+DFORTRANMP="$FCOMP -c -assume byterecl -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=2013.1 \
  -openmp -openmp_report2 -openmp-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=2013.1 \
  -I$MARC_SOURCE/${BCS_DIR}/common -I$MARC_SOURCE/mumpssolver/include $I8DEFINES -DLinux -DLINUX -DLinux_intel $FDEFINES $DDM $SOLVERFLAGS"
-DFORTHIGHMP="$FCOMP -c -assume byterecl -safe_cray_ptr $PROFILE -zero -mp1 -WB -fno-alias -shared-intel -O2 $I8FFLAGS -I$MARC_SOURCE/common \
+DFORTHIGHMP="$FCOMP -c -assume byterecl -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=2013.1 \
  -openmp -openmp_report2 -openmp-threadprivate=compat\
  -I$MARC_SOURCE/${BCS_DIR}/common -I$MARC_SOURCE/mumpssolver/include $I8DEFINES -DLinux -DLINUX -DLinux_intel $FDEFINES $DDM $SOLVERFLAGS"
@@ -470,21 +470,21 @@ then
   DFORTLOW="$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=2013.1 \
    -I$MARC_SOURCE/${BCS_DIR}/common -I$MARC_SOURCE/mumpssolver/include $I8DEFINES -DLinux -DLINUX -DLinux_intel $FDEFINES $DDM $SOLVERFLAGS"
-  DFORTLOWMP="$FCOMP -c -assume byterecl -safe_cray_ptr $PROFILE -zero -mp1 -WB -shared-intel $I8FFLAGS -I$MARC_SOURCE/common \
+  DFORTLOWMP="$FCOMP -c -assume byterecl -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=2013.1 \
    -openmp -openmp_report2 -openmp-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=2013.1 \
    -I$MARC_SOURCE/${BCS_DIR}/common -I$MARC_SOURCE/mumpssolver/include $I8DEFINES  -DLinux -DLINUX -DLinux_intel $FDEFINES $DDM $SOLVERFLAGS"
-  DFORTRANMP="$FCOMP -c -assume byterecl -safe_cray_ptr $PROFILE -zero -mp1 -WB -shared-intel $I8FFLAGS -I$MARC_SOURCE/common \
+  DFORTRANMP="$FCOMP -c -assume byterecl -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=2013.1 \
    -openmp -openmp_report2 -openmp-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=2013.1 \
    -I$MARC_SOURCE/${BCS_DIR}/common -I$MARC_SOURCE/mumpssolver/include $I8DEFINES -DLinux -DLINUX -DLinux_intel $FDEFINES $DDM $SOLVERFLAGS"
-  DFORTHIGHMP="$FCOMP -c -assume byterecl -safe_cray_ptr $PROFILE -zero -mp1 -WB -fno-alias -shared-intel $I8FFLAGS -I$MARC_SOURCE/common \
+  DFORTHIGHMP="$FCOMP -c -assume byterecl -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=2013.1 \
    -openmp -openmp_report2 -openmp-threadprivate=compat\
    -I$MARC_SOURCE/${BCS_DIR}/common -I$MARC_SOURCE/mumpssolver/include $I8DEFINES -DLinux -DLINUX -DLinux_intel $FDEFINES $DDM $SOLVERFLAGS"
diff --git a/installation/mods_MarcMentat/2013.1/Marc_tools/include_linux64.org b/installation/mods_MarcMentat/2013.1/Marc_tools/include_linux64.original
similarity index 100%
rename from installation/mods_MarcMentat/2013.1/Marc_tools/include_linux64.org
rename to installation/mods_MarcMentat/2013.1/Marc_tools/include_linux64.original
diff --git a/installation/mods_MarcMentat/2013.1/Marc_tools/run_damask b/installation/mods_MarcMentat/2013.1/Marc_tools/run_damask
index ea36f070b..2f1948048 100644
--- a/installation/mods_MarcMentat/2013.1/Marc_tools/run_damask
+++ b/installation/mods_MarcMentat/2013.1/Marc_tools/run_damask
@@ -2125,8 +2125,8 @@ fi
 #
 # user subroutine used
 #
-# add BLAS options for linking
-  BLAS="%BLAS%"
+# add DAMASK options for linking
+  DAMASK=""
 
   if test "$user"
   then
@@ -3235,7 +3235,7 @@ then
     $TKLIBS  \
     $MRCLIBS     \
     $METISLIBS \
-    $BLAS   \
+    $DAMASK   \
     $SYSLIBS  \
     $SECLIBS      || \
     {
@@ -3528,7 +3528,7 @@ then
   $TKLIBS  \
   $MRCLIBS     \
   $METISLIBS \
-  $BLAS \
+  $DAMASK \
   $SYSLIBS  \
   $SECLIBS    || \
   {
@@ -3838,7 +3838,7 @@ then
   $TKLIBS  \
   $MRCLIBS     \
   $METISLIBS \
-  $BLAS \
+  $DAMASK \
   $SYSLIBS \
   $SECLIBS         || \
   {
diff --git a/installation/mods_MarcMentat/2013.1/Marc_tools/run_damask_h b/installation/mods_MarcMentat/2013.1/Marc_tools/run_damask_h
index d405146b3..4aee42fa0 100644
--- a/installation/mods_MarcMentat/2013.1/Marc_tools/run_damask_h
+++ b/installation/mods_MarcMentat/2013.1/Marc_tools/run_damask_h
@@ -2125,8 +2125,8 @@ fi
 #
 # user subroutine used
 #
-# add BLAS options for linking
-  BLAS="%BLAS%"
+# add DAMASK options for linking
+  DAMASK=""
 
   if test "$user"
   then
@@ -3235,7 +3235,7 @@ then
     $TKLIBS  \
     $MRCLIBS     \
     $METISLIBS \
-    $BLAS   \
+    $DAMASK   \
     $SYSLIBS  \
     $SECLIBS      || \
     {
@@ -3528,7 +3528,7 @@ then
   $TKLIBS  \
   $MRCLIBS     \
   $METISLIBS \
-  $BLAS \
+  $DAMASK \
   $SYSLIBS  \
   $SECLIBS    || \
   {
@@ -3838,7 +3838,7 @@ then
   $TKLIBS  \
   $MRCLIBS     \
   $METISLIBS \
-  $BLAS \
+  $DAMASK \
   $SYSLIBS \
   $SECLIBS         || \
   {
diff --git a/installation/mods_MarcMentat/2013.1/Marc_tools/run_damask_hmp b/installation/mods_MarcMentat/2013.1/Marc_tools/run_damask_hmp
index a78a2833e..9460819a0 100644
--- a/installation/mods_MarcMentat/2013.1/Marc_tools/run_damask_hmp
+++ b/installation/mods_MarcMentat/2013.1/Marc_tools/run_damask_hmp
@@ -2125,8 +2125,8 @@ fi
 #
 # user subroutine used
 #
-# add BLAS options for linking
-  BLAS="%BLAS%"
+# add DAMASK options for linking
+  DAMASK=""
 
   if test "$user"
   then
@@ -3235,7 +3235,7 @@ then
     $TKLIBS  \
     $MRCLIBS     \
     $METISLIBS \
-    $BLAS   \
+    $DAMASK   \
     $SYSLIBS  \
     $SECLIBS      || \
     {
@@ -3528,7 +3528,7 @@ then
   $TKLIBS  \
   $MRCLIBS     \
   $METISLIBS \
-  $BLAS \
+  $DAMASK \
   $SYSLIBS  \
   $SECLIBS    || \
   {
@@ -3838,7 +3838,7 @@ then
   $TKLIBS  \
   $MRCLIBS     \
   $METISLIBS \
-  $BLAS \
+  $DAMASK \
   $SYSLIBS \
   $SECLIBS         || \
   {
diff --git a/installation/mods_MarcMentat/2013.1/Marc_tools/run_damask_l b/installation/mods_MarcMentat/2013.1/Marc_tools/run_damask_l
index 82aceb60c..31ef667c8 100644
--- a/installation/mods_MarcMentat/2013.1/Marc_tools/run_damask_l
+++ b/installation/mods_MarcMentat/2013.1/Marc_tools/run_damask_l
@@ -2125,8 +2125,8 @@ fi
 #
 # user subroutine used
 #
-# add BLAS options for linking
-  BLAS="%BLAS%"
+# add DAMASK options for linking
+  DAMASK=""
 
   if test "$user"
   then
@@ -3235,7 +3235,7 @@ then
     $TKLIBS  \
     $MRCLIBS     \
     $METISLIBS \
-    $BLAS   \
+    $DAMASK   \
     $SYSLIBS  \
     $SECLIBS      || \
     {
@@ -3528,7 +3528,7 @@ then
   $TKLIBS  \
   $MRCLIBS     \
   $METISLIBS \
-  $BLAS \
+  $DAMASK \
   $SYSLIBS  \
   $SECLIBS    || \
   {
@@ -3838,7 +3838,7 @@ then
   $TKLIBS  \
   $MRCLIBS     \
   $METISLIBS \
-  $BLAS \
+  $DAMASK \
   $SYSLIBS \
   $SECLIBS         || \
   {
diff --git a/installation/mods_MarcMentat/2013.1/Marc_tools/run_damask_lmp b/installation/mods_MarcMentat/2013.1/Marc_tools/run_damask_lmp
index 5d5c52221..bd111d6ba 100644
--- a/installation/mods_MarcMentat/2013.1/Marc_tools/run_damask_lmp
+++ b/installation/mods_MarcMentat/2013.1/Marc_tools/run_damask_lmp
@@ -2125,8 +2125,8 @@ fi
 #
 # user subroutine used
 #
-# add BLAS options for linking
-  BLAS="%BLAS%"
+# add DAMASK options for linking
+  DAMASK=""
 
   if test "$user"
   then
@@ -3235,7 +3235,7 @@ then
     $TKLIBS  \
     $MRCLIBS     \
     $METISLIBS \
-    $BLAS   \
+    $DAMASK   \
     $SYSLIBS  \
     $SECLIBS      || \
     {
@@ -3528,7 +3528,7 @@ then
   $TKLIBS  \
   $MRCLIBS     \
   $METISLIBS \
-  $BLAS \
+  $DAMASK \
   $SYSLIBS  \
   $SECLIBS    || \
   {
@@ -3838,7 +3838,7 @@ then
   $TKLIBS  \
   $MRCLIBS     \
   $METISLIBS \
-  $BLAS \
+  $DAMASK \
   $SYSLIBS \
   $SECLIBS         || \
   {
diff --git a/installation/mods_MarcMentat/2013.1/Marc_tools/run_damask_mp b/installation/mods_MarcMentat/2013.1/Marc_tools/run_damask_mp
index d2081273b..eaa8c253e 100644
--- a/installation/mods_MarcMentat/2013.1/Marc_tools/run_damask_mp
+++ b/installation/mods_MarcMentat/2013.1/Marc_tools/run_damask_mp
@@ -2125,8 +2125,8 @@ fi
 #
 # user subroutine used
 #
-# add BLAS options for linking
-  BLAS="%BLAS%"
+# add DAMASK options for linking
+  DAMASK=""
 
   if test "$user"
   then
@@ -3235,7 +3235,7 @@ then
     $TKLIBS  \
     $MRCLIBS     \
     $METISLIBS \
-    $BLAS   \
+    $DAMASK   \
     $SYSLIBS  \
     $SECLIBS      || \
     {
@@ -3528,7 +3528,7 @@ then
   $TKLIBS  \
   $MRCLIBS     \
   $METISLIBS \
-  $BLAS \
+  $DAMASK \
   $SYSLIBS  \
   $SECLIBS    || \
   {
@@ -3838,7 +3838,7 @@ then
   $TKLIBS  \
   $MRCLIBS     \
   $METISLIBS \
-  $BLAS \
+  $DAMASK \
   $SYSLIBS \
   $SECLIBS         || \
   {
diff --git a/installation/mods_MarcMentat/2013.1/Marc_tools/run_marc.org b/installation/mods_MarcMentat/2013.1/Marc_tools/run_marc.original
similarity index 100%
rename from installation/mods_MarcMentat/2013.1/Marc_tools/run_marc.org
rename to installation/mods_MarcMentat/2013.1/Marc_tools/run_marc.original
diff --git a/installation/mods_MarcMentat/2013/Marc_tools/comp_user.org b/installation/mods_MarcMentat/2013/Marc_tools/comp_user.original
similarity index 100%
rename from installation/mods_MarcMentat/2013/Marc_tools/comp_user.org
rename to installation/mods_MarcMentat/2013/Marc_tools/comp_user.original
diff --git a/installation/mods_MarcMentat/2013/Marc_tools/include_linux64.org b/installation/mods_MarcMentat/2013/Marc_tools/include_linux64.original
similarity index 100%
rename from installation/mods_MarcMentat/2013/Marc_tools/include_linux64.org
rename to installation/mods_MarcMentat/2013/Marc_tools/include_linux64.original
diff --git a/installation/mods_MarcMentat/2013/Marc_tools/run_damask b/installation/mods_MarcMentat/2013/Marc_tools/run_damask
index 32900f7a1..485b77525 100644
--- a/installation/mods_MarcMentat/2013/Marc_tools/run_damask
+++ b/installation/mods_MarcMentat/2013/Marc_tools/run_damask
@@ -1921,8 +1921,8 @@ fi
 #
 # user subroutine used
 #
-# add BLAS options for linking
-  BLAS="%BLAS%"
+# add DAMASK options for linking
+  DAMASK=""
   
   if test "$user"
   then
@@ -3031,7 +3031,7 @@ then
     $TKLIBS  \
     $MRCLIBS     \
     $METISLIBS \
-    $BLAS   \
+    $DAMASK   \
     $SYSLIBS  \
     $SECLIBS      || \
     {
@@ -3324,7 +3324,7 @@ then
   $TKLIBS  \
   $MRCLIBS     \
   $METISLIBS \
-  $BLAS   \
+  $DAMASK   \
   $SYSLIBS  \
   $SECLIBS    || \
   {
@@ -3634,7 +3634,7 @@ then
   $TKLIBS  \
   $MRCLIBS     \
   $METISLIBS \
-  $BLAS   \
+  $DAMASK   \
   $SYSLIBS \
   $SECLIBS         || \
   {
diff --git a/installation/mods_MarcMentat/2013/Marc_tools/run_damask_h b/installation/mods_MarcMentat/2013/Marc_tools/run_damask_h
index 958cb6963..dec30e5e0 100644
--- a/installation/mods_MarcMentat/2013/Marc_tools/run_damask_h
+++ b/installation/mods_MarcMentat/2013/Marc_tools/run_damask_h
@@ -1921,8 +1921,8 @@ fi
 #
 # user subroutine used
 #
-# add BLAS options for linking
-  BLAS="%BLAS%"
+# add DAMASK options for linking
+  DAMASK=""
   
   if test "$user"
   then
@@ -3031,7 +3031,7 @@ then
     $TKLIBS  \
     $MRCLIBS     \
     $METISLIBS \
-    $BLAS   \
+    $DAMASK   \
     $SYSLIBS  \
     $SECLIBS      || \
     {
@@ -3324,7 +3324,7 @@ then
   $TKLIBS  \
   $MRCLIBS     \
   $METISLIBS \
-  $BLAS   \
+  $DAMASK   \
   $SYSLIBS  \
   $SECLIBS    || \
   {
@@ -3634,7 +3634,7 @@ then
   $TKLIBS  \
   $MRCLIBS     \
   $METISLIBS \
-  $BLAS   \
+  $DAMASK   \
   $SYSLIBS \
   $SECLIBS         || \
   {
diff --git a/installation/mods_MarcMentat/2013/Marc_tools/run_damask_hmp b/installation/mods_MarcMentat/2013/Marc_tools/run_damask_hmp
index 8eb88853b..c59e40760 100644
--- a/installation/mods_MarcMentat/2013/Marc_tools/run_damask_hmp
+++ b/installation/mods_MarcMentat/2013/Marc_tools/run_damask_hmp
@@ -1921,8 +1921,8 @@ fi
 #
 # user subroutine used
 #
-# add BLAS options for linking
-  BLAS="%BLAS%"
+# add DAMASK options for linking
+  DAMASK=""
   
   if test "$user"
   then
@@ -3031,7 +3031,7 @@ then
     $TKLIBS  \
     $MRCLIBS     \
     $METISLIBS \
-    $BLAS   \
+    $DAMASK   \
     $SYSLIBS  \
     $SECLIBS      || \
     {
@@ -3324,7 +3324,7 @@ then
   $TKLIBS  \
   $MRCLIBS     \
   $METISLIBS \
-  $BLAS   \
+  $DAMASK   \
   $SYSLIBS  \
   $SECLIBS    || \
   {
@@ -3634,7 +3634,7 @@ then
   $TKLIBS  \
   $MRCLIBS     \
   $METISLIBS \
-  $BLAS   \
+  $DAMASK   \
   $SYSLIBS \
   $SECLIBS         || \
   {
diff --git a/installation/mods_MarcMentat/2013/Marc_tools/run_damask_l b/installation/mods_MarcMentat/2013/Marc_tools/run_damask_l
index 13c898c9c..dec0c9c22 100644
--- a/installation/mods_MarcMentat/2013/Marc_tools/run_damask_l
+++ b/installation/mods_MarcMentat/2013/Marc_tools/run_damask_l
@@ -1921,8 +1921,8 @@ fi
 #
 # user subroutine used
 #
-# add BLAS options for linking
-  BLAS="%BLAS%"
+# add DAMASK options for linking
+  DAMASK=""
   
   if test "$user"
   then
@@ -3031,7 +3031,7 @@ then
     $TKLIBS  \
     $MRCLIBS     \
     $METISLIBS \
-    $BLAS   \
+    $DAMASK   \
     $SYSLIBS  \
     $SECLIBS      || \
     {
@@ -3324,7 +3324,7 @@ then
   $TKLIBS  \
   $MRCLIBS     \
   $METISLIBS \
-  $BLAS   \
+  $DAMASK   \
   $SYSLIBS  \
   $SECLIBS    || \
   {
@@ -3634,7 +3634,7 @@ then
   $TKLIBS  \
   $MRCLIBS     \
   $METISLIBS \
-  $BLAS   \
+  $DAMASK   \
   $SYSLIBS \
   $SECLIBS         || \
   {
diff --git a/installation/mods_MarcMentat/2013/Marc_tools/run_damask_lmp b/installation/mods_MarcMentat/2013/Marc_tools/run_damask_lmp
index 819a3a8cc..05938be60 100644
--- a/installation/mods_MarcMentat/2013/Marc_tools/run_damask_lmp
+++ b/installation/mods_MarcMentat/2013/Marc_tools/run_damask_lmp
@@ -1921,8 +1921,8 @@ fi
 #
 # user subroutine used
 #
-# add BLAS options for linking
-  BLAS="%BLAS%"
+# add DAMASK options for linking
+  DAMASK=""
   
   if test "$user"
   then
@@ -3031,7 +3031,7 @@ then
     $TKLIBS  \
     $MRCLIBS     \
     $METISLIBS \
-    $BLAS   \
+    $DAMASK   \
     $SYSLIBS  \
     $SECLIBS      || \
     {
@@ -3324,7 +3324,7 @@ then
   $TKLIBS  \
   $MRCLIBS     \
   $METISLIBS \
-  $BLAS   \
+  $DAMASK   \
   $SYSLIBS  \
   $SECLIBS    || \
   {
@@ -3634,7 +3634,7 @@ then
   $TKLIBS  \
   $MRCLIBS     \
   $METISLIBS \
-  $BLAS   \
+  $DAMASK   \
   $SYSLIBS \
   $SECLIBS         || \
   {
diff --git a/installation/mods_MarcMentat/2013/Marc_tools/run_damask_mp b/installation/mods_MarcMentat/2013/Marc_tools/run_damask_mp
index d9312f729..7481797e4 100644
--- a/installation/mods_MarcMentat/2013/Marc_tools/run_damask_mp
+++ b/installation/mods_MarcMentat/2013/Marc_tools/run_damask_mp
@@ -1921,8 +1921,8 @@ fi
 #
 # user subroutine used
 #
-# add BLAS options for linking
-  BLAS="%BLAS%"
+# add DAMASK options for linking
+  DAMASK=""
   
   if test "$user"
   then
@@ -3031,7 +3031,7 @@ then
     $TKLIBS  \
     $MRCLIBS     \
     $METISLIBS \
-    $BLAS   \
+    $DAMASK   \
     $SYSLIBS  \
     $SECLIBS      || \
     {
@@ -3324,7 +3324,7 @@ then
   $TKLIBS  \
   $MRCLIBS     \
   $METISLIBS \
-  $BLAS   \
+  $DAMASK   \
   $SYSLIBS  \
   $SECLIBS    || \
   {
@@ -3634,7 +3634,7 @@ then
   $TKLIBS  \
   $MRCLIBS     \
   $METISLIBS \
-  $BLAS   \
+  $DAMASK   \
   $SYSLIBS \
   $SECLIBS         || \
   {
diff --git a/installation/mods_MarcMentat/2013/Marc_tools/run_marc.org b/installation/mods_MarcMentat/2013/Marc_tools/run_marc.original
similarity index 100%
rename from installation/mods_MarcMentat/2013/Marc_tools/run_marc.org
rename to installation/mods_MarcMentat/2013/Marc_tools/run_marc.original
diff --git a/installation/mods_MarcMentat/apply_DAMASK_modifications.sh b/installation/mods_MarcMentat/apply_DAMASK_modifications.sh
index 9fcc253eb..cfa678850 100755
--- a/installation/mods_MarcMentat/apply_DAMASK_modifications.sh
+++ b/installation/mods_MarcMentat/apply_DAMASK_modifications.sh
@@ -33,47 +33,6 @@ done
 INSTALLDIR=${INSTALLDIR%/}               # remove trailing slash
 echo "MSC installation path: $INSTALLDIR"
 
-BLASDIR=''
-BLASTYPE=''
-if [ "x$LAPACK_ROOT" != "x" ]; then
-  BLASDIR=$LAPACK_ROOT
-  BLASTYPE='LAPACK'
-fi
-if [ "x$ACML_ROOT" != "x" ]; then
-  BLASDIR=$ACML_ROOT
-  BLASTYPE='ACML'
-fi
-if [ "x$IMKL_ROOT" != "x" ]; then
-  BLASDIR=$IMKL_ROOT
-  BLASTYPE='IMKL'
-fi
-
-while [ ! -d "$BLASDIR" ] || [ -z "$BLASDIR" ]
-do
-  echo "Input type of BLAS installation [IMKL | ACML | LAPACK]:"
-  read BLASTYPE
-  echo "Input path of BLAS installation:"
-  read BLASDIR
-done
-
-BLASDIR=${BLASDIR%/}               # remove trailing slash
-
-case $BLASTYPE in
-    IMKL | imkl) 
-    BLAS=" -lmkl_intel_lp64 -lmkl_core -lmkl_sequential -lm -Wl,-rpath,$BLASDIR/lib/intel64 -L$BLASDIR/lib/intel64"
-    ;;
-    ACML | acml) 
-    BLAS=" -lacml -Wl,-rpath,$BLASDIR/ifort64/lib -L$BLASDIR/ifort64/lib"
-    ;;
-    LAPACK | lapack) 
-    BLAS=" -llapack -Wl,-rpath,$BLASDIR/lib,-rpath,$BLASDIR/lib64 -L$BLASDIR/lib64 -L$BLASDIR/lib"
-    ;;
-    *)
-    echo "error, BLAS type must be IMKL, ACML, or LAPACK"
-    exit
-    ;;
-esac
-
 DEFAULT_EDITOR='vi'
 EDITOR=''
 while [ -z "$EDITOR" ]
@@ -106,7 +65,6 @@ for filename in 'comp_damask' \
   cp $WORKINGDIR/$VERSION/Marc_tools/$filename $theDIR
   echo $theDIR/$filename | xargs perl -pi -e "s:%INSTALLDIR%:${INSTALLDIR}:g"
   echo $theDIR/$filename | xargs perl -pi -e "s:%VERSION%:${VERSION}:g"
-  echo $theDIR/$filename | xargs perl -pi -e "s:%BLAS%:${BLAS}:g"
   echo $filename
 done
 
@@ -179,6 +137,7 @@ case $YESNO in
                   'run_damask_lmp' \
                   'run_damask_hmp'; do
     echo ${filename:4}$VERSION
+    [ -f $BIN_DIR/${filename:4}$VERSION ] && rm $BIN_DIR/${filename:4}$VERSION
     ln -s $theDIR/$filename $BIN_DIR/${filename:4}$VERSION 
   done
   ;;
diff --git a/lib/damask/solver/marc.py b/lib/damask/solver/marc.py
index 1845cdc39..0a9cc0af1 100644
--- a/lib/damask/solver/marc.py
+++ b/lib/damask/solver/marc.py
@@ -18,9 +18,6 @@ class Marc(Solver):
               '2011':  ['linux64',''],
               '2010.2':['linux64',''],
               '2010':  ['linux64',''],
-              '2008r1':[''],
-              '2007r1':[''],
-              '2005r3':[''],
              }
 
 
@@ -95,9 +92,8 @@ class Marc(Solver):
     user = os.path.join(damaskEnv.relPath('code/'),'DAMASK_marc')
 
     # Define options [see Marc Installation and Operation Guide, pp 23]
-    if int(release[0:4]) >= 2013:
-       script = 'run_damask%s'%({False:'',True:'_'}[optimization!='' or openMP])
-       script =  script+'%s%s'%({False:'',True:optimization}[optimization!=''],{False:'',True:'mp'}[openMP])
+    script = 'run_damask%s'%({False:'',True:'_'}[optimization!='' or openMP])
+    script =  script+'%s%s'%({False:'',True:optimization}[optimization!=''],{False:'',True:'mp'}[openMP])
     else:
        script = 'run_marc'