diff --git a/code/Makefile b/code/Makefile index c79daa086..95f8639c2 100644 --- a/code/Makefile +++ b/code/Makefile @@ -39,10 +39,10 @@ SHELL = /bin/sh ######################################################################################## #auto values will be set by setup_code.py -FFTWROOT := auto -IMKLROOT := auto -ACMLROOT := auto -LAPACKROOT := auto +FFTWROOT := /usr/local +IMKLROOT := +ACMLROOT := +LAPACKROOT := /usr F90 ?= ifort COMPILERNAME ?= $(F90) diff --git a/lib/damask/test/test.py b/lib/damask/test/test.py index 33cead5d7..9955aff80 100644 --- a/lib/damask/test/test.py +++ b/lib/damask/test/test.py @@ -157,9 +157,9 @@ class Test(): file=open(outfile,'a+') print cmd process = subprocess.Popen(shlex.split(cmd),stdout = file,stderr = subprocess.STDOUT) - file.close() process.wait() - + file.close() + def compare_Array(self,File1,File2): import numpy diff --git a/processing/setup/setup_processing.py b/processing/setup/setup_processing.py index 3e4b00c81..94fd472ad 100755 --- a/processing/setup/setup_processing.py +++ b/processing/setup/setup_processing.py @@ -144,7 +144,7 @@ execute = { \ #' --overwrite-signature --no-lower prec.f90 DAMASK_spectral_interface.f90 math.f90 mesh.f90', ########################################################################### 'f2py damask.core.pyf' +\ - ' --build-dir processingBuildTemp' +\ + ' --build-dir ./' +\ ' -c --no-lower --fcompiler=%s'%(f2py_compiler) +\ ' %s'%'prec.f90'+\ ' %s'%'DAMASK_spectral_interface.f90'+\