JSOC/localize.py - diff

Return to localize.py CVS log

Up to [Development] / JSOC

version 1.6, 2013/11/13 17:26:27

version 1.8, 2013/11/13 19:38:37

Line 509 def parseConfig(fin, keymap, addenda, de

if not rv:

for mach in machDict:

mDefsMake.extend(list('\nifeq ($(MACHTYPE), ' + mach + ')'))

for var in platDict[plat]:

for var in machDict[mach]:

mDefsMake.extend(list('\n' + var + ' = ' + platDict[plat][var]))

mDefsMake.extend(list('\n' + var + ' = ' + machDict[mach][var]))

mDefsMake.extend(list('\nendif\n'))

return rv

Line 651 def configureComps(defs, mDefs):

mDefs.extend(list('\nFCOMPILER = gfortran'))

# Environment overrides. These get written, regardless of the disposition of auto-configuration.

mDefs.extend(list('\nifneq $(JSOC_COMPILER,)\n COMPILER = $(JSOC_COMPILER)\nendif'))

mDefs.extend(list('\nifneq ($(JSOC_COMPILER,))\n COMPILER = $(JSOC_COMPILER)\nendif'))

mDefs.extend(list('\nifneq $(JSOC_FCOMPILER,)\n FCOMPILER = $(JSOC_FCOMPILER)\nendif'))

mDefs.extend(list('\nifneq ($(JSOC_FCOMPILER,))\n FCOMPILER = $(JSOC_FCOMPILER)\nendif'))

return rv

Line 950 if rv == RET_SUCCESS:

# SUMS manager (it is in the configuration file)

configureNet(NET_CFG, cfile, mfile, pfile, pCfile, pMfile, pRfile, pTfile, optD['base'], keymap)

else:

# A Stanford user can override the parameters in configsdp.txt by copying that file to config.local,

# and then editing config.local. So, if config.local exists, use that.

if os.path.isfile(cdir + '/' + NET_CFG):

configureSdp(NET_CFG, cfile, mfile, pfile, pCfile, pMfile, pRfile, pTfile, optD['base'])

else:

configureSdp(SDP_CFG, cfile, mfile, pfile, pCfile, pMfile, pRfile, pTfile, optD['base'])

Legend: