Changeset 600

Timestamp:

12/02/16 16:24:04 (4 years ago)

Author:

mjuckes

Message:

final adjustments

Location:

CMIP6dreqbuild/trunk

Files:

• docs/dreq2.xls (modified) (previous)
• docs/xlst_xdsSchemaGen.xml (modified) (1 diff)
• src/framework/dreqPy/makeTables.py (modified) (4 diffs)
• src/framework/dreqPy/scope.py (modified) (2 diffs)
• src/framework/dreqPy/vrev.py (modified) (1 diff)
• src/workbook/CMIP6_issues_and_fixes.xls (modified) (previous)
• src/workbook/choiceCfg.py (modified) (4 diffs)
• src/workbook/importShDreq2.py (modified) (24 diffs)
• src/workbook/importWbMods.py (modified) (3 diffs)
• src/workbook/importWbMods.pyc (modified) (previous)
• src/workbook/inputs/CMORdims.xls (modified) (previous)
• src/workbook/inputs/spatialShape_ref.xls (modified) (previous)
• src/workbook/inputs/var.xls (modified) (previous)
• src/workbook/ivg.py (modified) (2 diffs)
• src/workbook/trial.xml (modified) (1 diff)
• srcMisc/dreqSX.py (modified) (3 diffs)
• srcMisc/dreq_consol_dreq.py (modified) (4 diffs)
• srcMisc/dreq_consol_tables.py (modified) (2 diffs)
• srcMisc/dreq_utils.py (modified) (4 diffs)
• srcMisc/sx2.py (modified) (3 diffs)

CMIP6dreqbuild/trunk/docs/xlst_xdsSchemaGen.xml

@@ -61 +61 @@
     <xs:pattern value="([a-zA-Z0-9])+"/></xs:restriction>
   </xs:simpleType><xsl:text>&#xa;</xsl:text>
+
+<xs:simpleType name="st__stringList">
+<xs:restriction base="aa:base__stringList">
+     <xs:minLength value="0"/>
+</xs:restriction>
+</xs:simpleType>
+
+<xs:simpleType name="base__stringList">
+    <xs:list itemType="xs:string"/>
+</xs:simpleType><xsl:text>&#xa;</xsl:text>
 
 <xs:simpleType name="st__integerList">

CMIP6dreqbuild/trunk/src/framework/dreqPy/makeTables.py

@@ -100 +100 @@
          oo.write( 'RewriteRule ^%s$ http://clipc-services.ceda.ac.uk/dreq/u/%s.html\n' % (v.label,v.uid) )
       else:
-         print 'Match failed: ', v.label
+         print ('Match failed: %s' % v.label )
     oo.close()
       
@@ -182 +182 @@
           strc = dq.inx.uid[ v.stid ]
           if strc._h.label == 'remarks':
-            print 'ERROR: structure not found for %s: %s .. %s (%s)' % (v.uid,v.label,v.title,v.mipTable)
+            print ( 'ERROR: structure not found for %s: %s .. %s (%s)' % (v.uid,v.label,v.title,v.mipTable) )
             ok = False
           else:
@@ -192 +192 @@
           if not ok:
             if (t,v.label) not in skipped:
-              print 'makeTables: skipping %s %s' % (t,v.label)
+              print ( 'makeTables: skipping %s %s' % (t,v.label) )
               skipped.add( (t,v.label) )
           else:
@@ -416 +416 @@
         assert x[0] == xs, 'ERROR.0088: consistency problem %s  %s %s %s' % (m,m2,x[0],xs)
         if x[0] == 0:
-          print 'Zero size:',m,m2
+          print ( 'Zero size: %s, %s' % (m,m2) )
           if len( x[2].keys() ) > 0:
-             print 'ERROR:zero: ',m,m2,x[2].keys()
+             print ( 'ERROR:zero: %s, %s: %s' % (m,m2,str(x[2].keys()) ) )
 
         if acc:

CMIP6dreqbuild/trunk/src/framework/dreqPy/scope.py

@@ -724 +724 @@
       -t <tier> maxmum tier;
       -p <priority>  maximum priority;
+      --xls : Create Excel file with requested variables;
+      --xlsDir <directory> : Directory in which to place variable listing [xls];
       --printLinesMax <n>: Maximum number of lines to be printed
       --printVars  : If present, a summary of the variables fitting the selection options will be printed
@@ -799 +801 @@
       mips = self.adict['m']
       odir = self.adict.get( 'xlsdir', 'xls' )
-      print 'odir:::::::::: ',odir
+      ##print 'odir:::::::::: ',odir
       ##m = list( mips )[0]
       self.sc.xlsByMipExpt(mips,eid,pmax,odir=odir)

CMIP6dreqbuild/trunk/src/framework/dreqPy/vrev.py

@@ -138 +138 @@
   c = checkVar(dq)
   c.chk( 'tas' )
-  print c.inc, c.missing
+  print ( '%s, %s' % (c.inc, c.missing))

CMIP6dreqbuild/trunk/src/workbook/choiceCfg.py

@@ -89 +89 @@
       thisClass = 'RedundancySet'
 ##
-## in order, 3hr, 4lev: 6hr, 7lev: 6hr, 4lev
+## in order, 3hr, 4lev: 6hr, 7lev: 6hr, 4lev: 6hr, 3lev
 ##
       ol = [2,2,1]
@@ -95 +95 @@
 ##HighResMIP [3hrPlev]
       ok = []
-      grps = {'ta':['3hrPlev','6hrPlev_extr'], 'wap':['3hrPlev','6hrPlev_extr_dr'] }
-      ranks = {'3hrPlev':3,'6hrPlev_extr':2,'6hrPlev_extr_dr':1}
+      grps = {'ta':['3hrPlev','6hrPlev_extr','6hrPlev'], 'wap':['3hrPlev','6hrPlev_extr_dr','6hrPlev'],
+              'hus':['3hrPlev','6hrPlev_extr'] }
+      ranks = {'3hrPlev':3,'6hrPlev_extr':2,'6hrPlev_extr_dr':1, '6hrPlev':0}
       
 ##
@@ -103 +104 @@
 ## need to add some 27 level fields, but 1st clarify requirements
 ##
-      for grp in grps.get( var, ['3hrPlev','6hrPlev_extr']):
-        c0 = [c for c in cm if c[19] == 'HighResMIP [%s]' % grp]
+      s1 = {c[19] for c in cm}
+      ##print sorted(list(s1))
+      ##raise
+      for grp in grps.get( var, ['3hrPlev','6hrPlev_extr','6hrPlev']):
+        c0 = [c for c in cm if c[19].find( '[%s]' % grp) != -1]
         thisl = labify( '%s-%s' % (var, grp) )
         title = '%s [%s]' % (var, grp)
-        ok.append( len(c0) ) == 1
+        ok.append( len(c0)  == 1 )
         cc += '%s:%s; ' % (grp,var)
         opts += '%s; ' % ol[ix]
@@ -113 +117 @@
         if len(c0 ) == 1:
           self.varChoiceLnk.append( [str(uuid.uuid1()), thisl, title,  c0[0][0], uid, str(ranks[grp]) ] )
+        else:
+          print 'Group %s not found' % grp
+          print s1, var
       if not all(ok):
         print 'ERROR.070.020001: not all groups found for %s [%s]' % (var,str(ok))

CMIP6dreqbuild/trunk/src/workbook/importShDreq2.py

@@ -26 +26 @@
 import ivg
 reload(ivg)
+
+class replaceItems(object):
+  def __init__(self):
+    self.v = collections.defaultdict( list )
+    self.items = {}
 
 WbMods = importWbMods.run()
@@ -126 +131 @@
 
     self.repl = collections.defaultdict( list )
+    self.replItems = {}
+    self.rep = {'cmv':replaceItems()}
+
     self.err0010 = collections.defaultdict( int )
-    self.replItems = {}
     self.defaultP = {}
     self.remo = {}
@@ -146 +153 @@
     if doRepl:
       self.importRepl()
+      self.importRepl(rfile='CMVreplace.csv',mode='cmv')
       self.importRemove()
       self.importUpdate()
@@ -163 +171 @@
     self.writeSn()
     self.writeMcfg()
+    self.writeProcNotes()
     self.writeCmDim()
     self.writeVar()
@@ -178 +187 @@
         self.write2()
       self.finish()
+
+  def writeProcNotes(self):
+    xx = self.vocabs.getElementsByTagName( 'processingOptions' )
+    assert len(xx) == 1, 'Expecting one element named "processingOptions", found %s' % len(xx)
+    iDoc = xx[0]
+## <item id="tmpid.0003" label="C4MIP" status="" title="Coupled Climate Carbon Cycle Model Intercomparison Project" url="http://c4mip.lsce.ipsl.fr/"/>
+    thiss = self.doc.getElementsByTagName( 'tags' )[0]
+    dil = thiss.getElementsByTagName('item')
+    for d in dil:
+      thiss.removeChild(d)
+    for i in iDoc.getElementsByTagName('item'):
+      item = self.doc.createElement( 'item' )
+      thisl = i.getAttribute( 'label' )
+      for k in ['title','description','label']:
+        item.setAttribute( k, i.getAttribute( k ) )
+      uid =  'TAG:%s' % thisl 
+      item.setAttribute( 'uid', uid )
+      thiss.appendChild( item )
 
   def writeMcfg(self):
@@ -224 +251 @@
       thiss.removeChild(d)
 #<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"/>
-    kk= ['label', 'title', 'description', 'procComment', 'procnote', 'prov', 'provmip', 'sn', 'units', 'uid','defaultp']
+    kk= ['label', 'title', 'description', 'procComment', 'procnote', 'prov', 'provmip', 'sn', 'units', 'uid','defaultp','replaced_by']
     for uid in self.importWbMods.vars.d1:
       item = self.doc.createElement( 'item' )
       thisr = self.importWbMods.vars.d1[uid]
-      for i in range( len(kk) -1 ):
+      for i in range( len(kk) -2 ):
            item.setAttribute( kk[i], thisr[i] )
       if len( self.importWbMods.vars.c1[ thisr[0] ] ) == 1:
@@ -842 +869 @@
                 if str(tt.mip) != 'OMIP':
                   gi.append( tt )
+                  ##if tt.mip == 'SIMIP' and tt.mask == 'yes':
+                    ##sm.add( 'seaIce' )
+                  ##else:
                   sm.add( tt.mask )
 
             print '####### masks: ',sm
             smdd = {}
-            dsn = {'floating ice shelf':u'floating ice sheet', u'ocean':u'sea' }
+            dsn = {'floating ice shelf':u'floating ice sheet', u'ocean':u'sea', 'yes':'seaIce' }
             d1 = {u'land':(False,'area: mean where land'), \
                   u'grounded ice sheet':(True,'area: mean where grounded_ice_sheet'), \
                   u'ice sheet':(True,'area: mean where ice_sheet'), \
                   u'floating ice sheet':(True,'area: mean where floating_ice_sheet'), \
-                  u'floating ice shelf':(True,'area: mean where floating_ice_sheet'),
+                  u'floating ice shelf':(True,'area: mean where floating_ice_sheet'), \
+                  u'seaIce':(True,'area: mean where sea_ice over sea'), \
                   u'sea':(False,'area: mean where sea') }
