Ignore:
Timestamp:
10/09/15 11:10:54 (5 years ago)
Author:
mjuckes
Message:

misc

File:
1 edited

Legend:

Unmodified
Added
Removed
  • CMIP6dreqbuild/trunk/srcMisc/dreq_consol_dreq.py

    r374 r382  
    351351    return rq(mip,path,parent=self) 
    352352 
    353   def addRow( self, mip, tab, obj, grid, gok, comment ): 
     353  def addRow( self, mip, tab, obj, grid, gok, comment,opt='',opar='' ): 
    354354    k = str( uuid.uuid1() ) 
    355     self.rowList.append( (k,mip,tab, obj, grid, gok, comment) ) 
     355    self.rowList.append( (k,mip,tab, obj, grid, gok, comment, opt, opar) ) 
    356356    return k 
    357357 
     
    475475        comment = rv[5] 
    476476        obj = rv[6] 
    477         uid = self.parent.addRow( self.mip, tab, obj, grid, gok, comment ) 
     477        opt = rv[1] 
     478        opar = rv[2] 
     479        uid = self.parent.addRow( self.mip, tab, obj, grid, gok, comment, opt=opt, opar=opar ) 
    478480        self.readDeckColPair( j, self.ixh, 160, rid=uid ) 
    479481    elif self.opt == 'deck': 
     
    485487        comment = rv[5] 
    486488        obj = rv[6] 
    487         uid = self.parent.addRow( self.mip, tab, obj, grid, gok, comment ) 
     489        opt = rv[1] 
     490        opar = rv[2] 
     491        uid = self.parent.addRow( self.mip, tab, obj, grid, gok, comment, opt=opt, opar=opar ) 
    488492        for je in range(5): 
    489493          self.readDeckColPair( j, self.iccntl + je*2, 160, expt=hh[je], rid=uid ) 
     
    496500        comment = rv[5] 
    497501        obj = rv[6] 
    498         uid = self.parent.addRow( self.mip, tab, obj, grid, gok, comment ) 
     502        opt = rv[1] 
     503        opar = rv[2] 
     504        uid = self.parent.addRow( self.mip, tab, obj, grid, gok, comment, opt=opt, opar=opar ) 
    499505        for je in range(5): 
    500506          self.readDeckColPair( j, self.iccntl + je*2, 160, expt=hh[je], rid=uid ) 
     
    703709### need to give temporary labels/titles here and consolidate after all variables have been collated in 
    704710### sx2. 
     711## rows from "request scoping" 
    705712for i in rqs.rowList: 
    706713  kk ='%s.%s' % (i[1],i[2]) 
     
    716723sh = shelve.open( '%s/requestLinks_tmp' % odir, 'n' ) 
    717724sh['__info__'] = { 'label':'requestLinks', 'title':'Links from variable groups to a request id' } 
    718 sh['__cols__'] = [ 'uid', 'mip', 'tab','objective','grid','gridreq','comment'] 
     725sh['__cols__'] = [ 'uid', 'mip', 'tab','objective','grid','gridreq','comment','opt','opar'] 
    719726for i in rqs.rowList: 
    720727  sh[i[0]] = i[:] 
Note: See TracChangeset for help on using the changeset viewer.