version 1.6, 2013/11/13 17:26:27
|
version 1.9, 2013/11/15 17:05:49
|
Line 42 PERL_FXNS_A = """sub new |
|
Line 42 PERL_FXNS_A = """sub new |
|
}; | }; |
| |
bless($self, $clname); | bless($self, $clname); |
$self->{_paramsH} = $self->initialize(); |
$self->{_paramsH} = {}; |
|
$self->initialize(); |
| |
return $self; | return $self; |
} | } |
Line 259 def processParam(cfgfile, line, regexpQu |
|
Line 260 def processParam(cfgfile, line, regexpQu |
|
# constants (the names of which are the parameter names) | # constants (the names of which are the parameter names) |
# we can refer to those in the init section. The key variable holds the | # we can refer to those in the init section. The key variable holds the |
# name of the constant. | # name of the constant. |
perlInitSection.extend(list('\n $self->{_paramsH}->{' + key + '} = ' + "'" + val + "';")) |
perlInitSection.extend(list("\n $self->{_paramsH}->{'" + key + "'} = " + key + ';')) |
else: | else: |
# No quote qualifier | # No quote qualifier |
raise Exception('missingQuoteQual', key) | raise Exception('missingQuoteQual', key) |
Line 509 def parseConfig(fin, keymap, addenda, de |
|
Line 510 def parseConfig(fin, keymap, addenda, de |
|
if not rv: | if not rv: |
for mach in machDict: | for mach in machDict: |
mDefsMake.extend(list('\nifeq ($(MACHTYPE), ' + mach + ')')) | 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')) | mDefsMake.extend(list('\nendif\n')) |
| |
return rv | return rv |
Line 651 def configureComps(defs, mDefs): |
|
Line 652 def configureComps(defs, mDefs): |
|
mDefs.extend(list('\nFCOMPILER = gfortran')) | mDefs.extend(list('\nFCOMPILER = gfortran')) |
| |
# Environment overrides. These get written, regardless of the disposition of auto-configuration. | # 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 | return rv |
| |
Line 950 if rv == RET_SUCCESS: |
|
Line 951 if rv == RET_SUCCESS: |
|
# SUMS manager (it is in the configuration file) | # SUMS manager (it is in the configuration file) |
configureNet(NET_CFG, cfile, mfile, pfile, pCfile, pMfile, pRfile, pTfile, optD['base'], keymap) | configureNet(NET_CFG, cfile, mfile, pfile, pCfile, pMfile, pRfile, pTfile, optD['base'], keymap) |
else: | 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']) | configureSdp(SDP_CFG, cfile, mfile, pfile, pCfile, pMfile, pRfile, pTfile, optD['base']) |
|
|
|
|
|
|