+
             for s in sm:
-              if s in  ['', u'none',u'Southern hemisphere', u'Northern hemisphere']:
+              if s in  ['', 'no', u'none',u'Southern hemisphere', u'Northern hemisphere']:
                 smdd[s] = (False,'')
               else:
-                smdd[s] = d1[ dsn.get( s,s ) ]
+                try:
+                  smdd[s] = d1[ dsn.get( s,s ) ]
+                except:
+                  print s, dsn.get( s,s )
+                  raise
 
             setu = set()
@@ -886 +922 @@
 ##
                 dset.add( (tt.shape,tt.levels,tt.tstyle,gr) )
-                dsgpi.add( (tt.shape,tt.levels,tt.tstyle,gr,smdd[tt.mask], 'None', 'None') )
+                if tt.mip == 'SIMIP':
+                  grprov = "SIMIP"
+                else:
+                  grprov = ""
+                dsgpi.add( (tt.shape,tt.levels,tt.tstyle,gr,smdd[tt.mask], 'None', 'None', grprov) )
 ### need to check where variables are, perhaps, refering to "ovar"
             ##kk = ['group', 'var', 'table', 'freq', 'descriptionEx', 'shape', 'levels', 'tstyle', 'mask', 'misc', 'mip', 'uid', 'rowIndex', 'new', 'gpid', 'vkey', 'vid']
@@ -903 +943 @@
                 fr = freqmap.get( tt.freq, tt.freq )
                 ntab = 'em%s' % string.capwords( fr )
+                if fr == '6hr' and tt.levels == '7h':
+                  ntab = '6hrPlev'
+                  print 'INFO.033.00001: adding to 6hrPlev ....',lab, tt.__dict__
                 
                 if ovuu.has_key(tt.vid):
