From 031a00237f157eac12b12b4cd8ebe46c4c0bff95 Mon Sep 17 00:00:00 2001
From: Martin	Diehl <m.diehl@mpie.de>
Date: Fri, 9 Dec 2011 16:34:53 +0000
Subject: [PATCH] improved makefile, no directly linking to files of acml
 corrected default pathinfo improved test for intel compiler

---
 code/makefile                 | 4 ++--
 installation/setup_shellrc.py | 2 +-
 lib/damask_test.py            | 5 +++--
 lib/pathinfo                  | 2 +-
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/code/makefile b/code/makefile
index 99c203a0f..e8126af2a 100644
--- a/code/makefile
+++ b/code/makefile
@@ -104,7 +104,7 @@ else
 FFTWOPTIONS =$(FFTWPATH)/libfftw3_threads.a $(FFTWPATH)/libfftw3.a -lpthread
 endif
 endif
-BLAS=-L $(ACMLPATH) -lacml_mp
+BLAS=$(ACMLPATH)/libacml_mp.a
 
 #setting defaults in case of single core compilation
 else
@@ -118,7 +118,7 @@ else
 FFTWOPTIONS =$(FFTWPATH)/libfftw3.a
 endif
 endif
-BLAS=-L $(ACMLPATH) -lacml
+BLAS=$(ACMLPATH)/libacml.a
 endif
 
 
diff --git a/installation/setup_shellrc.py b/installation/setup_shellrc.py
index 003796349..e57909b65 100755
--- a/installation/setup_shellrc.py
+++ b/installation/setup_shellrc.py
@@ -4,7 +4,7 @@ import os,sys,string,re
 from optparse import OptionParser
 
 pathInfo = {\
-            'acml': './acml4.4.0',
+            'acml': '/opt/acml4.4.0',
             'fftw': './fftw',
             'msc':  '/msc',
            }
diff --git a/lib/damask_test.py b/lib/damask_test.py
index 810dc1912..56efa1989 100644
--- a/lib/damask_test.py
+++ b/lib/damask_test.py
@@ -126,7 +126,7 @@ class DAMASK_TEST():
         return val
 
     def compare_to_reference(self):    
-        import string
+        import string, numpy as N
         print 'comparing results against reference_results...'
         os.chdir(os.path.join(self.test_dir,'current_results'))
         cur=self.read_val_from_file(fname='postProc/'+self.post_txt)
@@ -135,7 +135,8 @@ class DAMASK_TEST():
         err=abs((ref/cur)-1.) # relative tolerance
         #err=abs(ref-cur)      # absolute tolerance
         print 'tol', self.tol
-        if err.any()>self.tol: 
+        print 'max error', N.max(err)
+        if N.max(err)>self.tol:
           return False 
         return True
         
diff --git a/lib/pathinfo b/lib/pathinfo
index 54f8574c1..c1e19b2e5 100644
--- a/lib/pathinfo
+++ b/lib/pathinfo
@@ -1,3 +1,3 @@
 ACML  /opt/acml4.4.0/
-FFTW  ./
+FFTW  .
 MSC   /msc/