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

fixed bug: it's MSC_ROOT, not MARC_ROOT

This commit is contained in:
Martin Diehl 2014-01-28 09:49:04 +00:00
parent ee99216edc
commit edd7d1ec8b
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
configure vendored
View File

@ -42,7 +42,7 @@ if compiler == None: compiler ={True:'ifort',False:'gfortran'}[\
#--- default option values -------------------------------------------------------------------------- #--- default option values --------------------------------------------------------------------------
defaults={'F90':compiler,\ defaults={'F90':compiler,\
'FFTW_ROOT':'/usr/local',\ 'FFTW_ROOT':'/usr/local',\
'MARC_ROOT':'/msc',\ 'MSC_ROOT' :'/msc',\
'HDF5_ROOT':'/usr/local',\ 'HDF5_ROOT':'/usr/local',\
'DAMASK_NUM_THREADS':4,\ 'DAMASK_NUM_THREADS':4,\
'blasType':'LAPACK',\ 'blasType':'LAPACK',\
@ -71,8 +71,8 @@ try:
defaults['F90']=items[1].rstrip() defaults['F90']=items[1].rstrip()
elif items[0] == 'FFTW_ROOT': elif items[0] == 'FFTW_ROOT':
defaults['FFTW_ROOT']=items[1].rstrip() defaults['FFTW_ROOT']=items[1].rstrip()
elif items[0] == 'MARC_ROOT': elif items[0] == 'MSC_ROOT':
defaults['MARC_ROOT']=items[1].rstrip() defaults['MSC_ROOT']=items[1].rstrip()
elif items[0] == 'HDF5_ROOT': elif items[0] == 'HDF5_ROOT':
defaults['HDF5_ROOT']=items[1].rstrip() defaults['HDF5_ROOT']=items[1].rstrip()
elif items[0] == 'DAMASK_NUM_THREADS': elif items[0] == 'DAMASK_NUM_THREADS':
@ -90,8 +90,8 @@ parser.add_option('--with-fc', dest='compiler', type='string', met
help='F90 compiler [%default]') help='F90 compiler [%default]')
parser.add_option('--with-fftw-dir', dest='fftwRoot', type='string', metavar='string', \ parser.add_option('--with-fftw-dir', dest='fftwRoot', type='string', metavar='string', \
help='root directory of FFTW [%default]') help='root directory of FFTW [%default]')
parser.add_option('--with-marc-dir', dest='marcRoot', type='string', metavar='string', \ parser.add_option('--with-msc-dir', dest='mscRoot', type='string', metavar='string', \
help='root directory of MSC.Marc [%default]') help='root directory of MSC.Marc/Mentat [%default]')
parser.add_option('--with-HDF5-dir', dest='hdf5Root', type='string', metavar='string', \ parser.add_option('--with-HDF5-dir', dest='hdf5Root', type='string', metavar='string', \
help='root directory of HDF5 [%default]') help='root directory of HDF5 [%default]')
parser.add_option('--with-OMP-threads', dest='threads', type='int', metavar='int',\ parser.add_option('--with-OMP-threads', dest='threads', type='int', metavar='int',\
@ -105,7 +105,7 @@ parser.add_option('--with-spectral-options', dest='spectraloptions', type='strin
parser.set_defaults(compiler = defaults['F90']) parser.set_defaults(compiler = defaults['F90'])
parser.set_defaults(fftwRoot = defaults['FFTW_ROOT']) parser.set_defaults(fftwRoot = defaults['FFTW_ROOT'])
parser.set_defaults(marcRoot = defaults['MARC_ROOT']) parser.set_defaults(mscRoot = defaults['MSC_ROOT'])
parser.set_defaults(hdf5Root = defaults['HDF5_ROOT']) parser.set_defaults(hdf5Root = defaults['HDF5_ROOT'])
parser.set_defaults(threads = defaults['DAMASK_NUM_THREADS']) parser.set_defaults(threads = defaults['DAMASK_NUM_THREADS'])
parser.set_defaults(blasType = defaults['blasType']) parser.set_defaults(blasType = defaults['blasType'])
@ -131,7 +131,7 @@ parser.set_defaults(spectraloptions = [])
options.compiler=options.compiler.lower() options.compiler=options.compiler.lower()
options.blasType=options.blasType.upper() options.blasType=options.blasType.upper()
options.fftwRoot=options.fftwRoot.rstrip('/') options.fftwRoot=options.fftwRoot.rstrip('/')
options.marcRoot=options.marcRoot.rstrip('/') options.mscRoot =options.mscRoot.rstrip('/')
options.hdf5Root=options.hdf5Root.rstrip('/') options.hdf5Root=options.hdf5Root.rstrip('/')
options.blasRoot=options.blasRoot.rstrip('/') options.blasRoot=options.blasRoot.rstrip('/')
@ -146,8 +146,8 @@ for lib in ['libfftw3.so','libfftw3.a']:
if not os.path.isfile(os.path.join(options.fftwRoot,'lib/%s'%lib)): if not os.path.isfile(os.path.join(options.fftwRoot,'lib/%s'%lib)):
print('FFTW Warning: %s not found in %s!'%(lib,os.path.join(options.fftwRoot,'lib'))) print('FFTW Warning: %s not found in %s!'%(lib,os.path.join(options.fftwRoot,'lib')))
if not os.path.isdir(options.marcRoot): if not os.path.isdir(options.mscRoot):
print('MSC.Marc Warning: Root directory %s not found!'%options.marcRoot) print('MSC.Marc/Mentat Warning: Root directory %s not found!'%options.mscRoot)
if options.blasType == 'LAPACK': if options.blasType == 'LAPACK':
if os.path.isdir(os.path.join(options.blasRoot,'lib64')): if os.path.isdir(os.path.join(options.blasRoot,'lib64')):
@ -197,9 +197,9 @@ try:
if items[0] == 'FFTW_ROOT': if items[0] == 'FFTW_ROOT':
line = '%s=%s\n'%(items[0],options.fftwRoot) line = '%s=%s\n'%(items[0],options.fftwRoot)
options.fftwRoot ='' options.fftwRoot =''
if items[0] == 'MARC_ROOT': if items[0] == 'MSC_ROOT':
line = '%s=%s\n'%(items[0],options.marcRoot) line = '%s=%s\n'%(items[0],options.mscRoot)
options.marcRoot ='' options.mscRoot =''
if items[0] == 'HDF5_ROOT': if items[0] == 'HDF5_ROOT':
line = '%s=%s\n'%(items[0],options.hdf5Root) line = '%s=%s\n'%(items[0],options.hdf5Root)
options.hdf5Root ='' options.hdf5Root =''
@ -226,8 +226,8 @@ for opt, value in options.__dict__.items():
output.append('F90=%s\n'%value) output.append('F90=%s\n'%value)
if opt == 'fftwRoot' and value !='': if opt == 'fftwRoot' and value !='':
output.append('FFTW_ROOT=%s\n'%value) output.append('FFTW_ROOT=%s\n'%value)
if opt == 'marcRoot' and value !='': if opt == 'mscRoot' and value !='':
output.append('MARC_ROOT=%s\n'%value) output.append('MSC_ROOT=%s\n'%value)
if opt == 'hdf5Root' and value !='': if opt == 'hdf5Root' and value !='':
output.append('HDF5_ROOT=%s\n'%value) output.append('HDF5_ROOT=%s\n'%value)
if opt == 'threads' and value !='': if opt == 'threads' and value !='':