@@ -1061 +1104 @@
         {'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(), {''}]
     cmetl = ['time: point', 'time: mean', 'time: mean within years time: mean over years ', '']
+    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 ', '']
     ee1 = {}
-    for shp,lvls,sty,gr,tmsk, flgv, flgm in dsgpi:
+    for shp,lvls,sty,gr,tmsk, flgv, flgm, prov in dsgpi:
         t = (shp,lvls,sty,gr)
         tdim, tt = self.dsort_u1( self.dsortdd['groupitem'][0][t], self.dsortdd['groupitem'][1] )
@@ -1074 +1118 @@
         cmea = 'area: areacell%s' % gr
         cmet = ''
+        if sty == u'weighted time mean':
+           print 'INFO.xxxx: ',shp,lvls,sty,gr,tmsk, flgv, flgm, prov
         for i in range(4):
           if sty in ttt[i]:
-            cmet = cmetl[i]
+            if i == 1 and prov == 'SIMIP':
+              if sty == u'weighted time mean':
+                 cmet = 'time: mean where sea_ice area: mean where sea_ice'
+              else:
+                 cmet = 'time: mean area: mean where sea_ice over sea'
+            else:
+              cmet = cmetl[i]
         if cmet == '':
           cmet = msk
@@ -1084 +1136 @@
         label = 'str-%3.3i' % kk
         proc = ''
-        prov = 'CMIP5, endorsed MIPs'
+        if prov == '':
+          prov = 'CMIP5, endorsed MIPs'
         desc = ''
         dims = tt[0]
@@ -1264 +1317 @@
               'K':('sistraits','','time','',False), \
               'scalar':('','','time','',False), \
+              'sheet':('icesheet','','time','',False), \
               'ZST1':('alevel','site','time','',False), \
               'BasinYT':('latitude|basin','','time','',False), \
@@ -1293 +1347 @@
         lset = {'soil levels':'sdepth', 'all model levels above 400hPa':'alevel'} 
         lsdd = {}
+        print 'ls1....',ls1
         for l in ls1:
           ii = 0
@@ -1304 +1359 @@
             ii = -2
             this = l
+          elif l == '7h':
+            ii = 7
+            this = 'plev7h'
           else:
             ii = int( float(l) )
@@ -1316 +1374 @@
               if ii in [14,17]:
                 ii = 19
+              
               this = 'plev%s' % ii
+              if ii == 7:
+                this += 'c'
+
             else:
               this = ''
@@ -1617 +1679 @@
               mm = self.importWbMods.mmsi.ss[vid]
               self._editRequestVar01( item, mm, ll )
+
+            if vid in self.rep['cmv'].items:
+              vid1 = vid
+              vid = self.rep['cmv'].items[vid]
+              print 'INFO.090.09901a: vid updated :',vid,ll
+              item.setAttribute( 'vid', vid )
             if vid not in self.cmvs:
               l,t = (ll[0],ll[1])
@@ -1627 +1695 @@
 #  cmvByLab contains, for each uid, a (frequency,table) tuple
                 thisll = []
+                thislll = []
+                thisllp = []
                 for u in self.cmvByLab[l]:
                   if t in freq2tab[ self.cmvByLab[l][u][0] ]:
@@ -1635 +1705 @@
                     item.setAttribute( 'vid', str( vid ) )
                 elif len(thisll) > 1:
-                  print 'ERROR.090.09011c: vid not found (options found by lab)',ll, [self.cmvByLab[l][u] for u in thisll]
+                  for u in thisll:
+                    if string.find(self.cmvByLab[l][u][1], 'SPECS') == -1:
+                      thislll.append( u )
+                    if string.find(self.cmvByLab[l][u][1], 'OMIP') != -1:
+                      thisllp.append( u )
+                  if len( thislll ) == 1:
+                    print 'INFO.090.09011y: vid reset',ll
+                    vid = thislll[0]
+                    item.setAttribute( 'vid', str( vid ) )
+                  elif len( thisllp ) == 1:
+                    print 'INFO.090.09011z: vid reset',ll
+                    vid = thisllp[0]
+                    item.setAttribute( 'vid', str( vid ) )
+                  else:
+                    print 'ERROR.090.09011c: vid not found (options found by lab)',ll, [self.cmvByLab[l][u] for u in thisll]
                 else:
                   print 'ERROR.090.09011d: vid not found (no options at matching frequency)',ll
@@ -1763 +1847 @@
           s1 = set()
           for r in self.cmv:
+           if r[0] in self.rep['cmv'].items:
+             print 'INFO.090.09099: detected cmv replace request: ',r
+           else:
             if r[0] in s1:
               print 'ERROR.090.09005: duplicate key at ',r
@@ -1792 +1879 @@
                       print 'ERROR.099.00202: bad vid string: %s [%s]' % (r[k],str(r[:3]))
                     vid = str(r[k])
+                    if vid in self.importWbMods.vars.vmap:
+                      ov = vid
+                      vid = self.importWbMods.vars.vmap[vid]
+                      print 'INFO.040.04444: mapping',ov,vid
                   if n == "stid":
                     item.setAttribute( n, stid )
@@ -1969 +2060 @@
                 ##self.ff[ksect][0].appendChild( cln )
                 ##print 'INFO.046.0003: request variable split:', t[1]
+
+            if vid in self.rep['cmv'].items:
+              vid1 = vid
+              vid = self.rep['cmv'].items[vid]
+              print 'INFO.090.09901b: vid updated :',vid,t
+              item.setAttribute( 'vid', vid )
               
             did = '%s__%s' % (t[2],t[3])
@@ -2076 +2173 @@
       elif extraMappings.has_key(k):
         thisl = extraMappings[k]
+      elif self.experiments.has_key(k):
+        thisl = [k,]
       else:
         print 'ERROR.080.00010: no mapping founds for experiment %s' % k
@@ -2274 +2373 @@
     ##self.varChoiceLnkCfgInfo = [ 'uid', 'label', 'title', 'vid', 'cid', 'cfgid', 'cfg'
 
-  def importRepl(self,rfile='uuidreplace.csv'):
+  def importRepl(self,rfile='uuidreplace.csv',mode='var'):
     for l in open(rfile).readlines():
       bits = string.split( string.strip(l), '\t' )
       assert len(bits) == 7, 'Could not parse item replacement file'
-      self.repl[ bits[3] ].append( (bits[2],bits[0],bits[1] ) )
-      self.replItems[bits[0]] = bits[1]
+      if mode == 'var':
+        self.repl[ bits[3] ].append( (bits[2],bits[0],bits[1] ) )
+        self.replItems[bits[0]] = bits[1]
+      elif mode == 'cmv':
+        self.rep['cmv'].v[ bits[3] ].append( (bits[2],bits[0],bits[1] ) )
+        self.rep['cmv'].items[bits[0]] = bits[1]
+      
 
   def importRemove(self,rfile='uuidremove.csv'):

CMIP6dreqbuild/trunk/src/workbook/importWbMods.py

@@ -16 +16 @@
       self.records.append( nt__mapr._make(  rr ) )
     self.ss = collections.defaultdict( list )
+    self.ee = {}
     for r in self.records:
       self.ss[r.vid1].append( r )
+      self.ee[r.lab1] = r.lab2
 
 class loadVars(object):
-  def __init__(self,opt=1):
+  def __init__(self,opt=1,map01=None):
     if opt == 0:
       wb = workbook( 'inputs/var.xls' )
     else:
       wb = workbook( 'inputs/vars_20151201.xls' )
-    #x = ['label', 'title', 'description', 'procComment', 'procnote', 'prov', 'provmip', 'sn', 'units', 'uid','defaultp','tags','alias']
+    #x = ['label', 'title', 'description', 'procComment', 'procnote', 'prov', 'provmip', 'sn', 'units', 'uid','defaultp','replaced_by']
     #nt_var = collections.namedtuple( 'var', x )
+
+    self.mapx1 = {}
+    ii = open( 'inputs/simip_rename.csv', 'r' )
+    for l in ii.readlines():
+      bits = string.split( string.strip( l ), '\t' )
+      if bits[1] != '*':
+        print 'ERROR: unexpected line in inputs/simip_rename.csv: ',l
+      else:
+        self.mapx1[bits[4]]  = bits[2]
+    ii.close()
 
     self.d1 = {}
     self.c1 = collections.defaultdict(list)
+    d2 = {}
     s1 = wb.book.sheet_by_name(u'var')
     for i in range(1,s1.nrows):
@@ -43 +56 @@
         self.d1[uid] = [str(x) for x in rr]
         self.c1[rr[0]].append( uid )
+        if string.strip( rr[11] ) != '':
+          d2[uid] = (string.strip(rr[11]),rr[0] )
       except:
         print rr
         raise
+
+    mm = []
+    mmm = []
+
+    self.vmap= {}
+    for k in d2:
+      if d2[k][0] not in self.c1:
+        mm.append( (d2[k],k) )
+      elif len( self.c1[ d2[k][0] ] ) > 1:
+        mmm.append( (k,  self.c1[ d2[k][0] ] ) )
+      else:
+        self.vmap[k] = self.c1[ d2[k][0] ][0]
+
+
+    if map01 != None:
+      for k in map01:
+    ##for k in self.mapx1:
+        u1 = None
+        u2 = None
+        if len( self.c1[k] ) == 1:
+          u1  =  self.c1[k][0]
+        else:
+          print 'ERROR: ambigous variable label: %s' % k
+        k2 = map01[k]
+        if len( self.c1[k2] ) == 1:
+          u2  =  self.c1[k2][0]
+        else:
+          print 'ERROR: ambigous variable label: %s' % k2
+        if None not in [u1,u2]:
+           self.vmap[u1] = u2
+           rr = self.d1[u1]
+           if rr[4] == '':
+             rr[4] = 'OBSOLETE'
+           else:
+             rr[4] += ' OBSOLETE'
+           self.d1[u1] = rr
+    assert len( mm ) == 0, 'Mappings not all valid: %s' % str(mm)
+    assert len( mmm ) == 0, 'Mappings not all unambiguous: %s' % str(mmm)
     
 class loadFixes(object):
@@ -98 +151 @@
   def __init__(self):
     self.fx = loadFixes()
-    self.vars = loadVars()
     self.ls = loadSpatial()
     self.cm = loadCmorDims()
     self.mmsi = loadMipMaps( 'SIMIP' )
+    self.vars = loadVars(map01=self.mmsi.ee)

CMIP6dreqbuild/trunk/src/workbook/ivg.py

@@ -1 @@
-
 from scansh import rq
 import string, collections, uuid
@@ -131 +130 @@
             self.rqv_vg['%s.%s.%s' % (ll[2],ll[1],ll[0])] = vgid
 
-
-
 class checkCmv(object):
   def __init__(self,tlist):

CMIP6dreqbuild/trunk/src/workbook/trial.xml

@@ -2 +2 @@
 <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">
 <prologue>
-<dc:title>Draft CMIP6 Data Request</dc:title>
+<dc:title>Draft CMIP6 Data Request [01.beta.13]</dc:title>
+<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>
 <dc:creator>Martin Juckes</dc:creator>
-<dc:date>2015-10-01</dc:date>
+<dc:date>2015-11-25</dc:date>
 </prologue>
 <main>
-<institute class="vocab" id="cmip.drv.001" title="Institute" uid="SECTION:institute">
-<!-- <info srcType="dummy" srcRef="ptxt.py">Dummy entries</info> -->
-<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"/>
-<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/"/>
-<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/"/>
-<item description="Norwegian Climate Centre" id="tmpid.0004" isni="" label="NCC" title="NCC" url="http://folk.uib.no/ngfhd/EarthClim/index.htm"/>
-<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 "/>
-<item description="Canadian Centre for Climate Modelling and Analysis, Victoria, BC, Canada" id="tmpid.0006" isni="" label="CCCma" title="CCCma" url=""/>
-<item description="Institute for Numerical Mathematics, Moscow, Russia" id="tmpid.0007" isni="" label="INM" title="INM" url=""/>
-<item description="Meteorological Research Institute, Tsukuba, Japan" id="tmpid.0008" isni="" label="MRI" title="MRI" url=""/>
-<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=""/>
-<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=""/>
-<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/"/>
-<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"/>
-<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"/>
-<item description="Beijing Climate Center,China Meteorological Administration,China" id="tmpid.0014" isni="0000 0001 2234 550X [CMA]" label="BCC" title="BCC" url=""/>
-<item description="Max Planck Institute for Meteorology" id="tmpid.0015" isni="" label="MPI-M" title="MPI-M" url=""/>
-<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=""/>
-<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=""/>
-<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=""/>
-<item description="National Center for Atmospheric Research, Boulder, CO, USA" id="tmpid.0019" isni="" label="NSF-DOE-NCAR" title="NSF-DOE-NCAR" url=""/>
-<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=""/>
-<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=""/>
-<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/"/>
-<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=""/>
-<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"/>
-<item description="The First Institution of Oceanography,SOA,Qingdao,China" id="tmpid.0025" isni="" label="FIO" title="FIO" url=""/>
-<item description="Institute of Atmospheric Physics, Chinese Academy of Sciences,Beijing,China" id="tmpid.0026" isni="" label="LASG-IAP" title="LASG-IAP" url=""/>
-<item description="National Institute of Meteorological Research, Seoul, South Korea" id="tmpid.0027" isni="" label="NIMR-KMA" title="NIMR-KMA" url=""/>
-<item description="European Earth System Model" id="tmpid.0028" isni="" label="ICHEC" title="ICHEC" url=""/>
-<item description="Center for Ocean-Land-Atmosphere Studies, Calverton, MD" id="tmpid.0029" isni="" label="COLA-CFS" title="COLA-CFS" url=""/>
-<item description="National Centers for Environmental Prediction, Camp Springs, MD" id="tmpid.0030" isni="" label="NOAA-NCEP" title="NOAA-NCEP" url=""/>
+<institute id="cmip.drv.001" label="institute" title="Institute" uid="SECTION:institute" useClass="vocab">
+<!-- <info srcType="dummy" srcRef="ptxt.py">Dummy entries</info> -->
+<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"/>
+<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/"/>
+<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
+"/>
+<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"/>
+<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 "/>
+<item description="Canadian Centre for Climate Modelling and Analysis, Victoria, BC, Canada" isni="" label="CCCma" title="CCCma" uid="b726b294-c9b1-11e5-8bd5-5404a60d96b5" url=""/>
+<item description="Institute for Numerical Mathematics, Moscow, Russia" isni="" label="INM" title="INM" uid="b726b6ae-c9b1-11e5-8bd5-5404a60d96b5" url=""/>
+<item description="Meteorological Research Institute, Tsukuba, Japan" isni="" label="MRI" title="MRI" uid="b726ba96-c9b1-11e5-8bd5-5404a60d96b5" url=""/>
+<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=""/>
+<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=""/>
+<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/"/>
+<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"/>
+<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"/>
+<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=""/>
+<item description="Max Planck Institute for Meteorology" isni="" label="MPI-M" title="MPI-M" uid="b726d8f0-c9b1-11e5-8bd5-5404a60d96b5" url=""/>
+<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=""/>
+<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=""/>
+<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=""/>
+<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=""/>
+<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=""/>
+<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=""/>
+<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/"/>
+<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=""/>
+<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"/>
+<item description="The First Institution of Oceanography,SOA,Qingdao,China" isni="" label="FIO" title="FIO" uid="b727099c-c9b1-11e5-8bd5-5404a60d96b5" url=""/>
+<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=""/>
+<item description="National Institute of Meteorological Research, Seoul, South Korea" isni="" label="NIMR-KMA" title="NIMR-KMA" uid="b727116c-c9b1-11e5-8bd5-5404a60d96b5" url=""/>
+<item description="European Earth System Model" isni="" label="ICHEC" title="ICHEC" uid="b7271518-c9b1-11e5-8bd5-5404a60d96b5" url=""/>
+<item description="Center for Ocean-Land-Atmosphere Studies, Calverton, MD" isni="" label="COLA-CFS" title="COLA-CFS" uid="b72718d8-c9b1-11e5-8bd5-5404a60d96b5" url=""/>
+<item description="National Centers for Environmental Prediction, Camp Springs, MD" isni="" label="NOAA-NCEP" title="NOAA-NCEP" uid="b7271cca-c9b1-11e5-8bd5-5404a60d96b5" url=""/>
 </institute>
-<model class="vocab" id="cmip.drv.002" title="Model" uid="SECTION:model">
-<!-- <info srcType="dummy" srcRef="ptxt.py">Dummy entries</info> -->
-<item description="" id="tmpid.0001" label="ACCESS" title=""/>
-<item description="" id="tmpid.0002" label="AWI-CM" title=""/>
-<item description="" id="tmpid.0003" label="BCC" title=""/>
-<item description="" id="tmpid.0004" label="BESM" title=""/>
-<item description="" id="tmpid.0005" label="BNU" title=""/>
-<item description="" id="tmpid.0006" label="CAMS-CSM" title=""/>
-<item description="" id="tmpid.0007" label="CanESM" title=""/>
-<item description="" id="tmpid.0008" label="CAS-ESM" title=""/>
-<item description="" id="tmpid.0009" label="CESM" title=""/>
-<item description="" id="tmpid.0010" label="CESS-THU" title=""/>
-<item description="" id="tmpid.0011" label="CMCC" title=""/>
-<item description="" id="tmpid.0012" label="CNRM" title=""/>
-<item description="" id="tmpid.0013" label="EC-Earth" title=""/>
-<item description="" id="tmpid.0014" label="FGOALS" title=""/>
-<item description="" id="tmpid.0015" label="FIO" title=""/>
-<item description="" id="tmpid.0016" label="GFDL" title=""/>
-<item description="" id="tmpid.0017" label="GISS" title=""/>
-<item description="" id="tmpid.0018" label="IITM" title=""/>
-<item description="" id="tmpid.0019" label="INM" title=""/>
-<item description="" id="tmpid.0020" label="IPSL" title=""/>
-<item description="" id="tmpid.0021" label="MIROC6-CGCM" title=""/>
-<item description="" id="tmpid.0022" label="MIROC-ESM" title=""/>
-<item description="" id="tmpid.0023" label="NICAM" title=""/>
-<item description="" id="tmpid.0024" label="MPI-ESM" title=""/>
-<item description="" id="tmpid.0025" label="MRI-ESM1-x" title=""/>
-<item description="" id="tmpid.0026" label="MRI-AGCM3-xS" title=""/>
-<item description="" id="tmpid.0027" label="NorESM" title=""/>
-<item description="" id="tmpid.0028" label="NUIST-CSM" title=""/>
-<item description="" id="tmpid.0029" label="UKESM" title=""/>
-<item description="" id="tmpid.0030" label="HadGEM3" title=""/>
-<item description="" id="tmpid.0031" label="KMA-ACE" title=""/>
-<item description="" id="tmpid.0032" label="UKESM--KMA" title=""/>
+<model id="cmip.drv.002" label="model" title="Model" uid="SECTION:model" useClass="vocab">
+<!-- <info srcType="dummy" srcRef="ptxt.py">Dummy entries</info> -->
+<item description="" label="ACCESS" title="" uid="b72910a2-c9b1-11e5-8bd5-5404a60d96b5"/>
+<item description="" label="AWI-CM" title="" uid="b72915ca-c9b1-11e5-8bd5-5404a60d96b5"/>
+<item description="" label="BCC" title="" uid="b7291926-c9b1-11e5-8bd5-5404a60d96b5"/>
+<item description="" label="BESM" title="" uid="b7291c50-c9b1-11e5-8bd5-5404a60d96b5"/>
+<item description="" label="BNU" title="" uid="b7291f7a-c9b1-11e5-8bd5-5404a60d96b5"/>
+<item description="" label="CAMS-CSM" title="" uid="b729229a-c9b1-11e5-8bd5-5404a60d96b5"/>
+<item description="" label="CanESM" title="" uid="b72925ba-c9b1-11e5-8bd5-5404a60d96b5"/>
+<item description="" label="CAS-ESM" title="" uid="b7292b5a-c9b1-11e5-8bd5-5404a60d96b5"/>
+<item description="" label="CESM" title="" uid="b7292e7a-c9b1-11e5-8bd5-5404a60d96b5"/>
+<item description="" label="CESS-THU" title="" uid="b72931a4-c9b1-11e5-8bd5-5404a60d96b5"/>
+<item description="" label="CMCC" title="" uid="b729349c-c9b1-11e5-8bd5-5404a60d96b5"/>
+<item description="" label="CNRM" title="" uid="b72937bc-c9b1-11e5-8bd5-5404a60d96b5"/>
+<item description="" label="EC-Earth" title="" uid="b7293ae6-c9b1-11e5-8bd5-5404a60d96b5"/>
+<item description="" label="FGOALS" title="" uid="b7293e1a-c9b1-11e5-8bd5-5404a60d96b5"/>
+<item description="" label="FIO" title="" uid="b7294112-c9b1-11e5-8bd5-5404a60d96b5"/>
+<item description="" label="GFDL" title="" uid="b7294428-c9b1-11e5-8bd5-5404a60d96b5"/>
+<item description="" label="GISS" title="" uid="b729475c-c9b1-11e5-8bd5-5404a60d96b5"/>
+<item description="" label="IITM" title="" uid="b7294a72-c9b1-11e5-8bd5-5404a60d96b5"/>
+<item description="" label="INM" title="" uid="b7294d9c-c9b1-11e5-8bd5-5404a60d96b5"/>
+<item description="" label="IPSL" title="" uid="b72950a8-c9b1-11e5-8bd5-5404a60d96b5"/>
+<item description="" label="MIROC6-CGCM" title="" uid="b72953b4-c9b1-11e5-8bd5-5404a60d96b5"/>
+<item description="" label="MIROC-ESM" title="" uid="b72956ca-c9b1-11e5-8bd5-5404a60d96b5"/>
+<item description="" label="NICAM" title="" uid="b72959e0-c9b1-11e5-8bd5-5404a60d96b5"/>
+<item description="" label="MPI-ESM" title="" uid="b7295ce2-c9b1-11e5-8bd5-5404a60d96b5"/>
+<item description="" label="MRI-ESM1-x" title="" uid="b7296002-c9b1-11e5-8bd5-5404a60d96b5"/>
+<item description="" label="MRI-AGCM3-xS" title="" uid="b729630e-c9b1-11e5-8bd5-5404a60d96b5"/>
+<item description="" label="NorESM" title="" uid="b729661a-c9b1-11e5-8bd5-5404a60d96b5"/>
+<item description="" label="NUIST-CSM" title="" uid="b729691c-c9b1-11e5-8bd5-5404a60d96b5"/>
+<item description="" label="UKESM1-N96ORCA1" title="" uid="b7296c50-c9b1-11e5-8bd5-5404a60d96b5"/>
+<item description="" label="UKESM1-N216ORCA025hybrid" title="" uid="b7296f5c-c9b1-11e5-8bd5-5404a60d96b5"/>
+<item description="" label="HadGEM3-GC3-N96ORCA025" title="" uid="b7297268-c9b1-11e5-8bd5-5404a60d96b5"/>
+<item description="" label="HadGEm3-GC3-N216ORCA025" title="" uid="b729a92c-c9b1-11e5-8bd5-5404a60d96b5"/>
+<item description="" label="KMA-ACE" title="" uid="b729ad1e-c9b1-11e5-8bd5-5404a60d96b5"/>
+<item description="" label="UKESM--KMA" title="" uid="b729b0d4-c9b1-11e5-8bd5-5404a60d96b5"/>
 </model>
-<physicsvers class="vocab" id="cmip.drv.003" title="Physics Version" uid="SECTION:physicsvers">
-<!-- <info srcType="dummy" srcRef="ptxt.py">Dummy entries</info> -->
-<item description="dummyAt" id="001.003.001" label="example-01" title="dummy title string" uid="c2c151e8-6838-11e5-b0d3-5404a60d96b5"/>
+<physicsvers id="cmip.drv.003" label="physicsvers" title="Physics Version" uid="SECTION:physicsvers" useClass="vocab">
+<!-- <info srcType="dummy" srcRef="ptxt.py">Dummy entries</info> -->
+<item description="dummyAt" id="001.003.001" label="example-01" title="dummy title string" uid="875dbb46-9385-11e5-ac84-5404a60d96b5"/>
 </physicsvers>
-<initialisationmethod class="vocab" id="cmip.drv.004" title="Initialisation Method" uid="SECTION:initialisationmethod">
-<!-- <info srcType="dummy" srcRef="ptxt.py">Dummy entries</info> -->
-<item description="dummyAt" id="001.004.001" label="example-01" title="dummy title string" uid="c2c18a82-6838-11e5-b0d3-5404a60d96b5"/>
+<initialisationmethod id="cmip.drv.004" label="initialisationmethod" title="Initialisation Method" uid="SECTION:initialisationmethod" useClass="vocab">
+<!-- <info srcType="dummy" srcRef="ptxt.py">Dummy entries</info> -->
+<item description="dummyAt" id="001.004.001" label="example-01" title="dummy title string" uid="875dfd54-9385-11e5-ac84-5404a60d96b5"/>
 </initialisationmethod>
-<modelComp class="vocab" id="cmip.drv.005" title="Model Components" uid="SECTION:modelComp">
-<!-- <info srcType="dummy" srcRef="ptxt.py">Dummy entries</info> -->
-<item componentType="dummyAt" id="001.005.001" label="example-01" sizeH="dummyAt" sizeV="dummyAt" title="dummy title string" uid="c2c1c4a2-6838-11e5-b0d3-5404a60d96b5"/>
+<modelComp id="cmip.drv.005" label="modelComp" title="Model Components" uid="SECTION:modelComp" useClass="vocab">
+<!-- <info srcType="dummy" srcRef="ptxt.py">Dummy entries</info> -->
+<item componentType="dummyAt" id="001.005.001" label="example-01" sizeH="dummyAt" sizeV="dummyAt" title="dummy title string" uid="875e3f12-9385-11e5-ac84-5404a60d96b5"/>
 </modelComp>
-<activity class="vocab" id="cmip.drv.006" title="Coordinating activity" uid="SECTION:activity">
-<!-- <info srcType="dummy" srcRef="ptxt.py">Dummy entries</info> -->
-<item id="tmpid.0001" label="CMIP6" status="" title="Coupled Model Intercomparison Project, Phase 6" url="http://www.wcrp-climate.org/wgcm-cmip/wgcm-cmip6"/>
-<item id="tmpid.0002" label="AerChemMIP" status="" title="Aerosols and Chemistry Model Intercomparison Project" url="https://wiki.met.no/aerocom/aerchemmip/start"/>
-<item id="tmpid.0003" label="C4MIP" status="" title="Coupled Climate Carbon Cycle Model Intercomparison Project" url="http://c4mip.lsce.ipsl.fr/"/>
-<item id="tmpid.0004" label="CFMIP" status="" title="Cloud Feedback Model Intercomparison Project" url="http://www.cfmip.net./"/>
-<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"/>
-<item id="tmpid.0006" label="DCPP" status="" title="Decadal Climate Prediction Project" url=""/>
-<item id="tmpid.0007" label="FAFMIP" status="" title="Flux-Anomaly-Forced Model Intercomparison Project" url="http://www.met.reading.ac.uk/~jonathan/FAFMIP/"/>
-<item id="tmpid.0008" label="GeoMIP" status="" title="Geoengineering Model Intercomparison Project" url=""/>
-<item id="tmpid.0009" label="GMMIP" status="" title="Global Monsoons Model Intercomparison Project" url=""/>
-<item id="tmpid.0010" label="HighResMIP" status="" title="High Resolution Model Intercomparison Project" url="https://dev.knmi.nl/projects/highresmip/wiki"/>
-<item id="tmpid.0011" label="ISMIP6" status="" title="Ice Sheet Model Intercomparison Project for CMIP6" url=""/>
-<item id="tmpid.0012" label="LS3MIP" status="" title="Land Surface, Snow and Soil Moisture MIP" url=""/>
-<item id="tmpid.0013" label="LUMIP" status="" title="Land-Use Model Intercomparison Project" url=""/>
-<item id="tmpid.0014" label="OMIP" status="" title="Ocean Model Intercomparison Project" url=""/>
-<item id="tmpid.0015" label="PDRMIP" status="withdrawn" title="Precipitation Driver and Response Model Intercomparison Project" url=""/>
-<item id="tmpid.0016" label="PMIP" status="" title="Palaeoclimate Modelling Intercomparison Project" url=""/>
-<item id="tmpid.0017" label="RFMIP" status="" title="Radiative Forcing Model Intercomparison Project" url=""/>
-<item id="tmpid.0018" label="ScenarioMIP" status="" title="Scenario Model Intercomparison Project" url=""/>
-<item id="tmpid.0019" label="SolarMIP" status="merged with DAMIP" title="Solar Model Intercomparison Project" url=""/>
-<item id="tmpid.0020" label="VolMIP" status="" title="Volcanic Forcings Model Intercomparison Project" url=""/>
-<item id="tmpid.0021" label="CORDEX" status="Diagnostic" title="" url=""/>
-<item id="tmpid.0022" label="DynVar" status="Diagnostic" title="" url=""/>
-<item id="tmpid.0023" label="SIMIP" status="Diagnostic" title="" url=""/>
-<item id="tmpid.0024" label="VIACS AB" status="Diagnostic" title="" url=""/>
+<activity id="cmip.drv.006" label="activity" title="Coordinating activity" uid="SECTION:activity" useClass="vocab">
+<!-- <info srcType="dummy" srcRef="ptxt.py">Dummy entries</info> -->
+<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"/>
+<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"/>
+<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/"/>
+<item label="CFMIP" project="" status="" title="Cloud Feedback Model Intercomparison Project" uid="b7281fda-c9b1-11e5-8bd5-5404a60d96b5" url="http://www.cfmip.net/"/>
+<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"/>
+<item label="DCPP" project="DCP" status="" title="Decadal Climate Prediction Project" uid="b72827be-c9b1-11e5-8bd5-5404a60d96b5" url=""/>
+<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/"/>
+<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"/>
+<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/"/>
+<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"/>
+<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"/>
+<item label="LS3MIP" project="" status="" title="Land Surface, Snow and Soil Moisture MIP" uid="b7283f38-c9b1-11e5-8bd5-5404a60d96b5" url=""/>
+<item label="LUMIP" project="" status="" title="Land-Use Model Intercomparison Project" uid="b72845e6-c9b1-11e5-8bd5-5404a60d96b5" url=""/>
+<item label="OMIP" project="" status="" title="Ocean Model Intercomparison Project" uid="b72849ba-c9b1-11e5-8bd5-5404a60d96b5" url=""/>
+<item label="PDRMIP" project="" status="withdrawn" title="Precipitation Driver and Response Model Intercomparison Project" uid="b7284d66-c9b1-11e5-8bd5-5404a60d96b5" url=""/>
+<item label="PMIP" project="PMIP" status="" title="Palaeoclimate Modelling Intercomparison Project" uid="b7285158-c9b1-11e5-8bd5-5404a60d96b5" url=""/>
+<item label="RFMIP" project="" status="" title="Radiative Forcing Model Intercomparison Project" uid="b728554a-c9b1-11e5-8bd5-5404a60d96b5" url=""/>
+<item label="ScenarioMIP" project="" status="" title="Scenario Model Intercomparison Project" uid="b728591e-c9b1-11e5-8bd5-5404a60d96b5" url=""/>
+<item label="SolarMIP" project="" status="merged with DAMIP" title="Solar Model Intercomparison Project" uid="b7285cb6-c9b1-11e5-8bd5-5404a60d96b5" url=""/>
+<item label="VolMIP" project="" status="" title="Volcanic Forcings Model Intercomparison Project" uid="b728606c-c9b1-11e5-8bd5-5404a60d96b5" url=""/>
+<item label="CORDEX" project="CORDEX" status="Diagnostic" title="Coordinated Regional Downscaling Experiment (CORDEX)" uid="b72866a2-c9b1-11e5-8bd5-5404a60d96b5" url=""/>
+<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/"/>
+<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"/>
+<item label="VIACSAB" project="" status="Diagnostic" title="Vulnerability, Impacts, Adaptation, and Climate Services Advisory Board (VIACS AB)" uid="b72871c4-c9b1-11e5-8bd5-5404a60d96b5" url=""/>
+<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/"/>
+<item label="CCMI" project="" status="" title="Chemistry-Climate Model Initiative" uid="b7287c00-c9b1-11e5-8bd5-5404a60d96b5" url="http://www.met.reading.ac.uk/ccmi/"/>
+<item label="CMIP5" project="CMIP" status="" title="Coupled Model Intercomparison Project, Phase 5" uid="b72880a6-c9b1-11e5-8bd5-5404a60d96b5" url=""/>
 </activity>
-<product class="vocab" id="cmip.drv.007" title="Data product" uid="SECTION:product">
-<!-- <info srcType="dummy" srcRef="ptxt.py">Dummy entries</info> -->
-<item id="001.007.001" label="example-01" title="dummy title string" uid="c2c1d262-6838-11e5-b0d3-5404a60d96b5"/>
+<product id="cmip.drv.007" label="product" title="Data product" uid="SECTION:product" useClass="vocab">
+<!-- <info srcType="dummy" srcRef="ptxt.py">Dummy entries</info> -->
+<item id="001.007.001" label="example-01" title="dummy title string" uid="875e4f2a-9385-11e5-ac84-5404a60d96b5"/>
 </product>
-<experiment class="vocab" id="cmip.drv.008" title="Numerical Experiment" uid="SECTION:experiment">
-<!-- <info srcType="dummy" srcRef="ptxt.py">Dummy entries</info> -->
-<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"/>
+<experiment id="cmip.drv.008" label="experiment" title="Numerical Experiment" uid="SECTION:experiment" useClass="vocab">
+<!-- <info srcType="dummy" srcRef="ptxt.py">Dummy entries</info> -->
+<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"/>
 </experiment>
-<frequency class="vocab" id="cmip.drv.009" title="Temporal frequency of data values" uid="SECTION:frequency">
-<!-- <info srcType="dummy" srcRef="ptxt.py">Dummy entries</info> -->
-<item id="tmpid.0001" iso="P1Y" label="yr" title="Annual"/>
-<item id="tmpid.0002" iso="P1M" label="monClim" title="Monthly climatology"/>
-<item id="tmpid.0003" iso="P1M" label="mon" title="Monthly"/>
-<item id="tmpid.0004" iso="P1D" label="day" title="Daily"/>
-<item id="tmpid.0005" iso="PT6H" label="6hr" title="6-hourly"/>
-<item id="tmpid.0006" iso="PT3H" label="3hr" title="3-hourly"/>
-<item id="tmpid.0007" iso="PT1H" label="hr" title="Hourly"/>
-<item id="tmpid.0008" iso="" label="subhr" title="Sub-hourly"/>
+<frequency id="cmip.drv.009" label="frequency" title="Temporal frequency of data values" uid="SECTION:frequency" useClass="vocab">
+<!-- <info srcType="dummy" srcRef="ptxt.py">Dummy entries</info> -->
+<item isClimatology="0" iso="P1Y" label="yr" title="Annual" uid="b72744ca-c9b1-11e5-8bd5-5404a60d96b5"/>
+<item isClimatology="1" iso="P1M" label="monClim" title="Monthly climatology" uid="b727484e-c9b1-11e5-8bd5-5404a60d96b5"/>
+<item isClimatology="0" iso="P1M" label="mon" title="Monthly" uid="b7274b96-c9b1-11e5-8bd5-5404a60d96b5"/>
+<item isClimatology="0" iso="P1D" label="day" title="Daily" uid="b7274ed4-c9b1-11e5-8bd5-5404a60d96b5"/>
+<item isClimatology="0" iso="PT6H" label="6hr" title="6-hourly" uid="b7275294-c9b1-11e5-8bd5-5404a60d96b5"/>
+<item isClimatology="0" iso="PT3H" label="3hr" title="3-hourly" uid="b72755d2-c9b1-11e5-8bd5-5404a60d96b5"/>
+<item isClimatology="0" iso="PT1H" label="hr" title="Hourly" uid="b7275942-c9b1-11e5-8bd5-5404a60d96b5"/>
+<item isClimatology="0" iso="" label="subhr" title="Sub-hourly" uid="b7275f14-c9b1-11e5-8bd5-5404a60d96b5"/>
 </frequency>
-<realm class="vocab" id="cmip.drv.010" title="Modeling realm" uid="SECTION:realm">
-<!-- <info srcType="dummy" srcRef="ptxt.py">Dummy entries</info> -->
-<item id="tmpid.0001" label="atmos" title="Atmospheric"/>
-<item id="tmpid.0002" label="ocean" title="Oceanic"/>
-<item id="tmpid.0003" label="land" title="Land"/>
-<item id="tmpid.0004" label="landIce" title="Terrestrial cryosphere"/>
-<item id="tmpid.0005" label="seaIce" title="Marine cryosphere"/>
-<item id="tmpid.0006" label="aerosol" title="Aerosols"/>
-<item id="tmpid.0007" label="atmosChem" title="Atmospheric chemistry"/>
-<item id="tmpid.0008" label="ocnBgchem" title="Ocean bio-geochemistry"/>
+<realm id="cmip.drv.010" label="realm" title="Modeling realm" uid="SECTION:realm" useClass="vocab">
+<!-- <info srcType="dummy" srcRef="ptxt.py">Dummy entries</info> -->
+<item label="atmos" title="Atmospheric" uid="b725193e-c9b1-11e5-8bd5-5404a60d96b5"/>
+<item label="ocean" title="Oceanic" uid="b7256240-c9b1-11e5-8bd5-5404a60d96b5"/>
+<item label="land" title="Land" uid="b725afe8-c9b1-11e5-8bd5-5404a60d96b5"/>
+<item label="landIce" title="Terrestrial cryosphere" uid="b725b97a-c9b1-11e5-8bd5-5404a60d96b5"/>
+<item label="seaIce" title="Marine cryosphere" uid="b725bcd6-c9b1-11e5-8bd5-5404a60d96b5"/>
+<item label="aerosol" title="Aerosols" uid="b725bfce-c9b1-11e5-8bd5-5404a60d96b5"/>
+<item label="atmosChem" title="Atmospheric chemistry" uid="b725c2bc-c9b1-11e5-8bd5-5404a60d96b5"/>
+<item label="ocnBgchem" title="Ocean bio-geochemistry" uid="b725c5a0-c9b1-11e5-8bd5-5404a60d96b5"/>
 </realm>
-<grid class="vocab" id="cmip.drv.011" title="Native grid" uid="SECTION:grid">
-<!-- <info srcType="dummy" srcRef="ptxt.py">Dummy entries</info> -->
-<item id="tmpid.0001" label="atmosphere" title="Atmosphere grid"/>
-<item id="tmpid.0002" label="ocean" title="Ocean grid"/>
-<item id="tmpid.0003" label="ice" title="Grid used for ice sheets"/>
-<item id="tmpid.0004" label="land" title="Grid used for land surface modelling"/>
+<grid id="cmip.drv.011" label="grid" title="Native grid" uid="SECTION:grid" useClass="vocab">
+<!-- <info srcType="dummy" srcRef="ptxt.py">Dummy entries</info> -->
+<item label="atmosphere" title="Atmosphere grid" uid="b7276752-c9b1-11e5-8bd5-5404a60d96b5"/>
+<item label="ocean" title="Ocean grid" uid="b7276a9a-c9b1-11e5-8bd5-5404a60d96b5"/>
+<item label="ice" title="Grid used for ice sheets" uid="b7276d42-c9b1-11e5-8bd5-5404a60d96b5"/>
+<item label="land" title="Grid used for land surface modelling" uid="b7276fea-c9b1-11e5-8bd5-5404a60d96b5"/>
 </grid>
-<dimensions class="vocab" id="cmip.drv.012" title="MIP table variable dimensions" uid="SECTION:dimensions">
-<!-- <info srcType="dummy" srcRef="ptxt.py">Dummy entries</info> -->
-<item altLabel="dummyAt" id="001.012.001" label="example01" size="25" sn="dummyAt" title="dummy title string" uid="c2c1e54a-6838-11e5-b0d3-5404a60d96b5"/>
+<dimensions id="cmip.drv.012" label="dimensions" title="MIP table variable dimensions" uid="SECTION:dimensions" useClass="vocab">
+<!-- <info srcType="dummy" srcRef="ptxt.py">Dummy entries</info> -->
+<item altLabel="dummyAt" id="001.012.001" label="example01" size="25" sn="dummyAt" title="dummy title string" uid="875e65c8-9385-11e5-ac84-5404a60d96b5"/>
 </dimensions>
-<forcings class="vocab" id="cmip.drv.013" title="Forcing" uid="SECTION:forcings">
-<!-- <info srcType="dummy" srcRef="ptxt.py">Dummy entries</info> -->
-<item id="001.013.001" label="example-01" title="dummy title string" uid="c2c1e95a-6838-11e5-b0d3-5404a60d96b5"/>
+<forcings id="cmip.drv.013" label="forcings" title="Forcing" uid="SECTION:forcings" useClass="vocab">
+<!-- <info srcType="dummy" srcRef="ptxt.py">Dummy entries</info> -->
+<item id="001.013.001" label="example-01" title="dummy title string" uid="875e6924-9385-11e5-ac84-5404a60d96b5"/>
 </forcings>
-<table class="vocab" id="cmip.drv.014" title="Data specification table" uid="SECTION:table">
-<!-- <info srcType="dummy" srcRef="ptxt.py">Dummy entries</info> -->
-<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"/>
-<item comment="" description="Variables with no time dependency" frequency="fx" id="tmpid.0002" label="fx" title="Fixed variables"/>
-<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"/>
-<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"/>
-<item comment="" description="Monthly Mean Ocean Fields, Including Biogechemical Field" frequency="mon" id="tmpid.0005" label="Omon" title="Monthly ocean variables"/>
-<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)"/>
-<item comment="" description="Monthly Mean Land Cryosphere Fields" frequency="mon" id="tmpid.0007" label="LImon" title="Monthly land ice"/>
-<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"/>
-<item comment="" description="Monthly Mean Ocean Cryosphere Fields" frequency="mon" id="tmpid.0009" label="OImon" title="Sea-ice"/>
-<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"/>
-<item comment="Contains radiative fields from cfMon; some duplication with Amon " description="" frequency="mon" id="tmpid.0011" label="Rmon" title="Monthly atmospheric radiation data"/>
-<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"/>
-<item comment="" description="Daily Mean Atmosphere, Ocean and Surface Fields" frequency="day" id="tmpid.0013" label="Oday" title="Daily  ocean data"/>
-<item comment="" description="" frequency="" id="tmpid.0014" label="Aday" title="Daily atmospheric data, excluding composition and cloud forcing"/>
-<item comment="Formerly &quot;aero&quot;" description="" frequency="day" id="tmpid.0015" label="Cday" title="Daily atmospheric composition data"/>
-<item comment="" description="" frequency="" id="tmpid.0016" label="cfDay" title="Daily data associated with cloud forcing"/>
-<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"/>
-<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"/>
-<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"/>
-<item comment="" description="Atmospheric and Surface Fields Sampled Every 3 Hours" frequency="3hr" id="tmpid.0020" label="3hrAcc" title="3-hourly data, accumulated fields"/>
-<item comment="New -- part of HighResMIP request." description="" frequency="1hr" id="tmpid.0021" label="1hr" title=""/>
-<item comment="Includes cfsites and data for highresmip" description="" frequency="subhr" id="tmpid.0022" label="subhr" title=""/>
+<table id="cmip.drv.014" label="table" title="Data specification table" uid="SECTION:table" useClass="vocab">
+<!-- <info srcType="dummy" srcRef="ptxt.py">Dummy entries</info> -->
+<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"/>
+<item comment="" description="Variables with no time dependency" frequency="fx" label="fx" title="Fixed variables" uid="b728a18a-c9b1-11e5-8bd5-5404a60d96b5"/>
+<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"/>
+<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"/>
+<item comment="" description="Monthly Mean Ocean Fields, Including Biogechemical Field" frequency="mon" label="Omon" title="Monthly ocean variables" uid="b728affe-c9b1-11e5-8bd5-5404a60d96b5"/>
+<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"/>
+<item comment="" description="Monthly Mean Land Cryosphere Fields" frequency="mon" label="LImon" title="Monthly land ice" uid="b728b79c-c9b1-11e5-8bd5-5404a60d96b5"/>
+<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"/>
+<item comment="" description="Monthly Mean Ocean Cryosphere Fields" frequency="mon" label="OImon" title="Sea-ice" uid="b728beea-c9b1-11e5-8bd5-5404a60d96b5"/>
+<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"/>
+<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"/>
+<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"/>
+<item comment="" description="Daily Mean Atmosphere, Ocean and Surface Fields" frequency="day" label="Oday" title="Daily  ocean data" uid="b728d09c-c9b1-11e5-8bd5-5404a60d96b5"/>
+<item comment="" description="" frequency="" label="Aday" title="Daily atmospheric data, excluding composition and cloud forcing" uid="b728d47a-c9b1-11e5-8bd5-5404a60d96b5"/>
+<item comment="Formerly &quot;aero&quot;" description="" frequency="day" label="Cday" title="Daily atmospheric composition data" uid="b728d830-c9b1-11e5-8bd5-5404a60d96b5"/>
+<item comment="" description="" frequency="" label="cfDay" title="Daily data associated with cloud forcing" uid="b728dbd2-c9b1-11e5-8bd5-5404a60d96b5"/>
+<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"/>
+<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"/>
+<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"/>
+<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"/>
+<item comment="New -- part of HighResMIP request." description="" frequency="1hr" label="1hr" title="" uid="b728ee24-c9b1-11e5-8bd5-5404a60d96b5"/>
+<item comment="Includes cfsites and data for highresmip" description="" frequency="subhr" label="subhr" title="" uid="b728f1da-c9b1-11e5-8bd5-5404a60d96b5"/>
 </table>
