From e6ca36c7d7a5eda4ba4caab288b834cfe0665eb6 Mon Sep 17 00:00:00 2001
From: Martin	Diehl <m.diehl@mpie.de>
Date: Thu, 6 Jun 2013 16:04:40 +0000
Subject: [PATCH] removed old DAMASK_marcXXXX.f90 source files. If you just use
 one Marc version, simply select DAMASK_marc.f90, this matches for all
 releases. DAMAKS_marc.marc compile with Marc 2010 does not work with Marc
 2012. In case you need more than one Marc version in parallel, run
 symLink_Code.py in /code/setup to generate symlinks for Marc version
 2010,2011,2012

---
 code/DAMASK_marc2010.f90   |  3 ---
 code/DAMASK_marc2011.f90   |  2 --
 code/DAMASK_marc2012.f90   |  2 --
 code/Makefile              | 10 +++++-----
 code/setup/symlink_Code.py | 11 +++++++++++
 5 files changed, 16 insertions(+), 12 deletions(-)
 delete mode 100644 code/DAMASK_marc2010.f90
 delete mode 100644 code/DAMASK_marc2011.f90
 delete mode 100644 code/DAMASK_marc2012.f90

diff --git a/code/DAMASK_marc2010.f90 b/code/DAMASK_marc2010.f90
deleted file mode 100644
index 62564c9ac..000000000
--- a/code/DAMASK_marc2010.f90
+++ /dev/null
@@ -1,3 +0,0 @@
-#define Marc4DAMASK 2010
-#include "DAMASK_marc.f90"
-
diff --git a/code/DAMASK_marc2011.f90 b/code/DAMASK_marc2011.f90
deleted file mode 100644
index c596afe43..000000000
--- a/code/DAMASK_marc2011.f90
+++ /dev/null
@@ -1,2 +0,0 @@
-#define Marc4DAMASK 2011
-#include "DAMASK_marc.f90"
diff --git a/code/DAMASK_marc2012.f90 b/code/DAMASK_marc2012.f90
deleted file mode 100644
index bc7bc901b..000000000
--- a/code/DAMASK_marc2012.f90
+++ /dev/null
@@ -1,2 +0,0 @@
-#define Marc4DAMASK 2012
-#include "DAMASK_marc.f90"
diff --git a/code/Makefile b/code/Makefile
index ca58f3c83..3c5337b78 100644
--- a/code/Makefile
+++ b/code/Makefile
@@ -39,12 +39,12 @@ SHELL = /bin/sh
 ########################################################################################
 
 #any values will be overwritten by setup_code.py
-FFTWROOT   ?= auto
-IMKLROOT   ?= auto
-ACMLROOT   ?= auto
-LAPACKROOT ?= auto
+FFTWROOT ?= /usr/lib/fftw
+IMKLROOT ?= /opt/intel/composerxe/mkl
+ACMLROOT ?= /opt/acml5.2.0
+LAPACKROOT ?= 
 
-F90?=ifort
+F90 ?= ifort
 
 COMPILERNAME ?= $(F90)
 
diff --git a/code/setup/symlink_Code.py b/code/setup/symlink_Code.py
index dd2b393ec..c44d29863 100755
--- a/code/setup/symlink_Code.py
+++ b/code/setup/symlink_Code.py
@@ -8,6 +8,8 @@ bin_link = { \
                   ],
            }
 
+MarcReleases =[2010,2011,2012]
+
 damaskEnv = damask.Environment('../../')          # script location relative to root
 baseDir = damaskEnv.relPath('code/')
 
@@ -21,3 +23,12 @@ for dir in bin_link:
       if os.path.lexists(sym_link): os.remove(sym_link)
       os.symlink(src,sym_link)
       print sym_link,'-->',src
+
+
+for version in MarcReleases:
+  src = os.path.abspath(os.path.join(baseDir,'DAMASK_marc.f90'))
+  if os.path.exists(src): 
+    sym_link = os.path.abspath(os.path.join(baseDir,'DAMASK_marc'+str(version)+'.f90'))                    
+    if os.path.lexists(sym_link): os.remove(sym_link)
+    os.symlink(src,sym_link)
+    print sym_link,'-->',src