Ignore:
Timestamp:
15/02/17 12:02:45 (3 years ago)
Author:
mjuckes
Message:

updates

File:
1 edited

Legend:

Unmodified
Added
Removed
  • CMIP6dreqbuild/trunk/src/framework/ingest/util_checkUpd.py

    r940 r947  
    728728          if vo != vr: 
    729729            print 'WARN.outname.00001: out name issue: ',vo,vr, mip,snn 
    730           ##snn = {'OImon':'SImon'}.get(snn,snn) 
     730          snn = {'OImon':'SImon'}.get(snn,snn) 
    731731          ##snn = {'aero':'aermonthly'}.get(snn,snn) 
    732732          if vr == 'cllcalipso': 
     
    755755                   vid,sect = self.makeRefVarRec( rrrc, 1000 + k, 'Omon', mip ) 
    756756                   log.info( 'INFO.copy.0005: copy to Omon of 3d-tracer : %s' % vr ) 
     757                if sect == 'Amon_2d' and mip == 'CMIP5' and vr not in ['tasmin','tasmax','tasAdjust','tsAdjust','pslAdjust','prAdjust']: 
     758                   rrrc = rrr[:] 
     759                   rrrc[16] = 'site time1' 
     760                   rrrc[19] = 'subhr' 
     761                   rrrc[20] = '' 
     762                   rrrc[9] = 'area: point time: point' 
     763                   rrrc[4] = 'This table includes the 2-D variables listed in the "Amon" spreadsheet, omitting, however, the daily maximum and minimum temperatures.  All variables should be reported as synoptic fields, not daily means.' 
     764                   vid,sect = self.makeRefVarRec( rrrc, 1000 + k, 'cfSites', 'CFMIP' ) 
     765                   log.info( 'INFO.copy.0006: copy to cfSites of 2d field: %s' % vr ) 
    757766                self.uidLookup[ snn ][vr] = vid 
    758767                stnm = rrr[self.istnm] 
    759768                dims = rrr[self.idims] 
    760769                self.uidLookupSn[ snn ][(stnm,dims)] = (vid,vr,mip) 
    761           elif snn in ['OImon',]: 
     770          elif snn in ['OImonxx',]: 
    762771                vid = str( uuid.uuid1() ) 
    763772                log.info( 'INFO.newvid.00002: new vid minted for %s, %s, %s' % (mip,sname,vr) ) 
    764773          else: 
    765                 assert snn in self.uidLookup or snn in ['aero','LImon','Odec'], 'Bad table name; %s; %s:: %s' % (mip,snn, str( self.uidLookup.keys() ) ) 
     774                assert snn in self.uidLookup or snn in ['aero','LImon','Odec','OImon','SImon'], 'Bad table name; %s; %s:: %s' % (mip,snn, str( self.uidLookup.keys() ) ) 
    766775                if vr in {'*','include Oyr 3D tracers'}: 
    767776                   log.info( 'WARN.copy.00001: copy directive found ... copy not implemented: %s,%s:: %s' % (mip,sname,str(rrr)) ) 
     
    889898 
    890899        nss = None 
    891         if sect in [u'AerChemMIP-Zonal2d',u'AerChemMIP-Zonal',u'AerChemMIP-Mon2d', u'Monthly-mean 2d', u'Monthly-mean 1d', u'Monthly-mean zonal mean 2d', u'Monthly-mean 2d (T2)', u'Monthly-mean zonal mean 2d (T2)']: 
     900        if sect in [u'AerChemMIP-Zonal2d',u'AerChemMIP-Zonal',u'AerChemMIP-Mon2d', u'Monthly-mean 2d', u'Monthly-mean 1d', u'Monthly-mean zonal mean 2d', u'Monthly-mean 2d (T2)', u'Monthly-mean zonal mean 2d (T2)','aermonthly-2d']: 
    892901          print 'INFO.aerchem.00010: ', rec 
    893902          nss = 'aermonthly-oth' 
    894         elif sect in [ u'AerChemMIP-Mon3d',u'Monthly-mean 3d', u'Monthly-mean 3d (T2)']: 
     903        elif sect in [ u'AerChemMIP-Mon3d',u'Monthly-mean 3d', u'Monthly-mean 3d (T2)','aermonthly-3d']: 
    895904          print 'INFO.aerchem.00020: ', rec 
    896905          nss = 'aermonthly-3d' 
Note: See TracChangeset for help on using the changeset viewer.