-<cref class="vocab" id="cmip.drv.015" title="Coordinate Reference" uid="SECTION:cref">
-<!-- <info srcType="dummy" srcRef="ptxt.py">Dummy entries</info> -->
-<item id="001.015.001" label="example-01" title="dummy title string" uid="c2c1f0c6-6838-11e5-b0d3-5404a60d96b5"/>
+<cref id="cmip.drv.015" label="cref" title="Coordinate Reference" uid="SECTION:cref" useClass="vocab">
+<!-- <info srcType="dummy" srcRef="ptxt.py">Dummy entries</info> -->
+<item id="001.015.001" label="example-01" title="dummy title string" uid="875e716c-9385-11e5-ac84-5404a60d96b5"/>
 </cref>
-<areaType class="vocab" id="cmip.drv.016" title="CMIP Area Type" uid="SECTION:areaType">
-<!-- <info srcType="dummy" srcRef="ptxt.py">Dummy entries</info> -->
-<item id="001.016.001" inCF="dummyAt" label="example-01" title="dummy title string" uid="c2c1f422-6838-11e5-b0d3-5404a60d96b5"/>
+<areaType id="cmip.drv.016" label="areaType" title="CMIP Area Type" uid="SECTION:areaType" useClass="vocab">
+<!-- <info srcType="dummy" srcRef="ptxt.py">Dummy entries</info> -->
+<item id="001.016.001" inCF="dummyAt" label="example-01" title="dummy title string" uid="875e74f0-9385-11e5-ac84-5404a60d96b5"/>
 </areaType>
