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

compiling with hdf5 is now working for DAMASK (if HDF5=ON) and for playground example in private

This commit is contained in:
Martin Diehl 2013-11-07 12:52:36 +00:00
parent 8d4cd33c49
commit 9ac8846e41
3 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
code/Makefile
View File

@ -44,6 +44,7 @@ FFTWROOT ?= /usr/local
IMKLROOT ?= IMKLROOT ?=
ACMLROOT ?= ACMLROOT ?=
LAPACKROOT ?= /usr LAPACKROOT ?= /usr
HDF5ROOT ?=
F90 ?= ifort F90 ?= ifort
######################################################################################## ########################################################################################
@ -119,9 +120,9 @@ LIB_DIRS +=-L$(FFTWROOT)/lib
#hdf5 #hdf5
ifeq "$(HDF5)" "ON" ifeq "$(HDF5)" "ON"
LIB_DIRS +=-L/opt/hdf5-1.8.10-patch1/hdf5/lib LIBRARIES +=-lhdf5hl_fortran -lhdf5_hl -lhdf5_fortran -lhdf5
LIBRARIES +=-lhdf5_fortran -lhdf5 LIB_DIRS +=-L$(HDF5ROOT)/lib
INCLUDE_DIRS +=-I/opt/hdf5-1.8.10-patch1/hdf5/include -DHDF INCLUDE_DIRS +=-I$(HDF5ROOT)/include -DHDF
endif endif
ifdef PETSC_DIR ifdef PETSC_DIR

6
lib/damask/test/test.py
View File

@ -124,31 +124,37 @@ class Test():
def dirReference(self): def dirReference(self):
''' '''
Directory containing reference results of the test.
''' '''
return os.path.normpath(os.path.join(self.dirBase,'reference/')) return os.path.normpath(os.path.join(self.dirBase,'reference/'))
def dirCurrent(self): def dirCurrent(self):
''' '''
Directory containing current results of the test.
''' '''
return os.path.normpath(os.path.join(self.dirBase,'current/')) return os.path.normpath(os.path.join(self.dirBase,'current/'))
def dirProof(self): def dirProof(self):
''' '''
Directory containing human readable proof of correctness for the test.
''' '''
return os.path.normpath(os.path.join(self.dirBase,'proof/')) return os.path.normpath(os.path.join(self.dirBase,'proof/'))
def fileInReference(self,file): def fileInReference(self,file):
''' '''
Path to a file in the refrence directory for the test.
''' '''
return os.path.join(self.dirReference(),file) return os.path.join(self.dirReference(),file)
def fileInCurrent(self,file): def fileInCurrent(self,file):
''' '''
Path to a file in the current results directory for the test.
''' '''
return os.path.join(self.dirCurrent(),file) return os.path.join(self.dirCurrent(),file)
def fileInProof(self,file): def fileInProof(self,file):
''' '''
Path to a file in the proof directory for the test.
''' '''
return os.path.join(self.dirProof(),file) return os.path.join(self.dirProof(),file)

1
processing/setup/compile_CoreModule.py
View File

@ -117,7 +117,6 @@ for tasks in execute:
print 'failed..!' print 'failed..!'
pass pass
os.chdir(damaskEnv.relPath('processing/setup/'))
modules = glob.glob('*.mod') modules = glob.glob('*.mod')
for module in modules: for module in modules:
print 'removing', module print 'removing', module