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

removed -c from options to compile_spectralSolver and added functionality to remove "-c" or "--compile" from command line arguments befor calling compile_spectralSolver

This commit is contained in:
Martin Diehl 2013-02-25 18:46:36 +00:00
parent 1cc990c7ac
commit 72418f7b60
2 changed files with 20 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
code/setup/compile_SpectralSolver.py
View File

@ -29,13 +29,10 @@ Writes version specific files for different MARC releases, adjustes the make fil
""" + string.replace('$Id$','\n','\\n') """ + string.replace('$Id$','\n','\\n')
) )
parser.add_option('-c', '--compile', dest='spectralCompile', action='store_true', \
help='compiles the spectral solver [%default]')
parser.add_option('-o', '--options', dest='makeOptions', action='extend', type='string', \ parser.add_option('-o', '--options', dest='makeOptions', action='extend', type='string', \
metavar="KEY=VALUE", \ metavar="KEY=VALUE", \
help='comma-separated list of options passed to Makefile when compiling spectral code') help='comma-separated list of options passed to Makefile when compiling spectral code')
parser.set_defaults(spectralCompile = False)
parser.set_defaults(makeOptions = ['F90='+{True:'ifort',False:'gfortran'}[\ parser.set_defaults(makeOptions = ['F90='+{True:'ifort',False:'gfortran'}[\
subprocess.call(['which', 'ifort'],\ subprocess.call(['which', 'ifort'],\
stdout=subprocess.PIPE, stderr=subprocess.PIPE) == 0]]) stdout=subprocess.PIPE, stderr=subprocess.PIPE) == 0]])
@ -46,8 +43,7 @@ baseDir = damaskEnv.relPath('code/')
# compiling spectral code # compiling spectral code
if (options.spectralCompile): print 'base directory:', baseDir
print 'base directory:', baseDir os.system('make --directory %s clean'%(baseDir))
os.system('make --directory %s clean'%(baseDir)) print 'make options:',' '.join(options.makeOptions)
print 'make options:',' '.join(options.makeOptions) os.system('make --directory %s %s'%(baseDir,' '.join(options.makeOptions)))
os.system('make --directory %s %s'%(baseDir,' '.join(options.makeOptions)))

17
code/setup/setup_code.sh
View File

@ -1,5 +1,20 @@
#!/usr/bin/env sh #!/usr/bin/env sh
${DAMASK_ROOT}/code/setup/modify_Files.py ${DAMASK_ROOT}/code/setup/modify_Files.py
${DAMASK_ROOT}/code/setup/compile_SpectralSolver.py $@ #remove -c or --compile from args an in case call compile spectral solver
compile=0
myArgs=''
for args
do
if [ "$args" = "-c" -o "$args" = "--compile" ]
then compile=1
else
myArgs="$myArgs $args"
fi
done
echo $myArgs
if [ "$compile" = 1 ]
then echo 'Compiling spectral solver'
${DAMASK_ROOT}/code/setup/compile_SpectralSolver.py $myArgs
fi
${DAMASK_ROOT}/code/setup/symlink_Code.py ${DAMASK_ROOT}/code/setup/symlink_Code.py