-<timeSlice class="vocab" id="cmip.drv.017" title="Time slices used in data request" uid="SECTION:timeSlice">
-<!-- <info srcType="dummy" srcRef="ptxt.py">Dummy entries</info> -->
-<item id="001.017.001" label="example-01" specification="dummyAt" title="dummy title string" type="dummyAt" uid="c2c1f7d8-6838-11e5-b0d3-5404a60d96b5"/>
+<timeSlice id="cmip.drv.017" label="timeSlice" title="Time slices used in data request" uid="SECTION:timeSlice" useClass="vocab">
+<!-- <info srcType="dummy" srcRef="ptxt.py">Dummy entries</info> -->
+<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"/>
+<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"/>
+<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"/>
+<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"/>
+<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"/>
+<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"/>
 </timeSlice>
-<modelFamily class="vocab" id="cmip.drv.018" title="Family of model" uid="SECTION:modelFamily">
-<!-- <info srcType="dummy" srcRef="ptxt.py">Dummy entries</info> -->
-<item id="001.018.001" label="example-01" title="dummy title string" uid="c2c1fac6-6838-11e5-b0d3-5404a60d96b5"/>
+<modelFamily id="cmip.drv.018" label="modelFamily" title="Family of model" uid="SECTION:modelFamily" useClass="vocab">
+<!-- <info srcType="dummy" srcRef="ptxt.py">Dummy entries</info> -->
+<item id="001.018.001" label="example-01" title="dummy title string" uid="875e7eaa-9385-11e5-ac84-5404a60d96b5"/>
 </modelFamily>
