Changeset 600 for CMIP6dreqbuild


Ignore:
Timestamp:
12/02/16 16:24:04 (4 years ago)
Author:
mjuckes
Message:

final adjustments

Location:
CMIP6dreqbuild/trunk
Files:
20 edited

Legend:

Unmodified
Added
Removed
  • CMIP6dreqbuild/trunk/docs/xlst_xdsSchemaGen.xml

    r547 r600  
    6161    <xs:pattern value="([a-zA-Z0-9])+"/></xs:restriction> 
    6262  </xs:simpleType><xsl:text>&#xa;</xsl:text> 
     63 
     64<xs:simpleType name="st__stringList"> 
     65<xs:restriction base="aa:base__stringList"> 
     66     <xs:minLength value="0"/> 
     67</xs:restriction> 
     68</xs:simpleType> 
     69 
     70<xs:simpleType name="base__stringList"> 
     71    <xs:list itemType="xs:string"/> 
     72</xs:simpleType><xsl:text>&#xa;</xsl:text> 
    6373 
    6474<xs:simpleType name="st__integerList"> 
  • CMIP6dreqbuild/trunk/src/framework/dreqPy/makeTables.py

    r593 r600  
    100100         oo.write( 'RewriteRule ^%s$ http://clipc-services.ceda.ac.uk/dreq/u/%s.html\n' % (v.label,v.uid) ) 
    101101      else: 
    102          print 'Match failed: ', v.label 
     102         print ('Match failed: %s' % v.label ) 
    103103    oo.close() 
    104104       
     
    182182          strc = dq.inx.uid[ v.stid ] 
    183183          if strc._h.label == 'remarks': 
    184             print 'ERROR: structure not found for %s: %s .. %s (%s)' % (v.uid,v.label,v.title,v.mipTable) 
     184            print ( 'ERROR: structure not found for %s: %s .. %s (%s)' % (v.uid,v.label,v.title,v.mipTable) ) 
    185185            ok = False 
    186186          else: 
     
    192192          if not ok: 
    193193            if (t,v.label) not in skipped: 
    194               print 'makeTables: skipping %s %s' % (t,v.label) 
     194              print ( 'makeTables: skipping %s %s' % (t,v.label) ) 
    195195              skipped.add( (t,v.label) ) 
    196196          else: 
     
    416416        assert x[0] == xs, 'ERROR.0088: consistency problem %s  %s %s %s' % (m,m2,x[0],xs) 
    417417        if x[0] == 0: 
    418           print 'Zero size:',m,m2 
     418          print ( 'Zero size: %s, %s' % (m,m2) ) 
    419419          if len( x[2].keys() ) > 0: 
    420              print 'ERROR:zero: ',m,m2,x[2].keys() 
     420             print ( 'ERROR:zero: %s, %s: %s' % (m,m2,str(x[2].keys()) ) ) 
    421421 
    422422        if acc: 
  • CMIP6dreqbuild/trunk/src/framework/dreqPy/scope.py

    r593 r600  
    724724      -t <tier> maxmum tier; 
    725725      -p <priority>  maximum priority; 
     726      --xls : Create Excel file with requested variables; 
     727      --xlsDir <directory> : Directory in which to place variable listing [xls]; 
    726728      --printLinesMax <n>: Maximum number of lines to be printed 
    727729      --printVars  : If present, a summary of the variables fitting the selection options will be printed 
     
    799801      mips = self.adict['m'] 
    800802      odir = self.adict.get( 'xlsdir', 'xls' ) 
    801       print 'odir:::::::::: ',odir 
     803      ##print 'odir:::::::::: ',odir 
    802804      ##m = list( mips )[0] 
    803805      self.sc.xlsByMipExpt(mips,eid,pmax,odir=odir) 
  • CMIP6dreqbuild/trunk/src/framework/dreqPy/vrev.py

    r584 r600  
    138138  c = checkVar(dq) 
    139139  c.chk( 'tas' ) 
    140   print c.inc, c.missing 
     140  print ( '%s, %s' % (c.inc, c.missing)) 
  • CMIP6dreqbuild/trunk/src/workbook/choiceCfg.py

    r526 r600  
    8989      thisClass = 'RedundancySet' 
    9090## 
    91 ## in order, 3hr, 4lev: 6hr, 7lev: 6hr, 4lev 
     91## in order, 3hr, 4lev: 6hr, 7lev: 6hr, 4lev: 6hr, 3lev 
    9292## 
    9393      ol = [2,2,1] 
     
    9595##HighResMIP [3hrPlev] 
    9696      ok = [] 
    97       grps = {'ta':['3hrPlev','6hrPlev_extr'], 'wap':['3hrPlev','6hrPlev_extr_dr'] } 
    98       ranks = {'3hrPlev':3,'6hrPlev_extr':2,'6hrPlev_extr_dr':1} 
     97      grps = {'ta':['3hrPlev','6hrPlev_extr','6hrPlev'], 'wap':['3hrPlev','6hrPlev_extr_dr','6hrPlev'], 
     98              'hus':['3hrPlev','6hrPlev_extr'] } 
     99      ranks = {'3hrPlev':3,'6hrPlev_extr':2,'6hrPlev_extr_dr':1, '6hrPlev':0} 
    99100       
    100101## 
     
    103104## need to add some 27 level fields, but 1st clarify requirements 
    104105## 
    105       for grp in grps.get( var, ['3hrPlev','6hrPlev_extr']): 
    106         c0 = [c for c in cm if c[19] == 'HighResMIP [%s]' % grp] 
     106      s1 = {c[19] for c in cm} 
     107      ##print sorted(list(s1)) 
     108      ##raise 
     109      for grp in grps.get( var, ['3hrPlev','6hrPlev_extr','6hrPlev']): 
     110        c0 = [c for c in cm if c[19].find( '[%s]' % grp) != -1] 
    107111        thisl = labify( '%s-%s' % (var, grp) ) 
    108112        title = '%s [%s]' % (var, grp) 
    109         ok.append( len(c0) ) == 1 
     113        ok.append( len(c0)  == 1 ) 
    110114        cc += '%s:%s; ' % (grp,var) 
    111115        opts += '%s; ' % ol[ix] 
     
    113117        if len(c0 ) == 1: 
    114118          self.varChoiceLnk.append( [str(uuid.uuid1()), thisl, title,  c0[0][0], uid, str(ranks[grp]) ] ) 
     119        else: 
     120          print 'Group %s not found' % grp 
     121          print s1, var 
    115122      if not all(ok): 
    116123        print 'ERROR.070.020001: not all groups found for %s [%s]' % (var,str(ok)) 
  • CMIP6dreqbuild/trunk/src/workbook/importShDreq2.py

    r581 r600  
    2626import ivg 
    2727reload(ivg) 
     28 
     29class replaceItems(object): 
     30  def __init__(self): 
     31    self.v = collections.defaultdict( list ) 
     32    self.items = {} 
    2833 
    2934WbMods = importWbMods.run() 
     
    126131 
    127132    self.repl = collections.defaultdict( list ) 
     133    self.replItems = {} 
     134    self.rep = {'cmv':replaceItems()} 
     135 
    128136    self.err0010 = collections.defaultdict( int ) 
    129     self.replItems = {} 
    130137    self.defaultP = {} 
    131138    self.remo = {} 
     
    146153    if doRepl: 
    147154      self.importRepl() 
     155      self.importRepl(rfile='CMVreplace.csv',mode='cmv') 
    148156      self.importRemove() 
    149157      self.importUpdate() 
     
    163171    self.writeSn() 
    164172    self.writeMcfg() 
     173    self.writeProcNotes() 
    165174    self.writeCmDim() 
    166175    self.writeVar() 
     
    178187        self.write2() 
    179188      self.finish() 
     189 
     190  def writeProcNotes(self): 
     191    xx = self.vocabs.getElementsByTagName( 'processingOptions' ) 
     192    assert len(xx) == 1, 'Expecting one element named "processingOptions", found %s' % len(xx) 
     193    iDoc = xx[0] 
     194## <item id="tmpid.0003" label="C4MIP" status="" title="Coupled Climate Carbon Cycle Model Intercomparison Project" url="http://c4mip.lsce.ipsl.fr/"/> 
     195    thiss = self.doc.getElementsByTagName( 'tags' )[0] 
     196    dil = thiss.getElementsByTagName('item') 
     197    for d in dil: 
     198      thiss.removeChild(d) 
     199    for i in iDoc.getElementsByTagName('item'): 
     200      item = self.doc.createElement( 'item' ) 
     201      thisl = i.getAttribute( 'label' ) 
     202      for k in ['title','description','label']: 
     203        item.setAttribute( k, i.getAttribute( k ) ) 
     204      uid =  'TAG:%s' % thisl  
     205      item.setAttribute( 'uid', uid ) 
     206      thiss.appendChild( item ) 
    180207 
    181208  def writeMcfg(self): 
     
    224251      thiss.removeChild(d) 
    225252#<item description="dummyAt" id="001.001.001" label="example-01" procComment="dummyAt" procnote="dummyAt" prov="dummyAt" provmip="dummyAt" sn="dummyAt" title="dummy title string" uid="fa349c44-9ccb-11e5-8176-5404a60d96b5" units="dummyAt"/> 
    226     kk= ['label', 'title', 'description', 'procComment', 'procnote', 'prov', 'provmip', 'sn', 'units', 'uid','defaultp'] 
     253    kk= ['label', 'title', 'description', 'procComment', 'procnote', 'prov', 'provmip', 'sn', 'units', 'uid','defaultp','replaced_by'] 
    227254    for uid in self.importWbMods.vars.d1: 
    228255      item = self.doc.createElement( 'item' ) 
    229256      thisr = self.importWbMods.vars.d1[uid] 
    230       for i in range( len(kk) -1 ): 
     257      for i in range( len(kk) -2 ): 
    231258           item.setAttribute( kk[i], thisr[i] ) 
    232259      if len( self.importWbMods.vars.c1[ thisr[0] ] ) == 1: 
     
    842869                if str(tt.mip) != 'OMIP': 
    843870                  gi.append( tt ) 
     871                  ##if tt.mip == 'SIMIP' and tt.mask == 'yes': 
     872                    ##sm.add( 'seaIce' ) 
     873                  ##else: 
    844874                  sm.add( tt.mask ) 
    845875 
    846876            print '####### masks: ',sm 
    847877            smdd = {} 
    848             dsn = {'floating ice shelf':u'floating ice sheet', u'ocean':u'sea' } 
     878            dsn = {'floating ice shelf':u'floating ice sheet', u'ocean':u'sea', 'yes':'seaIce' } 
    849879            d1 = {u'land':(False,'area: mean where land'), \ 
    850880                  u'grounded ice sheet':(True,'area: mean where grounded_ice_sheet'), \ 
    851881                  u'ice sheet':(True,'area: mean where ice_sheet'), \ 
    852882                  u'floating ice sheet':(True,'area: mean where floating_ice_sheet'), \ 
    853                   u'floating ice shelf':(True,'area: mean where floating_ice_sheet'), 
     883                  u'floating ice shelf':(True,'area: mean where floating_ice_sheet'), \ 
     884                  u'seaIce':(True,'area: mean where sea_ice over sea'), \ 
    854885                  u'sea':(False,'area: mean where sea') } 
     886 
    855887            for s in sm: 
    856               if s in  ['', u'none',u'Southern hemisphere', u'Northern hemisphere']: 
     888              if s in  ['', 'no', u'none',u'Southern hemisphere', u'Northern hemisphere']: 
    857889                smdd[s] = (False,'') 
    858890              else: 
    859                 smdd[s] = d1[ dsn.get( s,s ) ] 
     891                try: 
     892                  smdd[s] = d1[ dsn.get( s,s ) ] 
     893                except: 
     894                  print s, dsn.get( s,s ) 
     895                  raise 
    860896 
    861897            setu = set() 
     
    886922## 
    887923                dset.add( (tt.shape,tt.levels,tt.tstyle,gr) ) 
    888                 dsgpi.add( (tt.shape,tt.levels,tt.tstyle,gr,smdd[tt.mask], 'None', 'None') ) 
     924                if tt.mip == 'SIMIP': 
     925                  grprov = "SIMIP" 
     926                else: 
     927                  grprov = "" 
     928                dsgpi.add( (tt.shape,tt.levels,tt.tstyle,gr,smdd[tt.mask], 'None', 'None', grprov) ) 
    889929### need to check where variables are, perhaps, refering to "ovar" 
    890930            ##kk = ['group', 'var', 'table', 'freq', 'descriptionEx', 'shape', 'levels', 'tstyle', 'mask', 'misc', 'mip', 'uid', 'rowIndex', 'new', 'gpid', 'vkey', 'vid'] 
     
    903943                fr = freqmap.get( tt.freq, tt.freq ) 
    904944                ntab = 'em%s' % string.capwords( fr ) 
     945                if fr == '6hr' and tt.levels == '7h': 
     946                  ntab = '6hrPlev' 
     947                  print 'INFO.033.00001: adding to 6hrPlev ....',lab, tt.__dict__ 
    905948                 
    906949                if ovuu.has_key(tt.vid): 
     
    10611104        {'Mean', u'time: mean', u'Time mean', u'daily mean', u'mean', u'time mean', u'time: day', u'time: mean', u'weighted time mean', 'Cumulative annual fraction'}, set(), {''}] 
    10621105    cmetl = ['time: point', 'time: mean', 'time: mean within years time: mean over years ', ''] 
     1106    cmetlsi = ['time: point', ('time: mean area: mean where sea_ice over sea','time: mean where sea_ice area: mean where sea_ice'), 'time: mean within years time: mean over years ', ''] 
    10631107    ee1 = {} 
    1064     for shp,lvls,sty,gr,tmsk, flgv, flgm in dsgpi: 
     1108    for shp,lvls,sty,gr,tmsk, flgv, flgm, prov in dsgpi: 
    10651109        t = (shp,lvls,sty,gr) 
    10661110        tdim, tt = self.dsort_u1( self.dsortdd['groupitem'][0][t], self.dsortdd['groupitem'][1] ) 
     
    10741118        cmea = 'area: areacell%s' % gr 
    10751119        cmet = '' 
     1120        if sty == u'weighted time mean': 
     1121           print 'INFO.xxxx: ',shp,lvls,sty,gr,tmsk, flgv, flgm, prov 
    10761122        for i in range(4): 
    10771123          if sty in ttt[i]: 
    1078             cmet = cmetl[i] 
     1124            if i == 1 and prov == 'SIMIP': 
     1125              if sty == u'weighted time mean': 
     1126                 cmet = 'time: mean where sea_ice area: mean where sea_ice' 
     1127              else: 
     1128                 cmet = 'time: mean area: mean where sea_ice over sea' 
     1129            else: 
     1130              cmet = cmetl[i] 
    10791131        if cmet == '': 
    10801132          cmet = msk 
     
    10841136        label = 'str-%3.3i' % kk 
    10851137        proc = '' 
    1086         prov = 'CMIP5, endorsed MIPs' 
     1138        if prov == '': 
     1139          prov = 'CMIP5, endorsed MIPs' 
    10871140        desc = '' 
    10881141        dims = tt[0] 
     
    12641317              'K':('sistraits','','time','',False), \ 
    12651318              'scalar':('','','time','',False), \ 
     1319              'sheet':('icesheet','','time','',False), \ 
    12661320              'ZST1':('alevel','site','time','',False), \ 
    12671321              'BasinYT':('latitude|basin','','time','',False), \ 
     
    12931347        lset = {'soil levels':'sdepth', 'all model levels above 400hPa':'alevel'}  
    12941348        lsdd = {} 
     1349        print 'ls1....',ls1 
    12951350        for l in ls1: 
    12961351          ii = 0 
     
    13041359            ii = -2 
    13051360            this = l 
     1361          elif l == '7h': 
     1362            ii = 7 
     1363            this = 'plev7h' 
    13061364          else: 
    13071365            ii = int( float(l) ) 
     
    13161374              if ii in [14,17]: 
    13171375                ii = 19 
     1376               
    13181377              this = 'plev%s' % ii 
     1378              if ii == 7: 
     1379                this += 'c' 
     1380 
    13191381            else: 
    13201382              this = '' 
     
    16171679              mm = self.importWbMods.mmsi.ss[vid] 
    16181680              self._editRequestVar01( item, mm, ll ) 
     1681 
     1682            if vid in self.rep['cmv'].items: 
     1683              vid1 = vid 
     1684              vid = self.rep['cmv'].items[vid] 
     1685              print 'INFO.090.09901a: vid updated :',vid,ll 
     1686              item.setAttribute( 'vid', vid ) 
    16191687            if vid not in self.cmvs: 
    16201688              l,t = (ll[0],ll[1]) 
     
    16271695#  cmvByLab contains, for each uid, a (frequency,table) tuple 
    16281696                thisll = [] 
     1697                thislll = [] 
     1698                thisllp = [] 
    16291699                for u in self.cmvByLab[l]: 
    16301700                  if t in freq2tab[ self.cmvByLab[l][u][0] ]: 
     
    16351705                    item.setAttribute( 'vid', str( vid ) ) 
    16361706                elif len(thisll) > 1: 
    1637                   print 'ERROR.090.09011c: vid not found (options found by lab)',ll, [self.cmvByLab[l][u] for u in thisll] 
     1707                  for u in thisll: 
     1708                    if string.find(self.cmvByLab[l][u][1], 'SPECS') == -1: 
     1709                      thislll.append( u ) 
     1710                    if string.find(self.cmvByLab[l][u][1], 'OMIP') != -1: 
     1711                      thisllp.append( u ) 
     1712                  if len( thislll ) == 1: 
     1713                    print 'INFO.090.09011y: vid reset',ll 
     1714                    vid = thislll[0] 
     1715                    item.setAttribute( 'vid', str( vid ) ) 
     1716                  elif len( thisllp ) == 1: 
     1717                    print 'INFO.090.09011z: vid reset',ll 
     1718                    vid = thisllp[0] 
     1719                    item.setAttribute( 'vid', str( vid ) ) 
     1720                  else: 
     1721                    print 'ERROR.090.09011c: vid not found (options found by lab)',ll, [self.cmvByLab[l][u] for u in thisll] 
    16381722                else: 
    16391723                  print 'ERROR.090.09011d: vid not found (no options at matching frequency)',ll 
     
    17631847          s1 = set() 
    17641848          for r in self.cmv: 
     1849           if r[0] in self.rep['cmv'].items: 
     1850             print 'INFO.090.09099: detected cmv replace request: ',r 
     1851           else: 
    17651852            if r[0] in s1: 
    17661853              print 'ERROR.090.09005: duplicate key at ',r 
     
    17921879                      print 'ERROR.099.00202: bad vid string: %s [%s]' % (r[k],str(r[:3])) 
    17931880                    vid = str(r[k]) 
     1881                    if vid in self.importWbMods.vars.vmap: 
     1882                      ov = vid 
     1883                      vid = self.importWbMods.vars.vmap[vid] 
     1884                      print 'INFO.040.04444: mapping',ov,vid 
    17941885                  if n == "stid": 
    17951886                    item.setAttribute( n, stid ) 
     
    19692060                ##self.ff[ksect][0].appendChild( cln ) 
    19702061                ##print 'INFO.046.0003: request variable split:', t[1] 
     2062 
     2063            if vid in self.rep['cmv'].items: 
     2064              vid1 = vid 
     2065              vid = self.rep['cmv'].items[vid] 
     2066              print 'INFO.090.09901b: vid updated :',vid,t 
     2067              item.setAttribute( 'vid', vid ) 
    19712068               
    19722069            did = '%s__%s' % (t[2],t[3]) 
     
    20762173      elif extraMappings.has_key(k): 
    20772174        thisl = extraMappings[k] 
     2175      elif self.experiments.has_key(k): 
     2176        thisl = [k,] 
    20782177      else: 
    20792178        print 'ERROR.080.00010: no mapping founds for experiment %s' % k 
     
    22742373    ##self.varChoiceLnkCfgInfo = [ 'uid', 'label', 'title', 'vid', 'cid', 'cfgid', 'cfg' 
    22752374 
    2276   def importRepl(self,rfile='uuidreplace.csv'): 
     2375  def importRepl(self,rfile='uuidreplace.csv',mode='var'): 
    22772376    for l in open(rfile).readlines(): 
    22782377      bits = string.split( string.strip(l), '\t' ) 
    22792378      assert len(bits) == 7, 'Could not parse item replacement file' 
    2280       self.repl[ bits[3] ].append( (bits[2],bits[0],bits[1] ) ) 
    2281       self.replItems[bits[0]] = bits[1] 
     2379      if mode == 'var': 
     2380        self.repl[ bits[3] ].append( (bits[2],bits[0],bits[1] ) ) 
     2381        self.replItems[bits[0]] = bits[1] 
     2382      elif mode == 'cmv': 
     2383        self.rep['cmv'].v[ bits[3] ].append( (bits[2],bits[0],bits[1] ) ) 
     2384        self.rep['cmv'].items[bits[0]] = bits[1] 
     2385       
    22822386 
    22832387  def importRemove(self,rfile='uuidremove.csv'): 
  • CMIP6dreqbuild/trunk/src/workbook/importWbMods.py

    r546 r600  
    1616      self.records.append( nt__mapr._make(  rr ) ) 
    1717    self.ss = collections.defaultdict( list ) 
     18    self.ee = {} 
    1819    for r in self.records: 
    1920      self.ss[r.vid1].append( r ) 
     21      self.ee[r.lab1] = r.lab2 
    2022 
    2123class loadVars(object): 
    22   def __init__(self,opt=1): 
     24  def __init__(self,opt=1,map01=None): 
    2325    if opt == 0: 
    2426      wb = workbook( 'inputs/var.xls' ) 
    2527    else: 
    2628      wb = workbook( 'inputs/vars_20151201.xls' ) 
    27     #x = ['label', 'title', 'description', 'procComment', 'procnote', 'prov', 'provmip', 'sn', 'units', 'uid','defaultp','tags','alias'] 
     29    #x = ['label', 'title', 'description', 'procComment', 'procnote', 'prov', 'provmip', 'sn', 'units', 'uid','defaultp','replaced_by'] 
    2830    #nt_var = collections.namedtuple( 'var', x ) 
     31 
     32    self.mapx1 = {} 
     33    ii = open( 'inputs/simip_rename.csv', 'r' ) 
     34    for l in ii.readlines(): 
     35      bits = string.split( string.strip( l ), '\t' ) 
     36      if bits[1] != '*': 
     37        print 'ERROR: unexpected line in inputs/simip_rename.csv: ',l 
     38      else: 
     39        self.mapx1[bits[4]]  = bits[2] 
     40    ii.close() 
    2941 
    3042    self.d1 = {} 
    3143    self.c1 = collections.defaultdict(list) 
     44    d2 = {} 
    3245    s1 = wb.book.sheet_by_name(u'var') 
    3346    for i in range(1,s1.nrows): 
     
    4356        self.d1[uid] = [str(x) for x in rr] 
    4457        self.c1[rr[0]].append( uid ) 
     58        if string.strip( rr[11] ) != '': 
     59          d2[uid] = (string.strip(rr[11]),rr[0] ) 
    4560      except: 
    4661        print rr 
    4762        raise 
     63 
     64    mm = [] 
     65    mmm = [] 
     66 
     67    self.vmap= {} 
     68    for k in d2: 
     69      if d2[k][0] not in self.c1: 
     70        mm.append( (d2[k],k) ) 
     71      elif len( self.c1[ d2[k][0] ] ) > 1: 
     72        mmm.append( (k,  self.c1[ d2[k][0] ] ) ) 
     73      else: 
     74        self.vmap[k] = self.c1[ d2[k][0] ][0] 
     75 
     76 
     77    if map01 != None: 
     78      for k in map01: 
     79    ##for k in self.mapx1: 
     80        u1 = None 
     81        u2 = None 
     82        if len( self.c1[k] ) == 1: 
     83          u1  =  self.c1[k][0] 
     84        else: 
     85          print 'ERROR: ambigous variable label: %s' % k 
     86        k2 = map01[k] 
     87        if len( self.c1[k2] ) == 1: 
     88          u2  =  self.c1[k2][0] 
     89        else: 
     90          print 'ERROR: ambigous variable label: %s' % k2 
     91        if None not in [u1,u2]: 
     92           self.vmap[u1] = u2 
     93           rr = self.d1[u1] 
     94           if rr[4] == '': 
     95             rr[4] = 'OBSOLETE' 
     96           else: 
     97             rr[4] += ' OBSOLETE' 
     98           self.d1[u1] = rr 
     99    assert len( mm ) == 0, 'Mappings not all valid: %s' % str(mm) 
     100    assert len( mmm ) == 0, 'Mappings not all unambiguous: %s' % str(mmm) 
    48101     
    49102class loadFixes(object): 
     
    98151  def __init__(self): 
    99152    self.fx = loadFixes() 
    100     self.vars = loadVars() 
    101153    self.ls = loadSpatial() 
    102154    self.cm = loadCmorDims() 
    103155    self.mmsi = loadMipMaps( 'SIMIP' ) 
     156    self.vars = loadVars(map01=self.mmsi.ee) 
  • CMIP6dreqbuild/trunk/src/workbook/ivg.py

    r530 r600  
    1  
    21from scansh import rq 
    32import string, collections, uuid 
     
    131130            self.rqv_vg['%s.%s.%s' % (ll[2],ll[1],ll[0])] = vgid 
    132131 
    133  
    134  
    135132class checkCmv(object): 
    136133  def __init__(self,tlist): 
  • CMIP6dreqbuild/trunk/src/workbook/trial.xml

    r397 r600  
    22<document xmlns="urn:w3id.org:cmip6.dreq.dreq:a" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="out/dreqSchema.xsd"> 
    33<prologue> 
    4 <dc:title>Draft CMIP6 Data Request</dc:title> 
     4<dc:title>Draft CMIP6 Data Request [01.beta.13]</dc:title> 
     5<dc:description>The CMIP6 Data Request will specify the variables requested for the CMIP6 archive, and the detail the experiments and time slices for which they are required.</dc:description> 
    56<dc:creator>Martin Juckes</dc:creator> 
    6 <dc:date>2015-10-01</dc:date> 
     7<dc:date>2015-11-25</dc:date> 
    78</prologue> 
    89<main> 
    9 <institute class="vocab" id="cmip.drv.001" title="Institute" uid="SECTION:institute"> 
    10 <!-- <info srcType="dummy" srcRef="ptxt.py">Dummy entries</info> --> 
    11 <item description="Met Office Hadley Centre, Fitzroy Road, Exeter, Devon, EX1 3PB, UK." id="tmpid.0001" isni="0000 0001 2299 303X  [UKMO]" label="MOHC" title="MOHC" url="http://www.metoffice.gov.uk; http://www.metoffice.gov.uk/climate-guide/science/science-behind-climate-change/hadley"/> 
    12 <item description="Institut Pierre Simon Laplace, Paris, France" id="tmpid.0002" isni="0000 0000 9000 8794" label="IPSL" title="IPSL" url="https://www.ipsl.fr/en/"/> 
    13 <item description="Centre National de Recherches Meteorologiques, Meteo-France, Toulouse, France) and CERFACS (Centre Europeen de Recherches et de Formation Avancee en Calcul Scientifique, Toulouse, France" id="tmpid.0003" isni="0000 0004 0640 7549 " label="CNRM-CERFACS" title="CNRM-CERFACS" url="http://www.cerfacs.fr/"/> 
    14 <item description="Norwegian Climate Centre" id="tmpid.0004" isni="" label="NCC" title="NCC" url="http://folk.uib.no/ngfhd/EarthClim/index.htm"/> 
    15 <item description="Australian Commonwealth Scientific and Industrial Research Organization (CSIRO) Marine and Atmospheric Research (Melbourne, Australia) in collaboration with the Queensland Climate Change Centre of Excellence (QCCCE) (Brisbane, Australia)" id="tmpid.0005" isni="0000 0001 2173 2719 ;  0000 0004 0380 0628 [Queensland Government]" label="CSIRO-QCCCE" title="CSIRO-QCCCE" url="www.csiro.au ; http://www.ehp.qld.gov.au/climatechange/index.html "/> 
    16 <item description="Canadian Centre for Climate Modelling and Analysis, Victoria, BC, Canada" id="tmpid.0006" isni="" label="CCCma" title="CCCma" url=""/> 
    17 <item description="Institute for Numerical Mathematics, Moscow, Russia" id="tmpid.0007" isni="" label="INM" title="INM" url=""/> 
    18 <item description="Meteorological Research Institute, Tsukuba, Japan" id="tmpid.0008" isni="" label="MRI" title="MRI" url=""/> 
    19 <item description="AORI (Atmosphere and Ocean Research Institute, The University of Tokyo, Chiba, Japan), NIES (National Institute for Environmental Studies, Ibaraki, Japan), JAMSTEC (Japan Agency for Marine-Earth Science and Technology, Kanagawa, Japan)" id="tmpid.0009" isni="" label="MIROC" title="MIROC" url=""/> 
    20 <item description="JAMSTEC (Japan Agency for Marine-Earth Science and Technology, Kanagawa, Japan), AORI (Atmosphere and Ocean Research Institute, The University of Tokyo, Chiba, Japan), and NIES (National Institute for Environmental Studies, Ibaraki, Japan)" id="tmpid.0010" isni="" label="MIROC" title="MIROC" url=""/> 
    21 <item description="Goddard Institute for Space Studies, New York, NY" id="tmpid.0011" isni="0000 0001 1456 7559  [NASA]" label="NASA-GISS" title="NASA-GISS" url="http://www.giss.nasa.gov/"/> 
    22 <item description="National Center for Atmospheric Research, Boulder, CO, USA" id="tmpid.0012" isni="0000 0004 0637 9680 " label="NCAR" title="NCAR" url="ncar.ucar.edu"/> 
    23 <item description="NOAA GFDL, 201 Forrestal Rd, Princeton, NJ, 08540" id="tmpid.0013" isni="0000 0000 9269 5516 " label="NOAA-GFDL" title="NOAA-GFDL" url="www.gfdl.noaa.gov"/> 
    24 <item description="Beijing Climate Center,China Meteorological Administration,China" id="tmpid.0014" isni="0000 0001 2234 550X [CMA]" label="BCC" title="BCC" url=""/> 
    25 <item description="Max Planck Institute for Meteorology" id="tmpid.0015" isni="" label="MPI-M" title="MPI-M" url=""/> 
    26 <item description="Institute of Atmospheric Physics, Chinese Academy of Sciences, Beijing, China and Tsinghua University" id="tmpid.0016" isni="" label="LASG-CESS" title="LASG-CESS" url=""/> 
    27 <item description="Global Modeling and Assimilation Office, NASA Goddard Space Flight Center, Greenbelt, MD 20771" id="tmpid.0017" isni="0000 0001 1456 7559  [NASA]" label="NASA-GMAO" title="NASA-GMAO" url=""/> 
    28 <item description="GCESS,BNU,Beijing,China (College of Global Change and Earth System Science, Beijing Normal University)" id="tmpid.0018" isni="" label="BNU" title="BNU" url=""/> 
    29 <item description="National Center for Atmospheric Research, Boulder, CO, USA" id="tmpid.0019" isni="" label="NSF-DOE-NCAR" title="NSF-DOE-NCAR" url=""/> 
    30 <item description="PNNL (Pacific Northwest National Laboratory) Richland, WA, USA/NCAR (National Center for Atmospheric Research) Boulder, CO, USA" id="tmpid.0020" isni="" label="NSF-DOE-NCAR" title="NSF-DOE-NCAR" url=""/> 
    31 <item description="NSF/DOE NCAR (National Center for Atmospheric Research) Boulder, CO, USA" id="tmpid.0021" isni="" label="NSF-DOE-NCAR" title="NSF-DOE-NCAR" url=""/> 
    32 <item description="Commonwealth Scientific and Industrial Research Organisation, Australia, and Bureau of Meteorology, Australia" id="tmpid.0022" isni="0000 0001 2173 2719  [CSIRO]; 0000 0004 0628 7751 [BOM]" label="CSIRO-BOM" title="CSIRO-BOM" url="www.csiro.au ; http://www.bom.gov.au/"/> 
    33 <item description="Nonhydrostatic Icosahedral Atmospheric Model (NICAM) Group (RIGC-JAMSTEC/AORI-U.Tokyo/AICS-RIKEN,Japan)" id="tmpid.0023" isni="" label="NICAM" title="NICAM" url=""/> 
    34 <item description="Centro Euro-Mediterraneo per i Cambiamenti Climatici, Bologna, Italy" id="tmpid.0024" isni="0000 0004 1761 0884" label="CMCC" title="CMCC" url="www.cmcc.it"/> 
    35 <item description="The First Institution of Oceanography,SOA,Qingdao,China" id="tmpid.0025" isni="" label="FIO" title="FIO" url=""/> 
    36 <item description="Institute of Atmospheric Physics, Chinese Academy of Sciences,Beijing,China" id="tmpid.0026" isni="" label="LASG-IAP" title="LASG-IAP" url=""/> 
    37 <item description="National Institute of Meteorological Research, Seoul, South Korea" id="tmpid.0027" isni="" label="NIMR-KMA" title="NIMR-KMA" url=""/> 
    38 <item description="European Earth System Model" id="tmpid.0028" isni="" label="ICHEC" title="ICHEC" url=""/> 
    39 <item description="Center for Ocean-Land-Atmosphere Studies, Calverton, MD" id="tmpid.0029" isni="" label="COLA-CFS" title="COLA-CFS" url=""/> 
    40 <item description="National Centers for Environmental Prediction, Camp Springs, MD" id="tmpid.0030" isni="" label="NOAA-NCEP" title="NOAA-NCEP" url=""/> 
     10<institute id="cmip.drv.001" label="institute" title="Institute" uid="SECTION:institute" useClass="vocab"> 
     11<!-- <info srcType="dummy" srcRef="ptxt.py">Dummy entries</info> --> 
     12<item description="Met Office Hadley Centre, Fitzroy Road, Exeter, Devon, EX1 3PB, UK." isni="0000 0001 2299 303X  [UKMO]" label="MOHC" title="MOHC" uid="b72699d0-c9b1-11e5-8bd5-5404a60d96b5" url="http://www.metoffice.gov.uk; http://www.metoffice.gov.uk/climate-guide/science/science-behind-climate-change/hadley"/> 
     13<item description="Institut Pierre Simon Laplace, Paris, France" isni="0000 0000 9000 8794" label="IPSL" title="IPSL" uid="b7269e4e-c9b1-11e5-8bd5-5404a60d96b5" url="https://www.ipsl.fr/en/"/> 
     14<item description="Centre National de Recherches Meteorologiques, Meteo-France, Toulouse, France) and CERFACS (Centre Europeen de Recherches et de Formation Avancee en Calcul Scientifique, Toulouse, France" isni="0000 0004 0640 7549 " label="CNRM-CERFACS" title="CNRM-CERFACS" uid="b726a376-c9b1-11e5-8bd5-5404a60d96b5" url="http://www.cnrm.meteo.fr/spip.php?rubrique1&amp;lang=en; http://www.cerfacs.fr 
     15"/> 
     16<item description="Norwegian Climate Centre" isni="" label="NCC" title="NCC" uid="b726a77c-c9b1-11e5-8bd5-5404a60d96b5" url="http://folk.uib.no/ngfhd/EarthClim/index.htm"/> 
     17<item description="Australian Commonwealth Scientific and Industrial Research Organization (CSIRO) Marine and Atmospheric Research (Melbourne, Australia) in collaboration with the Queensland Climate Change Centre of Excellence (QCCCE) (Brisbane, Australia)" isni="0000 0001 2173 2719 ;  0000 0004 0380 0628 [Queensland Government]" label="CSIRO-QCCCE" title="CSIRO-QCCCE" uid="b726ab82-c9b1-11e5-8bd5-5404a60d96b5" url="www.csiro.au ; http://www.ehp.qld.gov.au/climatechange/index.html "/> 
     18<item description="Canadian Centre for Climate Modelling and Analysis, Victoria, BC, Canada" isni="" label="CCCma" title="CCCma" uid="b726b294-c9b1-11e5-8bd5-5404a60d96b5" url=""/> 
     19<item description="Institute for Numerical Mathematics, Moscow, Russia" isni="" label="INM" title="INM" uid="b726b6ae-c9b1-11e5-8bd5-5404a60d96b5" url=""/> 
     20<item description="Meteorological Research Institute, Tsukuba, Japan" isni="" label="MRI" title="MRI" uid="b726ba96-c9b1-11e5-8bd5-5404a60d96b5" url=""/> 
     21<item description="AORI (Atmosphere and Ocean Research Institute, The University of Tokyo, Chiba, Japan), NIES (National Institute for Environmental Studies, Ibaraki, Japan), JAMSTEC (Japan Agency for Marine-Earth Science and Technology, Kanagawa, Japan)" isni="" label="MIROC" title="MIROC" uid="b726bea6-c9b1-11e5-8bd5-5404a60d96b5" url=""/> 
     22<item description="JAMSTEC (Japan Agency for Marine-Earth Science and Technology, Kanagawa, Japan), AORI (Atmosphere and Ocean Research Institute, The University of Tokyo, Chiba, Japan), and NIES (National Institute for Environmental Studies, Ibaraki, Japan)" isni="" label="MIROC" title="MIROC" uid="b726c2a2-c9b1-11e5-8bd5-5404a60d96b5" url=""/> 
     23<item description="Goddard Institute for Space Studies, New York, NY" isni="0000 0001 1456 7559  [NASA]" label="NASA-GISS" title="NASA-GISS" uid="b726c6bc-c9b1-11e5-8bd5-5404a60d96b5" url="http://www.giss.nasa.gov/"/> 
     24<item description="National Center for Atmospheric Research, Boulder, CO, USA" isni="0000 0004 0637 9680 " label="NCAR" title="NCAR" uid="b726cab8-c9b1-11e5-8bd5-5404a60d96b5" url="ncar.ucar.edu"/> 
     25<item description="NOAA GFDL, 201 Forrestal Rd, Princeton, NJ, 08540" isni="0000 0000 9269 5516 " label="NOAA-GFDL" title="NOAA-GFDL" uid="b726ceaa-c9b1-11e5-8bd5-5404a60d96b5" url="www.gfdl.noaa.gov"/> 
     26<item description="Beijing Climate Center,China Meteorological Administration,China" isni="0000 0001 2234 550X [CMA]" label="BCC" title="BCC" uid="b726d2ce-c9b1-11e5-8bd5-5404a60d96b5" url=""/> 
     27<item description="Max Planck Institute for Meteorology" isni="" label="MPI-M" title="MPI-M" uid="b726d8f0-c9b1-11e5-8bd5-5404a60d96b5" url=""/> 
     28<item description="Institute of Atmospheric Physics, Chinese Academy of Sciences, Beijing, China and Tsinghua University" isni="" label="LASG-CESS" title="LASG-CESS" uid="b726dd1e-c9b1-11e5-8bd5-5404a60d96b5" url=""/> 
     29<item description="Global Modeling and Assimilation Office, NASA Goddard Space Flight Center, Greenbelt, MD 20771" isni="0000 0001 1456 7559  [NASA]" label="NASA-GMAO" title="NASA-GMAO" uid="b726e124-c9b1-11e5-8bd5-5404a60d96b5" url=""/> 
     30<item description="GCESS,BNU,Beijing,China (College of Global Change and Earth System Science, Beijing Normal University)" isni="" label="BNU" title="BNU" uid="b726e624-c9b1-11e5-8bd5-5404a60d96b5" url=""/> 
     31<item description="National Center for Atmospheric Research, Boulder, CO, USA" isni="" label="NSF-DOE-NCAR" title="NSF-DOE-NCAR" uid="b726eb9c-c9b1-11e5-8bd5-5404a60d96b5" url=""/> 
     32<item description="PNNL (Pacific Northwest National Laboratory) Richland, WA, USA/NCAR (National Center for Atmospheric Research) Boulder, CO, USA" isni="" label="NSF-DOE-NCAR" title="NSF-DOE-NCAR" uid="b726f07e-c9b1-11e5-8bd5-5404a60d96b5" url=""/> 
     33<item description="NSF/DOE NCAR (National Center for Atmospheric Research) Boulder, CO, USA" isni="" label="NSF-DOE-NCAR" title="NSF-DOE-NCAR" uid="b726f52e-c9b1-11e5-8bd5-5404a60d96b5" url=""/> 
     34<item description="Commonwealth Scientific and Industrial Research Organisation, Australia, and Bureau of Meteorology, Australia" isni="0000 0001 2173 2719  [CSIRO]; 0000 0004 0628 7751 [BOM]" label="CSIRO-BOM" title="CSIRO-BOM" uid="b726f9fc-c9b1-11e5-8bd5-5404a60d96b5" url="www.csiro.au ; http://www.bom.gov.au/"/> 
     35<item description="Nonhydrostatic Icosahedral Atmospheric Model (NICAM) Group (RIGC-JAMSTEC/AORI-U.Tokyo/AICS-RIKEN,Japan)" isni="" label="NICAM" title="NICAM" uid="b726fe16-c9b1-11e5-8bd5-5404a60d96b5" url=""/> 
     36<item description="Centro Euro-Mediterraneo per i Cambiamenti Climatici, Bologna, Italy" isni="0000 0004 1761 0884" label="CMCC" title="CMCC" uid="b7270546-c9b1-11e5-8bd5-5404a60d96b5" url="www.cmcc.it"/> 
     37<item description="The First Institution of Oceanography,SOA,Qingdao,China" isni="" label="FIO" title="FIO" uid="b727099c-c9b1-11e5-8bd5-5404a60d96b5" url=""/> 
     38<item description="Institute of Atmospheric Physics, Chinese Academy of Sciences,Beijing,China" isni="" label="LASG-IAP" title="LASG-IAP" uid="b7270da2-c9b1-11e5-8bd5-5404a60d96b5" url=""/> 
     39<item description="National Institute of Meteorological Research, Seoul, South Korea" isni="" label="NIMR-KMA" title="NIMR-KMA" uid="b727116c-c9b1-11e5-8bd5-5404a60d96b5" url=""/> 
     40<item description="European Earth System Model" isni="" label="ICHEC" title="ICHEC" uid="b7271518-c9b1-11e5-8bd5-5404a60d96b5" url=""/> 
     41<item description="Center for Ocean-Land-Atmosphere Studies, Calverton, MD" isni="" label="COLA-CFS" title="COLA-CFS" uid="b72718d8-c9b1-11e5-8bd5-5404a60d96b5" url=""/> 
     42<item description="National Centers for Environmental Prediction, Camp Springs, MD" isni="" label="NOAA-NCEP" title="NOAA-NCEP" uid="b7271cca-c9b1-11e5-8bd5-5404a60d96b5" url=""/> 
    4143</institute> 
    42 <model class="vocab" id="cmip.drv.002" title="Model" uid="SECTION:model"> 
    43 <!-- <info srcType="dummy" srcRef="ptxt.py">Dummy entries</info> --> 
    44 <item description="" id="tmpid.0001" label="ACCESS" title=""/> 
    45 <item description="" id="tmpid.0002" label="AWI-CM" title=""/> 
    46 <item description="" id="tmpid.0003" label="BCC" title=""/> 
    47 <item description="" id="tmpid.0004" label="BESM" title=""/> 
    48 <item description="" id="tmpid.0005" label="BNU" title=""/> 
    49 <item description="" id="tmpid.0006" label="CAMS-CSM" title=""/> 
    50 <item description="" id="tmpid.0007" label="CanESM" title=""/> 
    51 <item description="" id="tmpid.0008" label="CAS-ESM" title=""/> 
    52 <item description="" id="tmpid.0009" label="CESM" title=""/> 
    53 <item description="" id="tmpid.0010" label="CESS-THU" title=""/> 
    54 <item description="" id="tmpid.0011" label="CMCC" title=""/> 
    55 <item description="" id="tmpid.0012" label="CNRM" title=""/> 
    56 <item description="" id="tmpid.0013" label="EC-Earth" title=""/> 
    57 <item description="" id="tmpid.0014" label="FGOALS" title=""/> 
    58 <item description="" id="tmpid.0015" label="FIO" title=""/> 
    59 <item description="" id="tmpid.0016" label="GFDL" title=""/> 
    60 <item description="" id="tmpid.0017" label="GISS" title=""/> 
    61 <item description="" id="tmpid.0018" label="IITM" title=""/> 
    62 <item description="" id="tmpid.0019" label="INM" title=""/> 
    63 <item description="" id="tmpid.0020" label="IPSL" title=""/> 
    64 <item description="" id="tmpid.0021" label="MIROC6-CGCM" title=""/> 
    65 <item description="" id="tmpid.0022" label="MIROC-ESM" title=""/> 
    66 <item description="" id="tmpid.0023" label="NICAM" title=""/> 
    67 <item description="" id="tmpid.0024" label="MPI-ESM" title=""/> 
    68 <item description="" id="tmpid.0025" label="MRI-ESM1-x" title=""/> 
    69 <item description="" id="tmpid.0026" label="MRI-AGCM3-xS" title=""/> 
    70 <item description="" id="tmpid.0027" label="NorESM" title=""/> 
    71 <item description="" id="tmpid.0028" label="NUIST-CSM" title=""/> 
    72 <item description="" id="tmpid.0029" label="UKESM" title=""/> 
    73 <item description="" id="tmpid.0030" label="HadGEM3" title=""/> 
    74 <item description="" id="tmpid.0031" label="KMA-ACE" title=""/> 
    75 <item description="" id="tmpid.0032" label="UKESM--KMA" title=""/> 
     44<model id="cmip.drv.002" label="model" title="Model" uid="SECTION:model" useClass="vocab"> 
     45<!-- <info srcType="dummy" srcRef="ptxt.py">Dummy entries</info> --> 
     46<item description="" label="ACCESS" title="" uid="b72910a2-c9b1-11e5-8bd5-5404a60d96b5"/> 
     47<item description="" label="AWI-CM" title="" uid="b72915ca-c9b1-11e5-8bd5-5404a60d96b5"/> 
     48<item description="" label="BCC" title="" uid="b7291926-c9b1-11e5-8bd5-5404a60d96b5"/> 
     49<item description="" label="BESM" title="" uid="b7291c50-c9b1-11e5-8bd5-5404a60d96b5"/> 
     50<item description="" label="BNU" title="" uid="b7291f7a-c9b1-11e5-8bd5-5404a60d96b5"/> 
     51<item description="" label="CAMS-CSM" title="" uid="b729229a-c9b1-11e5-8bd5-5404a60d96b5"/> 
     52<item description="" label="CanESM" title="" uid="b72925ba-c9b1-11e5-8bd5-5404a60d96b5"/> 
     53<item description="" label="CAS-ESM" title="" uid="b7292b5a-c9b1-11e5-8bd5-5404a60d96b5"/> 
     54<item description="" label="CESM" title="" uid="b7292e7a-c9b1-11e5-8bd5-5404a60d96b5"/> 
     55<item description="" label="CESS-THU" title="" uid="b72931a4-c9b1-11e5-8bd5-5404a60d96b5"/> 
     56<item description="" label="CMCC" title="" uid="b729349c-c9b1-11e5-8bd5-5404a60d96b5"/> 
     57<item description="" label="CNRM" title="" uid="b72937bc-c9b1-11e5-8bd5-5404a60d96b5"/> 
     58<item description="" label="EC-Earth" title="" uid="b7293ae6-c9b1-11e5-8bd5-5404a60d96b5"/> 
     59<item description="" label="FGOALS" title="" uid="b7293e1a-c9b1-11e5-8bd5-5404a60d96b5"/> 
     60<item description="" label="FIO" title="" uid="b7294112-c9b1-11e5-8bd5-5404a60d96b5"/> 
     61<item description="" label="GFDL" title="" uid="b7294428-c9b1-11e5-8bd5-5404a60d96b5"/> 
     62<item description="" label="GISS" title="" uid="b729475c-c9b1-11e5-8bd5-5404a60d96b5"/> 
     63<item description="" label="IITM" title="" uid="b7294a72-c9b1-11e5-8bd5-5404a60d96b5"/> 
     64<item description="" label="INM" title="" uid="b7294d9c-c9b1-11e5-8bd5-5404a60d96b5"/> 
     65<item description="" label="IPSL" title="" uid="b72950a8-c9b1-11e5-8bd5-5404a60d96b5"/> 
     66<item description="" label="MIROC6-CGCM" title="" uid="b72953b4-c9b1-11e5-8bd5-5404a60d96b5"/> 
     67<item description="" label="MIROC-ESM" title="" uid="b72956ca-c9b1-11e5-8bd5-5404a60d96b5"/> 
     68<item description="" label="NICAM" title="" uid="b72959e0-c9b1-11e5-8bd5-5404a60d96b5"/> 
     69<item description="" label="MPI-ESM" title="" uid="b7295ce2-c9b1-11e5-8bd5-5404a60d96b5"/> 
     70<item description="" label="MRI-ESM1-x" title="" uid="b7296002-c9b1-11e5-8bd5-5404a60d96b5"/> 
     71<item description="" label="MRI-AGCM3-xS" title="" uid="b729630e-c9b1-11e5-8bd5-5404a60d96b5"/> 
     72<item description="" label="NorESM" title="" uid="b729661a-c9b1-11e5-8bd5-5404a60d96b5"/> 
     73<item description="" label="NUIST-CSM" title="" uid="b729691c-c9b1-11e5-8bd5-5404a60d96b5"/> 
     74<item description="" label="UKESM1-N96ORCA1" title="" uid="b7296c50-c9b1-11e5-8bd5-5404a60d96b5"/> 
     75<item description="" label="UKESM1-N216ORCA025hybrid" title="" uid="b7296f5c-c9b1-11e5-8bd5-5404a60d96b5"/> 
     76<item description="" label="HadGEM3-GC3-N96ORCA025" title="" uid="b7297268-c9b1-11e5-8bd5-5404a60d96b5"/> 
     77<item description="" label="HadGEm3-GC3-N216ORCA025" title="" uid="b729a92c-c9b1-11e5-8bd5-5404a60d96b5"/> 
     78<item description="" label="KMA-ACE" title="" uid="b729ad1e-c9b1-11e5-8bd5-5404a60d96b5"/> 
     79<item description="" label="UKESM--KMA" title="" uid="b729b0d4-c9b1-11e5-8bd5-5404a60d96b5"/> 
    7680</model> 
    77 <physicsvers class="vocab" id="cmip.drv.003" title="Physics Version" uid="SECTION:physicsvers"> 
    78 <!-- <info srcType="dummy" srcRef="ptxt.py">Dummy entries</info> --> 
    79 <item description="dummyAt" id="001.003.001" label="example-01" title="dummy title string" uid="c2c151e8-6838-11e5-b0d3-5404a60d96b5"/> 
     81<physicsvers id="cmip.drv.003" label="physicsvers" title="Physics Version" uid="SECTION:physicsvers" useClass="vocab"> 
     82<!-- <info srcType="dummy" srcRef="ptxt.py">Dummy entries</info> --> 
     83<item description="dummyAt" id="001.003.001" label="example-01" title="dummy title string" uid="875dbb46-9385-11e5-ac84-5404a60d96b5"/> 
    8084</physicsvers> 
    81 <initialisationmethod class="vocab" id="cmip.drv.004" title="Initialisation Method" uid="SECTION:initialisationmethod"> 
    82 <!-- <info srcType="dummy" srcRef="ptxt.py">Dummy entries</info> --> 
    83 <item description="dummyAt" id="001.004.001" label="example-01" title="dummy title string" uid="c2c18a82-6838-11e5-b0d3-5404a60d96b5"/> 
     85<initialisationmethod id="cmip.drv.004" label="initialisationmethod" title="Initialisation Method" uid="SECTION:initialisationmethod" useClass="vocab"> 
     86<!-- <info srcType="dummy" srcRef="ptxt.py">Dummy entries</info> --> 
     87<item description="dummyAt" id="001.004.001" label="example-01" title="dummy title string" uid="875dfd54-9385-11e5-ac84-5404a60d96b5"/> 
    8488</initialisationmethod> 
    85 <modelComp class="vocab" id="cmip.drv.005" title="Model Components" uid="SECTION:modelComp"> 
    86 <!-- <info srcType="dummy" srcRef="ptxt.py">Dummy entries</info> --> 
    87 <item componentType="dummyAt" id="001.005.001" label="example-01" sizeH="dummyAt" sizeV="dummyAt" title="dummy title string" uid="c2c1c4a2-6838-11e5-b0d3-5404a60d96b5"/> 
     89<modelComp id="cmip.drv.005" label="modelComp" title="Model Components" uid="SECTION:modelComp" useClass="vocab"> 
     90<!-- <info srcType="dummy" srcRef="ptxt.py">Dummy entries</info> --> 
     91<item componentType="dummyAt" id="001.005.001" label="example-01" sizeH="dummyAt" sizeV="dummyAt" title="dummy title string" uid="875e3f12-9385-11e5-ac84-5404a60d96b5"/> 
    8892</modelComp> 
    89 <activity class="vocab" id="cmip.drv.006" title="Coordinating activity" uid="SECTION:activity"> 
    90 <!-- <info srcType="dummy" srcRef="ptxt.py">Dummy entries</info> --> 
    91 <item id="tmpid.0001" label="CMIP6" status="" title="Coupled Model Intercomparison Project, Phase 6" url="http://www.wcrp-climate.org/wgcm-cmip/wgcm-cmip6"/> 
    92 <item id="tmpid.0002" label="AerChemMIP" status="" title="Aerosols and Chemistry Model Intercomparison Project" url="https://wiki.met.no/aerocom/aerchemmip/start"/> 
    93 <item id="tmpid.0003" label="C4MIP" status="" title="Coupled Climate Carbon Cycle Model Intercomparison Project" url="http://c4mip.lsce.ipsl.fr/"/> 
    94 <item id="tmpid.0004" label="CFMIP" status="" title="Cloud Feedback Model Intercomparison Project" url="http://www.cfmip.net./"/> 
    95 <item id="tmpid.0005" label="DAMIP" status="" title="Detection and Attribution Model Intercomparison Project" url="http://www.wcrp-climate.org/modelling-wgcm-mip-catalogue/modelling-wgcm-mips/475-modelling-wgcm-damip"/> 
    96 <item id="tmpid.0006" label="DCPP" status="" title="Decadal Climate Prediction Project" url=""/> 
    97 <item id="tmpid.0007" label="FAFMIP" status="" title="Flux-Anomaly-Forced Model Intercomparison Project" url="http://www.met.reading.ac.uk/~jonathan/FAFMIP/"/> 
    98 <item id="tmpid.0008" label="GeoMIP" status="" title="Geoengineering Model Intercomparison Project" url=""/> 
    99 <item id="tmpid.0009" label="GMMIP" status="" title="Global Monsoons Model Intercomparison Project" url=""/> 
    100 <item id="tmpid.0010" label="HighResMIP" status="" title="High Resolution Model Intercomparison Project" url="https://dev.knmi.nl/projects/highresmip/wiki"/> 
    101 <item id="tmpid.0011" label="ISMIP6" status="" title="Ice Sheet Model Intercomparison Project for CMIP6" url=""/> 
    102 <item id="tmpid.0012" label="LS3MIP" status="" title="Land Surface, Snow and Soil Moisture MIP" url=""/> 
    103 <item id="tmpid.0013" label="LUMIP" status="" title="Land-Use Model Intercomparison Project" url=""/> 
    104 <item id="tmpid.0014" label="OMIP" status="" title="Ocean Model Intercomparison Project" url=""/> 
    105 <item id="tmpid.0015" label="PDRMIP" status="withdrawn" title="Precipitation Driver and Response Model Intercomparison Project" url=""/> 
    106 <item id="tmpid.0016" label="PMIP" status="" title="Palaeoclimate Modelling Intercomparison Project" url=""/> 
    107 <item id="tmpid.0017" label="RFMIP" status="" title="Radiative Forcing Model Intercomparison Project" url=""/> 
    108 <item id="tmpid.0018" label="ScenarioMIP" status="" title="Scenario Model Intercomparison Project" url=""/> 
    109 <item id="tmpid.0019" label="SolarMIP" status="merged with DAMIP" title="Solar Model Intercomparison Project" url=""/> 
    110 <item id="tmpid.0020" label="VolMIP" status="" title="Volcanic Forcings Model Intercomparison Project" url=""/> 
    111 <item id="tmpid.0021" label="CORDEX" status="Diagnostic" title="" url=""/> 
    112 <item id="tmpid.0022" label="DynVar" status="Diagnostic" title="" url=""/> 
    113 <item id="tmpid.0023" label="SIMIP" status="Diagnostic" title="" url=""/> 
    114 <item id="tmpid.0024" label="VIACS AB" status="Diagnostic" title="" url=""/> 
     93<activity id="cmip.drv.006" label="activity" title="Coordinating activity" uid="SECTION:activity" useClass="vocab"> 
     94<!-- <info srcType="dummy" srcRef="ptxt.py">Dummy entries</info> --> 
     95<item label="CMIP6" project="CMIP" status="" title="Coupled Model Intercomparison Project, Phase 6" uid="b72811e8-c9b1-11e5-8bd5-5404a60d96b5" url="http://www.wcrp-climate.org/wgcm-cmip/wgcm-cmip6"/> 
     96<item label="AerChemMIP" project="Aerocom CCMI" status="" title="Aerosols and Chemistry Model Intercomparison Project" uid="b72815ee-c9b1-11e5-8bd5-5404a60d96b5" url="https://wiki.met.no/aerocom/aerchemmip/start"/> 
     97<item label="C4MIP" project="" status="" title="Coupled Climate Carbon Cycle Model Intercomparison Project" uid="b72819b8-c9b1-11e5-8bd5-5404a60d96b5" url="http://c4mip.lsce.ipsl.fr/"/> 
     98<item label="CFMIP" project="" status="" title="Cloud Feedback Model Intercomparison Project" uid="b7281fda-c9b1-11e5-8bd5-5404a60d96b5" url="http://www.cfmip.net/"/> 
     99<item label="DAMIP" project="" status="" title="Detection and Attribution Model Intercomparison Project" uid="b72823ea-c9b1-11e5-8bd5-5404a60d96b5" url="http://www.wcrp-climate.org/modelling-wgcm-mip-catalogue/modelling-wgcm-mips/475-modelling-wgcm-damip"/> 
     100<item label="DCPP" project="DCP" status="" title="Decadal Climate Prediction Project" uid="b72827be-c9b1-11e5-8bd5-5404a60d96b5" url=""/> 
     101<item label="FAFMIP" project="" status="" title="Flux-Anomaly-Forced Model Intercomparison Project" uid="b7282c1e-c9b1-11e5-8bd5-5404a60d96b5" url="http://www.met.reading.ac.uk/~jonathan/FAFMIP/"/> 
     102<item label="GeoMIP" project="" status="" title="Geoengineering Model Intercomparison Project" uid="b728304c-c9b1-11e5-8bd5-5404a60d96b5" url="http://climate.envsci.rutgers.edu/GeoMIP/index.html"/> 
     103<item label="GMMIP" project="" status="" title="Global Monsoons Model Intercomparison Project" uid="b7283402-c9b1-11e5-8bd5-5404a60d96b5" url="http://www.met.reading.ac.uk/~sws05agt/MonsoonMIP/"/> 
     104<item label="HighResMIP" project="" status="" title="High Resolution Model Intercomparison Project" uid="b72837a4-c9b1-11e5-8bd5-5404a60d96b5" url="https://dev.knmi.nl/projects/highresmip/wiki"/> 
     105<item label="ISMIP6" project="" status="" title="Ice Sheet Model Intercomparison Project for CMIP6" uid="b7283b6e-c9b1-11e5-8bd5-5404a60d96b5" url="http://www.climate-cryosphere.org/activities/targeted/ismip6"/> 
     106<item label="LS3MIP" project="" status="" title="Land Surface, Snow and Soil Moisture MIP" uid="b7283f38-c9b1-11e5-8bd5-5404a60d96b5" url=""/> 
     107<item label="LUMIP" project="" status="" title="Land-Use Model Intercomparison Project" uid="b72845e6-c9b1-11e5-8bd5-5404a60d96b5" url=""/> 
     108<item label="OMIP" project="" status="" title="Ocean Model Intercomparison Project" uid="b72849ba-c9b1-11e5-8bd5-5404a60d96b5" url=""/> 
     109<item label="PDRMIP" project="" status="withdrawn" title="Precipitation Driver and Response Model Intercomparison Project" uid="b7284d66-c9b1-11e5-8bd5-5404a60d96b5" url=""/> 
     110<item label="PMIP" project="PMIP" status="" title="Palaeoclimate Modelling Intercomparison Project" uid="b7285158-c9b1-11e5-8bd5-5404a60d96b5" url=""/> 
     111<item label="RFMIP" project="" status="" title="Radiative Forcing Model Intercomparison Project" uid="b728554a-c9b1-11e5-8bd5-5404a60d96b5" url=""/> 
     112<item label="ScenarioMIP" project="" status="" title="Scenario Model Intercomparison Project" uid="b728591e-c9b1-11e5-8bd5-5404a60d96b5" url=""/> 
     113<item label="SolarMIP" project="" status="merged with DAMIP" title="Solar Model Intercomparison Project" uid="b7285cb6-c9b1-11e5-8bd5-5404a60d96b5" url=""/> 
     114<item label="VolMIP" project="" status="" title="Volcanic Forcings Model Intercomparison Project" uid="b728606c-c9b1-11e5-8bd5-5404a60d96b5" url=""/> 
     115<item label="CORDEX" project="CORDEX" status="Diagnostic" title="Coordinated Regional Downscaling Experiment (CORDEX)" uid="b72866a2-c9b1-11e5-8bd5-5404a60d96b5" url=""/> 
     116<item label="DynVar" project="DynVar" status="Diagnostic" title="Modelling the Dynamics and Variability of the Stratosphere-Troposphere System" uid="b7286a76-c9b1-11e5-8bd5-5404a60d96b5" url="http://www.sparcdynvar.org/models-data/"/> 
     117<item label="SIMIP" project="" status="Diagnostic" title="Sea Ice Model Intercomparison Project" uid="b7286e22-c9b1-11e5-8bd5-5404a60d96b5" url="http://gaim.unh.edu/Structure/Future/MIPs/SIMIP.html"/> 
     118<item label="VIACSAB" project="" status="Diagnostic" title="Vulnerability, Impacts, Adaptation, and Climate Services Advisory Board (VIACS AB)" uid="b72871c4-c9b1-11e5-8bd5-5404a60d96b5" url=""/> 
     119<item label="SPECS" project="" status="" title="Sesonal-to-decadal climate Prediction for the improvement of European Climate Services" uid="b7287598-c9b1-11e5-8bd5-5404a60d96b5" url="http://www.specs-fp7.eu/"/> 
     120<item label="CCMI" project="" status="" title="Chemistry-Climate Model Initiative" uid="b7287c00-c9b1-11e5-8bd5-5404a60d96b5" url="http://www.met.reading.ac.uk/ccmi/"/> 
     121<item label="CMIP5" project="CMIP" status="" title="Coupled Model Intercomparison Project, Phase 5" uid="b72880a6-c9b1-11e5-8bd5-5404a60d96b5" url=""/> 
    115122</activity> 
    116 <product class="vocab" id="cmip.drv.007" title="Data product" uid="SECTION:product"> 
    117 <!-- <info srcType="dummy" srcRef="ptxt.py">Dummy entries</info> --> 
    118 <item id="001.007.001" label="example-01" title="dummy title string" uid="c2c1d262-6838-11e5-b0d3-5404a60d96b5"/> 
     123<product id="cmip.drv.007" label="product" title="Data product" uid="SECTION:product" useClass="vocab"> 
     124<!-- <info srcType="dummy" srcRef="ptxt.py">Dummy entries</info> --> 
     125<item id="001.007.001" label="example-01" title="dummy title string" uid="875e4f2a-9385-11e5-ac84-5404a60d96b5"/> 
    119126</product> 
    120 <experiment class="vocab" id="cmip.drv.008" title="Numerical Experiment" uid="SECTION:experiment"> 
    121 <!-- <info srcType="dummy" srcRef="ptxt.py">Dummy entries</info> --> 
    122 <item altLabel="dummyAt" description="dummyAt" id="001.008.001" label="example-01" sponsor="dummyAt" title="dummy title string" uid="c2c1d744-6838-11e5-b0d3-5404a60d96b5" url="dummyAt"/> 
     127<experiment id="cmip.drv.008" label="experiment" title="Numerical Experiment" uid="SECTION:experiment" useClass="vocab"> 
     128<!-- <info srcType="dummy" srcRef="ptxt.py">Dummy entries</info> --> 
     129<item altLabel="dummyAt" description="dummyAt" id="001.008.001" label="example-01" sponsor="dummyAt" title="dummy title string" uid="875e54ac-9385-11e5-ac84-5404a60d96b5" url="dummyAt"/> 
    123130</experiment> 
    124 <frequency class="vocab" id="cmip.drv.009" title="Temporal frequency of data values" uid="SECTION:frequency"> 
    125 <!-- <info srcType="dummy" srcRef="ptxt.py">Dummy entries</info> --> 
    126 <item id="tmpid.0001" iso="P1Y" label="yr" title="Annual"/> 
    127 <item id="tmpid.0002" iso="P1M" label="monClim" title="Monthly climatology"/> 
    128 <item id="tmpid.0003" iso="P1M" label="mon" title="Monthly"/> 
    129 <item id="tmpid.0004" iso="P1D" label="day" title="Daily"/> 
    130 <item id="tmpid.0005" iso="PT6H" label="6hr" title="6-hourly"/> 
    131 <item id="tmpid.0006" iso="PT3H" label="3hr" title="3-hourly"/> 
    132 <item id="tmpid.0007" iso="PT1H" label="hr" title="Hourly"/> 
    133 <item id="tmpid.0008" iso="" label="subhr" title="Sub-hourly"/> 
     131<frequency id="cmip.drv.009" label="frequency" title="Temporal frequency of data values" uid="SECTION:frequency" useClass="vocab"> 
     132<!-- <info srcType="dummy" srcRef="ptxt.py">Dummy entries</info> --> 
     133<item isClimatology="0" iso="P1Y" label="yr" title="Annual" uid="b72744ca-c9b1-11e5-8bd5-5404a60d96b5"/> 
     134<item isClimatology="1" iso="P1M" label="monClim" title="Monthly climatology" uid="b727484e-c9b1-11e5-8bd5-5404a60d96b5"/> 
     135<item isClimatology="0" iso="P1M" label="mon" title="Monthly" uid="b7274b96-c9b1-11e5-8bd5-5404a60d96b5"/> 
     136<item isClimatology="0" iso="P1D" label="day" title="Daily" uid="b7274ed4-c9b1-11e5-8bd5-5404a60d96b5"/> 
     137<item isClimatology="0" iso="PT6H" label="6hr" title="6-hourly" uid="b7275294-c9b1-11e5-8bd5-5404a60d96b5"/> 
     138<item isClimatology="0" iso="PT3H" label="3hr" title="3-hourly" uid="b72755d2-c9b1-11e5-8bd5-5404a60d96b5"/> 
     139<item isClimatology="0" iso="PT1H" label="hr" title="Hourly" uid="b7275942-c9b1-11e5-8bd5-5404a60d96b5"/> 
     140<item isClimatology="0" iso="" label="subhr" title="Sub-hourly" uid="b7275f14-c9b1-11e5-8bd5-5404a60d96b5"/> 
    134141</frequency> 
    135 <realm class="vocab" id="cmip.drv.010" title="Modeling realm" uid="SECTION:realm"> 
    136 <!-- <info srcType="dummy" srcRef="ptxt.py">Dummy entries</info> --> 
    137 <item id="tmpid.0001" label="atmos" title="Atmospheric"/> 
    138 <item id="tmpid.0002" label="ocean" title="Oceanic"/> 
    139 <item id="tmpid.0003" label="land" title="Land"/> 
    140 <item id="tmpid.0004" label="landIce" title="Terrestrial cryosphere"/> 
    141 <item id="tmpid.0005" label="seaIce" title="Marine cryosphere"/> 
    142 <item id="tmpid.0006" label="aerosol" title="Aerosols"/> 
    143 <item id="tmpid.0007" label="atmosChem" title="Atmospheric chemistry"/> 
    144 <item id="tmpid.0008" label="ocnBgchem" title="Ocean bio-geochemistry"/> 
     142<realm id="cmip.drv.010" label="realm" title="Modeling realm" uid="SECTION:realm" useClass="vocab"> 
     143<!-- <info srcType="dummy" srcRef="ptxt.py">Dummy entries</info> --> 
     144<item label="atmos" title="Atmospheric" uid="b725193e-c9b1-11e5-8bd5-5404a60d96b5"/> 
     145<item label="ocean" title="Oceanic" uid="b7256240-c9b1-11e5-8bd5-5404a60d96b5"/> 
     146<item label="land" title="Land" uid="b725afe8-c9b1-11e5-8bd5-5404a60d96b5"/> 
     147<item label="landIce" title="Terrestrial cryosphere" uid="b725b97a-c9b1-11e5-8bd5-5404a60d96b5"/> 
     148<item label="seaIce" title="Marine cryosphere" uid="b725bcd6-c9b1-11e5-8bd5-5404a60d96b5"/> 
     149<item label="aerosol" title="Aerosols" uid="b725bfce-c9b1-11e5-8bd5-5404a60d96b5"/> 
     150<item label="atmosChem" title="Atmospheric chemistry" uid="b725c2bc-c9b1-11e5-8bd5-5404a60d96b5"/> 
     151<item label="ocnBgchem" title="Ocean bio-geochemistry" uid="b725c5a0-c9b1-11e5-8bd5-5404a60d96b5"/> 
    145152</realm> 
    146 <grid class="vocab" id="cmip.drv.011" title="Native grid" uid="SECTION:grid"> 
    147 <!-- <info srcType="dummy" srcRef="ptxt.py">Dummy entries</info> --> 
    148 <item id="tmpid.0001" label="atmosphere" title="Atmosphere grid"/> 
    149 <item id="tmpid.0002" label="ocean" title="Ocean grid"/> 
    150 <item id="tmpid.0003" label="ice" title="Grid used for ice sheets"/> 
    151 <item id="tmpid.0004" label="land" title="Grid used for land surface modelling"/> 
     153<grid id="cmip.drv.011" label="grid" title="Native grid" uid="SECTION:grid" useClass="vocab"> 
     154<!-- <info srcType="dummy" srcRef="ptxt.py">Dummy entries</info> --> 
     155<item label="atmosphere" title="Atmosphere grid" uid="b7276752-c9b1-11e5-8bd5-5404a60d96b5"/> 
     156<item label="ocean" title="Ocean grid" uid="b7276a9a-c9b1-11e5-8bd5-5404a60d96b5"/> 
     157<item label="ice" title="Grid used for ice sheets" uid="b7276d42-c9b1-11e5-8bd5-5404a60d96b5"/> 
     158<item label="land" title="Grid used for land surface modelling" uid="b7276fea-c9b1-11e5-8bd5-5404a60d96b5"/> 
    152159</grid> 
    153 <dimensions class="vocab" id="cmip.drv.012" title="MIP table variable dimensions" uid="SECTION:dimensions"> 
    154 <!-- <info srcType="dummy" srcRef="ptxt.py">Dummy entries</info> --> 
    155 <item altLabel="dummyAt" id="001.012.001" label="example01" size="25" sn="dummyAt" title="dummy title string" uid="c2c1e54a-6838-11e5-b0d3-5404a60d96b5"/> 
     160<dimensions id="cmip.drv.012" label="dimensions" title="MIP table variable dimensions" uid="SECTION:dimensions" useClass="vocab"> 
     161<!-- <info srcType="dummy" srcRef="ptxt.py">Dummy entries</info> --> 
     162<item altLabel="dummyAt" id="001.012.001" label="example01" size="25" sn="dummyAt" title="dummy title string" uid="875e65c8-9385-11e5-ac84-5404a60d96b5"/> 
    156163</dimensions> 
    157 <forcings class="vocab" id="cmip.drv.013" title="Forcing" uid="SECTION:forcings"> 
    158 <!-- <info srcType="dummy" srcRef="ptxt.py">Dummy entries</info> --> 
    159 <item id="001.013.001" label="example-01" title="dummy title string" uid="c2c1e95a-6838-11e5-b0d3-5404a60d96b5"/> 
     164<forcings id="cmip.drv.013" label="forcings" title="Forcing" uid="SECTION:forcings" useClass="vocab"> 
     165<!-- <info srcType="dummy" srcRef="ptxt.py">Dummy entries</info> --> 
     166<item id="001.013.001" label="example-01" title="dummy title string" uid="875e6924-9385-11e5-ac84-5404a60d96b5"/> 
    160167</forcings> 
    161 <table class="vocab" id="cmip.drv.014" title="Data specification table" uid="SECTION:table"> 
    162 <!-- <info srcType="dummy" srcRef="ptxt.py">Dummy entries</info> --> 
    163 <item comment="" description="Definitions of all the coordinate variables used in the CMIP6 data request" frequency="fx" id="tmpid.0001" label="grids" title="Fixed coordinate variables"/> 
    164 <item comment="" description="Variables with no time dependency" frequency="fx" id="tmpid.0002" label="fx" title="Fixed variables"/> 
    165 <item comment="&quot;ocean&quot; as in &quot;ocean grid&quot;" description="Annual mean variables on the ocean grid." frequency="yr" id="tmpid.0003" label="Oyr" title="Annual ocean variables"/> 
    166 <item comment="For CMIP5 there was &quot;Oclim&quot; for ocean climatologies, and atmospheric climatologies were in Amon. Moving Atmospheric climatologies to Clim gives us a strict hierarchy with a single &quot;frequency&quot; in each table." description="Monthly Mean Climatology" frequency="monClim" id="tmpid.0004" label="Clim" title="Monthly climatologies"/> 
    167 <item comment="" description="Monthly Mean Ocean Fields, Including Biogechemical Field" frequency="mon" id="tmpid.0005" label="Omon" title="Monthly ocean variables"/> 
    168 <item comment="See comment on ts: http://dreq01.vanillaforums.com/discussion/29/surface-temperature?new=1" description="Monthly Mean Atmospheric Fields and Some Surface Field" frequency="mon" id="tmpid.0006" label="Amon" title="Montly atmospheric variables (excluding composition and radiation)"/> 
    169 <item comment="" description="Monthly Mean Land Cryosphere Fields" frequency="mon" id="tmpid.0007" label="LImon" title="Monthly land ice"/> 
    170 <item comment="&quot;land&quot; as in &quot;land grid&quot; -- not including variables on atmospheric grid requested for analysis of land processes" description="Monthly Mean Land Fields, Including Physical, Vegetation, Soil, and Biogeochemical Variables" frequency="mon" id="tmpid.0008" label="Lmon" title="Monthly land variables"/> 
    171 <item comment="" description="Monthly Mean Ocean Cryosphere Fields" frequency="mon" id="tmpid.0009" label="OImon" title="Sea-ice"/> 
    172 <item comment="Used in CMIP5; not requested by CfMIP in CMIP6, but, provisionally, by HighResMIP" description="Monthly Offline Cloud Diagnostic Fields" frequency="mon" id="tmpid.0010" label="cfOff" title="Offline diagnostics for cloud forcing analysis"/> 
    173 <item comment="Contains radiative fields from cfMon; some duplication with Amon " description="" frequency="mon" id="tmpid.0011" label="Rmon" title="Monthly atmospheric radiation data"/> 
    174 <item comment="" description="Monthly atmospheric composition, including aerosols and properties of aerosols (but see Rmon for radiation quantities)" frequency="mon" id="tmpid.0012" label="Cmon" title="Monthly Atmospheric Composition Data"/> 
    175 <item comment="" description="Daily Mean Atmosphere, Ocean and Surface Fields" frequency="day" id="tmpid.0013" label="Oday" title="Daily  ocean data"/> 
    176 <item comment="" description="" frequency="" id="tmpid.0014" label="Aday" title="Daily atmospheric data, excluding composition and cloud forcing"/> 
    177 <item comment="Formerly &quot;aero&quot;" description="" frequency="day" id="tmpid.0015" label="Cday" title="Daily atmospheric composition data"/> 
    178 <item comment="" description="" frequency="" id="tmpid.0016" label="cfDay" title="Daily data associated with cloud forcing"/> 
    179 <item comment="" description="Fields (Sampled Every 6 Hours) for Driving Regional Models " frequency="6hr" id="tmpid.0017" label="6hrLev" title="6-hourly atmospheric data on model levels"/> 
    180 <item comment="Only 3 levels in CMIP5, more levels requested in CMIP6 by HighResMIP (low priority)" description="Fields (Sampled Every 6 Hours) for Storm-Track Analysis and other Advanced Diagnostic Applications" frequency="6hr" id="tmpid.0018" label="6hrPlev" title="6-hourly atmospheric data on pressure levels"/> 
    181 <item comment="CMIP5 had two MIP tables at 3hr frequency, &quot;3hr&quot; and &quot;cf3hr&quot;. In some cases variables were requested as instantaneous in one and accumulated in the other. Making two tables with clear definitions should make it easier to see what is going on." description="" frequency="3hr" id="tmpid.0019" label="3hrPoint" title="3-hourly data, instantaenous fields"/> 
    182 <item comment="" description="Atmospheric and Surface Fields Sampled Every 3 Hours" frequency="3hr" id="tmpid.0020" label="3hrAcc" title="3-hourly data, accumulated fields"/> 
    183 <item comment="New -- part of HighResMIP request." description="" frequency="1hr" id="tmpid.0021" label="1hr" title=""/> 
    184 <item comment="Includes cfsites and data for highresmip" description="" frequency="subhr" id="tmpid.0022" label="subhr" title=""/> 
     168<table id="cmip.drv.014" label="table" title="Data specification table" uid="SECTION:table" useClass="vocab"> 
     169<!-- <info srcType="dummy" srcRef="ptxt.py">Dummy entries</info> --> 
     170<item comment="" description="Definitions of all the coordinate variables used in the CMIP6 data request" frequency="fx" label="grids" title="Fixed coordinate variables" uid="b7289d48-c9b1-11e5-8bd5-5404a60d96b5"/> 
     171<item comment="" description="Variables with no time dependency" frequency="fx" label="fx" title="Fixed variables" uid="b728a18a-c9b1-11e5-8bd5-5404a60d96b5"/> 
     172<item comment="&quot;ocean&quot; as in &quot;ocean grid&quot;" description="Annual mean variables on the ocean grid." frequency="yr" label="Oyr" title="Annual ocean variables" uid="b728a84c-c9b1-11e5-8bd5-5404a60d96b5"/> 
     173<item comment="For CMIP5 there was &quot;Oclim&quot; for ocean climatologies, and atmospheric climatologies were in Amon. Moving Atmospheric climatologies to Clim gives us a strict hierarchy with a single &quot;frequency&quot; in each table." description="Monthly Mean Climatology" frequency="monClim" label="Clim" title="Monthly climatologies" uid="b728ac2a-c9b1-11e5-8bd5-5404a60d96b5"/> 
     174<item comment="" description="Monthly Mean Ocean Fields, Including Biogechemical Field" frequency="mon" label="Omon" title="Monthly ocean variables" uid="b728affe-c9b1-11e5-8bd5-5404a60d96b5"/> 
     175<item comment="See comment on ts: http://dreq01.vanillaforums.com/discussion/29/surface-temperature?new=1" description="Monthly Mean Atmospheric Fields and Some Surface Field" frequency="mon" label="Amon" title="Montly atmospheric variables (excluding composition and radiation)" uid="b728b3e6-c9b1-11e5-8bd5-5404a60d96b5"/> 
     176<item comment="" description="Monthly Mean Land Cryosphere Fields" frequency="mon" label="LImon" title="Monthly land ice" uid="b728b79c-c9b1-11e5-8bd5-5404a60d96b5"/> 
     177<item comment="&quot;land&quot; as in &quot;land grid&quot; -- not including variables on atmospheric grid requested for analysis of land processes" description="Monthly Mean Land Fields, Including Physical, Vegetation, Soil, and Biogeochemical Variables" frequency="mon" label="Lmon" title="Monthly land variables" uid="b728bb52-c9b1-11e5-8bd5-5404a60d96b5"/> 
     178<item comment="" description="Monthly Mean Ocean Cryosphere Fields" frequency="mon" label="OImon" title="Sea-ice" uid="b728beea-c9b1-11e5-8bd5-5404a60d96b5"/> 
     179<item comment="Used in CMIP5; not requested by CfMIP in CMIP6, but, provisionally, by HighResMIP" description="Monthly Offline Cloud Diagnostic Fields" frequency="mon" label="cfOff" title="Offline diagnostics for cloud forcing analysis" uid="b728c296-c9b1-11e5-8bd5-5404a60d96b5"/> 
     180<item comment="Contains radiative fields from cfMon; some duplication with Amon " description="" frequency="mon" label="Rmon" title="Monthly atmospheric radiation data" uid="b728c930-c9b1-11e5-8bd5-5404a60d96b5"/> 
     181<item comment="" description="Monthly atmospheric composition, including aerosols and properties of aerosols (but see Rmon for radiation quantities)" frequency="mon" label="Cmon" title="Monthly Atmospheric Composition Data" uid="b728ccfa-c9b1-11e5-8bd5-5404a60d96b5"/> 
     182<item comment="" description="Daily Mean Atmosphere, Ocean and Surface Fields" frequency="day" label="Oday" title="Daily  ocean data" uid="b728d09c-c9b1-11e5-8bd5-5404a60d96b5"/> 
     183<item comment="" description="" frequency="" label="Aday" title="Daily atmospheric data, excluding composition and cloud forcing" uid="b728d47a-c9b1-11e5-8bd5-5404a60d96b5"/> 
     184<item comment="Formerly &quot;aero&quot;" description="" frequency="day" label="Cday" title="Daily atmospheric composition data" uid="b728d830-c9b1-11e5-8bd5-5404a60d96b5"/> 
     185<item comment="" description="" frequency="" label="cfDay" title="Daily data associated with cloud forcing" uid="b728dbd2-c9b1-11e5-8bd5-5404a60d96b5"/> 
     186<item comment="" description="Fields (Sampled Every 6 Hours) for Driving Regional Models " frequency="6hr" label="6hrLev" title="6-hourly atmospheric data on model levels" uid="b728df88-c9b1-11e5-8bd5-5404a60d96b5"/> 
     187<item comment="Only 3 levels in CMIP5, more levels requested in CMIP6 by HighResMIP (low priority)" description="Fields (Sampled Every 6 Hours) for Storm-Track Analysis and other Advanced Diagnostic Applications" frequency="6hr" label="6hrPlev" title="6-hourly atmospheric data on pressure levels" uid="b728e32a-c9b1-11e5-8bd5-5404a60d96b5"/> 
     188<item comment="CMIP5 had two MIP tables at 3hr frequency, &quot;3hr&quot; and &quot;cf3hr&quot;. In some cases variables were requested as instantaneous in one and accumulated in the other. Making two tables with clear definitions should make it easier to see what is going on." description="" frequency="3hr" label="3hrPoint" title="3-hourly data, instantaenous fields" uid="b728e6f4-c9b1-11e5-8bd5-5404a60d96b5"/> 
     189<item comment="" description="Atmospheric and Surface Fields Sampled Every 3 Hours" frequency="3hr" label="3hrAcc" title="3-hourly data, accumulated fields" uid="b728ea96-c9b1-11e5-8bd5-5404a60d96b5"/> 
     190<item comment="New -- part of HighResMIP request." description="" frequency="1hr" label="1hr" title="" uid="b728ee24-c9b1-11e5-8bd5-5404a60d96b5"/> 
     191<item comment="Includes cfsites and data for highresmip" description="" frequency="subhr" label="subhr" title="" uid="b728f1da-c9b1-11e5-8bd5-5404a60d96b5"/> 
    185192</table> 
    186 <cref class="vocab" id="cmip.drv.015" title="Coordinate Reference" uid="SECTION:cref"> 
    187 <!-- <info srcType="dummy" srcRef="ptxt.py">Dummy entries</info> --> 
    188 <item id="001.015.001" label="example-01" title="dummy title string" uid="c2c1f0c6-6838-11e5-b0d3-5404a60d96b5"/> 
     193<cref id="cmip.drv.015" label="cref" title="Coordinate Reference" uid="SECTION:cref" useClass="vocab"> 
     194<!-- <info srcType="dummy" srcRef="ptxt.py">Dummy entries</info> --> 
     195<item id="001.015.001" label="example-01" title="dummy title string" uid="875e716c-9385-11e5-ac84-5404a60d96b5"/> 
    189196</cref> 
    190 <areaType class="vocab" id="cmip.drv.016" title="CMIP Area Type" uid="SECTION:areaType"> 
    191 <!-- <info srcType="dummy" srcRef="ptxt.py">Dummy entries</info> --> 
    192 <item id="001.016.001" inCF="dummyAt" label="example-01" title="dummy title string" uid="c2c1f422-6838-11e5-b0d3-5404a60d96b5"/> 
     197<areaType id="cmip.drv.016" label="areaType" title="CMIP Area Type" uid="SECTION:areaType" useClass="vocab"> 
     198<!-- <info srcType="dummy" srcRef="ptxt.py">Dummy entries</info> --> 
     199<item id="001.016.001" inCF="dummyAt" label="example-01" title="dummy title string" uid="875e74f0-9385-11e5-ac84-5404a60d96b5"/> 
    193200</areaType> 
    194 <timeSlice class="vocab" id="cmip.drv.017" title="Time slices used in data request" uid="SECTION:timeSlice"> 
    195 <!-- <info srcType="dummy" srcRef="ptxt.py">Dummy entries</info> --> 
    196 <item id="001.017.001" label="example-01" specification="dummyAt" title="dummy title string" type="dummyAt" uid="c2c1f7d8-6838-11e5-b0d3-5404a60d96b5"/> 
     201<timeSlice id="cmip.drv.017" label="timeSlice" title="Time slices used in data request" uid="SECTION:timeSlice" useClass="vocab"> 
     202<!-- <info srcType="dummy" srcRef="ptxt.py">Dummy entries</info> --> 
     203<item end="2020.0" label="DAMIP42" nyears="42.0" sliceLen="" start="1979.0" step="" title="DAMIP 42 year" type="simpleRange" uid="b727df0c-c9b1-11e5-8bd5-5404a60d96b5"/> 
     204<item end="2020.0" label="DAMIP18" nyears="18.0" sliceLen="" start="1850.0" step="10.0" title="DAMIP 18 sample years" type="yearList" uid="b727e466-c9b1-11e5-8bd5-5404a60d96b5"/> 
     205<item end="2020.0" label="DAMIP61" nyears="61.0" sliceLen="" start="1960.0" step="" title="DAMIP 42 year" type="simpleRange" uid="b727e952-c9b1-11e5-8bd5-5404a60d96b5"/> 
     206<item end="2100.0" label="DAMIP8" nyears="18.0" sliceLen="" start="2030.0" step="10.0" title="DAMIP 8 sample years" type="yearList" uid="b727ee3e-c9b1-11e5-8bd5-5404a60d96b5"/> 
     207<item end="2100.0" label="DAMIP40" nyears="40.0" sliceLen="20.0" start="2026.0" step="75.0" title="DAMIP 20 year slices" type="sliceList" uid="b727f33e-c9b1-11e5-8bd5-5404a60d96b5"/> 
     208<item end="2100.0" label="DAMIP20" nyears="20.0" sliceLen="" start="2081.0" step="" title="DAMIP 20 year" type="simpleRange" uid="b727f82a-c9b1-11e5-8bd5-5404a60d96b5"/> 
    197209</timeSlice> 
    198 <modelFamily class="vocab" id="cmip.drv.018" title="Family of model" uid="SECTION:modelFamily"> 
    199 <!-- <info srcType="dummy" srcRef="ptxt.py">Dummy entries</info> --> 
    200 <item id="001.018.001" label="example-01" title="dummy title string" uid="c2c1fac6-6838-11e5-b0d3-5404a60d96b5"/> 
     210<modelFamily id="cmip.drv.018" label="modelFamily" title="Family of model" uid="SECTION:modelFamily" useClass="vocab"> 
     211<!-- <info srcType="dummy" srcRef="ptxt.py">Dummy entries</info> --> 
     212<item id="001.018.001" label="example-01" title="dummy title string" uid="875e7eaa-9385-11e5-ac84-5404a60d96b5"/> 
    201213</modelFamily> 
    202 <priority class="vocab" id="cmip.drv.019" title="Variable priority" uid="SECTION:priority"> 
    203 <!-- <info srcType="dummy" srcRef="ptxt.py">Dummy entries</info> --> 
    204 <item description="Modelling centres must commit to supplying all priority 1 variables associated with at least one science question for Tier 1 experiments of any MIP which they participate in;" id="tmpid.0001" label="1.0" title="High"/> 
    205 <item description="Expected to be used in multi-model diagnostics; models not supplying these variables may be omitted from some parts of the inter-comparison;" id="tmpid.0002" label="3.0" title="Medium"/> 
    206 <item description="Experimental -- used for exploring new capabilities and/or unlikely to be used in multi-model diagnostic." id="tmpid.0003" label="3.0" title="Low"/> 
     214<priority id="cmip.drv.019" label="priority" title="Variable priority" uid="SECTION:priority" useClass="vocab"> 
     215<!-- <info srcType="dummy" srcRef="ptxt.py">Dummy entries</info> --> 
     216<item description="Modelling centres must commit to supplying all priority 1 variables associated with at least one science question for Tier 1 experiments of any MIP which they participate in;" label="1.0" title="High" uid="b7267702-c9b1-11e5-8bd5-5404a60d96b5"/> 
     217<item description="Expected to be used in multi-model diagnostics; models not supplying these variables may be omitted from some parts of the inter-comparison;" label="3.0" title="Medium" uid="b7267aae-c9b1-11e5-8bd5-5404a60d96b5"/> 
     218<item description="Experimental -- used for exploring new capabilities and/or unlikely to be used in multi-model diagnostic." label="3.0" title="Low" uid="b7267dc4-c9b1-11e5-8bd5-5404a60d96b5"/> 
    207219</priority> 
    208 <qcLevel class="vocab" id="cmip.drv.020" title="Quality control level" uid="SECTION:qcLevel"> 
    209 <!-- <info srcType="dummy" srcRef="ptxt.py">Dummy entries</info> --> 
    210 <item id="001.020.001" label="1" title="dummy title string" uid="c2c200fc-6838-11e5-b0d3-5404a60d96b5"/> 
     220<qcLevel id="cmip.drv.020" label="qcLevel" title="Quality control level" uid="SECTION:qcLevel" useClass="vocab"> 
     221<!-- <info srcType="dummy" srcRef="ptxt.py">Dummy entries</info> --> 
     222<item id="001.020.001" label="1" title="dummy title string" uid="875e853a-9385-11e5-ac84-5404a60d96b5"/> 
    211223</qcLevel> 
    212 <complianceCode class="vocab" id="cmip.drv.021" title="Data specification compliance codes" uid="SECTION:complianceCode"> 
    213 <!-- <info srcType="dummy" srcRef="ptxt.py">Dummy entries</info> --> 
    214 <item id="001.021.001" label="example-01" title="dummy title string" uid="c2c203e0-6838-11e5-b0d3-5404a60d96b5"/> 
     224<complianceCode id="cmip.drv.021" label="complianceCode" title="Data specification compliance codes" uid="SECTION:complianceCode" useClass="vocab"> 
     225<!-- <info srcType="dummy" srcRef="ptxt.py">Dummy entries</info> --> 
     226<item id="001.021.001" label="example-01" title="dummy title string" uid="875e8850-9385-11e5-ac84-5404a60d96b5"/> 
    215227</complianceCode> 
    216 <glossary class="vocab" id="cmip.drv.022" title="Glossary" uid="SECTION:glossary"> 
    217 <!-- <info srcType="dummy" srcRef="ptxt.py">Dummy entries</info> --> 
    218 <item description="" fullName="Coupled Model Intercomparison Project" id="tmpid.0001" label="cmip" title="CMIP" url=""/> 
    219 <item description="World Climate Research Programme (WCRP) Working Group on Coupled Modeling" fullName="Working Group on Coupled Models" id="tmpid.0002" label="wgcm" title="WGCM" url="http://www.wcrp-climate.org/wgcm/"/> 
    220 <item description="" fullName="" id="tmpid.0003" label="wcrp" title="WCRP" url=""/> 
    221 <item description="Full specifications of vocabularies used for formatting, archiving and dsitribution of CMIP data" fullName="Data Reference Vocabularies" id="tmpid.0004" label="drvocabs" title="DRVoc" url="https://drive.google.com/drive/folders/0B6AWgiTrQ0xFQ0t2RjYtWW1jaFk"/> 
     228<glossary id="cmip.drv.022" label="glossary" title="Glossary" uid="SECTION:glossary" useClass="vocab"> 
     229<!-- <info srcType="dummy" srcRef="ptxt.py">Dummy entries</info> --> 
     230<item description="" fullName="Coupled Model Intercomparison Project" label="cmip" title="CMIP" uid="b725d25c-c9b1-11e5-8bd5-5404a60d96b5" url=""/> 
     231<item description="World Climate Research Programme (WCRP) Working Group on Coupled Modeling" fullName="Working Group on Coupled Models" label="wgcm" title="WGCM" uid="b725d64e-c9b1-11e5-8bd5-5404a60d96b5" url="http://www.wcrp-climate.org/wgcm/"/> 
     232<item description="" fullName="" label="wcrp" title="WCRP" uid="b725da5e-c9b1-11e5-8bd5-5404a60d96b5" url=""/> 
     233<item description="Full specifications of vocabularies used for formatting, archiving and dsitribution of CMIP data" fullName="Data Reference Vocabularies" label="drvocabs" title="DRVoc" uid="b725de1e-c9b1-11e5-8bd5-5404a60d96b5" url="https://drive.google.com/drive/folders/0B6AWgiTrQ0xFQ0t2RjYtWW1jaFk"/> 
    222234</glossary> 
    223 <modelCompType class="vocab" id="cmip.drv.023" title="Model Component Types/Categories [redundant with *Native Grid*]" uid="SECTION:modelCompType"> 
    224 <!-- <info srcType="dummy" srcRef="ptxt.py">Dummy entries</info> --> 
    225 <item id="001.023.001" label="example-01" title="dummy title string" uid="c2c20ade-6838-11e5-b0d3-5404a60d96b5"/> 
     235<modelCompType id="cmip.drv.023" label="modelCompType" title="Model Component Types/Categories [redundant with *Native Grid*]" uid="SECTION:modelCompType" useClass="vocab"> 
     236<!-- <info srcType="dummy" srcRef="ptxt.py">Dummy entries</info> --> 
     237<item id="001.023.001" label="example-01" title="dummy title string" uid="875e8fd0-9385-11e5-ac84-5404a60d96b5"/> 
    226238</modelCompType> 
    227 <modelType class="vocab" id="cmip.drv.024" title="Class of model" uid="SECTION:modelType"> 
    228 <!-- <info srcType="dummy" srcRef="ptxt.py">Dummy entries</info> --> 
    229 <item id="tmpid.0001" label="AGCM" title="Atmosphere only GCM"/> 
    230 <item id="tmpid.0002" label="AOGCM" title="Coupled atmosphere-ocean model"/> 
    231 <item id="tmpid.0003" label="ESM" title="Earth System Model"/> 
    232 <item id="tmpid.0004" label="RCM" title="Regional Climate Model"/> 
    233 <item id="tmpid.0005" label="OGCM" title="Ocean General Circulation Model"/> 
    234 <item id="tmpid.0006" label="ICESH" title="Ice sheet model"/> 
    235 <item id="tmpid.0007" label="LU" title="Land use model"/> 
     239<modelType id="cmip.drv.024" label="modelType" title="Class of model" uid="SECTION:modelType" useClass="vocab"> 
     240<!-- <info srcType="dummy" srcRef="ptxt.py">Dummy entries</info> --> 
     241<item label="AGCM" title="Atmosphere only GCM" uid="b7272882-c9b1-11e5-8bd5-5404a60d96b5"/> 
     242<item label="AOGCM" title="Coupled atmosphere-ocean model" uid="b7272b8e-c9b1-11e5-8bd5-5404a60d96b5"/> 
     243<item label="ESM" title="Earth System Model" uid="b7272e2c-c9b1-11e5-8bd5-5404a60d96b5"/> 
     244<item label="RCM" title="Regional Climate Model" uid="b72730d4-c9b1-11e5-8bd5-5404a60d96b5"/> 
     245<item label="OGCM" title="Ocean General Circulation Model" uid="b7273386-c9b1-11e5-8bd5-5404a60d96b5"/> 
     246<item label="ICESH" title="Ice sheet model" uid="b7273638-c9b1-11e5-8bd5-5404a60d96b5"/> 
     247<item label="LU" title="Land use model" uid="b72738ea-c9b1-11e5-8bd5-5404a60d96b5"/> 
    236248</modelType> 
    237 <index class="vocab" id="cmip.drv.025" title="Index of vocabularies" uid="SECTION:index"> 
    238 <!-- <info srcType="dummy" srcRef="ptxt.py">Dummy entries</info> --> 
    239 <item description="This table defines the quantities used to specify CMOR dimensions. Further information is in the CMOR documentation." id="tmpid.0001" label="cmorDimAttr" title="Attributes of CMOR dimensions"/> 
     249<index id="cmip.drv.025" label="index" title="Index of vocabularies" uid="SECTION:index" useClass="vocab"> 
     250<!-- <info srcType="dummy" srcRef="ptxt.py">Dummy entries</info> --> 
     251<item description="This table defines the quantities used to specify CMOR dimensions. Further information is in the CMOR documentation." label="cmorDimAttr" title="Attributes of CMOR dimensions" uid="b724617e-c9b1-11e5-8bd5-5404a60d96b5"/> 
    240252</index> 
    241 <cmorDimAttr class="vocab" id="cmip.drv.026" title="CMOR Dimension Attributes" uid="SECTION:cmorDimAttr"> 
    242 <!-- <info srcType="dummy" srcRef="ptxt.py">Dummy entries</info> --> 
    243 <item CMORattr="" description="A list of CMOR tables in which this dimension is used." id="tmpid.0001" label="tables" title="Tables using this dimension"/> 
    244 <item CMORattr="" description="Name used by CMOR -- unique within one set of tables" id="tmpid.0002" label="CmorName" title="CMOR name"/> 
    245 <item CMORattr="" description="Name used for variable and dimension in netcdf files" id="tmpid.0003" label="name" title="Name in file"/> 
    246 <item CMORattr="" description="Value copied into NetCDF attribute 'long_name' of dimension variable" id="tmpid.0004" label="longname" title="Long name"/> 
    247 <item CMORattr="" description="For spatial or temporal dimensions -- should take the value X, Y, Z or T. Otherwise blank. Value copied into NetCDF attribute of dimension variable" id="tmpid.0005" label="axis" title="NetCDF axis attribute"/> 
    248 <item CMORattr="" description="Value copied into NetCDF attribute of dimension variable" id="tmpid.0006" label="units" title="Units"/> 
    249 <item CMORattr="" description="Set &quot;ok&quot; if the axis is an index (no netcdf variable will be created)." id="tmpid.0007" label="index" title="Is this an index dimension?"/> 
    250 <item CMORattr="coords_attrib" description="Used as variable name for coordinate values when these cannot be held in the axis variable (e.g. when the coordinate values are words)." id="tmpid.0008" label="coords" title="NetCDF coords attribute"/> 
    251 <item CMORattr="must_have_bounds" description="'Yes' or 'No', to indicate whether a bounds variable is needed." id="tmpid.0009" label="bounds" title="Are bounds required?"/> 
    252 <item CMORattr="stored_direction" description="Set to 'increasing' or 'decreasing'. " id="tmpid.0010" label="direction" title="Order of values in axis variable"/> 
    253 <item CMORattr="" description="" id="tmpid.0011" label="validMin" title=""/> 
    254 <item CMORattr="" description="" id="tmpid.0012" label="validMax" title=""/> 
    255 <item CMORattr="" description="Type (e.g. 'double', 'character', 'integer')" id="tmpid.0013" label="type" title="Type of axis values"/> 
    256 <item CMORattr="" description="This attribute is used for vertical coordinates, indicates whether the dimension increases upwards or downwards (valid values are 'up', 'down', or blank)" id="tmpid.0014" label="positive" title="NetCDF positive attribute"/> 
    257 <item CMORattr="" description="For array dimensions see 'requested'" id="tmpid.0015" label="value" title="Value of singleton dimension"/> 
    258 <item CMORattr="" description="For array dimensions see 'boundsreq'" id="tmpid.0016" label="bounds_values" title="Bounds of a singleton dimension"/> 
    259 <item CMORattr="" description="For singleton dimensions see 'value'" id="tmpid.0017" label="requested" title="Values of array dimensions"/> 
    260 <item CMORattr="" description="For singleton dimensions see 'bounds_value'" id="tmpid.0018" label="boundsreq" title="Bounds Requested"/> 
    261 <item CMORattr="" description="Variance from requested values that is tolerated" id="tmpid.0019" label="tolerance" title="Tolerance on requested values"/> 
    262 <item CMORattr="must_call_cmor_grid" description="" id="tmpid.0020" label="grid" title="Is this a grid"/> 
    263 <item CMORattr="" description="Value copied into NetCDF attribute of dimension variable" id="tmpid.0021" label="formula" title="NetCDF formula_terms attribute"/> 
    264 <item CMORattr="" description="Value copied into NetCDF attribute of dimension variable" id="tmpid.0022" label="z_factors" title="NetCDF z_factors attribute"/> 
    265 <item CMORattr="" description="Value copied into NetCDF attribute of dimension variable" id="tmpid.0023" label="z_bounds_factors" title="NetCDF z_bounds_factors"/> 
     253<cmorDimAttr id="cmip.drv.026" label="cmorDimAttr" title="CMOR Dimension Attributes" uid="SECTION:cmorDimAttr" useClass="vocab"> 
     254<!-- <info srcType="dummy" srcRef="ptxt.py">Dummy entries</info> --> 
     255<item CMORattr="" description="A list of CMOR tables in which this dimension is used." label="tables" title="Tables using this dimension" uid="b7278444-c9b1-11e5-8bd5-5404a60d96b5"/> 
     256<item CMORattr="" description="Name used by CMOR -- unique within one set of tables" label="CmorName" title="CMOR name" uid="b72787d2-c9b1-11e5-8bd5-5404a60d96b5"/> 
     257<item CMORattr="" description="Name used for variable and dimension in netcdf files" label="name" title="Name in file" uid="b7278b56-c9b1-11e5-8bd5-5404a60d96b5"/> 
     258<item CMORattr="" description="Value copied into NetCDF attribute 'long_name' of dimension variable" label="longname" title="Long name" uid="b7278ebc-c9b1-11e5-8bd5-5404a60d96b5"/> 
     259<item CMORattr="" description="For spatial or temporal dimensions -- should take the value X, Y, Z or T. Otherwise blank. Value copied into NetCDF attribute of dimension variable" label="axis" title="NetCDF axis attribute" uid="b727920e-c9b1-11e5-8bd5-5404a60d96b5"/> 
     260<item CMORattr="" description="Value copied into NetCDF attribute of dimension variable" label="units" title="Units" uid="b727957e-c9b1-11e5-8bd5-5404a60d96b5"/> 
     261<item CMORattr="" description="Set &quot;ok&quot; if the axis is an index (no netcdf variable will be created)." label="index" title="Is this an index dimension?" uid="b72798ee-c9b1-11e5-8bd5-5404a60d96b5"/> 
     262<item CMORattr="coords_attrib" description="Used as variable name for coordinate values when these cannot be held in the axis variable (e.g. when the coordinate values are words)." label="coords" title="NetCDF coords attribute" uid="b7279c2c-c9b1-11e5-8bd5-5404a60d96b5"/> 
     263<item CMORattr="must_have_bounds" description="'Yes' or 'No', to indicate whether a bounds variable is needed." label="bounds" title="Are bounds required?" uid="b7279fa6-c9b1-11e5-8bd5-5404a60d96b5"/> 
     264<item CMORattr="stored_direction" description="Set to 'increasing' or 'decreasing'. " label="direction" title="Order of values in axis variable" uid="b727a3d4-c9b1-11e5-8bd5-5404a60d96b5"/> 
     265<item CMORattr="" description="" label="validMin" title="" uid="b727a73a-c9b1-11e5-8bd5-5404a60d96b5"/> 
     266<item CMORattr="" description="" label="validMax" title="" uid="b727aa78-c9b1-11e5-8bd5-5404a60d96b5"/> 
     267<item CMORattr="" description="Type (e.g. 'double', 'character', 'integer')" label="type" title="Type of axis values" uid="b727adca-c9b1-11e5-8bd5-5404a60d96b5"/> 
     268<item CMORattr="" description="This attribute is used for vertical coordinates, indicates whether the dimension increases upwards or downwards (valid values are 'up', 'down', or blank)" label="positive" title="NetCDF positive attribute" uid="b727b126-c9b1-11e5-8bd5-5404a60d96b5"/> 
     269<item CMORattr="" description="For array dimensions see 'requested'" label="value" title="Value of singleton dimension" uid="b727b482-c9b1-11e5-8bd5-5404a60d96b5"/> 
     270<item CMORattr="" description="For array dimensions see 'boundsreq'" label="bounds_values" title="Bounds of a singleton dimension" uid="b727b7de-c9b1-11e5-8bd5-5404a60d96b5"/> 
     271<item CMORattr="" description="For singleton dimensions see 'value'" label="requested" title="Values of array dimensions" uid="b727bd74-c9b1-11e5-8bd5-5404a60d96b5"/> 
     272<item CMORattr="" description="For singleton dimensions see 'bounds_value'" label="boundsreq" title="Bounds Requested" uid="b727c0d0-c9b1-11e5-8bd5-5404a60d96b5"/> 
     273<item CMORattr="" description="Variance from requested values that is tolerated" label="tolerance" title="Tolerance on requested values" uid="b727c436-c9b1-11e5-8bd5-5404a60d96b5"/> 
     274<item CMORattr="must_call_cmor_grid" description="" label="grid" title="Is this a grid" uid="b727c774-c9b1-11e5-8bd5-5404a60d96b5"/> 
     275<item CMORattr="" description="Value copied into NetCDF attribute of dimension variable" label="formula" title="NetCDF formula_terms attribute" uid="b727cad0-c9b1-11e5-8bd5-5404a60d96b5"/> 
     276<item CMORattr="" description="Value copied into NetCDF attribute of dimension variable" label="z_factors" title="NetCDF z_factors attribute" uid="b727ce0e-c9b1-11e5-8bd5-5404a60d96b5"/> 
     277<item CMORattr="" description="Value copied into NetCDF attribute of dimension variable" label="z_bounds_factors" title="NetCDF z_bounds_factors" uid="b727d14c-c9b1-11e5-8bd5-5404a60d96b5"/> 
    266278</cmorDimAttr> 
    267 <processingOptions class="vocab" id="cmip.drv.027" title="Processing steps required" uid="SECTION:processingOptions"> 
    268 <!-- <info srcType="dummy" srcRef="ptxt.py">Dummy entries</info> --> 
    269 <item description="" id="tmpid.0001" label="TM" title="time mean"/> 
    270 <item description="The weighted time mean is important when a time varying mask is used (e.g. sea ice)" id="tmpid.0002" label="WM" title="weighted time mean"/> 
    271 <item description="" id="tmpid.0003" label="VCI" title="vertical coordinate interpolation"/> 
    272 <item description="" id="tmpid.0004" label="MSK" title="masking"/> 
    273 <item description="" id="tmpid.0005" label="NS" title="near surface (atmosphere)"/> 
    274 <item description="" id="tmpid.0006" label="SPI" title="spatial interpolation"/> 
    275 <item description="" id="tmpid.0007" label="SM" title="spectral mean"/> 
    276 <item description="" id="tmpid.0008" label="CL" title="climatology "/> 
    277 <item description="" id="tmpid.0009" label="STAT" title="temporal statistics"/> 
    278 <item description="specialised definition of variable which is more tightly constrained than the CF standard name; variables marked with this will need special attention." id="tmpid.0010" label="SD" title="specialised definition"/> 
     279<processingOptions id="cmip.drv.027" label="processingOptions" title="Processing steps required" uid="SECTION:processingOptions" useClass="vocab"> 
     280<!-- <info srcType="dummy" srcRef="ptxt.py">Dummy entries</info> --> 
     281<item description="" label="TM" title="time mean" uid="b725edaa-c9b1-11e5-8bd5-5404a60d96b5"/> 
     282<item description="The weighted time mean is important when a time varying mask is used (e.g. sea ice)" label="WM" title="weighted time mean" uid="b725f0fc-c9b1-11e5-8bd5-5404a60d96b5"/> 
     283<item description="" label="VCI" title="vertical coordinate interpolation" uid="b725f408-c9b1-11e5-8bd5-5404a60d96b5"/> 
     284<item description="" label="MSK" title="masking" uid="b725fc5a-c9b1-11e5-8bd5-5404a60d96b5"/> 
     285<item description="" label="NS" title="near surface (atmosphere)" uid="b725ff66-c9b1-11e5-8bd5-5404a60d96b5"/> 
     286<item description="" label="SPI" title="spatial interpolation" uid="b7260290-c9b1-11e5-8bd5-5404a60d96b5"/> 
     287<item description="" label="SM" title="spectral mean" uid="b726061e-c9b1-11e5-8bd5-5404a60d96b5"/> 
     288<item description="" label="CL" title="climatology " uid="b726093e-c9b1-11e5-8bd5-5404a60d96b5"/> 
     289<item description="" label="STAT" title="temporal statistics" uid="b7260c5e-c9b1-11e5-8bd5-5404a60d96b5"/> 
     290<item description="specialised definition of variable which is more tightly constrained than the CF standard name; variables marked with this will need special attention." label="SD" title="specialised definition" uid="b7260f6a-c9b1-11e5-8bd5-5404a60d96b5"/> 
     291<item description="" label="zm" title="Zonal mean" uid="b7261280-c9b1-11e5-8bd5-5404a60d96b5"/> 
     292<item description="Radiation fields should be computed with atmospheric CO2 concentrations multiplied by  a factor 4." label="4co2" title="Radiation fields with quadrupled CO2" uid="b7261578-c9b1-11e5-8bd5-5404a60d96b5"/> 
     293<item description="Gravity wave diagnostics" label="gw" title="Gravity wave diagnostics" uid="b726187a-c9b1-11e5-8bd5-5404a60d96b5"/> 
     294<item description="Variables which are restricted to sea-ice." label="si" title="Sea ice" uid="b7261bcc-c9b1-11e5-8bd5-5404a60d96b5"/> 
    279295</processingOptions> 
    280 <coordinateReference class="vocab" id="cmip.drv.028" title="Processing steps required" uid="SECTION:coordinateReference"> 
    281 <!-- <info srcType="dummy" srcRef="ptxt.py">Dummy entries</info> --> 
    282 <item id="tmpid.0001" label="Sphere" ogc_wkt="GEOGCS[&quot;WGS 84&quot;,DATUM[&quot;WGS_1984&quot;,SPHEROID[&quot;WGS 84&quot;,6378137,298.257223563,AUTHORITY[&quot;EPSG&quot;,&quot;7030&quot;]],AUTHORITY[&quot;EPSG&quot;,&quot;6326&quot;]],PRIMEM[&quot;Greenwich&quot;,0,AUTHORITY[&quot;EPSG&quot;,&quot;8901&quot;]],UNIT[&quot;degree&quot;,0.01745329251994328,AUTHORITY[&quot;EPSG&quot;,&quot;9122&quot;]],AUTHORITY[&quot;EPSG&quot;,&quot;4326&quot;]]" title="Spherical coordinate reference (WGS 84)" url="http://spatialreference.org/ref/epsg/wgs-84/"/> 
     296<coordinateReference id="cmip.drv.028" label="coordinateReference" title="Processing steps required" uid="SECTION:coordinateReference" useClass="vocab"> 
     297<!-- <info srcType="dummy" srcRef="ptxt.py">Dummy entries</info> --> 
     298<item label="Sphere" ogc_wkt="GEOGCS[&quot;WGS 84&quot;,DATUM[&quot;WGS_1984&quot;,SPHEROID[&quot;WGS 84&quot;,6378137,298.257223563,AUTHORITY[&quot;EPSG&quot;,&quot;7030&quot;]],AUTHORITY[&quot;EPSG&quot;,&quot;6326&quot;]],PRIMEM[&quot;Greenwich&quot;,0,AUTHORITY[&quot;EPSG&quot;,&quot;8901&quot;]],UNIT[&quot;degree&quot;,0.01745329251994328,AUTHORITY[&quot;EPSG&quot;,&quot;9122&quot;]],AUTHORITY[&quot;EPSG&quot;,&quot;4326&quot;]]" title="Spherical coordinate reference (WGS 84)" uid="b724bfca-c9b1-11e5-8bd5-5404a60d96b5" url="http://spatialreference.org/ref/epsg/wgs-84/"/> 
    283299</coordinateReference> 
     300<modelConfig id="cmip.drv.029" label="modelConfig" title="Model configuration options" uid="SECTION:modelConfig" useClass="vocab"> 
     301<!-- <info srcType="dummy" srcRef="ptxt.py">Dummy entries</info> --> 
     302<item MIPs="LUMIP" label="TiledLandUseModel" range="xs:boolean" title="Sub-grid land use reporting" type="capability" uid="b7262d42-c9b1-11e5-8bd5-5404a60d96b5" usage="Used on LUMIP to indicate variables only needed from models which have the capability to report on land use tiles."/> 
     303<item MIPs="C4MIP" label="InteractiveChemistry" range="xs:boolean" title="Interactive chemistry schemes" type="capability" uid="b72631d4-c9b1-11e5-8bd5-5404a60d96b5" usage="Different experiment specifications in C4MIP for models with and without interactive chemistry"/> 
     304<item MIPs="ISMIP6" label="DynamicIceSheet" range="xs:boolean" title="Evolving ice sheets." type="capability" uid="b72635bc-c9b1-11e5-8bd5-5404a60d96b5" usage=""/> 
     305<item MIPs="ISMIP6" label="OfflineIceSheetModel" range="xs:boolean" title="Offline ice sheet model (run with prescribed atmosphere and ocean boundary conditions)" type="category" uid="b72639ae-c9b1-11e5-8bd5-5404a60d96b5" usage=""/> 
     306<item MIPs="LUMIP" label="OfflineLandUseModel" range="xs:boolean" title="Offline ice sheet model (run with prescribed atmosphere boundary conditions)" type="category" uid="b7263d96-c9b1-11e5-8bd5-5404a60d96b5" usage=""/> 
     307<item MIPs="OMIP" label="BoussinesqOcean" range="xs:boolean" title="Boussinesq Ocean (with constant reference density)" type="capability" uid="b726417e-c9b1-11e5-8bd5-5404a60d96b5" usage="The &quot;rhozero&quot; field is only required for Boussinesq models. 
     308"/> 
     309<item MIPs="OMIP" label="BoussinesqOceanConstantTh" range="xs:boolean" title="Boussinesq Ocean With Constant Cell Thickness" type="capability" uid="b726457a-c9b1-11e5-8bd5-5404a60d96b5" usage="The ocean grid cell mass (masscello) can be supplied as a fixed field for Boussinesq models if the grid cell thickness is constant in time. Otherwise, this variable is required at monthly frequency."/> 
     310<item MIPs="" label="HydrostaticAtmosphere" range="xs:boolean" title="Hydrostatic Atmosphere (pressure determined by weight of air column alone)" type="capability" uid="b72649c6-c9b1-11e5-8bd5-5404a60d96b5" usage=""/> 
     311<item MIPs="CFMIP" label="CospEnabled" range="xs:boolean" title="The CFMIP Observation Simulation Package (COSP)" type="capability" uid="b7265164-c9b1-11e5-8bd5-5404a60d96b5" usage=""/> 
     312<item MIPs="HighResMIP" label="usePlev27" range="xs:boolean" title="Use 27 pressure levels rather than model levels were option exists." type="ioOption" uid="b726559c-c9b1-11e5-8bd5-5404a60d96b5" usage="A range of variables in the HighResMIP have the option of being delivered either on model levels or 27 pressure levels."/> 
     313<item MIPs="" label="horizontalOceanMeshSize" range="xs:integer" title="Horizontal Ocean Mesh Size" type="size" uid="b72659ac-c9b1-11e5-8bd5-5404a60d96b5" usage="Used in volume estimates"/> 
     314<item MIPs="" label="horizontalAmosphereMeshSize" range="xs:integer" title="Horizontal Amosphere Mesh Size" type="size" uid="b7265d9e-c9b1-11e5-8bd5-5404a60d96b5" usage="Used in volume estimates"/> 
     315<item MIPs="" label="verticalOceanLevelCount" range="xs:integer" title="Vertical Ocean Level Count" type="size" uid="b72661b8-c9b1-11e5-8bd5-5404a60d96b5" usage="Used in volume estimates"/> 
     316<item MIPs="" label="verticalAtmosphereLevelCount" range="xs:integer" title="Vertical Atmosphere Level Count" type="size" uid="b72665c8-c9b1-11e5-8bd5-5404a60d96b5" usage="Used in volume estimates"/> 
     317<item MIPs="" label="horizontalSoilMeshSize" range="xs:integer" title="Horizontal Soil Mesh Size" type="size" uid="b72669c4-c9b1-11e5-8bd5-5404a60d96b5" usage="Used in volume estimates"/> 
     318<item MIPs="" label="verticalSoilLevelCount" range="xs:integer" title="Vertical Soil Level Count" type="size" uid="b7266d8e-c9b1-11e5-8bd5-5404a60d96b5" usage="Used in volume estimates"/> 
     319</modelConfig> 
    284320</main> 
    285321</document> 
  • CMIP6dreqbuild/trunk/srcMisc/dreqSX.py

    r547 r600  
    5858  ccl[len(ee0[k])] += 1 
    5959 
    60 print 'tables ... groups ....',ccl 
     60print 'INFO.0000: tables ... groups ....',ccl 
    6161   
    6262 
     
    8787 mipt = ee_mip[k][22] 
    8888 ss.add( mipt ) 
    89  if mipt == 'OMIP.Oyr': 
    90    print ee_mip[k] 
    9189 
    9290for h in eeoldl.keys(): 
     
    156154for s in cmip5so.so.keys(): 
    157155  if not s in s1: 
    158     print 'ERROR.010.0002: Table %s not in old mip tables' % s 
     156    print 'ERROR.010.0003: Table %s not in old mip tables' % s 
    159157  for v in cmip5so.so[s].a.keys(): 
    160158    cmip5ByVar[v].append(s) 
  • CMIP6dreqbuild/trunk/srcMisc/dreq_consol_dreq.py

    r558 r600  
    125125    return clabs[i-1] + clabs[ n - i*26] 
    126126 
    127 def getRow(sht): 
    128   ee = {} 
    129   for i in range(sht.nrows): 
    130     if sht.row(i)[0].ctype == 2 and str( sht.row(i)[0].value ) != '0.0': 
    131       l = map( lambda x: str( x.value ), sht.row(i) ) 
    132       ##k = string.replace( l[5], ' ','') 
    133       k = l[5] 
    134       try: 
    135         ee[k] = l 
    136       except: 
    137         print l 
    138         raise 
    139   return ee 
    140127     
    141128def outvSer( ov ): 
     
    486473        rv = map( lambda x: x.value, self.wk1.currentSi.row(j)[:8] ) 
    487474        tab = rv[0] 
    488         grid = rv[3] 
    489         grids.add( grid ) 
    490         gok = rv[r4i.mode-2] 
    491         comment = rv[r4i.mode-1] 
    492         obj0 = rv[r4i.mode] 
    493         bb = string.split(obj0, ':' ) 
    494         if len(bb) > 1: 
    495           obj = bb[0] 
    496           preset = int( bb[1] ) 
    497         else: 
    498           obj = obj0 
    499           preset = -1 
    500         opt = rv[1] 
    501         opar = rv[2] 
    502         uid = str( uuid.uuid1() ) 
    503         nbl = False 
    504         if not tab in ['',u'']: 
    505           ##uid = self.parent.addRow( self.mip, tab, obj, grid, gok, comment, opt=opt, opar=opar ) 
    506           if self.mip != 'DCPP': 
     475        if not( len(tab) > 0 and tab[0] == '#'): 
     476          grid = rv[3] 
     477          grids.add( grid ) 
     478          gok = rv[r4i.mode-2] 
     479          comment = rv[r4i.mode-1] 
     480          obj0 = rv[r4i.mode] 
     481          bb = string.split(obj0, ':' ) 
     482          if len(bb) > 1: 
     483            obj = bb[0] 
     484            preset = int( bb[1] ) 
     485          else: 
     486            obj = obj0 
     487            preset = -1 
     488          opt = rv[1] 
     489          opar = rv[2] 
     490          uid = str( uuid.uuid1() ) 
     491          nbl = False 
     492          if not tab in ['',u'']: 
     493            ##uid = self.parent.addRow( self.mip, tab, obj, grid, gok, comment, opt=opt, opar=opar ) 
     494            if self.mip != 'DCPP': 
    507495              for je in range(5): 
    508496                j1 = r4i.ixcntl + je*2 
     
    510498                if ok: 
    511499                  nbl = True 
    512           for je in r4i.ownix: 
     500            for je in r4i.ownix: 
    513501                ok = self.readDeckColPair( j, je, 100, expt=string.strip(r4[je]), rid=uid ) 
    514502                if ok: 
    515503                  nbl = True 
    516           for jei in range( len(r4i.othix) ): 
     504            for jei in range( len(r4i.othix) ): 
    517505                je = r4i.othix[jei] 
    518506                tr = r4i.treset[jei] 
     
    521509                  nbl = True 
    522510### add row if non-blank element found 
    523         if nbl: 
    524           uid = self.parent.addRow( self.mip, tab, obj, grid, gok, comment, opt=opt, opar=opar, uid=uid, preset=preset ) 
     511          if nbl: 
     512            uid = self.parent.addRow( self.mip, tab, obj, grid, gok, comment, opt=opt, opar=opar, uid=uid, preset=preset ) 
    525513    print 'INFO.100.00001: grids for MIP %s: %s' % (self.mip, str(grids) ) 
    526514    return True 
  • CMIP6dreqbuild/trunk/srcMisc/dreq_consol_tables.py

    r508 r600  
    506506      except: 
    507507        oo.write( r[0] + '  --- rest missing --- \n' ) 
    508       if r[0] != '' and r[4] != '': 
     508      if r[0] != '' and r[4] != '' and r[0][0] != '#': 
    509509        v = string.strip( str( r[4] ) ) 
    510510        if v[0] != '#': 
     
    593593           irsh = 5 
    594594           for i in range(ll[-1]+1,sh.nrows): 
    595              rowIndex = i 
    596              thisr = sh.row(i) 
     595            rowIndex = i 
     596            thisr = sh.row(i) 
     597            v0 = str( thisr[0].value ) + '__'  
     598            if v0[0] != '#': 
    597599             if iv == 1: 
    598600                 ##self.ntr = nt__grptbl._make( getRowValues( thisr, minLen=9 ) + [105,k,''] ) 
  • CMIP6dreqbuild/trunk/srcMisc/dreq_utils.py

    r547 r600  
    240240      if string.find( r, '.' ) != -1: 
    241241        mip,tab = string.split(r, '.' ) 
    242         if r == 'HighResMIP.6hrLev': 
    243           print 'INFO.aaa.00900: processing ',r 
    244242        assert sx.cmip5so.so.has_key(tab), 'FATAL.001.0001: revised table not found in original: %s' % tab 
    245243        lnf = [] 
     
    251249          s1.add(v1) 
    252250          if not sx.cmip5so.so[tab].a.has_key(v1): 
    253             lnf.append(v) 
     251            if mip != 'OMIP': 
     252              lnf.append(v) 
    254253          else: 
    255254            if shb[r][v][1] == sx.cmip5so.so[tab].a[v1][0]: 
     
    268267            if not tabsectuuid[mip].has_key( sk ): 
    269268              tabsectuuid[mip][sk] = str( uuid.uuid1() ) 
    270  
    271269## 
    272270## want to copy to Omon ... but involves change of frequency ... and dimensionality .... 
     
    286284            if tab == 'Omon' and v in sx.cmip5so.sop['Oyr_3dtr']: 
    287285              pass 
    288               #print 'INFO.zzz.01010: overlooking %s --- 3dtr' % v 
    289286            else: 
    290287              lnu += 1   
  • CMIP6dreqbuild/trunk/srcMisc/sx2.py

    r547 r600  
    5151  for v in sx.cmip5so.sop[k]: 
    5252    cmip5GroupsIVAR[ string.split( k, '_' )[0] ][v] = k 
     53  if sx.cmip5so.omipInsert and k in sx.cmip5so.sxp: 
     54    for v in sx.cmip5so.sxp[k]: 
     55      cmip5GroupsIVAR[ string.split( k, '_' )[0] ][v] = k 
    5356sh1.close() 
    5457#### 'uuid', 'mip', 'label','title','ref','refNote' 
     
    352355   elif len(sx.ee_xref_bck[k]) > 1: 
    353356     nnm += 1 
    354      print 'ERROR.0001.001: #################################' 
    355      print sx.ee_mip[k] 
     357     print 'ERROR.0001.001: #######', sx.ee_mip[k] 
    356358     for k2 in sx.ee_xref_bck[k]: 
    357359       print sx.eeold[k2] 
     
    10021004      else: 
    10031005        p = sx.cmip5so.so[t].a[v1][0] 
    1004         rwix = sx.cmip5so.so[t].a[v1][-2] 
    1005         si = sx.cmip5so.so[t].a[v1][-1] 
    1006         rwix = rwix + 200*si 
     1006        rwix = sx.cmip5so.so[t].a[v1][23] 
     1007        si = sx.cmip5so.so[t].a[v1][24] 
     1008        try: 
     1009          rwix = rwix + 200*si 
     1010        except: 
     1011          print sx.cmip5so.so[t].a[v1], len(sx.cmip5so.so[t].a[v1]) 
     1012          raise 
    10071013 
    10081014## the "Oyr" group is for import, not needed in request 
Note: See TracChangeset for help on using the changeset viewer.