223031012
/
DAMASK_EICMD
mirror of https://github.com/achalhp/DAMASK_EICMD.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

improved makefile, no directly linking to files of acml 

corrected default pathinfo
improved test for intel compiler
This commit is contained in:
Martin Diehl 2011-12-09 16:34:53 +00:00
parent 7d1d2b6229
commit 031a00237f
4 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
code/makefile
View File

@ -104,7 +104,7 @@ else
FFTWOPTIONS =$(FFTWPATH)/libfftw3_threads.a $(FFTWPATH)/libfftw3.a -lpthread FFTWOPTIONS =$(FFTWPATH)/libfftw3_threads.a $(FFTWPATH)/libfftw3.a -lpthread
endif endif
endif endif
BLAS=-L $(ACMLPATH) -lacml_mp BLAS=$(ACMLPATH)/libacml_mp.a
#setting defaults in case of single core compilation #setting defaults in case of single core compilation
else else
@ -118,7 +118,7 @@ else
FFTWOPTIONS =$(FFTWPATH)/libfftw3.a FFTWOPTIONS =$(FFTWPATH)/libfftw3.a
endif endif
endif endif
BLAS=-L $(ACMLPATH) -lacml BLAS=$(ACMLPATH)/libacml.a
endif endif

2
installation/setup_shellrc.py
View File

@ -4,7 +4,7 @@ import os,sys,string,re
from optparse import OptionParser from optparse import OptionParser
pathInfo = {\ pathInfo = {\
'acml': './acml4.4.0', 'acml': '/opt/acml4.4.0',
'fftw': './fftw', 'fftw': './fftw',
'msc': '/msc', 'msc': '/msc',
} }

5
lib/damask_test.py
View File

@ -126,7 +126,7 @@ class DAMASK_TEST():
return val return val
def compare_to_reference(self): def compare_to_reference(self):
import string import string, numpy as N
print 'comparing results against reference_results...' print 'comparing results against reference_results...'
os.chdir(os.path.join(self.test_dir,'current_results')) os.chdir(os.path.join(self.test_dir,'current_results'))
cur=self.read_val_from_file(fname='postProc/'+self.post_txt) 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)-1.) # relative tolerance
#err=abs(ref-cur) # absolute tolerance #err=abs(ref-cur) # absolute tolerance
print 'tol', self.tol print 'tol', self.tol
if err.any()>self.tol: print 'max error', N.max(err)
if N.max(err)>self.tol:
return False return False
return True return True

2
lib/pathinfo
View File

@ -1,3 +1,3 @@
ACML /opt/acml4.4.0/ ACML /opt/acml4.4.0/
FFTW ./ FFTW .
MSC /msc/ MSC /msc/