-<priority class="vocab" id="cmip.drv.019" title="Variable priority" uid="SECTION:priority">
-<!-- <info srcType="dummy" srcRef="ptxt.py">Dummy entries</info> -->
-<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"/>
-<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"/>
-<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"/>
+<priority id="cmip.drv.019" label="priority" title="Variable priority" uid="SECTION:priority" useClass="vocab">
+<!-- <info srcType="dummy" srcRef="ptxt.py">Dummy entries</info> -->
+<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"/>
+<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"/>
+<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"/>
 </priority>
-<qcLevel class="vocab" id="cmip.drv.020" title="Quality control level" uid="SECTION:qcLevel">
-<!-- <info srcType="dummy" srcRef="ptxt.py">Dummy entries</info> -->
-<item id="001.020.001" label="1" title="dummy title string" uid="c2c200fc-6838-11e5-b0d3-5404a60d96b5"/>
+<qcLevel id="cmip.drv.020" label="qcLevel" title="Quality control level" uid="SECTION:qcLevel" useClass="vocab">
+<!-- <info srcType="dummy" srcRef="ptxt.py">Dummy entries</info> -->
+<item id="001.020.001" label="1" title="dummy title string" uid="875e853a-9385-11e5-ac84-5404a60d96b5"/>
 </qcLevel>
-<complianceCode class="vocab" id="cmip.drv.021" title="Data specification compliance codes" uid="SECTION:complianceCode">
-<!-- <info srcType="dummy" srcRef="ptxt.py">Dummy entries</info> -->
-<item id="001.021.001" label="example-01" title="dummy title string" uid="c2c203e0-6838-11e5-b0d3-5404a60d96b5"/>
+<complianceCode id="cmip.drv.021" label="complianceCode" title="Data specification compliance codes" uid="SECTION:complianceCode" useClass="vocab">
+<!-- <info srcType="dummy" srcRef="ptxt.py">Dummy entries</info> -->
+<item id="001.021.001" label="example-01" title="dummy title string" uid="875e8850-9385-11e5-ac84-5404a60d96b5"/>
 </complianceCode>
-<glossary class="vocab" id="cmip.drv.022" title="Glossary" uid="SECTION:glossary">
-<!-- <info srcType="dummy" srcRef="ptxt.py">Dummy entries</info> -->
-<item description="" fullName="Coupled Model Intercomparison Project" id="tmpid.0001" label="cmip" title="CMIP" url=""/>
-<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/"/>
-<item description="" fullName="" id="tmpid.0003" label="wcrp" title="WCRP" url=""/>
-<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"/>
+<glossary id="cmip.drv.022" label="glossary" title="Glossary" uid="SECTION:glossary" useClass="vocab">
+<!-- <info srcType="dummy" srcRef="ptxt.py">Dummy entries</info> -->
+<item description="" fullName="Coupled Model Intercomparison Project" label="cmip" title="CMIP" uid="b725d25c-c9b1-11e5-8bd5-5404a60d96b5" url=""/>
+<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/"/>
+<item description="" fullName="" label="wcrp" title="WCRP" uid="b725da5e-c9b1-11e5-8bd5-5404a60d96b5" url=""/>
+<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"/>
 </glossary>
