Changeset 681


Ignore:
Timestamp:
17/06/16 13:49:53 (4 years ago)
Author:
mjuckes
Message:

near release

Location:
CMIP6dreqbuild/trunk
Files:
18 edited

Legend:

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

    r600 r681  
    3232<xs:schema targetNamespace="urn:w3id.org:cmip6.dreq.dreq:a" 
    3333xmlns:dc="http://purl.org/dc/elements/1.1/" 
     34xmlns:pav="http://purl.org/pav/2.3" 
    3435xmlns:aa="urn:w3id.org:cmip6.dreq.dreq:a" xmlns:xs="http://www.w3.org/2001/XMLSchema"  elementFormDefault="qualified"><xsl:text>&#xa;</xsl:text> 
    3536<xs:import namespace="http://purl.org/dc/elements/1.1/" schemaLocation="dc1.xsd" /><xsl:text>&#xa;</xsl:text> 
     37<xs:import namespace="http://purl.org/pav/2.3" schemaLocation="pav.xsd"/><xsl:text>&#xa;</xsl:text> 
    3638 
    3739<!-- generic type definitions --> 
     
    115117    <xs:element name="prologue"> 
    116118        <xs:complexType> 
    117           <xs:group ref="dc:elementsGroup" maxOccurs="20"/> 
     119          <xs:sequence> 
     120            <xs:group ref="dc:elementsGroup" maxOccurs="20"/> 
     121            <xs:group ref="pav:elementsGroup" maxOccurs="20"/> 
     122          </xs:sequence> 
    118123        </xs:complexType> 
    119124    </xs:element> 
  • CMIP6dreqbuild/trunk/src/workbook/importShDreq2.py

    r667 r681  
    519519      self.tsliceMap = {} 
    520520      self.tsliceMap['DAMIP'] = {'18 (1850, 1860, ..,  2010, 2020)':'DAMIP18', 'all':None, '8\n(2030, 2040, .., 2090, 2100)':'DAMIP8', '61\n(1960-2020)':'DAMIP61', '40\n(2026-2045, 2081-2100)':'DAMIP40', '20\n(2081-2100)':'DAMIP20', '42\n(1979-2020)':'DAMIP42' } 
     521      self.tsliceMap['SIMIP'] = {'100 (last)':'piControl100' } 
    521522 
    522523      thissh = self.skey['experiment'] 
     
    554555      'concdust,concaerh2o,reffclwc,emiso4,loadso4,concso2,emidust,emiss,conccmcn,emiso2,concnmcn,concss,reffclws,loadss,conccn', 
    555556      'rsdsdiff,dryso4,wetso2,cldnci,od550lt1aer,reffclwtop,dryss,wetso4,sconcso4,cldncl,abs550aer,wetss,rsdscsdiff,wetdust,ec550aer,cldnvi,dryso2,drydust,od550aer,sconcss,sconcdust', 
     557      'vtem23, wtem23, epfy23, epfz23, utendepfd23, zmtnt23', 
     558      'tntlw, tntsw, utendogw, utendnogw', 
    556559      'thkcello,wmo,uo,hfnorth,tos,sos,soga,masscello,hfy,msftmrhoz,masso,pso,mlotst,zos,zostoga,rhopoto,hfydiff,hfbasin,ficeberg2d,thetao,so,zossga,dpco2,msftmyz,tauvo,sfdsi,msftyrhoz,spco2,fddtalk,hfxdiff,omlmax,htovovrt,sltovovrt,vmo,tauuo,volo,zsatarag,fgco2,zosga,wfo,vo,msftyyz,mfo,ficeberg,friver,msftbarot,umo,intpcalcite,intparag,fddtdic,hfx,agessc,hfbasindiff', 
    557560      'difvmo,difvho,difvso',  'pr, tas, huss & rsds' , 'ta, ua, va, zg, hus'} 
     
    599602            self.varGroupSs2[str(rr[-1])].a[(m,tuple(vl))].append(rr[0]) 
    600603            print 'INFO.077.07080: ',m,vl, rr[-1] 
    601  
    602 ## 
    603 ## not finding new variables .... may be better to redefine the groups ... 
     604## 
     605## !!!not finding new variables .... may be better to redefine the groups ... 
     606## requestVars group for emMon etc do not exist .... 
     607## need to build new group differently .... 
     608## cmor variables should be defined ... need to generate request vars and link to new group .... 
     609## or add tables ... might be easier ... 
     610## 
     611## 
    604612## 
    605613### 
     
    613621          ll = thissh[k][:] 
    614622          vgid = self.prqv.rqv_vg['%s.%s.%s' % (ll[2],ll[1],ll[0])] 
    615           ##if ll[1][:4] == 'DYVR': 
     623 
    616624          print 'INFO.802.00001: ',ll, vgid in self.varGroupSubset.keys() 
    617625          if vgid in self.varGroupSubset.keys(): 
     
    626634### 
    627635      nf = [] 
     636      vgmap = {} 
     637      if 'aermonthly' not in self.varGroupByLabel: 
     638         print 'SEVERE.aermonthly.00001: not found'  
     639         if self.varGroupByLabel['aermonthly'] not in varGroupFull: 
     640             print 'SEVERE.aermonthly.00002: not found', self.varGroupByLabel['aermonthly'] 
     641 
    628642      for k in self.varGroupSubset.keys(): 
    629643       if not (k in varGroupFull): 
     
    650664      self.rqvgrpExtra = [] 
    651665      self.rqlRedirect = {} 
     666      thissh = self.skey['requestlink'] 
    652667      for k in varGroupFull: 
    653         for m,k2 in self.varGroupSs2[k].a: 
     668        kk1 = vgmap.get(k,k) 
     669        ##if k == self.varGroupByLabel['CCMI-monthly']: 
     670          ##assert k != kk1, 'This value should be mapped: %s' % k 
     671          ##print 'INFO.aermonthly: k mapped to %s' % kk1 
     672        for m,k2 in self.varGroupSs2[kk1].a: 
    654673          ok1 = [] 
    655674          for i in k2: 
     
    669688          if not ok: 
    670689            k2m = [  k2[i]  for i in range(len(k2)) if not ok1[i] ] 
    671             print 'ERROR.080.06060: not all vars found [%s] %s' % ( k, str(k2m) ) 
     690            msg = ['%s.%s' % (thissh[kk][1],thissh[kk][2]) for kk in self.varGroupSs2[kk1].a[(m,k2)] ] 
     691            print 'ERROR.080.06060: not all vars found [%s] %s: %s' % ( k, str(k2m), string.join(msg) ) 
    672692          else: 
    673693## 
     
    675695## 
    676696            gpid = str( uuid.uuid1() ) 
    677             for rqlid in self.varGroupSs2[k].a[(m,k2)]: 
     697            for rqlid in self.varGroupSs2[kk1].a[(m,k2)]: 
    678698              self.rqlRedirect[rqlid] = gpid 
     699              if k != kk1: 
     700                 print 'INFO.aermonthly: redirected subset ..... ' 
    679701              ##kk = ['uid', 'mip', 'label', 'title', 'ref', 'refNote'] 
    680702## e.g. ['4db2f616-6d9e-11e5-b29a-ac72891c3257', 'DAMIP', u'DynVar-day', u'DAMIP: DynVar-day', 'new', u'DynVar.DYVR_daily'] 
    681             ll =  rq.rqvg[k][:] 
     703            ll =  rq.rqvg[kk1][:] 
    682704            ll[0] = gpid 
    683705            ll[2] += '-subset' 
     
    691713              i1 = i 
    692714              if type(i) == type( () ) and len(i) == 2: 
    693                 if varGroupFull[k].has_key(i[0]): 
     715                if varGroupFull[kk1].has_key(i[0]): 
    694716                  i1 = i[0] 
    695717                else: 
     
    697719              elif string.find( i, 'and ' ) != -1: 
    698720                i1 = string.split(i)[-1] 
    699               self.rqvClone[varGroupFull[k][i1]].append( gpid ) 
     721              self.rqvClone[varGroupFull[kk1][i1]].append( gpid ) 
    700722 
    701723  def finishRequestLink(self): 
     
    801823                if string.find( rr[23], 'plevs' ) != -1: 
    802824                   print 'INFO.qqqq01: ',rr[21:24] 
    803                 rr[23] = string.replace(rr[23], 'plevs', 'plev17') 
     825                rr[23] = string.replace(rr[23], 'plevs', 'plev19') 
    804826                ## this was a mis-understanding --- tau is optical thickness. 
    805827                ##rr[23] = string.replace(rr[23], '|tau|', '|effectRad|') 
     
    930952                  if rr[il] == u'10/17/23': 
    931953                     lev0 = 10 
    932                      levsp = [17,23] 
     954                     levsp = [19,23] 
    933955                  else: 
    934                      lev0 = 17 
     956                     lev0 = 19 
    935957                     levsp = [23,] 
    936958                  rr[ixp] = 1 
     
    10701092                  print 'INFO.022.0002: Setting p... coordinate for ',tt 
    10711093                  if tt.cmorv[-5:] in [ 't2000']: 
    1072                     thisc = 't2000' 
    1073                   elif tt.cmorv[-5:] in [ 't300', 't700']: 
    1074                     thisc = tt.cmorv[-4:] 
     1094                    thisc = 'depth2000m' 
     1095                  elif tt.cmorv[-4:] in [ 't300', 't700']: 
     1096                    thisc = 'depth%sm' % tt.cmorv[-3:] 
    10751097                  elif tt.cmorv[-3:] == '000': 
    10761098                    assert tt.cmorv[-4:] == '1000',str(tt) 
     
    12211243    tshp = { 'time':['time-mean','Temporal mean'], 'time1':['time-point','Instantaneous value (i.e. synoptic or time-step value)'], \ 
    12221244             'time2':['climatoglogy','Climatological mean'], \ 
    1223              'diurnal':['diurnal-cycle','Mean Diurnal Cycle'], \ 
     1245             'time3':['diurnal-cycle','Mean Diurnal Cycle'], \ 
    12241246             '':['None','No temporal dimensions ... fixed field'], 'xxxx':['unknown','dimension not recognised'] } 
    12251247 
     
    14651487      """Sort the dimensions string into spatial, temporal and other sections, 
    14661488       returns a dictionary of tuples: spatial dimensions, other, temporal, coords and a 2nd, keyyed on spatial dimensions with a level count indicator.  """ 
    1467       vdims = {'plev7':7, 'plev':4, 'plevs':17, 'plev3':3,'plev8':8,'alt40':40,'alev1':1, 'alevhalf':-1,'olevel':-1,'rho':-1,'sdepth':-1,'alevel':-1} 
     1489      vdims = {'plev7':7, 'plev':4, 'plevs':19, 'plev3':3,'plev8':8,'alt40':40,'alev1':1, 'alevhalf':-1,'olevel':-1,'rho':-1,'sdepth':-1,'alevel':-1} 
    14681490      odims = {'sza5','vegtype','scatratio','dbze','typepdec','vgidx','tau','effectRad'} 
    14691491      dl = sorted( list(dset) ) 
     
    15261548        ('time', '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'), 
    15271549        (), 
    1528         ('diurnal',), ('',)] 
     1550        ('diurnal','time3'), ('',)] 
    15291551        ttdd = {} 
    1530         kkk = ['time1','time','time2','diurnal',''] 
     1552        kkk = ['time1','time','time2','time3',''] 
    15311553        for i in range(4): 
    15321554          for k in ttt[i]: 
     
    15501572              'XYZKspT':('longitude|latitude|%s','spectband','time','',True), \ 
    15511573              'XYT':('longitude|latitude','','time','',False), \ 
    1552               'XYKT':('longitude|latitude','angle','time','',False), \ 
     1574              'XYKT':('longitude|latitude','sza5','time','',False), \ 
    15531575              'XYLT':('longitude|latitude','landUse','time','',False), \ 
    15541576              'XYKszT':('longitude|latitude','sza5','time','',False), \ 
    15551577              'YZT':('latitude|%s','','time','',True), \ 
    1556               'XYK':('longitude|latitude','snowband','time','',False), \ 
     1578              'XYKsn':('longitude|latitude','snowband','time','',False), \ 
     1579              'XYKic':('longitude|latitude','iceband','time','',False), \ 
    15571580              'K':('sistraits','','time','',False), \ 
    15581581              'scalar':('','','time','',False), \ 
     
    23802403                    print 'INFO.h2p.00002: H2p vid not found %s' % vid 
    23812404  
    2382                   if thisl in self.importWbMods.vars.c1 or (thisl[-2:] in ['17','23','27','7c','7h'] and thisl[:-2] in self.importWbMods.vars.c1): 
     2405                  if thisl in self.importWbMods.vars.c1 or (thisl[-2:] in ['17','19','23','27','7c','7h'] and thisl[:-2] in self.importWbMods.vars.c1): 
    23832406                    if thisl in self.importWbMods.vars.c1: 
    23842407                      thisn = thisl 
     
    24572480              rr = list(rr) 
    24582481              rr[3] = kk 
     2482            elif kk == 'longitude|latitude|plev7': 
     2483              kk = 'longitude|latitude|plev7c' 
     2484              print 'INFO.plev7.00001: plev7 --> plev7c' 
     2485              rr = list(rr) 
     2486              rr[3] = kk 
    24592487            self.spatialDims[rr[0]] = rr[3] 
    24602488            if kk not in spsResets: 
     
    24992527          kkf = 0 
    25002528          for t in self.rqv: 
     2529            if t[5][:6] == 'SPECS_': 
     2530               print 'SEVERE.specs.00001: mis-assigned mip: ',t 
    25012531            item = self.doc.createElement( 'item' ) 
    25022532            ###assert len(t) == len(kk), 'BAD request variable line: %s' % str(t) 
     
    25312561              newd = self._editRequestVar01( item, mm, t, {} ) 
    25322562 
     2563            tm = item.getAttribute( 'mip' ) 
     2564            if tm[:6] == 'SPECS_': 
     2565               print 'SEVERE.specs.00002: mis-assigned mip: ',t 
    25332566            if vid in self.rep['cmv'].items: 
    25342567              vid1 = vid 
     
    26402673                    'LULCC_hist, CPL_1pctDF, LND_DF, ATM_DF, CPL_DF, CPL_noLULCC_hist_conc (LUMIP)':['LULCC_hist', 'CPL_1pctDF', 'LND_DF', 'ATM_DF', 'CPL_DF', 'CPL_noLULCC_hist_conc'] \ 
    26412674                 } 
     2675 
     2676## 
     2677## extra fix for HighResMIP .... after encoding in template made consistent with other MIPs 
     2678## 
     2679    shm = {} 
     2680    for k in sh.keys(): 
     2681      if string.find( k, ' ' ) != -1 and k[:4] == 'High': 
     2682        k1 = string.split( k)[0] 
     2683        assert k1 not in shm, 'Duplicate abbreviated key: %s [%s and %s]' % (k1,k,shm[k1]) 
     2684        shm[k1] = k 
    26422685    ks = sorted( self.exptPnt.keys() ) 
    26432686    self.exptPntMap = collections.defaultdict( list ) 
     
    26532696      if sh.has_key(k): 
    26542697        thisl = sh[k] 
     2698      elif shm.has_key(k): 
     2699        thisl = sh[shm[k]] 
    26552700      elif extraMappings.has_key(k): 
    26562701        thisl = extraMappings[k] 
  • CMIP6dreqbuild/trunk/src/workbook/importWbMods.py

    r667 r681  
    270270    for i in range(3,s1.nrows): 
    271271      rr = [string.strip( str(x.value) ) for x in s1.row(i)] 
    272       assert rr[1] not in self.ss, 'Duplicate dimension: %s' % rr[1] 
    273       self.ss[ rr[1] ] = rr 
     272      if rr[1] != '': 
     273        assert rr[1] not in self.ss, 'Duplicate dimension: %s' % rr[1] 
     274        self.ss[ rr[1] ] = rr 
    274275 
    275276class loadSpatial(object): 
  • CMIP6dreqbuild/trunk/src/workbook/trial.xml

    r600 r681  
    1010<institute id="cmip.drv.001" label="institute" title="Institute" uid="SECTION:institute" useClass="vocab"> 
    1111<!-- <info srcType="dummy" srcRef="ptxt.py">Dummy entries</info> --> 
    12 <item description="Met Office Hadley Centre, Fitzroy Road, Exeter, Devon, EX1 3PB, UK." isni="0000 0001 2299 303X  [UKMO]" label="MOHC" title="MOHC" uid="b72699d0-c9b1-11e5-8bd5-5404a60d96b5" url="http://www.metoffice.gov.uk; http://www.metoffice.gov.uk/climate-guide/science/science-behind-climate-change/hadley"/> 
    13 <item description="Institut Pierre Simon Laplace, Paris, France" isni="0000 0000 9000 8794" label="IPSL" title="IPSL" uid="b7269e4e-c9b1-11e5-8bd5-5404a60d96b5" url="https://www.ipsl.fr/en/"/> 
    14 <item description="Centre National de Recherches Meteorologiques, Meteo-France, Toulouse, France) and CERFACS (Centre Europeen de Recherches et de Formation Avancee en Calcul Scientifique, Toulouse, France" isni="0000 0004 0640 7549 " label="CNRM-CERFACS" title="CNRM-CERFACS" uid="b726a376-c9b1-11e5-8bd5-5404a60d96b5" url="http://www.cnrm.meteo.fr/spip.php?rubrique1&amp;lang=en; http://www.cerfacs.fr 
     12<item description="Met Office Hadley Centre, Fitzroy Road, Exeter, Devon, EX1 3PB, UK." isni="0000 0001 2299 303X  [UKMO]" label="MOHC" title="MOHC" uid="19519700-2f14-11e6-9f5a-5404a60d96b5" url="http://www.metoffice.gov.uk; http://www.metoffice.gov.uk/climate-guide/science/science-behind-climate-change/hadley"/> 
     13<item description="Institut Pierre Simon Laplace, Paris, France" isni="0000 0000 9000 8794" label="IPSL" title="IPSL" uid="19519e58-2f14-11e6-9f5a-5404a60d96b5" url="https://www.ipsl.fr/en/"/> 
     14<item description="Centre National de Recherches Meteorologiques, Meteo-France, Toulouse, France) and CERFACS (Centre Europeen de Recherches et de Formation Avancee en Calcul Scientifique, Toulouse, France" isni="0000 0004 0640 7549 " label="CNRM-CERFACS" title="CNRM-CERFACS" uid="1951a376-2f14-11e6-9f5a-5404a60d96b5" url="http://www.cnrm.meteo.fr/spip.php?rubrique1&amp;lang=en; http://www.cerfacs.fr 
    1515"/> 
    16 <item description="Norwegian Climate Centre" isni="" label="NCC" title="NCC" uid="b726a77c-c9b1-11e5-8bd5-5404a60d96b5" url="http://folk.uib.no/ngfhd/EarthClim/index.htm"/> 
    17 <item description="Australian Commonwealth Scientific and Industrial Research Organization (CSIRO) Marine and Atmospheric Research (Melbourne, Australia) in collaboration with the Queensland Climate Change Centre of Excellence (QCCCE) (Brisbane, Australia)" isni="0000 0001 2173 2719 ;  0000 0004 0380 0628 [Queensland Government]" label="CSIRO-QCCCE" title="CSIRO-QCCCE" uid="b726ab82-c9b1-11e5-8bd5-5404a60d96b5" url="www.csiro.au ; http://www.ehp.qld.gov.au/climatechange/index.html "/> 
    18 <item description="Canadian Centre for Climate Modelling and Analysis, Victoria, BC, Canada" isni="" label="CCCma" title="CCCma" uid="b726b294-c9b1-11e5-8bd5-5404a60d96b5" url=""/> 
    19 <item description="Institute for Numerical Mathematics, Moscow, Russia" isni="" label="INM" title="INM" uid="b726b6ae-c9b1-11e5-8bd5-5404a60d96b5" url=""/> 
    20 <item description="Meteorological Research Institute, Tsukuba, Japan" isni="" label="MRI" title="MRI" uid="b726ba96-c9b1-11e5-8bd5-5404a60d96b5" url=""/> 
    21 <item description="AORI (Atmosphere and Ocean Research Institute, The University of Tokyo, Chiba, Japan), NIES (National Institute for Environmental Studies, Ibaraki, Japan), JAMSTEC (Japan Agency for Marine-Earth Science and Technology, Kanagawa, Japan)" isni="" label="MIROC" title="MIROC" uid="b726bea6-c9b1-11e5-8bd5-5404a60d96b5" url=""/> 
    22 <item description="JAMSTEC (Japan Agency for Marine-Earth Science and Technology, Kanagawa, Japan), AORI (Atmosphere and Ocean Research Institute, The University of Tokyo, Chiba, Japan), and NIES (National Institute for Environmental Studies, Ibaraki, Japan)" isni="" label="MIROC" title="MIROC" uid="b726c2a2-c9b1-11e5-8bd5-5404a60d96b5" url=""/> 
    23 <item description="Goddard Institute for Space Studies, New York, NY" isni="0000 0001 1456 7559  [NASA]" label="NASA-GISS" title="NASA-GISS" uid="b726c6bc-c9b1-11e5-8bd5-5404a60d96b5" url="http://www.giss.nasa.gov/"/> 
    24 <item description="National Center for Atmospheric Research, Boulder, CO, USA" isni="0000 0004 0637 9680 " label="NCAR" title="NCAR" uid="b726cab8-c9b1-11e5-8bd5-5404a60d96b5" url="ncar.ucar.edu"/> 
    25 <item description="NOAA GFDL, 201 Forrestal Rd, Princeton, NJ, 08540" isni="0000 0000 9269 5516 " label="NOAA-GFDL" title="NOAA-GFDL" uid="b726ceaa-c9b1-11e5-8bd5-5404a60d96b5" url="www.gfdl.noaa.gov"/> 
    26 <item description="Beijing Climate Center,China Meteorological Administration,China" isni="0000 0001 2234 550X [CMA]" label="BCC" title="BCC" uid="b726d2ce-c9b1-11e5-8bd5-5404a60d96b5" url=""/> 
    27 <item description="Max Planck Institute for Meteorology" isni="" label="MPI-M" title="MPI-M" uid="b726d8f0-c9b1-11e5-8bd5-5404a60d96b5" url=""/> 
    28 <item description="Institute of Atmospheric Physics, Chinese Academy of Sciences, Beijing, China and Tsinghua University" isni="" label="LASG-CESS" title="LASG-CESS" uid="b726dd1e-c9b1-11e5-8bd5-5404a60d96b5" url=""/> 
    29 <item description="Global Modeling and Assimilation Office, NASA Goddard Space Flight Center, Greenbelt, MD 20771" isni="0000 0001 1456 7559  [NASA]" label="NASA-GMAO" title="NASA-GMAO" uid="b726e124-c9b1-11e5-8bd5-5404a60d96b5" url=""/> 
    30 <item description="GCESS,BNU,Beijing,China (College of Global Change and Earth System Science, Beijing Normal University)" isni="" label="BNU" title="BNU" uid="b726e624-c9b1-11e5-8bd5-5404a60d96b5" url=""/> 
    31 <item description="National Center for Atmospheric Research, Boulder, CO, USA" isni="" label="NSF-DOE-NCAR" title="NSF-DOE-NCAR" uid="b726eb9c-c9b1-11e5-8bd5-5404a60d96b5" url=""/> 
    32 <item description="PNNL (Pacific Northwest National Laboratory) Richland, WA, USA/NCAR (National Center for Atmospheric Research) Boulder, CO, USA" isni="" label="NSF-DOE-NCAR" title="NSF-DOE-NCAR" uid="b726f07e-c9b1-11e5-8bd5-5404a60d96b5" url=""/> 
    33 <item description="NSF/DOE NCAR (National Center for Atmospheric Research) Boulder, CO, USA" isni="" label="NSF-DOE-NCAR" title="NSF-DOE-NCAR" uid="b726f52e-c9b1-11e5-8bd5-5404a60d96b5" url=""/> 
    34 <item description="Commonwealth Scientific and Industrial Research Organisation, Australia, and Bureau of Meteorology, Australia" isni="0000 0001 2173 2719  [CSIRO]; 0000 0004 0628 7751 [BOM]" label="CSIRO-BOM" title="CSIRO-BOM" uid="b726f9fc-c9b1-11e5-8bd5-5404a60d96b5" url="www.csiro.au ; http://www.bom.gov.au/"/> 
    35 <item description="Nonhydrostatic Icosahedral Atmospheric Model (NICAM) Group (RIGC-JAMSTEC/AORI-U.Tokyo/AICS-RIKEN,Japan)" isni="" label="NICAM" title="NICAM" uid="b726fe16-c9b1-11e5-8bd5-5404a60d96b5" url=""/> 
    36 <item description="Centro Euro-Mediterraneo per i Cambiamenti Climatici, Bologna, Italy" isni="0000 0004 1761 0884" label="CMCC" title="CMCC" uid="b7270546-c9b1-11e5-8bd5-5404a60d96b5" url="www.cmcc.it"/> 
    37 <item description="The First Institution of Oceanography,SOA,Qingdao,China" isni="" label="FIO" title="FIO" uid="b727099c-c9b1-11e5-8bd5-5404a60d96b5" url=""/> 
    38 <item description="Institute of Atmospheric Physics, Chinese Academy of Sciences,Beijing,China" isni="" label="LASG-IAP" title="LASG-IAP" uid="b7270da2-c9b1-11e5-8bd5-5404a60d96b5" url=""/> 
    39 <item description="National Institute of Meteorological Research, Seoul, South Korea" isni="" label="NIMR-KMA" title="NIMR-KMA" uid="b727116c-c9b1-11e5-8bd5-5404a60d96b5" url=""/> 
    40 <item description="European Earth System Model" isni="" label="ICHEC" title="ICHEC" uid="b7271518-c9b1-11e5-8bd5-5404a60d96b5" url=""/> 
    41 <item description="Center for Ocean-Land-Atmosphere Studies, Calverton, MD" isni="" label="COLA-CFS" title="COLA-CFS" uid="b72718d8-c9b1-11e5-8bd5-5404a60d96b5" url=""/> 
    42 <item description="National Centers for Environmental Prediction, Camp Springs, MD" isni="" label="NOAA-NCEP" title="NOAA-NCEP" uid="b7271cca-c9b1-11e5-8bd5-5404a60d96b5" url=""/> 
     16<item description="Norwegian Climate Centre" isni="" label="NCC" title="NCC" uid="1951a83a-2f14-11e6-9f5a-5404a60d96b5" url="http://folk.uib.no/ngfhd/EarthClim/index.htm"/> 
     17<item description="Australian Commonwealth Scientific and Industrial Research Organization (CSIRO) Marine and Atmospheric Research (Melbourne, Australia) in collaboration with the Queensland Climate Change Centre of Excellence (QCCCE) (Brisbane, Australia)" isni="0000 0001 2173 2719 ;  0000 0004 0380 0628 [Queensland Government]" label="CSIRO-QCCCE" title="CSIRO-QCCCE" uid="1951accc-2f14-11e6-9f5a-5404a60d96b5" url="www.csiro.au ; http://www.ehp.qld.gov.au/climatechange/index.html "/> 
     18<item description="Canadian Centre for Climate Modelling and Analysis, Victoria, BC, Canada" isni="" label="CCCma" title="CCCma" uid="1951b668-2f14-11e6-9f5a-5404a60d96b5" url=""/> 
     19<item description="Institute for Numerical Mathematics, Moscow, Russia" isni="" label="INM" title="INM" uid="1951bb40-2f14-11e6-9f5a-5404a60d96b5" url=""/> 
     20<item description="Meteorological Research Institute, Tsukuba, Japan" isni="" label="MRI" title="MRI" uid="1951bfc8-2f14-11e6-9f5a-5404a60d96b5" url=""/> 
     21<item description="AORI (Atmosphere and Ocean Research Institute, The University of Tokyo, Chiba, Japan), NIES (National Institute for Environmental Studies, Ibaraki, Japan), JAMSTEC (Japan Agency for Marine-Earth Science and Technology, Kanagawa, Japan)" isni="" label="MIROC" title="MIROC" uid="1951c46e-2f14-11e6-9f5a-5404a60d96b5" url=""/> 
     22<item description="JAMSTEC (Japan Agency for Marine-Earth Science and Technology, Kanagawa, Japan), AORI (Atmosphere and Ocean Research Institute, The University of Tokyo, Chiba, Japan), and NIES (National Institute for Environmental Studies, Ibaraki, Japan)" isni="" label="MIROC" title="MIROC" uid="1951c928-2f14-11e6-9f5a-5404a60d96b5" url=""/> 
     23<item description="Goddard Institute for Space Studies, New York, NY" isni="0000 0001 1456 7559  [NASA]" label="NASA-GISS" title="NASA-GISS" uid="1951cdba-2f14-11e6-9f5a-5404a60d96b5" url="http://www.giss.nasa.gov/"/> 
     24<item description="National Center for Atmospheric Research, Boulder, CO, USA" isni="0000 0004 0637 9680 " label="NCAR" title="NCAR" uid="1951d27e-2f14-11e6-9f5a-5404a60d96b5" url="ncar.ucar.edu"/> 
     25<item description="NOAA GFDL, 201 Forrestal Rd, Princeton, NJ, 08540" isni="0000 0000 9269 5516 " label="NOAA-GFDL" title="NOAA-GFDL" uid="1951d6ac-2f14-11e6-9f5a-5404a60d96b5" url="www.gfdl.noaa.gov"/> 
     26<item description="Beijing Climate Center,China Meteorological Administration,China" isni="0000 0001 2234 550X [CMA]" label="BCC" title="BCC" uid="1951dac6-2f14-11e6-9f5a-5404a60d96b5" url=""/> 
     27<item description="Max Planck Institute for Meteorology" isni="" label="MPI-M" title="MPI-M" uid="1951deb8-2f14-11e6-9f5a-5404a60d96b5" url=""/> 
     28<item description="Institute of Atmospheric Physics, Chinese Academy of Sciences, Beijing, China and Tsinghua University" isni="" label="LASG-CESS" title="LASG-CESS" uid="1951e2d2-2f14-11e6-9f5a-5404a60d96b5" url=""/> 
     29<item description="Global Modeling and Assimilation Office, NASA Goddard Space Flight Center, Greenbelt, MD 20771" isni="0000 0001 1456 7559  [NASA]" label="NASA-GMAO" title="NASA-GMAO" uid="1951e750-2f14-11e6-9f5a-5404a60d96b5" url=""/> 
     30<item description="GCESS,BNU,Beijing,China (College of Global Change and Earth System Science, Beijing Normal University)" isni="" label="BNU" title="BNU" uid="1951eb4c-2f14-11e6-9f5a-5404a60d96b5" url=""/> 
     31<item description="National Center for Atmospheric Research, Boulder, CO, USA" isni="" label="NSF-DOE-NCAR" title="NSF-DOE-NCAR" uid="1951ef8e-2f14-11e6-9f5a-5404a60d96b5" url=""/> 
     32<item description="PNNL (Pacific Northwest National Laboratory) Richland, WA, USA/NCAR (National Center for Atmospheric Research) Boulder, CO, USA" isni="" label="NSF-DOE-NCAR" title="NSF-DOE-NCAR" uid="1951f380-2f14-11e6-9f5a-5404a60d96b5" url=""/> 
     33<item description="NSF/DOE NCAR (National Center for Atmospheric Research) Boulder, CO, USA" isni="" label="NSF-DOE-NCAR" title="NSF-DOE-NCAR" uid="1951f768-2f14-11e6-9f5a-5404a60d96b5" url=""/> 
     34<item description="Commonwealth Scientific and Industrial Research Organisation, Australia, and Bureau of Meteorology, Australia" isni="0000 0001 2173 2719  [CSIRO]; 0000 0004 0628 7751 [BOM]" label="CSIRO-BOM" title="CSIRO-BOM" uid="1951fb78-2f14-11e6-9f5a-5404a60d96b5" url="www.csiro.au ; http://www.bom.gov.au/"/> 
     35<item description="Nonhydrostatic Icosahedral Atmospheric Model (NICAM) Group (RIGC-JAMSTEC/AORI-U.Tokyo/AICS-RIKEN,Japan)" isni="" label="NICAM" title="NICAM" uid="1952042e-2f14-11e6-9f5a-5404a60d96b5" url=""/> 
     36<item description="Centro Euro-Mediterraneo per i Cambiamenti Climatici, Bologna, Italy" isni="0000 0004 1761 0884" label="CMCC" title="CMCC" uid="19520898-2f14-11e6-9f5a-5404a60d96b5" url="www.cmcc.it"/> 
     37<item description="The First Institution of Oceanography,SOA,Qingdao,China" isni="" label="FIO" title="FIO" uid="19520c80-2f14-11e6-9f5a-5404a60d96b5" url=""/> 
     38<item description="Institute of Atmospheric Physics, Chinese Academy of Sciences,Beijing,China" isni="" label="LASG-IAP" title="LASG-IAP" uid="19521090-2f14-11e6-9f5a-5404a60d96b5" url=""/> 
     39<item description="National Institute of Meteorological Research, Seoul, South Korea" isni="" label="NIMR-KMA" title="NIMR-KMA" uid="19521496-2f14-11e6-9f5a-5404a60d96b5" url=""/> 
     40<item description="European Earth System Model" isni="" label="ICHEC" title="ICHEC" uid="195218a6-2f14-11e6-9f5a-5404a60d96b5" url=""/> 
     41<item description="Center for Ocean-Land-Atmosphere Studies, Calverton, MD" isni="" label="COLA-CFS" title="COLA-CFS" uid="19521c7a-2f14-11e6-9f5a-5404a60d96b5" url=""/> 
     42<item description="National Centers for Environmental Prediction, Camp Springs, MD" isni="" label="NOAA-NCEP" title="NOAA-NCEP" uid="19522058-2f14-11e6-9f5a-5404a60d96b5" url=""/> 
    4343</institute> 
    4444<model id="cmip.drv.002" label="model" title="Model" uid="SECTION:model" useClass="vocab"> 
    4545<!-- <info srcType="dummy" srcRef="ptxt.py">Dummy entries</info> --> 
    46 <item description="" label="ACCESS" title="" uid="b72910a2-c9b1-11e5-8bd5-5404a60d96b5"/> 
    47 <item description="" label="AWI-CM" title="" uid="b72915ca-c9b1-11e5-8bd5-5404a60d96b5"/> 
    48 <item description="" label="BCC" title="" uid="b7291926-c9b1-11e5-8bd5-5404a60d96b5"/> 
    49 <item description="" label="BESM" title="" uid="b7291c50-c9b1-11e5-8bd5-5404a60d96b5"/> 
    50 <item description="" label="BNU" title="" uid="b7291f7a-c9b1-11e5-8bd5-5404a60d96b5"/> 
    51 <item description="" label="CAMS-CSM" title="" uid="b729229a-c9b1-11e5-8bd5-5404a60d96b5"/> 
    52 <item description="" label="CanESM" title="" uid="b72925ba-c9b1-11e5-8bd5-5404a60d96b5"/> 
    53 <item description="" label="CAS-ESM" title="" uid="b7292b5a-c9b1-11e5-8bd5-5404a60d96b5"/> 
    54 <item description="" label="CESM" title="" uid="b7292e7a-c9b1-11e5-8bd5-5404a60d96b5"/> 
    55 <item description="" label="CESS-THU" title="" uid="b72931a4-c9b1-11e5-8bd5-5404a60d96b5"/> 
    56 <item description="" label="CMCC" title="" uid="b729349c-c9b1-11e5-8bd5-5404a60d96b5"/> 
    57 <item description="" label="CNRM" title="" uid="b72937bc-c9b1-11e5-8bd5-5404a60d96b5"/> 
    58 <item description="" label="EC-Earth" title="" uid="b7293ae6-c9b1-11e5-8bd5-5404a60d96b5"/> 
    59 <item description="" label="FGOALS" title="" uid="b7293e1a-c9b1-11e5-8bd5-5404a60d96b5"/> 
    60 <item description="" label="FIO" title="" uid="b7294112-c9b1-11e5-8bd5-5404a60d96b5"/> 
    61 <item description="" label="GFDL" title="" uid="b7294428-c9b1-11e5-8bd5-5404a60d96b5"/> 
    62 <item description="" label="GISS" title="" uid="b729475c-c9b1-11e5-8bd5-5404a60d96b5"/> 
    63 <item description="" label="IITM" title="" uid="b7294a72-c9b1-11e5-8bd5-5404a60d96b5"/> 
    64 <item description="" label="INM" title="" uid="b7294d9c-c9b1-11e5-8bd5-5404a60d96b5"/> 
    65 <item description="" label="IPSL" title="" uid="b72950a8-c9b1-11e5-8bd5-5404a60d96b5"/> 
    66 <item description="" label="MIROC6-CGCM" title="" uid="b72953b4-c9b1-11e5-8bd5-5404a60d96b5"/> 
    67 <item description="" label="MIROC-ESM" title="" uid="b72956ca-c9b1-11e5-8bd5-5404a60d96b5"/> 
    68 <item description="" label="NICAM" title="" uid="b72959e0-c9b1-11e5-8bd5-5404a60d96b5"/> 
    69 <item description="" label="MPI-ESM" title="" uid="b7295ce2-c9b1-11e5-8bd5-5404a60d96b5"/> 
    70 <item description="" label="MRI-ESM1-x" title="" uid="b7296002-c9b1-11e5-8bd5-5404a60d96b5"/> 
    71 <item description="" label="MRI-AGCM3-xS" title="" uid="b729630e-c9b1-11e5-8bd5-5404a60d96b5"/> 
    72 <item description="" label="NorESM" title="" uid="b729661a-c9b1-11e5-8bd5-5404a60d96b5"/> 
    73 <item description="" label="NUIST-CSM" title="" uid="b729691c-c9b1-11e5-8bd5-5404a60d96b5"/> 
    74 <item description="" label="UKESM1-N96ORCA1" title="" uid="b7296c50-c9b1-11e5-8bd5-5404a60d96b5"/> 
    75 <item description="" label="UKESM1-N216ORCA025hybrid" title="" uid="b7296f5c-c9b1-11e5-8bd5-5404a60d96b5"/> 
    76 <item description="" label="HadGEM3-GC3-N96ORCA025" title="" uid="b7297268-c9b1-11e5-8bd5-5404a60d96b5"/> 
    77 <item description="" label="HadGEm3-GC3-N216ORCA025" title="" uid="b729a92c-c9b1-11e5-8bd5-5404a60d96b5"/> 
    78 <item description="" label="KMA-ACE" title="" uid="b729ad1e-c9b1-11e5-8bd5-5404a60d96b5"/> 
    79 <item description="" label="UKESM--KMA" title="" uid="b729b0d4-c9b1-11e5-8bd5-5404a60d96b5"/> 
     46<item description="" label="ACCESS" title="" uid="1954d366-2f14-11e6-9f5a-5404a60d96b5"/> 
     47<item description="" label="AWI-CM" title="" uid="1954dc6c-2f14-11e6-9f5a-5404a60d96b5"/> 
     48<item description="" label="BCC" title="" uid="1954e07c-2f14-11e6-9f5a-5404a60d96b5"/> 
     49<item description="" label="BESM" title="" uid="1954e450-2f14-11e6-9f5a-5404a60d96b5"/> 
     50<item description="" label="BNU" title="" uid="1954e9dc-2f14-11e6-9f5a-5404a60d96b5"/> 
     51<item description="" label="CAMS-CSM" title="" uid="1954ede2-2f14-11e6-9f5a-5404a60d96b5"/> 
     52<item description="" label="CanESM" title="" uid="1954f1ac-2f14-11e6-9f5a-5404a60d96b5"/> 
     53<item description="" label="CAS-ESM" title="" uid="1954f74c-2f14-11e6-9f5a-5404a60d96b5"/> 
     54<item description="" label="CESM" title="" uid="1954fb84-2f14-11e6-9f5a-5404a60d96b5"/> 
     55<item description="" label="CESS-THU" title="" uid="1954ff6c-2f14-11e6-9f5a-5404a60d96b5"/> 
     56<item description="" label="CMCC" title="" uid="1955032c-2f14-11e6-9f5a-5404a60d96b5"/> 
     57<item description="" label="CNRM" title="" uid="19550778-2f14-11e6-9f5a-5404a60d96b5"/> 
     58<item description="" label="EC-Earth" title="" uid="19550b74-2f14-11e6-9f5a-5404a60d96b5"/> 
     59<item description="" label="FGOALS" title="" uid="19550f52-2f14-11e6-9f5a-5404a60d96b5"/> 
     60<item description="" label="FIO" title="" uid="19551330-2f14-11e6-9f5a-5404a60d96b5"/> 
     61<item description="" label="GFDL" title="" uid="19551704-2f14-11e6-9f5a-5404a60d96b5"/> 
     62<item description="" label="GISS" title="" uid="19551ad8-2f14-11e6-9f5a-5404a60d96b5"/> 
     63<item description="" label="IITM" title="" uid="19551ee8-2f14-11e6-9f5a-5404a60d96b5"/> 
     64<item description="" label="INM" title="" uid="1955229e-2f14-11e6-9f5a-5404a60d96b5"/> 
     65<item description="" label="IPSL" title="" uid="1955267c-2f14-11e6-9f5a-5404a60d96b5"/> 
     66<item description="" label="MIROC6-CGCM" title="" uid="19552a82-2f14-11e6-9f5a-5404a60d96b5"/> 
     67<item description="" label="MIROC-ESM" title="" uid="19552e60-2f14-11e6-9f5a-5404a60d96b5"/> 
     68<item description="" label="NICAM" title="" uid="195532de-2f14-11e6-9f5a-5404a60d96b5"/> 
     69<item description="" label="MPI-ESM" title="" uid="195536da-2f14-11e6-9f5a-5404a60d96b5"/> 
     70<item description="" label="MRI-ESM1-x" title="" uid="19553aae-2f14-11e6-9f5a-5404a60d96b5"/> 
     71<item description="" label="MRI-AGCM3-xS" title="" uid="19557974-2f14-11e6-9f5a-5404a60d96b5"/> 
     72<item description="" label="NorESM" title="" uid="19557d5c-2f14-11e6-9f5a-5404a60d96b5"/> 
     73<item description="" label="NUIST-CSM" title="" uid="195580fe-2f14-11e6-9f5a-5404a60d96b5"/> 
     74<item description="" label="UKESM1-N96ORCA1" title="" uid="195584aa-2f14-11e6-9f5a-5404a60d96b5"/> 
     75<item description="" label="UKESM1-N216ORCA025hybrid" title="" uid="19558892-2f14-11e6-9f5a-5404a60d96b5"/> 
     76<item description="" label="HadGEM3-GC3-N96ORCA025" title="" uid="19558c2a-2f14-11e6-9f5a-5404a60d96b5"/> 
     77<item description="" label="HadGEm3-GC3-N216ORCA025" title="" uid="195590b2-2f14-11e6-9f5a-5404a60d96b5"/> 
     78<item description="" label="KMA-ACE" title="" uid="19559468-2f14-11e6-9f5a-5404a60d96b5"/> 
     79<item description="" label="UKESM--KMA" title="" uid="1955983c-2f14-11e6-9f5a-5404a60d96b5"/> 
    8080</model> 
    8181<physicsvers id="cmip.drv.003" label="physicsvers" title="Physics Version" uid="SECTION:physicsvers" useClass="vocab"> 
     
    9393<activity id="cmip.drv.006" label="activity" title="Coordinating activity" uid="SECTION:activity" useClass="vocab"> 
    9494<!-- <info srcType="dummy" srcRef="ptxt.py">Dummy entries</info> --> 
    95 <item label="CMIP6" project="CMIP" status="" title="Coupled Model Intercomparison Project, Phase 6" uid="b72811e8-c9b1-11e5-8bd5-5404a60d96b5" url="http://www.wcrp-climate.org/wgcm-cmip/wgcm-cmip6"/> 
    96 <item label="AerChemMIP" project="Aerocom CCMI" status="" title="Aerosols and Chemistry Model Intercomparison Project" uid="b72815ee-c9b1-11e5-8bd5-5404a60d96b5" url="https://wiki.met.no/aerocom/aerchemmip/start"/> 
    97 <item label="C4MIP" project="" status="" title="Coupled Climate Carbon Cycle Model Intercomparison Project" uid="b72819b8-c9b1-11e5-8bd5-5404a60d96b5" url="http://c4mip.lsce.ipsl.fr/"/> 
    98 <item label="CFMIP" project="" status="" title="Cloud Feedback Model Intercomparison Project" uid="b7281fda-c9b1-11e5-8bd5-5404a60d96b5" url="http://www.cfmip.net/"/> 
    99 <item label="DAMIP" project="" status="" title="Detection and Attribution Model Intercomparison Project" uid="b72823ea-c9b1-11e5-8bd5-5404a60d96b5" url="http://www.wcrp-climate.org/modelling-wgcm-mip-catalogue/modelling-wgcm-mips/475-modelling-wgcm-damip"/> 
    100 <item label="DCPP" project="DCP" status="" title="Decadal Climate Prediction Project" uid="b72827be-c9b1-11e5-8bd5-5404a60d96b5" url=""/> 
    101 <item label="FAFMIP" project="" status="" title="Flux-Anomaly-Forced Model Intercomparison Project" uid="b7282c1e-c9b1-11e5-8bd5-5404a60d96b5" url="http://www.met.reading.ac.uk/~jonathan/FAFMIP/"/> 
    102 <item label="GeoMIP" project="" status="" title="Geoengineering Model Intercomparison Project" uid="b728304c-c9b1-11e5-8bd5-5404a60d96b5" url="http://climate.envsci.rutgers.edu/GeoMIP/index.html"/> 
    103 <item label="GMMIP" project="" status="" title="Global Monsoons Model Intercomparison Project" uid="b7283402-c9b1-11e5-8bd5-5404a60d96b5" url="http://www.met.reading.ac.uk/~sws05agt/MonsoonMIP/"/> 
    104 <item label="HighResMIP" project="" status="" title="High Resolution Model Intercomparison Project" uid="b72837a4-c9b1-11e5-8bd5-5404a60d96b5" url="https://dev.knmi.nl/projects/highresmip/wiki"/> 
    105 <item label="ISMIP6" project="" status="" title="Ice Sheet Model Intercomparison Project for CMIP6" uid="b7283b6e-c9b1-11e5-8bd5-5404a60d96b5" url="http://www.climate-cryosphere.org/activities/targeted/ismip6"/> 
    106 <item label="LS3MIP" project="" status="" title="Land Surface, Snow and Soil Moisture MIP" uid="b7283f38-c9b1-11e5-8bd5-5404a60d96b5" url=""/> 
    107 <item label="LUMIP" project="" status="" title="Land-Use Model Intercomparison Project" uid="b72845e6-c9b1-11e5-8bd5-5404a60d96b5" url=""/> 
    108 <item label="OMIP" project="" status="" title="Ocean Model Intercomparison Project" uid="b72849ba-c9b1-11e5-8bd5-5404a60d96b5" url=""/> 
    109 <item label="PDRMIP" project="" status="withdrawn" title="Precipitation Driver and Response Model Intercomparison Project" uid="b7284d66-c9b1-11e5-8bd5-5404a60d96b5" url=""/> 
    110 <item label="PMIP" project="PMIP" status="" title="Palaeoclimate Modelling Intercomparison Project" uid="b7285158-c9b1-11e5-8bd5-5404a60d96b5" url=""/> 
    111 <item label="RFMIP" project="" status="" title="Radiative Forcing Model Intercomparison Project" uid="b728554a-c9b1-11e5-8bd5-5404a60d96b5" url=""/> 
    112 <item label="ScenarioMIP" project="" status="" title="Scenario Model Intercomparison Project" uid="b728591e-c9b1-11e5-8bd5-5404a60d96b5" url=""/> 
    113 <item label="SolarMIP" project="" status="merged with DAMIP" title="Solar Model Intercomparison Project" uid="b7285cb6-c9b1-11e5-8bd5-5404a60d96b5" url=""/> 
    114 <item label="VolMIP" project="" status="" title="Volcanic Forcings Model Intercomparison Project" uid="b728606c-c9b1-11e5-8bd5-5404a60d96b5" url=""/> 
    115 <item label="CORDEX" project="CORDEX" status="Diagnostic" title="Coordinated Regional Downscaling Experiment (CORDEX)" uid="b72866a2-c9b1-11e5-8bd5-5404a60d96b5" url=""/> 
    116 <item label="DynVar" project="DynVar" status="Diagnostic" title="Modelling the Dynamics and Variability of the Stratosphere-Troposphere System" uid="b7286a76-c9b1-11e5-8bd5-5404a60d96b5" url="http://www.sparcdynvar.org/models-data/"/> 
    117 <item label="SIMIP" project="" status="Diagnostic" title="Sea Ice Model Intercomparison Project" uid="b7286e22-c9b1-11e5-8bd5-5404a60d96b5" url="http://gaim.unh.edu/Structure/Future/MIPs/SIMIP.html"/> 
    118 <item label="VIACSAB" project="" status="Diagnostic" title="Vulnerability, Impacts, Adaptation, and Climate Services Advisory Board (VIACS AB)" uid="b72871c4-c9b1-11e5-8bd5-5404a60d96b5" url=""/> 
    119 <item label="SPECS" project="" status="" title="Sesonal-to-decadal climate Prediction for the improvement of European Climate Services" uid="b7287598-c9b1-11e5-8bd5-5404a60d96b5" url="http://www.specs-fp7.eu/"/> 
    120 <item label="CCMI" project="" status="" title="Chemistry-Climate Model Initiative" uid="b7287c00-c9b1-11e5-8bd5-5404a60d96b5" url="http://www.met.reading.ac.uk/ccmi/"/> 
    121 <item label="CMIP5" project="CMIP" status="" title="Coupled Model Intercomparison Project, Phase 5" uid="b72880a6-c9b1-11e5-8bd5-5404a60d96b5" url=""/> 
     95<item label="CMIP6" project="CMIP" status="" title="Coupled Model Intercomparison Project, Phase 6" uid="1953825e-2f14-11e6-9f5a-5404a60d96b5" url="http://www.wcrp-climate.org/wgcm-cmip/wgcm-cmip6"/> 
     96<item label="AerChemMIP" project="Aerocom CCMI" status="" title="Aerosols and Chemistry Model Intercomparison Project" uid="1953877c-2f14-11e6-9f5a-5404a60d96b5" url="https://wiki.met.no/aerocom/aerchemmip/start"/> 
     97<item label="C4MIP" project="" status="" title="Coupled Climate Carbon Cycle Model Intercomparison Project" uid="19538c04-2f14-11e6-9f5a-5404a60d96b5" url="http://c4mip.lsce.ipsl.fr/"/> 
     98<item label="CFMIP" project="" status="" title="Cloud Feedback Model Intercomparison Project" uid="195390be-2f14-11e6-9f5a-5404a60d96b5" url="http://www.cfmip.net/"/> 
     99<item label="DAMIP" project="" status="" title="Detection and Attribution Model Intercomparison Project" uid="19539550-2f14-11e6-9f5a-5404a60d96b5" url="http://www.wcrp-climate.org/modelling-wgcm-mip-catalogue/modelling-wgcm-mips/475-modelling-wgcm-damip"/> 
     100<item label="DCPP" project="DCP" status="" title="Decadal Climate Prediction Project" uid="19539a00-2f14-11e6-9f5a-5404a60d96b5" url=""/> 
     101<item label="FAFMIP" project="" status="" title="Flux-Anomaly-Forced Model Intercomparison Project" uid="19539e9c-2f14-11e6-9f5a-5404a60d96b5" url="http://www.met.reading.ac.uk/~jonathan/FAFMIP/"/> 
     102<item label="GeoMIP" project="" status="" title="Geoengineering Model Intercomparison Project" uid="1953a54a-2f14-11e6-9f5a-5404a60d96b5" url="http://climate.envsci.rutgers.edu/GeoMIP/index.html"/> 
     103<item label="GMMIP" project="" status="" title="Global Monsoons Model Intercomparison Project" uid="1953aa04-2f14-11e6-9f5a-5404a60d96b5" url="http://www.met.reading.ac.uk/~sws05agt/MonsoonMIP/"/> 
     104<item label="HighResMIP" project="" status="" title="High Resolution Model Intercomparison Project" uid="1953aed2-2f14-11e6-9f5a-5404a60d96b5" url="https://dev.knmi.nl/projects/highresmip/wiki"/> 
     105<item label="ISMIP6" project="" status="" title="Ice Sheet Model Intercomparison Project for CMIP6" uid="1953b378-2f14-11e6-9f5a-5404a60d96b5" url="http://www.climate-cryosphere.org/activities/targeted/ismip6"/> 
     106<item label="LS3MIP" project="" status="" title="Land Surface, Snow and Soil Moisture MIP" uid="1953b7d8-2f14-11e6-9f5a-5404a60d96b5" url=""/> 
     107<item label="LUMIP" project="" status="" title="Land-Use Model Intercomparison Project" uid="1953bd3c-2f14-11e6-9f5a-5404a60d96b5" url=""/> 
     108<item label="OMIP" project="" status="" title="Ocean Model Intercomparison Project" uid="1953c1e2-2f14-11e6-9f5a-5404a60d96b5" url=""/> 
     109<item label="PDRMIP" project="" status="withdrawn" title="Precipitation Driver and Response Model Intercomparison Project" uid="1953c8c2-2f14-11e6-9f5a-5404a60d96b5" url=""/> 
     110<item label="PMIP" project="PMIP" status="" title="Palaeoclimate Modelling Intercomparison Project" uid="1953cf20-2f14-11e6-9f5a-5404a60d96b5" url=""/> 
     111<item label="RFMIP" project="" status="" title="Radiative Forcing Model Intercomparison Project" uid="1953d8c6-2f14-11e6-9f5a-5404a60d96b5" url=""/> 
     112<item label="ScenarioMIP" project="" status="" title="Scenario Model Intercomparison Project" uid="1953dd58-2f14-11e6-9f5a-5404a60d96b5" url=""/> 
     113<item label="SolarMIP" project="" status="merged with DAMIP" title="Solar Model Intercomparison Project" uid="1953e212-2f14-11e6-9f5a-5404a60d96b5" url=""/> 
     114<item label="VolMIP" project="" status="" title="Volcanic Forcings Model Intercomparison Project" uid="1953e690-2f14-11e6-9f5a-5404a60d96b5" url=""/> 
     115<item label="CORDEX" project="CORDEX" status="Diagnostic" title="Coordinated Regional Downscaling Experiment (CORDEX)" uid="1953eb0e-2f14-11e6-9f5a-5404a60d96b5" url=""/> 
     116<item label="DynVar" project="DynVar" status="Diagnostic" title="Modelling the Dynamics and Variability of the Stratosphere-Troposphere System" uid="1953efa0-2f14-11e6-9f5a-5404a60d96b5" url="http://www.sparcdynvar.org/models-data/"/> 
     117<item label="SIMIP" project="" status="Diagnostic" title="Sea Ice Model Intercomparison Project" uid="1953f48c-2f14-11e6-9f5a-5404a60d96b5" url="http://gaim.unh.edu/Structure/Future/MIPs/SIMIP.html"/> 
     118<item label="VIACSAB" project="" status="Diagnostic" title="Vulnerability, Impacts, Adaptation, and Climate Services Advisory Board (VIACS AB)" uid="1953fcb6-2f14-11e6-9f5a-5404a60d96b5" url=""/> 
     119<item label="SPECS" project="" status="" title="Sesonal-to-decadal climate Prediction for the improvement of European Climate Services" uid="19540238-2f14-11e6-9f5a-5404a60d96b5" url="http://www.specs-fp7.eu/"/> 
     120<item label="CCMI" project="" status="" title="Chemistry-Climate Model Initiative" uid="1954063e-2f14-11e6-9f5a-5404a60d96b5" url="http://www.met.reading.ac.uk/ccmi/"/> 
     121<item label="CMIP5" project="CMIP" status="" title="Coupled Model Intercomparison Project, Phase 5" uid="19540a26-2f14-11e6-9f5a-5404a60d96b5" url=""/> 
    122122</activity> 
    123123<product id="cmip.drv.007" label="product" title="Data product" uid="SECTION:product" useClass="vocab"> 
     
    131131<frequency id="cmip.drv.009" label="frequency" title="Temporal frequency of data values" uid="SECTION:frequency" useClass="vocab"> 
    132132<!-- <info srcType="dummy" srcRef="ptxt.py">Dummy entries</info> --> 
    133 <item isClimatology="0" iso="P1Y" label="yr" title="Annual" uid="b72744ca-c9b1-11e5-8bd5-5404a60d96b5"/> 
    134 <item isClimatology="1" iso="P1M" label="monClim" title="Monthly climatology" uid="b727484e-c9b1-11e5-8bd5-5404a60d96b5"/> 
    135 <item isClimatology="0" iso="P1M" label="mon" title="Monthly" uid="b7274b96-c9b1-11e5-8bd5-5404a60d96b5"/> 
    136 <item isClimatology="0" iso="P1D" label="day" title="Daily" uid="b7274ed4-c9b1-11e5-8bd5-5404a60d96b5"/> 
    137 <item isClimatology="0" iso="PT6H" label="6hr" title="6-hourly" uid="b7275294-c9b1-11e5-8bd5-5404a60d96b5"/> 
    138 <item isClimatology="0" iso="PT3H" label="3hr" title="3-hourly" uid="b72755d2-c9b1-11e5-8bd5-5404a60d96b5"/> 
    139 <item isClimatology="0" iso="PT1H" label="hr" title="Hourly" uid="b7275942-c9b1-11e5-8bd5-5404a60d96b5"/> 
    140 <item isClimatology="0" iso="" label="subhr" title="Sub-hourly" uid="b7275f14-c9b1-11e5-8bd5-5404a60d96b5"/> 
     133<item isClimatology="0" iso="P1Y" label="yr" title="Annual" uid="19526950-2f14-11e6-9f5a-5404a60d96b5"/> 
     134<item isClimatology="1" iso="P1M" label="monClim" title="Monthly climatology" uid="19526d9c-2f14-11e6-9f5a-5404a60d96b5"/> 
     135<item isClimatology="0" iso="P1M" label="mon" title="Monthly" uid="19527314-2f14-11e6-9f5a-5404a60d96b5"/> 
     136<item isClimatology="0" iso="P1D" label="day" title="Daily" uid="195277b0-2f14-11e6-9f5a-5404a60d96b5"/> 
     137<item isClimatology="0" iso="PT6H" label="6hr" title="6-hourly" uid="19527c24-2f14-11e6-9f5a-5404a60d96b5"/> 
     138<item isClimatology="0" iso="PT3H" label="3hr" title="3-hourly" uid="19528070-2f14-11e6-9f5a-5404a60d96b5"/> 
     139<item isClimatology="0" iso="PT1H" label="hr" title="Hourly" uid="19528b7e-2f14-11e6-9f5a-5404a60d96b5"/> 
     140<item isClimatology="0" iso="" label="subhr" title="Sub-hourly" uid="19528fde-2f14-11e6-9f5a-5404a60d96b5"/> 
    141141</frequency> 
    142142<realm id="cmip.drv.010" label="realm" title="Modeling realm" uid="SECTION:realm" useClass="vocab"> 
    143143<!-- <info srcType="dummy" srcRef="ptxt.py">Dummy entries</info> --> 
    144 <item label="atmos" title="Atmospheric" uid="b725193e-c9b1-11e5-8bd5-5404a60d96b5"/> 
    145 <item label="ocean" title="Oceanic" uid="b7256240-c9b1-11e5-8bd5-5404a60d96b5"/> 
    146 <item label="land" title="Land" uid="b725afe8-c9b1-11e5-8bd5-5404a60d96b5"/> 
    147 <item label="landIce" title="Terrestrial cryosphere" uid="b725b97a-c9b1-11e5-8bd5-5404a60d96b5"/> 
    148 <item label="seaIce" title="Marine cryosphere" uid="b725bcd6-c9b1-11e5-8bd5-5404a60d96b5"/> 
    149 <item label="aerosol" title="Aerosols" uid="b725bfce-c9b1-11e5-8bd5-5404a60d96b5"/> 
    150 <item label="atmosChem" title="Atmospheric chemistry" uid="b725c2bc-c9b1-11e5-8bd5-5404a60d96b5"/> 
    151 <item label="ocnBgchem" title="Ocean bio-geochemistry" uid="b725c5a0-c9b1-11e5-8bd5-5404a60d96b5"/> 
     144<item label="atmos" title="Atmospheric" uid="194fd712-2f14-11e6-9f5a-5404a60d96b5"/> 
     145<item label="ocean" title="Oceanic" uid="19502b18-2f14-11e6-9f5a-5404a60d96b5"/> 
     146<item label="land" title="Land" uid="1950782a-2f14-11e6-9f5a-5404a60d96b5"/> 
     147<item label="landIce" title="Terrestrial cryosphere" uid="19508338-2f14-11e6-9f5a-5404a60d96b5"/> 
     148<item label="seaIce" title="Marine cryosphere" uid="19508766-2f14-11e6-9f5a-5404a60d96b5"/> 
     149<item label="aerosol" title="Aerosols" uid="19508b44-2f14-11e6-9f5a-5404a60d96b5"/> 
     150<item label="atmosChem" title="Atmospheric chemistry" uid="19508ec8-2f14-11e6-9f5a-5404a60d96b5"/> 
     151<item label="ocnBgchem" title="Ocean bio-geochemistry" uid="1950927e-2f14-11e6-9f5a-5404a60d96b5"/> 
    152152</realm> 
    153153<grid id="cmip.drv.011" label="grid" title="Native grid" uid="SECTION:grid" useClass="vocab"> 
    154154<!-- <info srcType="dummy" srcRef="ptxt.py">Dummy entries</info> --> 
    155 <item label="atmosphere" title="Atmosphere grid" uid="b7276752-c9b1-11e5-8bd5-5404a60d96b5"/> 
    156 <item label="ocean" title="Ocean grid" uid="b7276a9a-c9b1-11e5-8bd5-5404a60d96b5"/> 
    157 <item label="ice" title="Grid used for ice sheets" uid="b7276d42-c9b1-11e5-8bd5-5404a60d96b5"/> 
    158 <item label="land" title="Grid used for land surface modelling" uid="b7276fea-c9b1-11e5-8bd5-5404a60d96b5"/> 
     155<item label="atmosphere" title="Atmosphere grid" uid="19529a2e-2f14-11e6-9f5a-5404a60d96b5"/> 
     156<item label="ocean" title="Ocean grid" uid="19529e84-2f14-11e6-9f5a-5404a60d96b5"/> 
     157<item label="ice" title="Grid used for ice sheets" uid="1952a1f4-2f14-11e6-9f5a-5404a60d96b5"/> 
     158<item label="land" title="Grid used for land surface modelling" uid="1952a564-2f14-11e6-9f5a-5404a60d96b5"/> 
    159159</grid> 
    160160<dimensions id="cmip.drv.012" label="dimensions" title="MIP table variable dimensions" uid="SECTION:dimensions" useClass="vocab"> 
     
    168168<table id="cmip.drv.014" label="table" title="Data specification table" uid="SECTION:table" useClass="vocab"> 
    169169<!-- <info srcType="dummy" srcRef="ptxt.py">Dummy entries</info> --> 
    170 <item comment="" description="Definitions of all the coordinate variables used in the CMIP6 data request" frequency="fx" label="grids" title="Fixed coordinate variables" uid="b7289d48-c9b1-11e5-8bd5-5404a60d96b5"/> 
    171 <item comment="" description="Variables with no time dependency" frequency="fx" label="fx" title="Fixed variables" uid="b728a18a-c9b1-11e5-8bd5-5404a60d96b5"/> 
    172 <item comment="&quot;ocean&quot; as in &quot;ocean grid&quot;" description="Annual mean variables on the ocean grid." frequency="yr" label="Oyr" title="Annual ocean variables" uid="b728a84c-c9b1-11e5-8bd5-5404a60d96b5"/> 
    173 <item comment="For CMIP5 there was &quot;Oclim&quot; for ocean climatologies, and atmospheric climatologies were in Amon. Moving Atmospheric climatologies to Clim gives us a strict hierarchy with a single &quot;frequency&quot; in each table." description="Monthly Mean Climatology" frequency="monClim" label="Clim" title="Monthly climatologies" uid="b728ac2a-c9b1-11e5-8bd5-5404a60d96b5"/> 
    174 <item comment="" description="Monthly Mean Ocean Fields, Including Biogechemical Field" frequency="mon" label="Omon" title="Monthly ocean variables" uid="b728affe-c9b1-11e5-8bd5-5404a60d96b5"/> 
    175 <item comment="See comment on ts: http://dreq01.vanillaforums.com/discussion/29/surface-temperature?new=1" description="Monthly Mean Atmospheric Fields and Some Surface Field" frequency="mon" label="Amon" title="Montly atmospheric variables (excluding composition and radiation)" uid="b728b3e6-c9b1-11e5-8bd5-5404a60d96b5"/> 
    176 <item comment="" description="Monthly Mean Land Cryosphere Fields" frequency="mon" label="LImon" title="Monthly land ice" uid="b728b79c-c9b1-11e5-8bd5-5404a60d96b5"/> 
    177 <item comment="&quot;land&quot; as in &quot;land grid&quot; -- not including variables on atmospheric grid requested for analysis of land processes" description="Monthly Mean Land Fields, Including Physical, Vegetation, Soil, and Biogeochemical Variables" frequency="mon" label="Lmon" title="Monthly land variables" uid="b728bb52-c9b1-11e5-8bd5-5404a60d96b5"/> 
    178 <item comment="" description="Monthly Mean Ocean Cryosphere Fields" frequency="mon" label="OImon" title="Sea-ice" uid="b728beea-c9b1-11e5-8bd5-5404a60d96b5"/> 
    179 <item comment="Used in CMIP5; not requested by CfMIP in CMIP6, but, provisionally, by HighResMIP" description="Monthly Offline Cloud Diagnostic Fields" frequency="mon" label="cfOff" title="Offline diagnostics for cloud forcing analysis" uid="b728c296-c9b1-11e5-8bd5-5404a60d96b5"/> 
    180 <item comment="Contains radiative fields from cfMon; some duplication with Amon " description="" frequency="mon" label="Rmon" title="Monthly atmospheric radiation data" uid="b728c930-c9b1-11e5-8bd5-5404a60d96b5"/> 
    181 <item comment="" description="Monthly atmospheric composition, including aerosols and properties of aerosols (but see Rmon for radiation quantities)" frequency="mon" label="Cmon" title="Monthly Atmospheric Composition Data" uid="b728ccfa-c9b1-11e5-8bd5-5404a60d96b5"/> 
    182 <item comment="" description="Daily Mean Atmosphere, Ocean and Surface Fields" frequency="day" label="Oday" title="Daily  ocean data" uid="b728d09c-c9b1-11e5-8bd5-5404a60d96b5"/> 
    183 <item comment="" description="" frequency="" label="Aday" title="Daily atmospheric data, excluding composition and cloud forcing" uid="b728d47a-c9b1-11e5-8bd5-5404a60d96b5"/> 
    184 <item comment="Formerly &quot;aero&quot;" description="" frequency="day" label="Cday" title="Daily atmospheric composition data" uid="b728d830-c9b1-11e5-8bd5-5404a60d96b5"/> 
    185 <item comment="" description="" frequency="" label="cfDay" title="Daily data associated with cloud forcing" uid="b728dbd2-c9b1-11e5-8bd5-5404a60d96b5"/> 
    186 <item comment="" description="Fields (Sampled Every 6 Hours) for Driving Regional Models " frequency="6hr" label="6hrLev" title="6-hourly atmospheric data on model levels" uid="b728df88-c9b1-11e5-8bd5-5404a60d96b5"/> 
    187 <item comment="Only 3 levels in CMIP5, more levels requested in CMIP6 by HighResMIP (low priority)" description="Fields (Sampled Every 6 Hours) for Storm-Track Analysis and other Advanced Diagnostic Applications" frequency="6hr" label="6hrPlev" title="6-hourly atmospheric data on pressure levels" uid="b728e32a-c9b1-11e5-8bd5-5404a60d96b5"/> 
    188 <item comment="CMIP5 had two MIP tables at 3hr frequency, &quot;3hr&quot; and &quot;cf3hr&quot;. In some cases variables were requested as instantaneous in one and accumulated in the other. Making two tables with clear definitions should make it easier to see what is going on." description="" frequency="3hr" label="3hrPoint" title="3-hourly data, instantaenous fields" uid="b728e6f4-c9b1-11e5-8bd5-5404a60d96b5"/> 
    189 <item comment="" description="Atmospheric and Surface Fields Sampled Every 3 Hours" frequency="3hr" label="3hrAcc" title="3-hourly data, accumulated fields" uid="b728ea96-c9b1-11e5-8bd5-5404a60d96b5"/> 
    190 <item comment="New -- part of HighResMIP request." description="" frequency="1hr" label="1hr" title="" uid="b728ee24-c9b1-11e5-8bd5-5404a60d96b5"/> 
    191 <item comment="Includes cfsites and data for highresmip" description="" frequency="subhr" label="subhr" title="" uid="b728f1da-c9b1-11e5-8bd5-5404a60d96b5"/> 
     170<item comment="" description="Definitions of all the coordinate variables used in the CMIP6 data request" frequency="fx" label="grids" title="Fixed coordinate variables" uid="1954362c-2f14-11e6-9f5a-5404a60d96b5"/> 
     171<item comment="" description="Variables with no time dependency" frequency="fx" label="fx" title="Fixed variables" uid="19543ed8-2f14-11e6-9f5a-5404a60d96b5"/> 
     172<item comment="&quot;ocean&quot; as in &quot;ocean grid&quot;" description="Annual mean variables on the ocean grid." frequency="yr" label="Oyr" title="Annual ocean variables" uid="1954472a-2f14-11e6-9f5a-5404a60d96b5"/> 
     173<item comment="For CMIP5 there was &quot;Oclim&quot; for ocean climatologies, and atmospheric climatologies were in Amon. Moving Atmospheric climatologies to Clim gives us a strict hierarchy with a single &quot;frequency&quot; in each table." description="Monthly Mean Climatology" frequency="monClim" label="Clim" title="Monthly climatologies" uid="19544ec8-2f14-11e6-9f5a-5404a60d96b5"/> 
     174<item comment="" description="Monthly Mean Ocean Fields, Including Biogechemical Field" frequency="mon" label="Omon" title="Monthly ocean variables" uid="1954577e-2f14-11e6-9f5a-5404a60d96b5"/> 
     175<item comment="See comment on ts: http://dreq01.vanillaforums.com/discussion/29/surface-temperature?new=1" description="Monthly Mean Atmospheric Fields and Some Surface Field" frequency="mon" label="Amon" title="Montly atmospheric variables (excluding composition and radiation)" uid="19545db4-2f14-11e6-9f5a-5404a60d96b5"/> 
     176<item comment="" description="Monthly Mean Land Cryosphere Fields" frequency="mon" label="LImon" title="Monthly land ice" uid="19546872-2f14-11e6-9f5a-5404a60d96b5"/> 
     177<item comment="&quot;land&quot; as in &quot;land grid&quot; -- not including variables on atmospheric grid requested for analysis of land processes" description="Monthly Mean Land Fields, Including Physical, Vegetation, Soil, and Biogeochemical Variables" frequency="mon" label="Lmon" title="Monthly land variables" uid="19546d4a-2f14-11e6-9f5a-5404a60d96b5"/> 
     178<item comment="" description="Monthly Mean Ocean Cryosphere Fields" frequency="mon" label="OImon" title="Sea-ice" uid="19547222-2f14-11e6-9f5a-5404a60d96b5"/> 
     179<item comment="Used in CMIP5; not requested by CfMIP in CMIP6, but, provisionally, by HighResMIP" description="Monthly Offline Cloud Diagnostic Fields" frequency="mon" label="cfOff" title="Offline diagnostics for cloud forcing analysis" uid="195476c8-2f14-11e6-9f5a-5404a60d96b5"/> 
     180<item comment="Contains radiative fields from cfMon; some duplication with Amon " description="" frequency="mon" label="Rmon" title="Monthly atmospheric radiation data" uid="19547b50-2f14-11e6-9f5a-5404a60d96b5"/> 
     181<item comment="" description="Monthly atmospheric composition, including aerosols and properties of aerosols (but see Rmon for radiation quantities)" frequency="mon" label="Cmon" title="Monthly Atmospheric Composition Data" uid="19547fec-2f14-11e6-9f5a-5404a60d96b5"/> 
     182<item comment="" description="Daily Mean Atmosphere, Ocean and Surface Fields" frequency="day" label="Oday" title="Daily  ocean data" uid="1954847e-2f14-11e6-9f5a-5404a60d96b5"/> 
     183<item comment="" description="" frequency="" label="Aday" title="Daily atmospheric data, excluding composition and cloud forcing" uid="1954892e-2f14-11e6-9f5a-5404a60d96b5"/> 
     184<item comment="Formerly &quot;aero&quot;" description="" frequency="day" label="Cday" title="Daily atmospheric composition data" uid="19548db6-2f14-11e6-9f5a-5404a60d96b5"/> 
     185<item comment="" description="" frequency="" label="cfDay" title="Daily data associated with cloud forcing" uid="19549270-2f14-11e6-9f5a-5404a60d96b5"/> 
     186<item comment="" description="Fields (Sampled Every 6 Hours) for Driving Regional Models " frequency="6hr" label="6hrLev" title="6-hourly atmospheric data on model levels" uid="195496f8-2f14-11e6-9f5a-5404a60d96b5"/> 
     187<item comment="Only 3 levels in CMIP5, more levels requested in CMIP6 by HighResMIP (low priority)" description="Fields (Sampled Every 6 Hours) for Storm-Track Analysis and other Advanced Diagnostic Applications" frequency="6hr" label="6hrPlev" title="6-hourly atmospheric data on pressure levels" uid="19549bbc-2f14-11e6-9f5a-5404a60d96b5"/> 
     188<item comment="CMIP5 had two MIP tables at 3hr frequency, &quot;3hr&quot; and &quot;cf3hr&quot;. In some cases variables were requested as instantaneous in one and accumulated in the other. Making two tables with clear definitions should make it easier to see what is going on." description="" frequency="3hr" label="3hrPoint" title="3-hourly data, instantaenous fields" uid="1954a080-2f14-11e6-9f5a-5404a60d96b5"/> 
     189<item comment="" description="Atmospheric and Surface Fields Sampled Every 3 Hours" frequency="3hr" label="3hrAcc" title="3-hourly data, accumulated fields" uid="1954a526-2f14-11e6-9f5a-5404a60d96b5"/> 
     190<item comment="New -- part of HighResMIP request." description="" frequency="1hr" label="1hr" title="" uid="1954a9ae-2f14-11e6-9f5a-5404a60d96b5"/> 
     191<item comment="Includes cfsites and data for highresmip" description="" frequency="subhr" label="subhr" title="" uid="1954ae54-2f14-11e6-9f5a-5404a60d96b5"/> 
    192192</table> 
    193193<cref id="cmip.drv.015" label="cref" title="Coordinate Reference" uid="SECTION:cref" useClass="vocab"> 
     
    201201<timeSlice id="cmip.drv.017" label="timeSlice" title="Time slices used in data request" uid="SECTION:timeSlice" useClass="vocab"> 
    202202<!-- <info srcType="dummy" srcRef="ptxt.py">Dummy entries</info> --> 
    203 <item end="2020.0" label="DAMIP42" nyears="42.0" sliceLen="" start="1979.0" step="" title="DAMIP 42 year" type="simpleRange" uid="b727df0c-c9b1-11e5-8bd5-5404a60d96b5"/> 
    204 <item end="2020.0" label="DAMIP18" nyears="18.0" sliceLen="" start="1850.0" step="10.0" title="DAMIP 18 sample years" type="yearList" uid="b727e466-c9b1-11e5-8bd5-5404a60d96b5"/> 
    205 <item end="2020.0" label="DAMIP61" nyears="61.0" sliceLen="" start="1960.0" step="" title="DAMIP 42 year" type="simpleRange" uid="b727e952-c9b1-11e5-8bd5-5404a60d96b5"/> 
    206 <item end="2100.0" label="DAMIP8" nyears="18.0" sliceLen="" start="2030.0" step="10.0" title="DAMIP 8 sample years" type="yearList" uid="b727ee3e-c9b1-11e5-8bd5-5404a60d96b5"/> 
    207 <item end="2100.0" label="DAMIP40" nyears="40.0" sliceLen="20.0" start="2026.0" step="75.0" title="DAMIP 20 year slices" type="sliceList" uid="b727f33e-c9b1-11e5-8bd5-5404a60d96b5"/> 
    208 <item end="2100.0" label="DAMIP20" nyears="20.0" sliceLen="" start="2081.0" step="" title="DAMIP 20 year" type="simpleRange" uid="b727f82a-c9b1-11e5-8bd5-5404a60d96b5"/> 
     203<item end="2020.0" label="DAMIP42" nyears="42.0" sliceLen="" start="1979.0" step="" title="DAMIP 42 year" type="simpleRange" uid="1953352e-2f14-11e6-9f5a-5404a60d96b5"/> 
     204<item end="2020.0" label="DAMIP18" nyears="18.0" sliceLen="" start="1850.0" step="10.0" title="DAMIP 18 sample years" type="yearList" uid="19533b32-2f14-11e6-9f5a-5404a60d96b5"/> 
     205<item end="2020.0" label="DAMIP61" nyears="61.0" sliceLen="" start="1960.0" step="" title="DAMIP 42 year" type="simpleRange" uid="195340fa-2f14-11e6-9f5a-5404a60d96b5"/> 
     206<item end="2100.0" label="DAMIP8" nyears="18.0" sliceLen="" start="2030.0" step="10.0" title="DAMIP 8 sample years" type="yearList" uid="195346ea-2f14-11e6-9f5a-5404a60d96b5"/> 
     207<item end="2100.0" label="DAMIP40" nyears="40.0" sliceLen="20.0" start="2026.0" step="75.0" title="DAMIP 20 year slices" type="sliceList" uid="19534cbc-2f14-11e6-9f5a-5404a60d96b5"/> 
     208<item end="2100.0" label="DAMIP20" nyears="20.0" sliceLen="" start="2081.0" step="" title="DAMIP 20 year" type="simpleRange" uid="19535284-2f14-11e6-9f5a-5404a60d96b5"/> 
     209<item end="2015.0" label="cfOff" nyears="1.0" sliceLen="" start="2015.0" step="" title="Single year for high frequency data" type="simpleRange" uid="19535860-2f14-11e6-9f5a-5404a60d96b5"/> 
     210<item end="" label="piControl100" nyears="100.0" sliceLen="" start="" step="0.0" title="Last 100 years of piControl" type="finalRange" uid="195362e2-2f14-11e6-9f5a-5404a60d96b5"/> 
    209211</timeSlice> 
    210212<modelFamily id="cmip.drv.018" label="modelFamily" title="Family of model" uid="SECTION:modelFamily" useClass="vocab"> 
     
    214216<priority id="cmip.drv.019" label="priority" title="Variable priority" uid="SECTION:priority" useClass="vocab"> 
    215217<!-- <info srcType="dummy" srcRef="ptxt.py">Dummy entries</info> --> 
    216 <item description="Modelling centres must commit to supplying all priority 1 variables associated with at least one science question for Tier 1 experiments of any MIP which they participate in;" label="1.0" title="High" uid="b7267702-c9b1-11e5-8bd5-5404a60d96b5"/> 
    217 <item description="Expected to be used in multi-model diagnostics; models not supplying these variables may be omitted from some parts of the inter-comparison;" label="3.0" title="Medium" uid="b7267aae-c9b1-11e5-8bd5-5404a60d96b5"/> 
    218 <item description="Experimental -- used for exploring new capabilities and/or unlikely to be used in multi-model diagnostic." label="3.0" title="Low" uid="b7267dc4-c9b1-11e5-8bd5-5404a60d96b5"/> 
     218<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="19516e56-2f14-11e6-9f5a-5404a60d96b5"/> 
     219<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="195172d4-2f14-11e6-9f5a-5404a60d96b5"/> 
     220<item description="Experimental -- used for exploring new capabilities and/or unlikely to be used in multi-model diagnostic." label="3.0" title="Low" uid="195176a8-2f14-11e6-9f5a-5404a60d96b5"/> 
    219221</priority> 
    220222<qcLevel id="cmip.drv.020" label="qcLevel" title="Quality control level" uid="SECTION:qcLevel" useClass="vocab"> 
     
    228230<glossary id="cmip.drv.022" label="glossary" title="Glossary" uid="SECTION:glossary" useClass="vocab"> 
    229231<!-- <info srcType="dummy" srcRef="ptxt.py">Dummy entries</info> --> 
    230 <item description="" fullName="Coupled Model Intercomparison Project" label="cmip" title="CMIP" uid="b725d25c-c9b1-11e5-8bd5-5404a60d96b5" url=""/> 
    231 <item description="World Climate Research Programme (WCRP) Working Group on Coupled Modeling" fullName="Working Group on Coupled Models" label="wgcm" title="WGCM" uid="b725d64e-c9b1-11e5-8bd5-5404a60d96b5" url="http://www.wcrp-climate.org/wgcm/"/> 
    232 <item description="" fullName="" label="wcrp" title="WCRP" uid="b725da5e-c9b1-11e5-8bd5-5404a60d96b5" url=""/> 
    233 <item description="Full specifications of vocabularies used for formatting, archiving and dsitribution of CMIP data" fullName="Data Reference Vocabularies" label="drvocabs" title="DRVoc" uid="b725de1e-c9b1-11e5-8bd5-5404a60d96b5" url="https://drive.google.com/drive/folders/0B6AWgiTrQ0xFQ0t2RjYtWW1jaFk"/> 
     232<item description="" fullName="Coupled Model Intercomparison Project" label="cmip" title="CMIP" uid="1950a142-2f14-11e6-9f5a-5404a60d96b5" url=""/> 
     233<item description="World Climate Research Programme (WCRP) Working Group on Coupled Modeling" fullName="Working Group on Coupled Models" label="wgcm" title="WGCM" uid="1950a656-2f14-11e6-9f5a-5404a60d96b5" url="http://www.wcrp-climate.org/wgcm/"/> 
     234<item description="" fullName="" label="wcrp" title="WCRP" uid="1950ab56-2f14-11e6-9f5a-5404a60d96b5" url=""/> 
     235<item description="Full specifications of vocabularies used for formatting, archiving and dsitribution of CMIP data" fullName="Data Reference Vocabularies" label="drvocabs" title="DRVoc" uid="1950b056-2f14-11e6-9f5a-5404a60d96b5" url="https://drive.google.com/drive/folders/0B6AWgiTrQ0xFQ0t2RjYtWW1jaFk"/> 
    234236</glossary> 
    235237<modelCompType id="cmip.drv.023" label="modelCompType" title="Model Component Types/Categories [redundant with *Native Grid*]" uid="SECTION:modelCompType" useClass="vocab"> 
     
    239241<modelType id="cmip.drv.024" label="modelType" title="Class of model" uid="SECTION:modelType" useClass="vocab"> 
    240242<!-- <info srcType="dummy" srcRef="ptxt.py">Dummy entries</info> --> 
    241 <item label="AGCM" title="Atmosphere only GCM" uid="b7272882-c9b1-11e5-8bd5-5404a60d96b5"/> 
    242 <item label="AOGCM" title="Coupled atmosphere-ocean model" uid="b7272b8e-c9b1-11e5-8bd5-5404a60d96b5"/> 
    243 <item label="ESM" title="Earth System Model" uid="b7272e2c-c9b1-11e5-8bd5-5404a60d96b5"/> 
    244 <item label="RCM" title="Regional Climate Model" uid="b72730d4-c9b1-11e5-8bd5-5404a60d96b5"/> 
    245 <item label="OGCM" title="Ocean General Circulation Model" uid="b7273386-c9b1-11e5-8bd5-5404a60d96b5"/> 
    246 <item label="ICESH" title="Ice sheet model" uid="b7273638-c9b1-11e5-8bd5-5404a60d96b5"/> 
    247 <item label="LU" title="Land use model" uid="b72738ea-c9b1-11e5-8bd5-5404a60d96b5"/> 
     243<item label="AGCM" title="Atmosphere only GCM" uid="19522bac-2f14-11e6-9f5a-5404a60d96b5"/> 
     244<item label="AOGCM" title="Coupled atmosphere-ocean model" uid="195231ce-2f14-11e6-9f5a-5404a60d96b5"/> 
     245<item label="ESM" title="Earth System Model" uid="195237aa-2f14-11e6-9f5a-5404a60d96b5"/> 
     246<item label="RCM" title="Regional Climate Model" uid="19523ea8-2f14-11e6-9f5a-5404a60d96b5"/> 
     247<item label="OGCM" title="Ocean General Circulation Model" uid="1952468c-2f14-11e6-9f5a-5404a60d96b5"/> 
     248<item label="ICESH" title="Ice sheet model" uid="19524d62-2f14-11e6-9f5a-5404a60d96b5"/> 
     249<item label="LU" title="Land use model" uid="19525366-2f14-11e6-9f5a-5404a60d96b5"/> 
    248250</modelType> 
    249251<index id="cmip.drv.025" label="index" title="Index of vocabularies" uid="SECTION:index" useClass="vocab"> 
    250252<!-- <info srcType="dummy" srcRef="ptxt.py">Dummy entries</info> --> 
    251 <item description="This table defines the quantities used to specify CMOR dimensions. Further information is in the CMOR documentation." label="cmorDimAttr" title="Attributes of CMOR dimensions" uid="b724617e-c9b1-11e5-8bd5-5404a60d96b5"/> 
     253<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="194f2916-2f14-11e6-9f5a-5404a60d96b5"/> 
    252254</index> 
    253255<cmorDimAttr id="cmip.drv.026" label="cmorDimAttr" title="CMOR Dimension Attributes" uid="SECTION:cmorDimAttr" useClass="vocab"> 
    254256<!-- <info srcType="dummy" srcRef="ptxt.py">Dummy entries</info> --> 
    255 <item CMORattr="" description="A list of CMOR tables in which this dimension is used." label="tables" title="Tables using this dimension" uid="b7278444-c9b1-11e5-8bd5-5404a60d96b5"/> 
    256 <item CMORattr="" description="Name used by CMOR -- unique within one set of tables" label="CmorName" title="CMOR name" uid="b72787d2-c9b1-11e5-8bd5-5404a60d96b5"/> 
    257 <item CMORattr="" description="Name used for variable and dimension in netcdf files" label="name" title="Name in file" uid="b7278b56-c9b1-11e5-8bd5-5404a60d96b5"/> 
    258 <item CMORattr="" description="Value copied into NetCDF attribute 'long_name' of dimension variable" label="longname" title="Long name" uid="b7278ebc-c9b1-11e5-8bd5-5404a60d96b5"/> 
    259 <item CMORattr="" description="For spatial or temporal dimensions -- should take the value X, Y, Z or T. Otherwise blank. Value copied into NetCDF attribute of dimension variable" label="axis" title="NetCDF axis attribute" uid="b727920e-c9b1-11e5-8bd5-5404a60d96b5"/> 
    260 <item CMORattr="" description="Value copied into NetCDF attribute of dimension variable" label="units" title="Units" uid="b727957e-c9b1-11e5-8bd5-5404a60d96b5"/> 
    261 <item CMORattr="" description="Set &quot;ok&quot; if the axis is an index (no netcdf variable will be created)." label="index" title="Is this an index dimension?" uid="b72798ee-c9b1-11e5-8bd5-5404a60d96b5"/> 
    262 <item CMORattr="coords_attrib" description="Used as variable name for coordinate values when these cannot be held in the axis variable (e.g. when the coordinate values are words)." label="coords" title="NetCDF coords attribute" uid="b7279c2c-c9b1-11e5-8bd5-5404a60d96b5"/> 
    263 <item CMORattr="must_have_bounds" description="'Yes' or 'No', to indicate whether a bounds variable is needed." label="bounds" title="Are bounds required?" uid="b7279fa6-c9b1-11e5-8bd5-5404a60d96b5"/> 
    264 <item CMORattr="stored_direction" description="Set to 'increasing' or 'decreasing'. " label="direction" title="Order of values in axis variable" uid="b727a3d4-c9b1-11e5-8bd5-5404a60d96b5"/> 
    265 <item CMORattr="" description="" label="validMin" title="" uid="b727a73a-c9b1-11e5-8bd5-5404a60d96b5"/> 
    266 <item CMORattr="" description="" label="validMax" title="" uid="b727aa78-c9b1-11e5-8bd5-5404a60d96b5"/> 
    267 <item CMORattr="" description="Type (e.g. 'double', 'character', 'integer')" label="type" title="Type of axis values" uid="b727adca-c9b1-11e5-8bd5-5404a60d96b5"/> 
    268 <item CMORattr="" description="This attribute is used for vertical coordinates, indicates whether the dimension increases upwards or downwards (valid values are 'up', 'down', or blank)" label="positive" title="NetCDF positive attribute" uid="b727b126-c9b1-11e5-8bd5-5404a60d96b5"/> 
    269 <item CMORattr="" description="For array dimensions see 'requested'" label="value" title="Value of singleton dimension" uid="b727b482-c9b1-11e5-8bd5-5404a60d96b5"/> 
    270 <item CMORattr="" description="For array dimensions see 'boundsreq'" label="bounds_values" title="Bounds of a singleton dimension" uid="b727b7de-c9b1-11e5-8bd5-5404a60d96b5"/> 
    271 <item CMORattr="" description="For singleton dimensions see 'value'" label="requested" title="Values of array dimensions" uid="b727bd74-c9b1-11e5-8bd5-5404a60d96b5"/> 
    272 <item CMORattr="" description="For singleton dimensions see 'bounds_value'" label="boundsreq" title="Bounds Requested" uid="b727c0d0-c9b1-11e5-8bd5-5404a60d96b5"/> 
    273 <item CMORattr="" description="Variance from requested values that is tolerated" label="tolerance" title="Tolerance on requested values" uid="b727c436-c9b1-11e5-8bd5-5404a60d96b5"/> 
    274 <item CMORattr="must_call_cmor_grid" description="" label="grid" title="Is this a grid" uid="b727c774-c9b1-11e5-8bd5-5404a60d96b5"/> 
    275 <item CMORattr="" description="Value copied into NetCDF attribute of dimension variable" label="formula" title="NetCDF formula_terms attribute" uid="b727cad0-c9b1-11e5-8bd5-5404a60d96b5"/> 
    276 <item CMORattr="" description="Value copied into NetCDF attribute of dimension variable" label="z_factors" title="NetCDF z_factors attribute" uid="b727ce0e-c9b1-11e5-8bd5-5404a60d96b5"/> 
    277 <item CMORattr="" description="Value copied into NetCDF attribute of dimension variable" label="z_bounds_factors" title="NetCDF z_bounds_factors" uid="b727d14c-c9b1-11e5-8bd5-5404a60d96b5"/> 
     257<item CMORattr="" description="A list of CMOR tables in which this dimension is used." label="tables" title="Tables using this dimension" uid="1952be28-2f14-11e6-9f5a-5404a60d96b5"/> 
     258<item CMORattr="" description="Name used by CMOR -- unique within one set of tables" label="CmorName" title="CMOR name" uid="1952c29c-2f14-11e6-9f5a-5404a60d96b5"/> 
     259<item CMORattr="" description="Name used for variable and dimension in netcdf files" label="name" title="Name in file" uid="1952c706-2f14-11e6-9f5a-5404a60d96b5"/> 
     260<item CMORattr="" description="Value copied into NetCDF attribute 'long_name' of dimension variable" label="longname" title="Long name" uid="1952cb84-2f14-11e6-9f5a-5404a60d96b5"/> 
     261<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="1952cf94-2f14-11e6-9f5a-5404a60d96b5"/> 
     262<item CMORattr="" description="Value copied into NetCDF attribute of dimension variable" label="units" title="Units" uid="1952d3e0-2f14-11e6-9f5a-5404a60d96b5"/> 
     263<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="1952d872-2f14-11e6-9f5a-5404a60d96b5"/> 
     264<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="1952dca0-2f14-11e6-9f5a-5404a60d96b5"/> 
     265<item CMORattr="must_have_bounds" description="'Yes' or 'No', to indicate whether a bounds variable is needed." label="bounds" title="Are bounds required?" uid="1952e0ba-2f14-11e6-9f5a-5404a60d96b5"/> 
     266<item CMORattr="stored_direction" description="Set to 'increasing' or 'decreasing'. " label="direction" title="Order of values in axis variable" uid="1952e506-2f14-11e6-9f5a-5404a60d96b5"/> 
     267<item CMORattr="" description="" label="validMin" title="" uid="1952e970-2f14-11e6-9f5a-5404a60d96b5"/> 
     268<item CMORattr="" description="" label="validMax" title="" uid="1952ed8a-2f14-11e6-9f5a-5404a60d96b5"/> 
     269<item CMORattr="" description="Type (e.g. 'double', 'character', 'integer')" label="type" title="Type of axis values" uid="1952f1cc-2f14-11e6-9f5a-5404a60d96b5"/> 
     270<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="1952f618-2f14-11e6-9f5a-5404a60d96b5"/> 
     271<item CMORattr="" description="For array dimensions see 'requested'" label="value" title="Value of singleton dimension" uid="1952fa28-2f14-11e6-9f5a-5404a60d96b5"/> 
     272<item CMORattr="" description="For array dimensions see 'boundsreq'" label="bounds_values" title="Bounds of a singleton dimension" uid="195303d8-2f14-11e6-9f5a-5404a60d96b5"/> 
     273<item CMORattr="" description="For singleton dimensions see 'value'" label="requested" title="Values of array dimensions" uid="19530824-2f14-11e6-9f5a-5404a60d96b5"/> 
     274<item CMORattr="" description="For singleton dimensions see 'bounds_value'" label="boundsreq" title="Bounds Requested" uid="19530c5c-2f14-11e6-9f5a-5404a60d96b5"/> 
     275<item CMORattr="" description="Variance from requested values that is tolerated" label="tolerance" title="Tolerance on requested values" uid="19531076-2f14-11e6-9f5a-5404a60d96b5"/> 
     276<item CMORattr="must_call_cmor_grid" description="" label="grid" title="Is this a grid" uid="1953147c-2f14-11e6-9f5a-5404a60d96b5"/> 
     277<item CMORattr="" description="Value copied into NetCDF attribute of dimension variable" label="formula" title="NetCDF formula_terms attribute" uid="195318a0-2f14-11e6-9f5a-5404a60d96b5"/> 
     278<item CMORattr="" description="Value copied into NetCDF attribute of dimension variable" label="z_factors" title="NetCDF z_factors attribute" uid="19531cba-2f14-11e6-9f5a-5404a60d96b5"/> 
     279<item CMORattr="" description="Value copied into NetCDF attribute of dimension variable" label="z_bounds_factors" title="NetCDF z_bounds_factors" uid="19532278-2f14-11e6-9f5a-5404a60d96b5"/> 
    278280</cmorDimAttr> 
    279281<processingOptions id="cmip.drv.027" label="processingOptions" title="Processing steps required" uid="SECTION:processingOptions" useClass="vocab"> 
    280282<!-- <info srcType="dummy" srcRef="ptxt.py">Dummy entries</info> --> 
    281 <item description="" label="TM" title="time mean" uid="b725edaa-c9b1-11e5-8bd5-5404a60d96b5"/> 
    282 <item description="The weighted time mean is important when a time varying mask is used (e.g. sea ice)" label="WM" title="weighted time mean" uid="b725f0fc-c9b1-11e5-8bd5-5404a60d96b5"/> 
    283 <item description="" label="VCI" title="vertical coordinate interpolation" uid="b725f408-c9b1-11e5-8bd5-5404a60d96b5"/> 
    284 <item description="" label="MSK" title="masking" uid="b725fc5a-c9b1-11e5-8bd5-5404a60d96b5"/> 
    285 <item description="" label="NS" title="near surface (atmosphere)" uid="b725ff66-c9b1-11e5-8bd5-5404a60d96b5"/> 
    286 <item description="" label="SPI" title="spatial interpolation" uid="b7260290-c9b1-11e5-8bd5-5404a60d96b5"/> 
    287 <item description="" label="SM" title="spectral mean" uid="b726061e-c9b1-11e5-8bd5-5404a60d96b5"/> 
    288 <item description="" label="CL" title="climatology " uid="b726093e-c9b1-11e5-8bd5-5404a60d96b5"/> 
    289 <item description="" label="STAT" title="temporal statistics" uid="b7260c5e-c9b1-11e5-8bd5-5404a60d96b5"/> 
    290 <item description="specialised definition of variable which is more tightly constrained than the CF standard name; variables marked with this will need special attention." label="SD" title="specialised definition" uid="b7260f6a-c9b1-11e5-8bd5-5404a60d96b5"/> 
    291 <item description="" label="zm" title="Zonal mean" uid="b7261280-c9b1-11e5-8bd5-5404a60d96b5"/> 
    292 <item description="Radiation fields should be computed with atmospheric CO2 concentrations multiplied by  a factor 4." label="4co2" title="Radiation fields with quadrupled CO2" uid="b7261578-c9b1-11e5-8bd5-5404a60d96b5"/> 
    293 <item description="Gravity wave diagnostics" label="gw" title="Gravity wave diagnostics" uid="b726187a-c9b1-11e5-8bd5-5404a60d96b5"/> 
    294 <item description="Variables which are restricted to sea-ice." label="si" title="Sea ice" uid="b7261bcc-c9b1-11e5-8bd5-5404a60d96b5"/> 
     283<item description="" label="TM" title="time mean" uid="1950c33e-2f14-11e6-9f5a-5404a60d96b5"/> 
     284<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="1950c758-2f14-11e6-9f5a-5404a60d96b5"/> 
     285<item description="" label="VCI" title="vertical coordinate interpolation" uid="1950cb36-2f14-11e6-9f5a-5404a60d96b5"/> 
     286<item description="" label="MSK" title="masking" uid="1950d5f4-2f14-11e6-9f5a-5404a60d96b5"/> 
     287<item description="" label="NS" title="near surface (atmosphere)" uid="1950da0e-2f14-11e6-9f5a-5404a60d96b5"/> 
     288<item description="" label="SPI" title="spatial interpolation" uid="1950dde2-2f14-11e6-9f5a-5404a60d96b5"/> 
     289<item description="" label="SM" title="spectral mean" uid="1950e1c0-2f14-11e6-9f5a-5404a60d96b5"/> 
     290<item description="" label="CL" title="climatology " uid="1950e59e-2f14-11e6-9f5a-5404a60d96b5"/> 
     291<item description="" label="STAT" title="temporal statistics" uid="1950e972-2f14-11e6-9f5a-5404a60d96b5"/> 
     292<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="1950ed50-2f14-11e6-9f5a-5404a60d96b5"/> 
     293<item description="" label="zm" title="Zonal mean" uid="1950f124-2f14-11e6-9f5a-5404a60d96b5"/> 
     294<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="1950f4c6-2f14-11e6-9f5a-5404a60d96b5"/> 
     295<item description="Gravity wave diagnostics" label="gw" title="Gravity wave diagnostics" uid="1950f8a4-2f14-11e6-9f5a-5404a60d96b5"/> 
     296<item description="Variables which are restricted to sea-ice." label="si" title="Sea ice" uid="1950fc96-2f14-11e6-9f5a-5404a60d96b5"/> 
    295297</processingOptions> 
    296298<coordinateReference id="cmip.drv.028" label="coordinateReference" title="Processing steps required" uid="SECTION:coordinateReference" useClass="vocab"> 
    297299<!-- <info srcType="dummy" srcRef="ptxt.py">Dummy entries</info> --> 
    298 <item label="Sphere" ogc_wkt="GEOGCS[&quot;WGS 84&quot;,DATUM[&quot;WGS_1984&quot;,SPHEROID[&quot;WGS 84&quot;,6378137,298.257223563,AUTHORITY[&quot;EPSG&quot;,&quot;7030&quot;]],AUTHORITY[&quot;EPSG&quot;,&quot;6326&quot;]],PRIMEM[&quot;Greenwich&quot;,0,AUTHORITY[&quot;EPSG&quot;,&quot;8901&quot;]],UNIT[&quot;degree&quot;,0.01745329251994328,AUTHORITY[&quot;EPSG&quot;,&quot;9122&quot;]],AUTHORITY[&quot;EPSG&quot;,&quot;4326&quot;]]" title="Spherical coordinate reference (WGS 84)" uid="b724bfca-c9b1-11e5-8bd5-5404a60d96b5" url="http://spatialreference.org/ref/epsg/wgs-84/"/> 
     300<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="194f7f4c-2f14-11e6-9f5a-5404a60d96b5" url="http://spatialreference.org/ref/epsg/wgs-84/"/> 
    299301</coordinateReference> 
    300302<modelConfig id="cmip.drv.029" label="modelConfig" title="Model configuration options" uid="SECTION:modelConfig" useClass="vocab"> 
    301303<!-- <info srcType="dummy" srcRef="ptxt.py">Dummy entries</info> --> 
    302 <item MIPs="LUMIP" label="TiledLandUseModel" range="xs:boolean" title="Sub-grid land use reporting" type="capability" uid="b7262d42-c9b1-11e5-8bd5-5404a60d96b5" usage="Used on LUMIP to indicate variables only needed from models which have the capability to report on land use tiles."/> 
    303 <item MIPs="C4MIP" label="InteractiveChemistry" range="xs:boolean" title="Interactive chemistry schemes" type="capability" uid="b72631d4-c9b1-11e5-8bd5-5404a60d96b5" usage="Different experiment specifications in C4MIP for models with and without interactive chemistry"/> 
    304 <item MIPs="ISMIP6" label="DynamicIceSheet" range="xs:boolean" title="Evolving ice sheets." type="capability" uid="b72635bc-c9b1-11e5-8bd5-5404a60d96b5" usage=""/> 
    305 <item MIPs="ISMIP6" label="OfflineIceSheetModel" range="xs:boolean" title="Offline ice sheet model (run with prescribed atmosphere and ocean boundary conditions)" type="category" uid="b72639ae-c9b1-11e5-8bd5-5404a60d96b5" usage=""/> 
    306 <item MIPs="LUMIP" label="OfflineLandUseModel" range="xs:boolean" title="Offline ice sheet model (run with prescribed atmosphere boundary conditions)" type="category" uid="b7263d96-c9b1-11e5-8bd5-5404a60d96b5" usage=""/> 
    307 <item MIPs="OMIP" label="BoussinesqOcean" range="xs:boolean" title="Boussinesq Ocean (with constant reference density)" type="capability" uid="b726417e-c9b1-11e5-8bd5-5404a60d96b5" usage="The &quot;rhozero&quot; field is only required for Boussinesq models. 
     304<item MIPs="LUMIP" label="TiledLandUseModel" range="xs:boolean" title="Sub-grid land use reporting" type="capability" uid="19511140-2f14-11e6-9f5a-5404a60d96b5" usage="Used on LUMIP to indicate variables only needed from models which have the capability to report on land use tiles."/> 
     305<item MIPs="C4MIP" label="InteractiveChemistry" range="xs:boolean" title="Interactive chemistry schemes" type="capability" uid="19511672-2f14-11e6-9f5a-5404a60d96b5" usage="Different experiment specifications in C4MIP for models with and without interactive chemistry"/> 
     306<item MIPs="ISMIP6" label="DynamicIceSheet" range="xs:boolean" title="Evolving ice sheets." type="capability" uid="19511ba4-2f14-11e6-9f5a-5404a60d96b5" usage=""/> 
     307<item MIPs="ISMIP6" label="OfflineIceSheetModel" range="xs:boolean" title="Offline ice sheet model (run with prescribed atmosphere and ocean boundary conditions)" type="category" uid="19512090-2f14-11e6-9f5a-5404a60d96b5" usage=""/> 
     308<item MIPs="LUMIP" label="OfflineLandUseModel" range="xs:boolean" title="Offline ice sheet model (run with prescribed atmosphere boundary conditions)" type="category" uid="1951263a-2f14-11e6-9f5a-5404a60d96b5" usage=""/> 
     309<item MIPs="OMIP" label="BoussinesqOcean" range="xs:boolean" title="Boussinesq Ocean (with constant reference density)" type="capability" uid="19512b3a-2f14-11e6-9f5a-5404a60d96b5" usage="The &quot;rhozero&quot; field is only required for Boussinesq models. 
    308310"/> 
    309 <item MIPs="OMIP" label="BoussinesqOceanConstantTh" range="xs:boolean" title="Boussinesq Ocean With Constant Cell Thickness" type="capability" uid="b726457a-c9b1-11e5-8bd5-5404a60d96b5" usage="The ocean grid cell mass (masscello) can be supplied as a fixed field for Boussinesq models if the grid cell thickness is constant in time. Otherwise, this variable is required at monthly frequency."/> 
    310 <item MIPs="" label="HydrostaticAtmosphere" range="xs:boolean" title="Hydrostatic Atmosphere (pressure determined by weight of air column alone)" type="capability" uid="b72649c6-c9b1-11e5-8bd5-5404a60d96b5" usage=""/> 
    311 <item MIPs="CFMIP" label="CospEnabled" range="xs:boolean" title="The CFMIP Observation Simulation Package (COSP)" type="capability" uid="b7265164-c9b1-11e5-8bd5-5404a60d96b5" usage=""/> 
    312 <item MIPs="HighResMIP" label="usePlev27" range="xs:boolean" title="Use 27 pressure levels rather than model levels were option exists." type="ioOption" uid="b726559c-c9b1-11e5-8bd5-5404a60d96b5" usage="A range of variables in the HighResMIP have the option of being delivered either on model levels or 27 pressure levels."/> 
    313 <item MIPs="" label="horizontalOceanMeshSize" range="xs:integer" title="Horizontal Ocean Mesh Size" type="size" uid="b72659ac-c9b1-11e5-8bd5-5404a60d96b5" usage="Used in volume estimates"/> 
    314 <item MIPs="" label="horizontalAmosphereMeshSize" range="xs:integer" title="Horizontal Amosphere Mesh Size" type="size" uid="b7265d9e-c9b1-11e5-8bd5-5404a60d96b5" usage="Used in volume estimates"/> 
    315 <item MIPs="" label="verticalOceanLevelCount" range="xs:integer" title="Vertical Ocean Level Count" type="size" uid="b72661b8-c9b1-11e5-8bd5-5404a60d96b5" usage="Used in volume estimates"/> 
    316 <item MIPs="" label="verticalAtmosphereLevelCount" range="xs:integer" title="Vertical Atmosphere Level Count" type="size" uid="b72665c8-c9b1-11e5-8bd5-5404a60d96b5" usage="Used in volume estimates"/> 
    317 <item MIPs="" label="horizontalSoilMeshSize" range="xs:integer" title="Horizontal Soil Mesh Size" type="size" uid="b72669c4-c9b1-11e5-8bd5-5404a60d96b5" usage="Used in volume estimates"/> 
    318 <item MIPs="" label="verticalSoilLevelCount" range="xs:integer" title="Vertical Soil Level Count" type="size" uid="b7266d8e-c9b1-11e5-8bd5-5404a60d96b5" usage="Used in volume estimates"/> 
     311<item MIPs="OMIP" label="BoussinesqOceanConstantTh" range="xs:boolean" title="Boussinesq Ocean With Constant Cell Thickness" type="capability" uid="1951301c-2f14-11e6-9f5a-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."/> 
     312<item MIPs="" label="HydrostaticAtmosphere" range="xs:boolean" title="Hydrostatic Atmosphere (pressure determined by weight of air column alone)" type="capability" uid="1951354e-2f14-11e6-9f5a-5404a60d96b5" usage=""/> 
     313<item MIPs="CFMIP" label="CospEnabled" range="xs:boolean" title="The CFMIP Observation Simulation Package (COSP)" type="capability" uid="19513ee0-2f14-11e6-9f5a-5404a60d96b5" usage=""/> 
     314<item MIPs="HighResMIP" label="usePlev27" range="xs:boolean" title="Use 27 pressure levels rather than model levels were option exists." type="ioOption" uid="19514408-2f14-11e6-9f5a-5404a60d96b5" usage="A range of variables in the HighResMIP have the option of being delivered either on model levels or 27 pressure levels."/> 
     315<item MIPs="" label="horizontalOceanMeshSize" range="xs:integer" title="Horizontal Ocean Mesh Size" type="size" uid="195148f4-2f14-11e6-9f5a-5404a60d96b5" usage="Used in volume estimates"/> 
     316<item MIPs="" label="horizontalAmosphereMeshSize" range="xs:integer" title="Horizontal Amosphere Mesh Size" type="size" uid="19514f02-2f14-11e6-9f5a-5404a60d96b5" usage="Used in volume estimates"/> 
     317<item MIPs="" label="verticalOceanLevelCount" range="xs:integer" title="Vertical Ocean Level Count" type="size" uid="1951543e-2f14-11e6-9f5a-5404a60d96b5" usage="Used in volume estimates"/> 
     318<item MIPs="" label="verticalAtmosphereLevelCount" range="xs:integer" title="Vertical Atmosphere Level Count" type="size" uid="19515934-2f14-11e6-9f5a-5404a60d96b5" usage="Used in volume estimates"/> 
     319<item MIPs="" label="horizontalSoilMeshSize" range="xs:integer" title="Horizontal Soil Mesh Size" type="size" uid="19515e2a-2f14-11e6-9f5a-5404a60d96b5" usage="Used in volume estimates"/> 
     320<item MIPs="" label="verticalSoilLevelCount" range="xs:integer" title="Vertical Soil Level Count" type="size" uid="19516316-2f14-11e6-9f5a-5404a60d96b5" usage="Used in volume estimates"/> 
    319321</modelConfig> 
    320322</main> 
  • CMIP6dreqbuild/trunk/srcMisc/dreqSX.py

    r624 r681  
    66 
    77vdate = "20160309" 
     8vdate2 = "20160601" 
    89 
    910## writen by dreq_consol_tables  
     
    7273      ee[r[0]] = r 
    7374else: 
    74   for ee,fn,sep,xxx,nrmin in [(ee_xref,'vlsc5_xref_v%s.csv' % vdate,',',False,5),(ee_mip,'vlsc5_mip_v%s.csv' % vdate, '\t',False,24),(eeoldl,'vlsc5b_v%s.csv' % vdate, '\t',True,9)]: 
     75  for ee,fn,sep,xxx,nrmin in [(ee_xref,'vlsc5_xref_v%s.csv' % vdate2,',',False,5),(ee_mip,'vlsc5_mip_v%s.csv' % vdate2, '\t',False,24),(eeoldl,'vlsc5b_v%s.csv' % vdate2, '\t',True,9)]: 
    7576    for i in open(fn).readlines(): 
    7677      r = map( lambda x: string.strip(str(uniCleanFunc(x))), string.split( string.strip(i), sep ) ) 
     
    110111for k in ee_xref.keys(): 
    111112  if eeold.has_key(k): 
     113    if eeold[k][1][-4:] == "Clim": 
     114      print 'bad xref to clim: ',eeold[k] 
    112115    for k2 in ee_xref[k][1:]: 
    113116      if k2 != '': 
     
    126129  tid = ee_mip[k][-2] 
    127130  ee_miptables_old[tid].append(  ee_mip[k][0] ) 
    128   ee_miptables_vars_old[tid].append(  ee_mip[k][-3] ) 
    129   ee_ovars_old['%s.%s' % (tid,ee_mip[k][-3]) ].append(  k ) 
    130   ee_byvar[ ee_mip[k][-3] ].append( k ) 
     131  ee_miptables_vars_old[tid].append(  ee_mip[k][15] ) 
     132  ee_ovars_old['%s.%s' % (tid,ee_mip[k][15]) ].append(  k ) 
     133  ee_byvar[ ee_mip[k][15] ].append( k ) 
    131134 
    132135## check cmip5 vs. standard output 
  • CMIP6dreqbuild/trunk/srcMisc/dreq_consol_dreq.py

    r600 r681  
    99import dreq_cfg 
    1010import dreq_utils 
     11import utils_wb 
    1112 
    1213cmip5Vg = ['Omon','fx','Oyr','Oclim','Omon_3d','Omon_oth','Amon','Lmon','LImon','OImon','aero_3d','aero_oth','cfDay_2d','cfDay_3d','cfMon_3dstd','cfMon_3dmod','cfMon_2dmod','cfMon_sim','day_oth','day_ss','cfOff','cfSites','6hrLev','6hrPlev','3hr','cf3hr_grid','cf3hr_sim'] 
     
    410411## 
    411412    lega = False 
    412     if lega: 
    413      try: 
    414       self.ixh = r4.index( u'CMIP6 historical' ) 
    415       self.ixm = r4.index( u'MIP name:' ) 
    416       if r4[self.ixh-8] == u'control': 
    417         self.iccntl = self.ixh-8 
    418         hh = [] 
    419         for j in range(5): 
    420           hh.append( r4[self.iccntl + j*2] ) 
    421           if hh[j] != hhref[j]: 
    422             print 'ERROR.001.002: mismatch in heading %s' %j, r4 
    423       else: 
    424         print 'ERROR.001.001: control expt. column not found', r4 
    425      except: 
    426       if self.mip == 'DCPP': 
    427         self.ix0 = r4.index( u'DCPP-A' ) 
    428         self.ixm = self.ix0+8 
    429         self.ixh = -1 
    430         self.iccntl = self.ix0 
    431         hh = [] 
    432         for j in range(5): 
    433           hh.append( r4[self.iccntl + j*2] ) 
    434       else: 
    435         print 'Failed to parse Row 4' 
    436         raise 
    437      nn = len(r4) - self.ixm 
    438      self.mipl = [] 
    439      self.mipix = [] 
    440      for v in r4[self.ixm+1:]: 
    441       if v not in ['',u'MIP name:']: 
    442         self.mipl.append( v ) 
    443         self.mipix.append( r4.index(v) ) 
    444  
    445      if self.ixh > 0: 
    446       i0 = self.ixh - 8 
    447      else: 
    448       i0 = self.ix0 
    449      if len(self.mipix) == 0: 
    450       i9 = self.ixm-1 
    451      else: 
    452       i9 = max( self.mipix ) + 1 
    453      self.nbl = [] 
    454      self.hnbl = [] 
    455  
    456      for j in range(5,self.wk1.currentSi.nrows): 
    457       rv = map( lambda x: x.value, self.wk1.currentSi.row(j) ) 
    458       isblnk = all( map( lambda x: x == '', rv[i0:i9] ) ) 
    459       if not isblnk: 
    460         self.nbl.append(j) 
    461       if self.ixh > 0: 
    462         ishblnk = all( map( lambda x: x == '', rv[self.ixh:self.ixh+2] ) ) 
    463         if not isblnk: 
    464           self.hnbl.append(j) 
    465413 
    466414    ##self.opt = 'self' 
     
    553501 
    554502      try: 
    555         if snens == u'all': 
     503        if snens in [ u'all', u'ALL']: 
    556504          nens = 1 
    557505          nenmax = -1 
     
    563511          nenmax = nens 
    564512 
    565         if sny == u'all': 
     513        if sny in [ u'all', u'ALL']: 
    566514          ny = nydef 
    567515          ony = 'all' 
     
    646594##wke = wbcp( 'CMIP6_consolidatedExptList_20150408.xls' ) 
    647595wke = wbcp( 'CMIP6DataRequest_ConsolidatedExperiments_20150618.xls' ) 
    648 wke.focus( 'Experiments' ) 
    649 expgs = collections.defaultdict( int ) 
    650 expgsEns = collections.defaultdict( int ) 
    651 expgsYpe = collections.defaultdict( int ) 
    652 tier0 = 1 
    653 pre = dreq_utils.prcexr() 
    654 elist = [] 
    655 for k in range(2,wke.currentSi.nrows): 
     596 
     597wb = utils_wb.workbook( 'CMIP6DataRequest_ConsolidatedExperiments_20160110.xls' ) 
     598sht = wb.book.sheet_by_name( 'Experiments' ) 
     599p = dreq_utils.prconsolexpt() 
     600p.parse(sht) 
     601 
     602 
     603oexp = False 
     604if oexp: 
     605 wke = wbcp( 'CMIP6DataRequest_ConsolidatedExperiments_20160110.xls' ) 
     606 wke.focus( 'Experiments' ) 
     607 expgs = collections.defaultdict( int ) 
     608 expgsEns = collections.defaultdict( int ) 
     609 expgsYpe = collections.defaultdict( int ) 
     610 tier0 = 1 
     611 pre = dreq_utils.prcexr() 
     612 elist = [] 
     613 edict = {} 
     614 for k in range(2,wke.currentSi.nrows): 
    656615  vals = map( lambda x: x.value, wke.currentSi.row(k) ) 
    657616  pre.parse( vals ) 
    658617  elist.append( pre.row ) 
     618  edict[dreq_utils.labcoerce(pre.row.label)] = pre.row 
    659619  g = string.strip( vals[1] ) 
    660620  tier = vals[5] 
     
    662622    print '######',g,vals[12],vals[13],tier 
    663623  if tier0 >= tier: 
    664     expgs[g] += vals[13] 
    665     expgsEns[g] = vals[12] 
    666 for k in expgs.keys(): 
     624    try: 
     625      expgs[g] += vals[13] 
     626      expgsEns[g] = vals[12] 
     627    except: 
     628      print vals 
     629      raise 
     630 for k in expgs.keys(): 
    667631  if expgsEns[k] == 0: 
    668632    expgsYpe[k] = 0 
     
    674638      raise 
    675639 
    676 rqs= rqsummary(exptInfo=(expgs,expgsEns,expgsYpe)) 
     640 rqs= rqsummary(exptInfo=(expgs,expgsEns,expgsYpe)) 
     641else: 
     642 rqs= rqsummary() 
    677643 
    678644##for k in keys: 
     
    740706##('AerChemMIP', u'Omon_3d', u'CMIP6 historical', 'ad74be9a-26ef-11e5-8d9b-ac72891c3257', 0.0) 
    741707for i in rqs.records: 
    742   k = str( uuid.uuid1() ) 
    743   if type(i[4]) not in  (type( 0 ),type(1.)): 
    744     print 'ERROR.099.0001: non-integer ny: %s' % str(i) 
     708  if type(i[4]) not in ( type(0), type(1.) ): 
     709      print 'ERROR.099.0001: non-integer ny: %s' % str(i) 
     710  expt = i[2] 
     711  if string.find( expt, '(' ) != -1: 
     712    expt = string.strip( expt[:string.find( expt, '(' )] ) 
    745713  if i[3] not in s1: 
    746714    print 'SEVERE.005.00009: bad link ',i 
    747   sh[k] = i[:] 
     715  if string.find( expt, ',' ) != -1 or (string.find( expt, ' ' ) != -1 and expt != "CMIP6 historical"): 
     716    bits = map( lambda x: string.strip(x), string.split( expt, ',' ) ) 
     717    print 'INFO.expt.00006: ',i[:3], bits 
     718    for b in bits: 
     719      il = list(i) 
     720      il[2] = b 
     721      bb = dreq_utils.labcoerce(b) 
     722      if b not in p.edict and bb not in p.edict: 
     723        print 'ERROR.expt.00007: experiment %s not found, %s' % (b,str(il)) 
     724      k = str( uuid.uuid1() ) 
     725      sh[k] =  il[:]  
     726  else: 
     727    k = str( uuid.uuid1() ) 
     728    if expt != i[2]: 
     729      il = list(i) 
     730      il[2] = expt 
     731      sh[k] =  il[:]  
     732    else: 
     733      sh[k] =  i[:]  
    748734sh.close() 
  • CMIP6dreqbuild/trunk/srcMisc/dreq_consol_tables.py

    r624 r681  
    1313vdate = '20160309' 
    1414 
     15nt__grphd = collections.namedtuple( 'grphd', ['withPriority','thisl', 'iv', 'it','ll'] ) 
    1516nt__deckrq = collections.namedtuple( 'dckrq', ['control','AMIP','abrupt4xCO2','rq_1pctCO2','historical'] ) 
    1617nt__grptbl = collections.namedtuple( 'grptbl', ['grp','var','srcTable','freq','description','shape','levels','timeProc','mask','priority','mip','id'] ) 
     
    542543    oo.close() 
    543544 
    544   def groups(self): 
    545     vl3 = self.vl3 
     545  def parseGrpHead(self,sh,path,k,s): 
    546546    rh1 = ['Short name', 'Standard Name', 'Table', 'Frequency', 'Description extension (optional)', 'Shape', 'Levels', 'Time mean, point or climatology', 'Mask (optional)'] 
    547547    rh2 = ['Short name of group', 'Variable short name', 'Table', 'Frequency', 'Description extension (optional)', 'Shape', 'Levels', 'Time mean, point or climatology', 'Mask (optional)'] 
     548            
     549## 
     550## initial loop over rows in variable group sheet 
     551## 
     552    ll = [] 
     553    for i in range(sh.nrows): 
     554             thisr = sh.row(i) 
     555             tv = thisr[0].value 
     556             if tv[:10] == 'Short name': 
     557               ll.append(i) 
     558 
     559    assert len(ll) in [1,2], 'Could not parse sheet  %s, %s, %s: %s' % (path,k,s,len(ll)) 
     560    withPriority = False 
     561    hr = sh.row( ll[-1] ) 
     562    if len(ll) == 1: 
     563## nt__grptbl = collections.namedtuple( 'grptbl', ['grp','var','srcTable','freq','description','shape','levels','timeProc','mask'] ) 
     564             iv = 1 
     565             it = 0 
     566             ok = len( hr ) >= 9 and all( map( lambda x: string.strip(hr[x].value) == rh2[x], range(9) ) ) 
     567             assert ok, '001: Sheet heading not recognised: %s' % str(hr) 
     568             if len(hr) > 9 and hr[9].value == u'Priority': 
     569               withPriority = True 
     570               thisl = 10 
     571             else: 
     572               thisl = 9 
     573    else: 
     574             ok = len( hr ) >= 9 and all( map( lambda x: string.strip(hr[x].value) == rh1[x], range(9) ) ) 
     575             assert ok, '002: Sheet heading not recognised: %s' % str(hr) 
     576             iv = 0 
     577             it = -1 
     578             tv = sh.row(2)[1].value 
     579             thisl = 9 
     580    return (nt__grphd( withPriority, thisl, iv, it, ll ), tv) 
     581 
     582  def groups(self): 
     583    '''Parse new variable groups''' 
     584    vl3 = self.vl3 
     585##    rh1 = ['Short name', 'Standard Name', 'Table', 'Frequency', 'Description extension (optional)', 'Shape', 'Levels', 'Time mean, point or climatology', 'Mask (optional)'] 
     586##    rh2 = ['Short name of group', 'Variable short name', 'Table', 'Frequency', 'Description extension (optional)', 'Shape', 'Levels', 'Time mean, point or climatology', 'Mask (optional)'] 
    548587    rh3 = ['Short name of group', 'Variable short name', 'Table', 'Frequency', 'Description extension (optional)', 'Shape', 'Levels', 'Time mean, point or climatology', 'Mask (optional)', 'Priority'] 
    549588 
     
    553592    keys.sort() 
    554593    ee = {} 
     594 
     595## 
     596## array for information and debugging 
     597## 
    555598    self.glist = [] 
    556599    for k in keys: 
     
    567610          if s[:5] != 'CMIP5': 
    568611           sh = wb.book.sheet_by_name( s )  
    569            ll = [] 
    570            for i in range(sh.nrows): 
    571              thisr = sh.row(i) 
    572              tv = thisr[0].value 
    573              if tv[:10] == 'Short name': 
    574                ll.append(i) 
    575            assert len(ll) in [1,2], 'Could not parse sheet  %s, %s, %s: %s' % (path,k,s,len(ll)) 
    576            withPriority = False 
    577            hr = sh.row( ll[-1] ) 
    578            if len(ll) == 1: 
    579 ## nt__grptbl = collections.namedtuple( 'grptbl', ['grp','var','srcTable','freq','description','shape','levels','timeProc','mask'] ) 
    580              iv = 1 
    581              it = 0 
    582              ok = len( hr ) >= 9 and all( map( lambda x: string.strip(hr[x].value) == rh2[x], range(9) ) ) 
    583              assert ok, '001: Sheet heading not recognised: %s' % str(hr) 
    584              if len(hr) > 9 and hr[9].value == u'Priority': 
    585                withPriority = True 
    586                thisl = 10 
    587              else: 
    588                thisl = 9 
    589            else: 
    590              ok = len( hr ) >= 9 and all( map( lambda x: string.strip(hr[x].value) == rh1[x], range(9) ) ) 
    591              assert ok, '002: Sheet heading not recognised: %s' % str(hr) 
    592              iv = 0 
    593              it = -1 
    594              tv = sh.row(2)[1].value 
    595              thisl = 9 
    596  
     612## 
     613## parse headers of sheet into named tuple "gh" 
     614## 
     615           gh, tv = self.parseGrpHead(sh,path,k,s) 
     616 
     617## 
     618## main loop over rows in variable group sheet 
     619## 
    597620           irsh = 5 
    598            for i in range(ll[-1]+1,sh.nrows): 
     621           for i in range(gh.ll[-1]+1,sh.nrows): 
    599622            rowIndex = i 
    600623            thisr = sh.row(i) 
    601624            v0 = str( thisr[0].value ) + '__'  
    602625            if v0[0] != '#': 
    603              if iv == 1: 
     626             if gh.iv == 1: 
    604627                 ##self.ntr = nt__grptbl._make( getRowValues( thisr, minLen=9 ) + [105,k,''] ) 
    605                 lll = getRowValues( thisr, minLen=thisl, maxLen=thisl ) 
     628                lll = getRowValues( thisr, minLen=gh.thisl, maxLen=gh.thisl ) 
    606629             else: 
    607                 lll = getRowValues( thisr, minLen=thisl, maxLen=thisl ) 
     630                lll = getRowValues( thisr, minLen=gh.thisl, maxLen=gh.thisl ) 
    608631                lll[1] = lll[0] 
    609632                lll[0] = tv 
    610              if thisl == 9: 
     633             if gh.thisl == 9: 
    611634               lll.append( 105 ) 
    612635 
     
    615638### add mip name and space ... 
    616639             lll += [k,''] 
    617              if it >= 0: 
    618                tv = thisr[it].value 
    619              v = thisr[iv].value 
     640             if gh.it >= 0: 
     641               tv = thisr[gh.it].value 
     642             v = thisr[gh.iv].value 
    620643             bits = string.split(v, ' ') 
    621644             if len(bits) > 1: 
    622645               v = bits[0] 
    623646             if v == 'ta': 
    624                print 'INFO.045.0001: reading ta: thisl=%s, lll=%s' % (thisl,lll) 
    625                print hr 
     647               print 'INFO.045.0001: reading ta: thisl=%s, lll=%s' % (gh.thisl,lll) 
    626648             t = thisr[2].value 
    627649             if t[:6] == "CMIP5_": 
     
    703725               print 'ERROR.020.0002: attempt to set non integer priority: %s [%s] ... %s' % (p,str(lll),pmsg) 
    704726               p = 106 
    705              if (not withPriority) or string.strip( str( lll[9]) ) == '': 
     727             if (not gh.withPriority) or string.strip( str( lll[9]) ) == '': 
    706728               lll[9] = p 
    707729             if p0 != None and lll[9] != p0: 
    708730               print 'INFO.088.00001: overriding p: ',lll,p0 
    709731             if v == 'ta': 
    710                print 'INFO.045.0002: reading ta: thisl=%s, lll=%s' % (thisl,lll) 
    711                print hr 
    712              if v == 'sisnconc': 
    713                print 'INFO.sisnconc.00001', lll, t, t in  self.cmip5sns, withPriority 
     732               print 'INFO.045.0002: reading ta: thisl=%s, lll=%s' % (gh.thisl,lll) 
     733             if v == 'clisccp': 
     734               print 'INFO.clisccp.00001', lll, t, t in  self.cmip5sns, gh.withPriority 
    714735             self.ntr = nt__grptbl._make( lll ) 
    715736             ku = str( uuid.uuid1() ) 
     
    718739             gset.add( lll[0] ) 
    719740###   MIP, group, size, dictionary -- # items in each shape. 
    720            self.glist.append( (k, s, ll, e1) ) 
     741           self.glist.append( (k, s, gh.ll, e1) ) 
    721742           print 'INFO.gset.0001: ',k,gset 
    722743 
  • CMIP6dreqbuild/trunk/srcMisc/dreq_utils.py

    r613 r681  
    22import string, collections, shelve, uuid 
    33from sets import Set 
     4from utils_wb import uniCleanFunc 
     5 
     6def labcoerce(s): 
     7  s = string.replace(s, '.', '' ) 
     8  s = string.replace(s, '+', '' ) 
     9  s = string.replace(s, '/', ' ' ) 
     10  s = string.replace(s, '--', '-' ) 
     11  if string.find(s, '-' ) != -1: 
     12    s = string.replace(s, '-', ' ' ) 
     13  if string.find(s, ' ' ) != -1: 
     14    s = string.replace( string.capwords( s ), ' ', '' ) 
     15  return s 
     16 
     17class loadcsv(object): 
     18  def __init__(self,vdate): 
     19    self.eeoldl = collections.defaultdict( list ) 
     20    self.ee_xref = {} 
     21    self.ee_mip = {} 
     22    self.cmv = collections.defaultdict( list ) 
     23    for ee,fn,sep,xxx,nrmin in [(self.ee_xref,'vlsc5_xref_v%s.csv' % vdate,',',False,5),(self.ee_mip,'vlsc5_mip_v%s.csv' % vdate, '\t',False,24),(self.eeoldl,'vlsc5b_v%s.csv' % vdate, '\t',True,9)]: 
     24      for i in open(fn).readlines(): 
     25        r = map( lambda x: string.strip(str(uniCleanFunc(x))), string.split( string.strip(i), sep ) ) 
     26        while len(r) < nrmin: 
     27          r.append( '' ) 
     28        if xxx: 
     29          ee[r[0]].append( r ) 
     30        else: 
     31          ee[r[0]] = r 
     32 
     33    for k in self.ee_mip.keys(): 
     34      r = self.ee_mip[k] 
     35      v = r[21] 
     36      if string.strip(v) == '': 
     37        v = r[15] 
     38      mtab = r[22] 
     39      kk = '%s.%s' % (mtab,v) 
     40      self.cmv[kk].append( k ) 
    441 
    542 
     
    744  def __init__(self): 
    845    self.records = [] 
     46    self.edict = {} 
    947    self.info =['label','group','mip','description','modelClass','tier','nstart','starty','endy','yps','ensz','ntot','comment']  
    1048  def parse(self,sh): 
     
    5997        ##ensz = int( r[12] ) 
    6098        ##ntot = int( r[13] ) 
     99        self.edict[n] = (n,g,mip,desc,mcfg,tier,nstart,starty,endy,yps,ensz,ntot,comment) 
    61100        self.records.append( [n,g,mip,desc,mcfg,tier,nstart,starty,endy,yps,ensz,ntot,comment] ) 
    62101 
     
    182221    except: 
    183222      if mip == 'DCPP': 
     223       try: 
    184224        self.ix0 = r4.index( u'DCPP-A' ) 
    185225        self.ixm = self.ix0+8 
     
    187227        self.iccntl = self.ix0 
    188228        hh = [] 
    189         for j in range(5): 
     229        for j in range(4): 
    190230          hh.append( r4[self.iccntl + j*2] ) 
     231       except: 
     232        print '!!!!!!!!!!!', r4 
     233        raise 
    191234      else: 
    192235        print 'Failed to parse Row 4' 
     236        print r4 
    193237        raise 
    194238 
  • CMIP6dreqbuild/trunk/srcMisc/extractMipInfo.py

    r374 r681  
    2020 
    2121NT_mip = collections.namedtuple( 'mip',['label','dir','pattern'] ) 
    22 NT_var = collections.namedtuple( 'var',['name','sn','snStat','realm','units','longName','comment','mip'] ) 
     22NT_var = collections.namedtuple( 'var',['name','sn','snStat','realm','units','longName','comment','mip','cmvname'] ) 
    2323NT_canvari = collections.namedtuple( 'canonicalVariation',['conditions','text', 'ref'] ) 
    2424vlist = [ 
     
    543543    pass 
    544544 
    545   def  run(self): 
     545  def run(self): 
    546546    self.m = mipCo( mips )   
    547547    self.json() 
     
    565565    for k in keys: 
    566566      for t in self.m.vdict[k]: 
    567   ##NT_var = collections.namedtuple( 'mip',['name','sn','snStat','realm','units','longName','comment'] ) 
    568         sn, r, units, ln, c = map( lambda x: self.m.td[t][k][1].get(x,None), ['standard_name','modeling_realm','units','long_name','comment'] )  
     567  ##NT_var = collections.namedtuple( 'mip',['name','sn','snStat','realm','units','longName','comment','cmvname'] ) 
     568        sn, r, units, ln, c, cmv = map( lambda x: self.m.td[t][k][1].get(x,None), ['standard_name','modeling_realm','units','long_name','comment','out_name'] )  
     569        if cmv == None: 
     570          cmv = k 
     571          ##print 'WARN.cmv.00002: empty out_name ...: ',sn,r,units,ln,t,k 
     572 
    569573        mipid = string.split(t,'_')[0] 
    570574        if c == '': 
    571575          c = None 
    572         v = NT_var( k, sn, 'exists', r, units, ln, c,mipid ) 
     576        v = NT_var( k, sn, 'exists', r, units, ln, c,mipid, cmv ) 
    573577        vl.append(v) 
    574578    self.tupList = vl 
  • CMIP6dreqbuild/trunk/srcMisc/fcc_utils2.py

    r442 r681  
    9898## l[0] = var name, l[1] = dimensions, l[2] = attributes, l[3] = tag 
    9999      for l in eee: 
    100         ff[l[0]] = ( l[1], l[2], l[3] ) 
     100        vn = l[2].get( 'out_name', l[0] ) 
     101        if vn != l[0]: 
     102          print 'INFO.outname.00001: ',l[0],vn 
     103        ff[vn] = ( l[1], l[2], l[3] ) 
    101104      self.adict = {} 
    102105## l[0] = axis name, l[1] = attributes, l[2] = tag 
  • CMIP6dreqbuild/trunk/srcMisc/sumMip_pp.py

    r613 r681  
    22import hashlib, collections, string, uuid, sys 
    33import dreq_cfg 
     4import dreq_utils 
    45 
    56from utils_wb import workbook 
     7 
     8l1 = dreq_utils.loadcsv( '20160309' ) 
    69 
    710eeat = collections.defaultdict( int ) 
     
    3942        if started: 
    4043          omit = False 
     44          print r 
    4145          k2 = str( uuid.uuid1() ) 
    42           this = [k2,] 
     46          this = [] 
    4347          for k in eeatKeysPlus: 
    4448            if k == 'mip': 
     
    6771              this.append( '' ) 
    6872          if not omit: 
    69             eeomip.append( this ) 
     73            mtab =  'OMIP.%s' % s 
     74            kcmv = '%s.%s' % (mtab,v) 
     75            if kcmv in l1.cmv: 
     76              if len( l1.cmv[kcmv] ) == 1: 
     77                k2 = l1.cmv[kcmv][0] 
     78              else: 
     79                print 'WARN.kcmv.0003: %s multiple entries' % kcmv 
     80            else: 
     81              print 'WARN.kcmv.0004: %s not found' % kcmv, r 
     82            eeomip.append( [k2,] + this ) 
    7083        elif r[0] == 'priority': 
    7184          started = True 
     
    117130    return x 
    118131 
     132 
    119133for k in keys: 
    120134  v = string.split( k, '__')[0] 
     
    125139  l = mp( e.m.td[m][v][1].get('long_name','unset'), 'unset' ) 
    126140  s = mp( e.m.td[m][v][1].get('standard_name','unset'), 'unset' ) 
     141  vn = mp( e.m.td[m][v][1].get('out_name','unset'), 'unset' ) 
     142  if vn == 'unset': 
     143    vn = v 
    127144  u = e.m.td[m][v][1].get('units','unset') 
    128145  t = (v,l,s,c,u) 
     
    135152## need to add v & m .... 
    136153  for m in ff[k]: 
     154   if m not in e.m.td: 
     155     print 'ERROR: %S not in e.m.td' % m 
     156   else: 
    137157    thisdict = e.m.td[m][v][1].copy() 
    138158    thisdict['var'] = v 
    139159    thisdict['mip'] = m 
    140160    thisdict['dims'] = string.join( e.m.td[m][v][0], '|' ) 
     161    r = mipr2l( thisdict ) 
     162    vv = r[14] 
     163    if string.strip(vv) == '': 
     164        vv = r[20] 
     165    mtab = r[21] 
     166    kcmv = '%s.%s' % (mtab,vv) 
    141167    k2 = str( uuid.uuid1() ) 
     168    if kcmv in l1.cmv: 
     169      if len( l1.cmv[kcmv] ) == 1: 
     170        k2 = l1.cmv[kcmv][0] 
     171      else: 
     172        print 'WARN.kcmv.0001: %s multiple entries' % kcmv 
     173    else: 
     174      print 'WARN.kcmv.0002: %s not found' % kcmv, r 
    142175### create a uuid reference for each table entry 
    143     eel[k2] = mipr2l( thisdict ) 
     176    eel[k2] = r 
    144177### for each parameter, create a list of table entries 
    145178    eeh[h].append(k2) 
     
    149182ee_extra = {} 
    150183for r in eeomip: 
    151   v = r[-3] 
     184  ##v = r[-3] 
     185  v = r[15] 
    152186  k2 = r[0] 
    153187  u = r[17] 
     
    225259    print '+++++++++++++++++++++++++++++++' 
    226260    
    227  
    228261assert idk == 0 or idk == ics, 'NOT FOUND: %s records (%s)' % (idk,ics) 
    229262assert idkh == 0, 'NOT FOUND: %s hash keys' % idkh 
     
    261294#### want to get additional info from ref: ..... from?? 
    262295yyy = '2016mmdd' 
     296yyy = '20160601' 
    263297oo=open( 'vlsc5b_v%s.csv' % yyy,'w') 
    264298idk = 0 
  • CMIP6dreqbuild/trunk/srcMisc/sx2.py

    r624 r681  
    1010import dreq_utils 
    1111import utils_wb 
    12 from sets import Set 
     12 
     13from dreq_utils import labcoerce 
    1314odir = 'sh20150827' 
    1415 
     
    2526 
    2627uidgen = collections.defaultdict( uid1 ) 
    27  
    28 def labcoerce(s): 
    29   s = string.replace(s, '.', '' ) 
    30   s = string.replace(s, '+', '' ) 
    31   s = string.replace(s, '/', ' ' ) 
    32   s = string.replace(s, '--', '-' ) 
    33   if string.find(s, '-' ) != -1: 
    34     s = string.replace(s, '-', ' ' ) 
    35   if string.find(s, ' ' ) != -1: 
    36     s = string.replace( string.capwords( s ), ' ', '' ) 
    37   return s 
    3828 
    3929sh1 = shelve.open( '%s/cmip5Groups' % odir, 'n' ) 
     
    6656  cmip5tbs0.add( k ) 
    6757  cmip5tbs.append( [u,"CMIP6",k,"CMIP6 CMOR Table: %s" % k, "CMIP5", "CMIP5 MIP Table: %s" % k] ) 
     58 
     59for k in ['aermonthly','aerhourly','aerfixed','aerdaily','aerannual']: 
     60  u = str( uuid.uuid1() ) 
     61  cmip5gplk[k] = u 
     62  cmip5tbs0.add( k ) 
     63  cmip5tbs.append( [u,"AerChemMIP",k,"CMIP6 CMOR Table: %s" % k, "CMIP6 [AerChemMIP]", "MIP Table: %s" % k] ) 
    6864 
    6965for k in sx.cmip5so.sop.keys(): 
     
    539535 
    540536sh = shelve.open( 'dreq_consol_tables_reviewed_b_v%s' % vdate, 'r' ) 
    541 revTabIds = Set( sh.keys()[:] ) 
     537revTabIds = set( sh.keys()[:] ) 
    542538sh.close() 
    543539 
     
    571567kmapk1 = {} 
    572568for k in k1: 
    573   assert len(ee0_gp[k].keys()) in  [0,1], 'Multiple references to %s' % k  
     569  assert len(ee0_gp[k].keys()) in  [0,1], 'Multiple references to %s [%s]' % (k,str( ee0_gp[k].keys() ) )  
    574570  for k2 in ee0_gp[k].keys(): 
    575571    if eervg.has_key( '%s.%s' % (k2,k) ): 
     
    772768        kl = 5 
    773769        lab = string.replace( lab, '_', '-' ) 
     770        print 'INFO.nomap.00001: ',cls,k2,lab 
    774771      else: 
    775772        lab = '%s-%s' % (mip,k2) 
     
    777774      if sx2e.r1.match( lab ) == None: 
    778775        print 'NON_COMPLIANT label', lab,k2, cls 
     776 
    779777      rec, sup = ([id,mip,lab,'%s: %s' % (mip,lab), cls, refNote],[ttt,kkk]) 
     778 
    780779      if string.find( string.join( rec ), '__unset__' ) != -1: 
    781780         print 'INFO.ppp.00003: ',rec, sup, lab,k2, cls, kl 
     781 
    782782      if refNote == 'C4MIP.Lmon': 
    783783        print 'WARN.051.00001: ',rec,sup, lab,k2, cls, kl 
     784 
    784785##['6a7ed72e-98d7-11e5-9c3a-ac72891c3257', 'LUMIP', u'C4MIP-Lmon', u'LUMIP: C4MIP-Lmon', 'rev', u'C4MIP.Lmon'] ['new', u'C4MIP.Lmon'] C4MIP-Lmon C4MIP.Lmon rev 1 
    785786      print 'INFO.bbb.0002: ',id,rec,sup 
     
    841842    print 'SEVERE.090.0001: ',k,sss[k] 
    842843 
    843 ## 
    844 ## appears to have become redundant 
    845 ## 
    846 dosi = False 
    847 if dosi: 
    848   for k in ['seaiceday', 'seaicemon']: 
    849     id =  str( uuid.uuid1() ) 
    850     mip = 'SIMIP' 
    851     lab = '%s-%s' % (mip,k) 
    852     title = '%s: %s' % (mip,k) 
    853     cls = 'newOrp' 
    854     refNote = '%s.%s' % (mip,k) 
    855     rvguids.add( id ) 
    856     sh[id] = [id,mip,lab,title, cls, refNote] 
    857     lookup1[cls].d[refNote].append(id) 
    858844       
    859845## add CMIP5 groups ......... 
     
    886872######## with link to variable group associated with the CMIP5 group. 
    887873######## latter should be available through "CMIP5-Omon_3d" etc....: 
    888  
    889874## 
    890875 
     
    905890       err001[kkk] += 1 
    906891    r = ee0_p1[k][:] 
     892    t = ee0_xref[k][0] 
     893    ##if t[0] == 1: 
     894      ##r[-2] = 0 
     895      ##r[-1] = '__see_vid__' 
    907896    if id != None: 
    908897      r[-2] = 1 
     
    911900      r[-2] = -1 
    912901      r[-1] = '__none__' 
    913     t = ee0_xref[k][0] 
    914902    r += [t[0],t[1][0]] 
     903    if r[1] == 'mrro': 
     904      print 'INFO.mrro.0001:', r 
    915905    if r[1] == 'sisnconc': 
    916906      print 'INFO.sisnconc.0001:', r 
     
    1005995    if v1 == 'rtmt': 
    1006996      print 'xxyyyy',v1,sx.ee_mip[k] 
     997    if v1 == 'clisccp': 
     998      print 'INFO.clisccp.0001:', sx.ee_mip[k] 
    1007999 
    10081000    trc = [] 
     
    10691061# variable name 
    10701062    v1 = sx.ee_mip[k][21] 
     1063    if v0[:3] == "dms" or v1[:3] == "dms": 
     1064      print 'INFO.dms.0001: ',sx.ee_mip[k] 
    10711065    if type(v0) == type( 'y' ) and v0 not in ['', ' ']: 
    10721066      v1 = v0 
     1067 
    10731068## check to see if sections are defined. 
    10741069    if shbx.tabsectbyvar.has_key(m): 
     
    11051100    r = sx.eeold[kv] 
    11061101    vnam0 = r[1] 
     1102    if vnam0[-4:] == "Clim": 
     1103      print 'error in xref back .... ',r 
    11071104    kit = 0 
    11081105    itl = [] 
     
    11111108      if ee_mv0.has_key(r[8]): 
    11121109        kv = ee_mv0[ r[8] ] 
     1110        r0 = r[:] 
    11131111        r = sx.eeold[kv] 
     1112        if r[1] != vnam0: 
     1113          print 'WARN: CHANGE ',vnam0,kv,r,r0 
    11141114      else: 
    11151115        print 'ERROR.002.0002: ambiguous back reference: %s' % str(r) 
     
    11191119        print 'WARNING.002.0001: chained reference: %s' % str(r) 
    11201120    kl = [kv,] 
    1121   print 'INFO.999.00005: ',omit, rec 
     1121  ##print 'INFO.999.00005: ',omit, rec 
     1122 
    11221123  if not omit: 
    11231124## count refs, for use in determining where to create group records .... 
     
    11281129    if len( sx.ee_mip[k][:] ) != 24: 
    11291130      print 'ERROR.015.0002: Bad record length %s: %s' % (k,sx.ee_mip[k]) 
     1131 
    11301132    rec = sx.ee_mip[k][:]  + [kl[0],gpid,rwix,p] 
    11311133    if rec[21] == u'bsi' or rec[15] == u'bsi': 
    11321134      print 'INFO.999.00001: ',[rec[i] for i in [15,21,22,25]] 
     1135    if v1 == 'clisccp': 
     1136      print 'INFO.clisccp.0002:', rec 
    11331137    sh[k] = sx.ee_mip[k][:]  + [kl[0],gpid,rwix,ssect,p]  
     1138    if kl[0] in sx.eeold and sx.eeold[kl[0]][1] == 'ch4Clim': 
     1139      print 'INFO.ch4Clim.0001: ',sh[k] 
    11341140    if gpid not in rvguids: 
    11351141        print 'ERROR.080.06006: Request variable group link broken:', sh[k] 
     
    12471253## add OMIP (+ ....?) 
    12481254 nomip = 0 
    1249  for k in shbx.tabuuid.keys(): 
     1255 donomip = False 
     1256 if donomip: 
     1257  for k in shbx.tabuuid.keys(): 
    12501258   if k[0] != '_': 
    12511259  ####cmip5tbs.append( [u,"CMIP6",k,"CMIP6 CMOR Table: %s" % k, "CMIP5", "CMIP5 MIP Table: %s" % k] ) 
  • CMIP6dreqbuild/trunk/srcMisc/sx2_extra.py

    r508 r681  
    55l1 = [u'ISMIP6.new_LImon', u'PMIP.PMIP-LIclim', u'HighResMIP.6hrPlev_extr_dr', u'LUMIP.Lmon_Lut', u'FAFMIP.fafOyr', u'PMIP.PMIP-day', u'DynVar.DYVR_daily', u'C4MIP.C_LandT2', u'PMIP.PMIP-aeroclim', u'PMIP.PMIP-aero', u'C4MIP.C_LandT1', u'HighResMIP.1hrLev', u'PMIP.PMIP-Omon', 'C4MIP.L_day', u'FAFMIP.fafOmonB', u'CFMIP.cfDayExtra', u'CFMIP.cfDay_2d_new', u'PMIP.PMIP-Oclim', u'ISMIP6.new_Omon', u'ISMIP6.new_fx', u'CFMIP.aeroDay_2d', u'HighResMIP.Amon_ext', u'HighResMIP.1hr_energy', u'HighResMIP.day_jet', u'C4MIP.C_Hist', u'CFMIP.cfSites_new', u'PMIP.PMIP-Amon', u'HighResMIP.6hrPlev_intense', u'CFMIP.cfMonExtra', u'LS3MIP.LCmon', u'GeoMIP.aeroGeo', u'PMIP.PMIP-Lmon', u'HighResMIP.3hr_cloud', u'HighResMIP.1ts', u'ISMIP6.icesheetmon', u'HighResMIP.Amon_sparc', u'C4MIP.C_Ocean_T1', u'HighResMIP.Amon_conv', u'LUMIP.Lyr_Lut', u'HighResMIP.1hr_strat', u'HighResMIP.3hr_extr', u'PMIP.PMIP-Lclim', u'CFMIP.cf3hr_sim', u'FAFMIP.fafOmon', u'FAFMIP.fafOyrB', u'RFMIP.aero_irf', u'PMIP.PMIP-Aclim', u'LS3MIP.LWday', u'C4MIP.C_Basic', u'CFMIP.cfMon_3dstd_new', u'HighResMIP.3hrPlev', u'ISMIP6.icesheetyear', u'C4MIP.C_Ocean_T2', 'C4MIP.L_3hr', u'RFMIP.OfflineRad', u'VolMIP.VIRF', u'HighResMIP.6hrPlev_extr', u'PMIP.PMIP-OIclim', u'PMIP.PMIP-6hr', u'HighResMIP.Amon_diag', 'DynVar.DYVR_monthly', 'LS3MIP.LEday', 'DAMIP.new_monthly','DCPP.DCPP-day', u'DCPP.DCPP-6hr', 'DCPP.DCPP-mon', 'DynVar.DYVR_zg', 'SIMIP.seaicemon', 'SIMIP.seaiceday' ] 
    66 
     7l1p = [ 
     8'DynVar.DYVR_daily_d', 
     9'DynVar.DYVR_daily_c', 
     10'DynVar.DYVR_daily_b', 
     11'DynVar.DYVR_daily_a', 
     12'DAMIP.DAMIP_6hrPlev_p2', 
     13'DAMIP.DAMIP_Amon_new', 
     14'DynVar.DYVR_monthly_d', 
     15'DynVar.DYVR_monthly_a', 
     16'DynVar.DYVR_monthly_c', 
     17'DynVar.DYVR_monthly_b', 
     18'DAMIP.DAMIP_day', 
     19'CFMIP.cf3hr_sim_new', 
     20'DAMIP.DAMIP_3hr_p2', 
     21'DAMIP.DAMIP_Omon_p2', 
     22'DAMIP.DAMIP_day_zm', 
     23'DAMIP.DAMIP_emMon', 
     24'CFMIP.cf1hrClimMon', 
     25'DAMIP.DAMIP_emMonZ', 
     26'DAMIP.DAMIP_aermonthly'] 
     27 
     28l2p = [ 
     29'DynVar-daily-d', 
     30'DynVar-daily-c', 
     31'DynVar-daily-b', 
     32'DynVar-daily-a', 
     33'DAMIP-6hrPlev-p2', 
     34'DAMIP-Amon-new', 
     35'DynVar-monthly-d', 
     36'DynVar-monthly-a', 
     37'DynVar-monthly-c', 
     38'DynVar-monthly-b', 
     39'DAMIP-day', 
     40'cf3hr-sim-new', 
     41'DAMIP-3hr-p2', 
     42'DAMIP-Omon-p2', 
     43'DAMIP-day-zm', 
     44'DAMIP-emMon', 
     45'cf1hrClimMon', 
     46'DAMIP-emMonZ', 
     47'DAMIP-aermonthly'] 
     48 
    749l2 = [u'ISMIP6-LImon', u'PMIP-LIclim', u'HighResMIP-6hrPlevExtrDr', u'LUMIP-LmonLut', u'FAFMIP-fafOyr', u'PMIP-day', u'DynVar-day', u'C4MIP-LandT2', u'PMIP-aeroclim', u'PMIP-aero', u'C4MIP-LandT1', u'HighResMIP-1hrLev', u'PMIP-Omon', 'C4MIP-day', u'FAFMIP-OmonB', u'CFMIP-cfDayExtra', u'CFMIP-cfDay2dNew', u'PMIP-Oclim', u'ISMIP6-OmonNew', u'ISMIP6-fxNew', u'CFMIP-aeroDay2d', u'HighResMIP-AmonExt', u'HighResMIP-1hrEnergy', u'HighResMIP-dayJet', u'C4MIP-Hist', u'CFMIP-cfSitesNew', u'PMIP-Amon', u'HighResMIP-6hrPlevIntense', u'CFMIP-cfMonExtra', u'LS3MIP-LCmon', u'GeoMIP-aeroGeo', u'PMIP-Lmon', u'HighResMIP-3hrCloud', u'HighResMIP-1ts', u'ISMIP6-icesheetmon', u'HighResMIP-AmonSparc', u'C4MIP-OceanT1', u'HighResMIP-AmonConv', u'LUMIP-LyrLut', u'HighResMIP-1hrStrat', u'HighResMIP-3hrExtr', u'PMIP-Lclim', u'CFMIP-cf3hrSim', u'FAFMIP-Omon', u'FAFMIP-OyrB', u'RFMIP-aeroIrf', u'PMIP-Aclim', u'LS3MIP-LWday', u'C4MIP-Basic', u'CFMIP-cfMon3dstdNew', u'HighResMIP-3hrPlev', u'ISMIP6-icesheetyear', u'C4MIP-OceanT2', 'C4MIP-3hr', u'RFMIP-OfflineRad', u'VolMIP-VIRF', u'HighResMIP-6hrPlevExtr', u'PMIP-OIclim', u'PMIP-6hr', u'HighResMIP-AmonDiag', 'DynVar-mon', 'LS3MIP-LEday', 'DAMIP-newMonthly','DCPP-day', u'DCPP-6hr', 'DCPP-mon', 'DynVar-DYVRzg', 'SIMIP-seaicemon', 'SIMIP-seaiceday'] 
     50 
     51l1 += l1p 
     52l2 += l2p 
    853 
    954r1 = re.compile( '^([a-zA-Z0-9-]*)$' ) 
Note: See TracChangeset for help on using the changeset viewer.