Changeset 801


Ignore:
Timestamp:
04/11/16 11:05:06 (3 years ago)
Author:
mjuckes
Message:

adding util_gen

Location:
CMIP6dreqbuild/trunk/src/framework/ingest
Files:
1 added
3 edited

Legend:

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

    r792 r801  
    190190 
    191191              if vgl1 not in tref.uidByLabel: 
    192                 print 'SEVERE.requestvar.00001: group not found: %s' % vgl 
     192                print 'SEVERE.requestvar.00001: group not found: %s: %s' % (vgl,f) 
    193193                vgid = '__vgid_not_found__' 
    194194              else: 
     
    619619      if k[0] != '_': 
    620620        if this[k] == None: 
    621           print 'WARN.dyngrp.00002: variable not found: ',rgid,k, glab 
     621          print 'ERROR.dyngrp.00002: variable not found: ',rgid,k, glab 
    622622        else: 
    623623          vid, priority = this[k] 
  • CMIP6dreqbuild/trunk/src/framework/ingest/util_checkUpd.py

    r791 r801  
    516516 
    517517        ll = [x in ['','0.0','42'] for x in rrr] 
     518        nonblnk = sum( 1 for x in rrr if x not in ['','0.0'] ) 
     519 
    518520        if all( ll[1:6] ) and  all( ll[7:12] ): 
    519521          if not all(ll): 
    520             log.info( 'INFO.skip.0001: %s:%s[%s]: skipping: %s' % (mip,sname,k,str(rrr)) ) 
     522            log.info( 'INFO.var.0001: %s:%s[%s]: skipping: %s' % (mip,sname,k,str(rrr)) ) 
     523        elif nonblnk < 5: 
     524            log.info( 'WARN.var.0002: %s:%s[%s]: skipping: %s' % (mip,sname,k,str(rrr)) ) 
    521525        else: 
    522             if rr[17].ctype == 1: 
     526          if rr[17].ctype == 1: 
    523527                  vr = rrr[17] 
    524             else: 
     528          else: 
    525529                  vr = rrr[5] 
     530          if vr == 'include Amon 2D': 
     531            log.info( 'WARN.var.0003: %s:%s[%s]: skipping: %s' % (mip,sname,k,str(rrr)) ) 
     532          elif vr == '' and rrr[1][:29] == 'Mole Fraction of Other Radiat': 
     533            log.info( 'WARN.var.0006: %s:%s[%s]: skipping: %s' % (mip,sname,k,str(rrr)) ) 
     534          else: 
    526535            v1 = rrr[5] 
    527536            rrr[17] = vr 
     
    532541            f2 = vr in ['','0.0'] 
    533542            if f1 or f2: 
    534               log.error( 'ERROR: no variable found: %s' % str(rrr)) 
     543              log.error( 'ERROR.var.0004: no variable found: [%s.%s] %s' % (mip,sname,str(rrr)) ) 
    535544              ok = False 
    536545            v1 = rrr[2] 
     
    539548            f2 = v2 in ['','0.0'] 
    540549            if f1 and f2: 
    541               log.error( 'ERROR: no units found: %s' % str(rrr)) 
     550              log.error( 'ERROR.var.0005: no units found: [%s.%s] %s' % (mip,sname,str(rrr)) ) 
    542551              ok = False 
    543552            elif f1: 
  • CMIP6dreqbuild/trunk/src/framework/ingest/util_varGroups.py

    r791 r801  
    6262               'tas, pr, psl':('Amon','Amon-subset-02'), 
    6363               'tasmax,tasmin,pr,prc,uas,vas':('day','day-subset-01'), 
    64                'tasmax,tasmin, pr,hfls,hfss':('LEday','LEday-subset'), 
     64               'tasmax,tasmin, pr,hfls,hfss':('day','LEday-subset'), 
    6565               'tas, pr, psl, uas':('day','day-subset-02'), 
    6666               'ps':('cfDay','cfDay-subset-01'), 
     
    6969               'dryso4,wetso2,od550lt1aer,reffclwtop,dryss,wetso4,abs550aer,wetss,wetdust,dryso2,drydust,od550aer,emidust,emiss,emiso4,emiso2':('aermonthly','aermonthly-subset-01'), 
    7070               'hfcorr, wfcorr, masso, pbo, pso, volo, zos, zostoga, masscello, thkcello, thetao, thetaoga, bigthetao, bigthetaoga, tos, tob, tomint, tosga, so, soga, sos, sob, somint, msftbarot, uo, vo, wmo, msftmyz, msftmrho, msftyyz, msftyrho, msftmzmpa, msftmrhompa, msftyzmpa, msftyrhompa, msftmzsmpa, msftyzsmpa, hfbasin, hfbasinpmadv, hfbasinpmdiff, hfbasinpsmadv, hfbasinpadv, fsitherm, wfo, wfonocorr, sfdsi, sfriver, hfsifrazil, hfsifrazil, hfsithermds, hfsithermds, hfds, zfull, zhalf':('Omon','Omon-subset-01'), 
    71                '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':('Omon','Omon-subset-02') } 
     71               'thkcello,wmo,uo,hfnorth,tos,sos,soga,masscello,hfy,msftmrho,masso,pso,mlotst,zos,zostoga,rhopoto,hfydiff,hfbasin,ficeberg2d,thetao,so,zossga,dpco2,msftmyz,tauvo,sfdsi,msftyrho,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':('Omon','Omon-subset-02') } 
    7272    self.s2 = {} 
    7373 
     
    185185 
    186186  def loadGroups(self): 
    187     wb = workbook( 'sortedVarGroups.xls' )   
     187    wb = workbook( 'ingest/sortedVarGroups.xls' )   
    188188    sh = wb.book.sheet_by_name( 'Sheet1' ) 
    189189    self.groupset = {} 
Note: See TracChangeset for help on using the changeset viewer.