-<modelCompType class="vocab" id="cmip.drv.023" title="Model Component Types/Categories [redundant with *Native Grid*]" uid="SECTION:modelCompType">
-<!-- <info srcType="dummy" srcRef="ptxt.py">Dummy entries</info> -->
-<item id="001.023.001" label="example-01" title="dummy title string" uid="c2c20ade-6838-11e5-b0d3-5404a60d96b5"/>
+<modelCompType id="cmip.drv.023" label="modelCompType" title="Model Component Types/Categories [redundant with *Native Grid*]" uid="SECTION:modelCompType" useClass="vocab">
+<!-- <info srcType="dummy" srcRef="ptxt.py">Dummy entries</info> -->
+<item id="001.023.001" label="example-01" title="dummy title string" uid="875e8fd0-9385-11e5-ac84-5404a60d96b5"/>
 </modelCompType>
-<modelType class="vocab" id="cmip.drv.024" title="Class of model" uid="SECTION:modelType">
-<!-- <info srcType="dummy" srcRef="ptxt.py">Dummy entries</info> -->
-<item id="tmpid.0001" label="AGCM" title="Atmosphere only GCM"/>
-<item id="tmpid.0002" label="AOGCM" title="Coupled atmosphere-ocean model"/>
-<item id="tmpid.0003" label="ESM" title="Earth System Model"/>
-<item id="tmpid.0004" label="RCM" title="Regional Climate Model"/>
-<item id="tmpid.0005" label="OGCM" title="Ocean General Circulation Model"/>
-<item id="tmpid.0006" label="ICESH" title="Ice sheet model"/>
-<item id="tmpid.0007" label="LU" title="Land use model"/>
+<modelType id="cmip.drv.024" label="modelType" title="Class of model" uid="SECTION:modelType" useClass="vocab">
+<!-- <info srcType="dummy" srcRef="ptxt.py">Dummy entries</info> -->
+<item label="AGCM" title="Atmosphere only GCM" uid="b7272882-c9b1-11e5-8bd5-5404a60d96b5"/>
+<item label="AOGCM" title="Coupled atmosphere-ocean model" uid="b7272b8e-c9b1-11e5-8bd5-5404a60d96b5"/>
+<item label="ESM" title="Earth System Model" uid="b7272e2c-c9b1-11e5-8bd5-5404a60d96b5"/>
+<item label="RCM" title="Regional Climate Model" uid="b72730d4-c9b1-11e5-8bd5-5404a60d96b5"/>
+<item label="OGCM" title="Ocean General Circulation Model" uid="b7273386-c9b1-11e5-8bd5-5404a60d96b5"/>
+<item label="ICESH" title="Ice sheet model" uid="b7273638-c9b1-11e5-8bd5-5404a60d96b5"/>
+<item label="LU" title="Land use model" uid="b72738ea-c9b1-11e5-8bd5-5404a60d96b5"/>
 </modelType>
-<index class="vocab" id="cmip.drv.025" title="Index of vocabularies" uid="SECTION:index">
-<!-- <info srcType="dummy" srcRef="ptxt.py">Dummy entries</info> -->
-<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"/>
+<index id="cmip.drv.025" label="index" title="Index of vocabularies" uid="SECTION:index" useClass="vocab">
+<!-- <info srcType="dummy" srcRef="ptxt.py">Dummy entries</info> -->
+<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"/>
 </index>
-<cmorDimAttr class="vocab" id="cmip.drv.026" title="CMOR Dimension Attributes" uid="SECTION:cmorDimAttr">
-<!-- <info srcType="dummy" srcRef="ptxt.py">Dummy entries</info> -->
-<item CMORattr="" description="A list of CMOR tables in which this dimension is used." id="tmpid.0001" label="tables" title="Tables using this dimension"/>
-<item CMORattr="" description="Name used by CMOR -- unique within one set of tables" id="tmpid.0002" label="CmorName" title="CMOR name"/>
-<item CMORattr="" description="Name used for variable and dimension in netcdf files" id="tmpid.0003" label="name" title="Name in file"/>
-<item CMORattr="" description="Value copied into NetCDF attribute 'long_name' of dimension variable" id="tmpid.0004" label="longname" title="Long name"/>
-<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"/>
-<item CMORattr="" description="Value copied into NetCDF attribute of dimension variable" id="tmpid.0006" label="units" title="Units"/>
-<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?"/>
-<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"/>
-<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?"/>
-<item CMORattr="stored_direction" description="Set to 'increasing' or 'decreasing'. " id="tmpid.0010" label="direction" title="Order of values in axis variable"/>
-<item CMORattr="" description="" id="tmpid.0011" label="validMin" title=""/>
-<item CMORattr="" description="" id="tmpid.0012" label="validMax" title=""/>
-<item CMORattr="" description="Type (e.g. 'double', 'character', 'integer')" id="tmpid.0013" label="type" title="Type of axis values"/>
-<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"/>
-<item CMORattr="" description="For array dimensions see 'requested'" id="tmpid.0015" label="value" title="Value of singleton dimension"/>
-<item CMORattr="" description="For array dimensions see 'boundsreq'" id="tmpid.0016" label="bounds_values" title="Bounds of a singleton dimension"/>
-<item CMORattr="" description="For singleton dimensions see 'value'" id="tmpid.0017" label="requested" title="Values of array dimensions"/>
-<item CMORattr="" description="For singleton dimensions see 'bounds_value'" id="tmpid.0018" label="boundsreq" title="Bounds Requested"/>
-<item CMORattr="" description="Variance from requested values that is tolerated" id="tmpid.0019" label="tolerance" title="Tolerance on requested values"/>
-<item CMORattr="must_call_cmor_grid" description="" id="tmpid.0020" label="grid" title="Is this a grid"/>
-<item CMORattr="" description="Value copied into NetCDF attribute of dimension variable" id="tmpid.0021" label="formula" title="NetCDF formula_terms attribute"/>
-<item CMORattr="" description="Value copied into NetCDF attribute of dimension variable" id="tmpid.0022" label="z_factors" title="NetCDF z_factors attribute"/>
-<item CMORattr="" description="Value copied into NetCDF attribute of dimension variable" id="tmpid.0023" label="z_bounds_factors" title="NetCDF z_bounds_factors"/>
+<cmorDimAttr id="cmip.drv.026" label="cmorDimAttr" title="CMOR Dimension Attributes" uid="SECTION:cmorDimAttr" useClass="vocab">
+<!-- <info srcType="dummy" srcRef="ptxt.py">Dummy entries</info> -->
+<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"/>
+<item CMORattr="" description="Name used by CMOR -- unique within one set of tables" label="CmorName" title="CMOR name" uid="b72787d2-c9b1-11e5-8bd5-5404a60d96b5"/>
+<item CMORattr="" description="Name used for variable and dimension in netcdf files" label="name" title="Name in file" uid="b7278b56-c9b1-11e5-8bd5-5404a60d96b5"/>
+<item CMORattr="" description="Value copied into NetCDF attribute 'long_name' of dimension variable" label="longname" title="Long name" uid="b7278ebc-c9b1-11e5-8bd5-5404a60d96b5"/>
+<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"/>
+<item CMORattr="" description="Value copied into NetCDF attribute of dimension variable" label="units" title="Units" uid="b727957e-c9b1-11e5-8bd5-5404a60d96b5"/>
+<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"/>
+<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"/>
+<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"/>
+<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"/>
+<item CMORattr="" description="" label="validMin" title="" uid="b727a73a-c9b1-11e5-8bd5-5404a60d96b5"/>
+<item CMORattr="" description="" label="validMax" title="" uid="b727aa78-c9b1-11e5-8bd5-5404a60d96b5"/>
+<item CMORattr="" description="Type (e.g. 'double', 'character', 'integer')" label="type" title="Type of axis values" uid="b727adca-c9b1-11e5-8bd5-5404a60d96b5"/>
+<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"/>
+<item CMORattr="" description="For array dimensions see 'requested'" label="value" title="Value of singleton dimension" uid="b727b482-c9b1-11e5-8bd5-5404a60d96b5"/>
+<item CMORattr="" description="For array dimensions see 'boundsreq'" label="bounds_values" title="Bounds of a singleton dimension" uid="b727b7de-c9b1-11e5-8bd5-5404a60d96b5"/>
+<item CMORattr="" description="For singleton dimensions see 'value'" label="requested" title="Values of array dimensions" uid="b727bd74-c9b1-11e5-8bd5-5404a60d96b5"/>
+<item CMORattr="" description="For singleton dimensions see 'bounds_value'" label="boundsreq" title="Bounds Requested" uid="b727c0d0-c9b1-11e5-8bd5-5404a60d96b5"/>
+<item CMORattr="" description="Variance from requested values that is tolerated" label="tolerance" title="Tolerance on requested values" uid="b727c436-c9b1-11e5-8bd5-5404a60d96b5"/>
+<item CMORattr="must_call_cmor_grid" description="" label="grid" title="Is this a grid" uid="b727c774-c9b1-11e5-8bd5-5404a60d96b5"/>
+<item CMORattr="" description="Value copied into NetCDF attribute of dimension variable" label="formula" title="NetCDF formula_terms attribute" uid="b727cad0-c9b1-11e5-8bd5-5404a60d96b5"/>
+<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"/>
+<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"/>
 </cmorDimAttr>
