Changeset 428


Ignore:
Timestamp:
16/10/15 16:40:43 (4 years ago)
Author:
mjuckes
Message:

updates for glob snow

Location:
CCCC/trunk/ceda_cc
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • CCCC/trunk/ceda_cc/config/esacci_vocabs/extraAtts.txt

    r364 r428  
    33uk.ac.pml, ESACCI-OC-L3S-OC_PRODUCTS-MERGED-1M_MONTHLY_4km_GEO_PML_OC4v6_QAA, algorithm=SeaDAS-6-4-OCCCI, frequency=mon 
    44fi.fmi, , algorithm=Pulliainen2006, frequency=day 
    5 @ESA GlobSnow snow water equivalent L3B monthly aggregated|fi.fmi, , algorithm=Pulliainen2006, frequency=mon 
     5@ESA GlobSnow snow water equivalent L3B monthly aggregated:P1M|fi.fmi, , algorithm=Pulliainen2006, frequency=mon 
     6@ESA GlobSnow snow water equivalent L3B weekly aggregated:P1W|fi.fmi, , algorithm=Pulliainen2006, frequency=week 
     7@ESA GlobSnow L3B mean STD of 7 day running mean Snow Water Equivalent estimates:P1W|fi.fmi, , algorithm=Pulliainen2006, frequency=week 
     8@ESA GlobSnow L3A STD of daily Snow Water Equivalent estimates:P1D|fi.fmi, , algorithm=Pulliainen2006, frequency=day 
    69org.ghrsst, OSTIA-ESACCI-L4-v01.0, algorithm=OSTIA2-0, frequency=day 
    710DLR, ESACCI-OZONE-L3S-TC-MERGED-DLR_1M, algorith=DLR.merged, frequency=mon 
  • CCCC/trunk/ceda_cc/config/esacci_vocabs/variableInFile.txt

    r363 r428  
    88SWE:monthly SWE_avg lwe_thickness_of_surface_snow_amount 
    99SWE_max SWE_max lwe_thickness_of_surface_snow_amount 
    10 SWEweekly SWE_avg lwe_thickness_of_surface_snow_amount 
     10SWE_avg SWE_avg lwe_thickness_of_surface_snow_amount 
     11SWE_std_avg SWE_std_avg lwe_thickness_of_surface_snow_amount standard_error 
     12SWE_std SWE_std lwe_thickness_of_surface_snow_amount standard_error 
    1113TC atmosphere_mole_content_of_ozone atmosphere_mole_content_of_ozone 
  • CCCC/trunk/ceda_cc/config/esacci_vocabs/variables.txt

    r340 r428  
    6969Snow Water Equivalent SWE 
    7070Snow Water Equivalent SWE_max 
     71Snow Water Equivalent SWE_avg 
     72Snow Water Equivalent SWE_std_avg 
     73Snow Water Equivalent SWE_std 
  • CCCC/trunk/ceda_cc/utils_c4.py

    r407 r428  
    480480            self.fileId = '%s.%s' % (self.globalAts['naming_authority'],self.globalAts['id'][:i0+9]) 
    481481      else: 
    482         self.fileId = '%s.:%s' % (self.globalAts['naming_authority'],self.globalAts['title']) 
     482        self.fileId = '%s.:%s:%s' % (self.globalAts['naming_authority'],self.globalAts['title'],self.globalAts['time_coverage_duration']) 
    483483 
    484484  def getDrs( self ): 
     
    512512      elif self.drsMappings[k][0] == '*': 
    513513        thisk = self.drsMappings[k][1:] 
    514         ee[k] = self.varAts[self.var][thisk] 
     514        ee[k] = self.varAts[self.var].get(thisk,'__none__') 
    515515      elif self.drsMappings[k][0] == '#': 
    516516        thisk = self.drsMappings[k][1:] 
     
    612612      targ = varAts[varName].get( k, 'Attribute not present' ) 
    613613      val = vocabs['variable'].getAttr( varName, varGroup, k ) 
     614 
     615      if k == "standard_name": 
     616        if val.find( ' ' ) != -1: 
     617          val = string.join( string.split(val,maxsplit=1) ) 
     618        if targ.find( ' ' ) != -1: 
     619          targ = string.join( string.split(targ,maxsplit=1) ) 
    614620 
    615621      if k == "cell_methods": 
     
    10531059            p1 = l 
    10541060            p2 = None 
    1055           dt, v, sn = string.split( string.strip(p1) ) 
     1061          dt, v, sn = string.split( string.strip(p1), maxsplit=2 ) 
    10561062          if p2 != None: 
    10571063            bits = string.split( string.strip(p2), '=' ) 
Note: See TracChangeset for help on using the changeset viewer.