Changeset 344

Timestamp:

14/06/15 19:12:00 (5 years ago)

Author:

mjuckes

Message:

cleaned up glob snow variable detection; extra code for map file generation

Location:

CCCC/trunk/ceda_cc

Files:

• config/esacci_vocabs/extraAtts.txt (modified) (1 diff)
• config/esacci_vocabs/variableInFile.txt (modified) (1 diff)
• config_c4.py (modified) (1 diff)
• extra (added)
• extra/makemap.py (added)
• extra/md5s.py (added)
• utils_c4.py (modified) (3 diffs)

CCCC/trunk/ceda_cc/config/esacci_vocabs/extraAtts.txt

@@ -3 +3 @@
 uk.ac.pml, ESACCI-OC-L3S-OC_PRODUCTS-MERGED-1M_MONTHLY_4km_GEO_PML_OC4v6_QAA, algorithm=SeaDAS-6-4-OCCCI, frequency=mon
 fi.fmi, , algorithm=Pulliainen2006, frequency=day
+@ESA GlobSnow snow water equivalent L3B monthly aggregated|fi.fmi, , algorithm=Pulliainen2006, frequency=mon
 org.ghrsst, OSTIA-ESACCI-L4-v01.0, algorithm=OSTIA2-0, frequency=day

CCCC/trunk/ceda_cc/config/esacci_vocabs/variableInFile.txt

@@ -5 +5 @@
 BA    burned_area burned_area
 OC_PRODUCTS chlor_a mass_concentration_of_chlorophyll_a_in_sea_water
-SWE SWE lwe_thickness_of_surface_snow_amount
+SWE:daily SWE lwe_thickness_of_surface_snow_amount
+SWE:monthly SWE_avg lwe_thickness_of_surface_snow_amount
 SWE_max SWE_max lwe_thickness_of_surface_snow_amount
 SWEweekly SWE_avg lwe_thickness_of_surface_snow_amount

CCCC/trunk/ceda_cc/config_c4.py

@@ -398 +398 @@
       for l in open( eafile ).readlines():
         if l[0] != '#':
-          bits = map( string.strip, string.split(l,',') )
+          if l[0] == "@":
+            p1,p2 = string.split( l[1:], '|' )
+          else:
+            p1,p2 = None, l
+          bits = map( string.strip, string.split(p2,',') )
           id = '%s.%s' % (bits[0],bits[1])
+          if p1 != None:
+            id += ':%s' % p1
           ee = {}
           for b in bits[2:]:

CCCC/trunk/ceda_cc/utils_c4.py

@@ -355 +355 @@
 
     self.var = self.fnParts[self.pcfg.varIndex]
-    if self.pcfg.projectV.id in ['ESA-CCI']:
+    if self.pcfg.projectV.id in ['ESA-CCIxxx']:
       if  self.fnDict['project'] == 'GlobSnow':
         if self.fnDict['additional'] == 'weekly':
           self.var += 'weekly'
+        elif self.fnDict['additional'] == 'monthly' and self.var == 'SWE':
+          self.var += 'weekly'
 
     if self.pcfg.fnvdict != None:
       if self.pcfg.fnvdict.has_key( self.var ):
         self.var = self.pcfg.fnvdict.get( self.var )['v']
+      else:
+        addi = self.fnDict.get('additional','xxxx')
+        thiskey = '%s:%s' % (self.var,addi)
+        if self.pcfg.fnvdict.has_key( thiskey ):
+          self.var = self.pcfg.fnvdict.get( thiskey )['v']
 
     self.isFixed = self.freq in ['fx','fixed']
@@ -462 +469 @@
   def getId(self):
     if self.fileId == None:
-      self.fileId = '%s.%s' % (self.globalAts['naming_authority'],self.globalAts['id'])
-      if self.globalAts['naming_authority'] == 'uk.ac.pml':
-        i0 = string.find(self.globalAts['id'],'OC4v6_QAA')
-        if i0 != -1:
-          self.fileId = '%s.%s' % (self.globalAts['naming_authority'],self.globalAts['id'][:i0+9])
+      id = self.globalAts['id']
+      if id != '':
+        self.fileId = '%s.%s' % (self.globalAts['naming_authority'],id)
+        if self.globalAts['naming_authority'] == 'uk.ac.pml':
+          i0 = string.find(self.globalAts['id'],'OC4v6_QAA')
+          if i0 != -1:
+            self.fileId = '%s.%s' % (self.globalAts['naming_authority'],self.globalAts['id'][:i0+9])
+      else:
+        self.fileId = '%s.:%s' % (self.globalAts['naming_authority'],self.globalAts['title'])
 
   def getDrs( self ):
@@ -1032 +1043 @@
      for l in ll:
        if l[0] != '#':
-          dt, v, sn = string.split( string.strip(l) )
-          self.pcfg.fnvdict[dt] = { 'v':v, 'sn':sn }
+          bits = string.split( string.strip(l), '|' )
+          if len(bits) == 2:
+            p1,p2 = bits
+          else:
+            p1 = l
+            p2 = None
+          dt, v, sn = string.split( string.strip(p1) )
+          if p2 != None:
+            bits = string.split( string.strip(p2), '=' )
+            eex = { bits[0]:bits[1] }
+          else:
+            eex = None
+          self.pcfg.fnvdict[dt] = { 'v':v, 'sn':sn, 'ex':eex }
           ar = []
           ac = []