-<processingOptions class="vocab" id="cmip.drv.027" title="Processing steps required" uid="SECTION:processingOptions">
-<!-- <info srcType="dummy" srcRef="ptxt.py">Dummy entries</info> -->
-<item description="" id="tmpid.0001" label="TM" title="time mean"/>
-<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"/>
-<item description="" id="tmpid.0003" label="VCI" title="vertical coordinate interpolation"/>
-<item description="" id="tmpid.0004" label="MSK" title="masking"/>
-<item description="" id="tmpid.0005" label="NS" title="near surface (atmosphere)"/>
-<item description="" id="tmpid.0006" label="SPI" title="spatial interpolation"/>
-<item description="" id="tmpid.0007" label="SM" title="spectral mean"/>
-<item description="" id="tmpid.0008" label="CL" title="climatology "/>
-<item description="" id="tmpid.0009" label="STAT" title="temporal statistics"/>
-<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"/>
+<processingOptions id="cmip.drv.027" label="processingOptions" title="Processing steps required" uid="SECTION:processingOptions" useClass="vocab">
+<!-- <info srcType="dummy" srcRef="ptxt.py">Dummy entries</info> -->
+<item description="" label="TM" title="time mean" uid="b725edaa-c9b1-11e5-8bd5-5404a60d96b5"/>
+<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"/>
+<item description="" label="VCI" title="vertical coordinate interpolation" uid="b725f408-c9b1-11e5-8bd5-5404a60d96b5"/>
+<item description="" label="MSK" title="masking" uid="b725fc5a-c9b1-11e5-8bd5-5404a60d96b5"/>
+<item description="" label="NS" title="near surface (atmosphere)" uid="b725ff66-c9b1-11e5-8bd5-5404a60d96b5"/>
+<item description="" label="SPI" title="spatial interpolation" uid="b7260290-c9b1-11e5-8bd5-5404a60d96b5"/>
+<item description="" label="SM" title="spectral mean" uid="b726061e-c9b1-11e5-8bd5-5404a60d96b5"/>
+<item description="" label="CL" title="climatology " uid="b726093e-c9b1-11e5-8bd5-5404a60d96b5"/>
+<item description="" label="STAT" title="temporal statistics" uid="b7260c5e-c9b1-11e5-8bd5-5404a60d96b5"/>
+<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"/>
+<item description="" label="zm" title="Zonal mean" uid="b7261280-c9b1-11e5-8bd5-5404a60d96b5"/>
+<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"/>
+<item description="Gravity wave diagnostics" label="gw" title="Gravity wave diagnostics" uid="b726187a-c9b1-11e5-8bd5-5404a60d96b5"/>
+<item description="Variables which are restricted to sea-ice." label="si" title="Sea ice" uid="b7261bcc-c9b1-11e5-8bd5-5404a60d96b5"/>
 </processingOptions>
-<coordinateReference class="vocab" id="cmip.drv.028" title="Processing steps required" uid="SECTION:coordinateReference">
-<!-- <info srcType="dummy" srcRef="ptxt.py">Dummy entries</info> -->
-<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/"/>
+<coordinateReference id="cmip.drv.028" label="coordinateReference" title="Processing steps required" uid="SECTION:coordinateReference" useClass="vocab">
+<!-- <info srcType="dummy" srcRef="ptxt.py">Dummy entries</info> -->
+<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/"/>
 </coordinateReference>
+<modelConfig id="cmip.drv.029" label="modelConfig" title="Model configuration options" uid="SECTION:modelConfig" useClass="vocab">
+<!-- <info srcType="dummy" srcRef="ptxt.py">Dummy entries</info> -->
+<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."/>
+<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"/>
+<item MIPs="ISMIP6" label="DynamicIceSheet" range="xs:boolean" title="Evolving ice sheets." type="capability" uid="b72635bc-c9b1-11e5-8bd5-5404a60d96b5" usage=""/>
+<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=""/>
+<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=""/>
+<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.
+"/>
+<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."/>
+<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=""/>
+<item MIPs="CFMIP" label="CospEnabled" range="xs:boolean" title="The CFMIP Observation Simulation Package (COSP)" type="capability" uid="b7265164-c9b1-11e5-8bd5-5404a60d96b5" usage=""/>
+<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."/>
+<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"/>
+<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"/>
+<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"/>
+<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"/>
+<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"/>
+<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"/>
+</modelConfig>
 </main>
 </document>

CMIP6dreqbuild/trunk/srcMisc/dreqSX.py

@@ -58 +58 @@
   ccl[len(ee0[k])] += 1
 
-print 'tables ... groups ....',ccl
+print 'INFO.0000: tables ... groups ....',ccl
   
 
@@ -87 +87 @@
  mipt = ee_mip[k][22]
  ss.add( mipt )
- if mipt == 'OMIP.Oyr':
-   print ee_mip[k]
 
 for h in eeoldl.keys():
@@ -156 +154 @@
 for s in cmip5so.so.keys():
   if not s in s1:
-    print 'ERROR.010.0002: Table %s not in old mip tables' % s
+    print 'ERROR.010.0003: Table %s not in old mip tables' % s
   for v in cmip5so.so[s].a.keys():
     cmip5ByVar[v].append(s)

CMIP6dreqbuild/trunk/srcMisc/dreq_consol_dreq.py

@@ -125 +125 @@
     return clabs[i-1] + clabs[ n - i*26]
 
-def getRow(sht):
-  ee = {}
-  for i in range(sht.nrows):
-    if sht.row(i)[0].ctype == 2 and str( sht.row(i)[0].value ) != '0.0':
-      l = map( lambda x: str( x.value ), sht.row(i) )
-      ##k = string.replace( l[5], ' ','')
-      k = l[5]
-      try:
-        ee[k] = l
-      except:
-        print l
-        raise
-  return ee
     
 def outvSer( ov ):
@@ -486 +473 @@
         rv = map( lambda x: x.value, self.wk1.currentSi.row(j)[:8] )
         tab = rv[0]
-        grid = rv[3]
-        grids.add( grid )
-        gok = rv[r4i.mode-2]
-        comment = rv[r4i.mode-1]
-        obj0 = rv[r4i.mode]
-        bb = string.split(obj0, ':' )
-        if len(bb) > 1:
-          obj = bb[0]
-          preset = int( bb[1] )
-        else:
-          obj = obj0
-          preset = -1
-        opt = rv[1]
-        opar = rv[2]
-        uid = str( uuid.uuid1() )
-        nbl = False
-        if not tab in ['',u'']:
-          ##uid = self.parent.addRow( self.mip, tab, obj, grid, gok, comment, opt=opt, opar=opar )
-          if self.mip != 'DCPP':
+        if not( len(tab) > 0 and tab[0] == '#'):
+          grid = rv[3]
+          grids.add( grid )
+          gok = rv[r4i.mode-2]
+          comment = rv[r4i.mode-1]
+          obj0 = rv[r4i.mode]
+          bb = string.split(obj0, ':' )
+          if len(bb) > 1:
+            obj = bb[0]
+            preset = int( bb[1] )
+          else:
+            obj = obj0
+            preset = -1
+          opt = rv[1]
+          opar = rv[2]
+          uid = str( uuid.uuid1() )
+          nbl = False
+          if not tab in ['',u'']:
+            ##uid = self.parent.addRow( self.mip, tab, obj, grid, gok, comment, opt=opt, opar=opar )
+            if self.mip != 'DCPP':
               for je in range(5):
                 j1 = r4i.ixcntl + je*2
@@ -510 +498 @@
                 if ok:
                   nbl = True
-          for je in r4i.ownix:
+            for je in r4i.ownix:
                 ok = self.readDeckColPair( j, je, 100, expt=string.strip(r4[je]), rid=uid )
                 if ok:
                   nbl = True
-          for jei in range( len(r4i.othix) ):
+            for jei in range( len(r4i.othix) ):
                 je = r4i.othix[jei]
                 tr = r4i.treset[jei]
@@ -521 +509 @@
                   nbl = True
 ### add row if non-blank element found
-        if nbl:
-          uid = self.parent.addRow( self.mip, tab, obj, grid, gok, comment, opt=opt, opar=opar, uid=uid, preset=preset )
+          if nbl:
+            uid = self.parent.addRow( self.mip, tab, obj, grid, gok, comment, opt=opt, opar=opar, uid=uid, preset=preset )
     print 'INFO.100.00001: grids for MIP %s: %s' % (self.mip, str(grids) )
     return True

CMIP6dreqbuild/trunk/srcMisc/dreq_consol_tables.py

@@ -506 +506 @@
       except:
         oo.write( r[0] + '  --- rest missing --- \n' )
-      if r[0] != '' and r[4] != '':
+      if r[0] != '' and r[4] != '' and r[0][0] != '#':
         v = string.strip( str( r[4] ) )
         if v[0] != '#':
@@ -593 +593 @@
            irsh = 5
            for i in range(ll[-1]+1,sh.nrows):
-             rowIndex = i
-             thisr = sh.row(i)
+            rowIndex = i
+            thisr = sh.row(i)
+            v0 = str( thisr[0].value ) + '__' 
+            if v0[0] != '#':
              if iv == 1:
                  ##self.ntr = nt__grptbl._make( getRowValues( thisr, minLen=9 ) + [105,k,''] )

CMIP6dreqbuild/trunk/srcMisc/dreq_utils.py

@@ -240 +240 @@
       if string.find( r, '.' ) != -1:
         mip,tab = string.split(r, '.' )
-        if r == 'HighResMIP.6hrLev':
-          print 'INFO.aaa.00900: processing ',r
         assert sx.cmip5so.so.has_key(tab), 'FATAL.001.0001: revised table not found in original: %s' % tab
         lnf = []
@@ -251 +249 @@
           s1.add(v1)
           if not sx.cmip5so.so[tab].a.has_key(v1):
-            lnf.append(v)
+            if mip != 'OMIP':
+              lnf.append(v)
           else:
             if shb[r][v][1] == sx.cmip5so.so[tab].a[v1][0]:
@@ -268 +267 @@
             if not tabsectuuid[mip].has_key( sk ):
               tabsectuuid[mip][sk] = str( uuid.uuid1() )
-
 ##
 ## want to copy to Omon ... but involves change of frequency ... and dimensionality ....
@@ -286 +284 @@
             if tab == 'Omon' and v in sx.cmip5so.sop['Oyr_3dtr']:
               pass
-              #print 'INFO.zzz.01010: overlooking %s --- 3dtr' % v
             else:
               lnu += 1  

CMIP6dreqbuild/trunk/srcMisc/sx2.py

@@ -51 +51 @@
   for v in sx.cmip5so.sop[k]:
     cmip5GroupsIVAR[ string.split( k, '_' )[0] ][v] = k
+  if sx.cmip5so.omipInsert and k in sx.cmip5so.sxp:
+    for v in sx.cmip5so.sxp[k]:
+      cmip5GroupsIVAR[ string.split( k, '_' )[0] ][v] = k
 sh1.close()
 #### 'uuid', 'mip', 'label','title','ref','refNote'
@@ -352 +355 @@
    elif len(sx.ee_xref_bck[k]) > 1:
      nnm += 1
-     print 'ERROR.0001.001: #################################'
-     print sx.ee_mip[k]
+     print 'ERROR.0001.001: #######', sx.ee_mip[k]
      for k2 in sx.ee_xref_bck[k]:
        print sx.eeold[k2]
@@ -1002 +1004 @@
       else:
         p = sx.cmip5so.so[t].a[v1][0]
-        rwix = sx.cmip5so.so[t].a[v1][-2]
-        si = sx.cmip5so.so[t].a[v1][-1]
-        rwix = rwix + 200*si
+        rwix = sx.cmip5so.so[t].a[v1][23]
+        si = sx.cmip5so.so[t].a[v1][24]
+        try:
+          rwix = rwix + 200*si
+        except:
+          print sx.cmip5so.so[t].a[v1], len(sx.cmip5so.so[t].a[v1])
+          raise
 
 ## the "Oyr" group is for import, not needed in request