Changeset 344
- Timestamp:
- 14/06/15 19:12:00 (6 years ago)
- Location:
- CCCC/trunk/ceda_cc
- Files:
-
- 3 added
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
CCCC/trunk/ceda_cc/config/esacci_vocabs/extraAtts.txt
r325 r344 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 4 4 fi.fmi, , algorithm=Pulliainen2006, frequency=day 5 @ESA GlobSnow snow water equivalent L3B monthly aggregated|fi.fmi, , algorithm=Pulliainen2006, frequency=mon 5 6 org.ghrsst, OSTIA-ESACCI-L4-v01.0, algorithm=OSTIA2-0, frequency=day -
CCCC/trunk/ceda_cc/config/esacci_vocabs/variableInFile.txt
r340 r344 5 5 BA burned_area burned_area 6 6 OC_PRODUCTS chlor_a mass_concentration_of_chlorophyll_a_in_sea_water 7 SWE SWE lwe_thickness_of_surface_snow_amount 7 SWE:daily SWE lwe_thickness_of_surface_snow_amount 8 SWE:monthly SWE_avg lwe_thickness_of_surface_snow_amount 8 9 SWE_max SWE_max lwe_thickness_of_surface_snow_amount 9 10 SWEweekly SWE_avg lwe_thickness_of_surface_snow_amount -
CCCC/trunk/ceda_cc/config_c4.py
r340 r344 398 398 for l in open( eafile ).readlines(): 399 399 if l[0] != '#': 400 bits = map( string.strip, string.split(l,',') ) 400 if l[0] == "@": 401 p1,p2 = string.split( l[1:], '|' ) 402 else: 403 p1,p2 = None, l 404 bits = map( string.strip, string.split(p2,',') ) 401 405 id = '%s.%s' % (bits[0],bits[1]) 406 if p1 != None: 407 id += ':%s' % p1 402 408 ee = {} 403 409 for b in bits[2:]: -
CCCC/trunk/ceda_cc/utils_c4.py
r343 r344 355 355 356 356 self.var = self.fnParts[self.pcfg.varIndex] 357 if self.pcfg.projectV.id in ['ESA-CCI ']:357 if self.pcfg.projectV.id in ['ESA-CCIxxx']: 358 358 if self.fnDict['project'] == 'GlobSnow': 359 359 if self.fnDict['additional'] == 'weekly': 360 360 self.var += 'weekly' 361 elif self.fnDict['additional'] == 'monthly' and self.var == 'SWE': 362 self.var += 'weekly' 361 363 362 364 if self.pcfg.fnvdict != None: 363 365 if self.pcfg.fnvdict.has_key( self.var ): 364 366 self.var = self.pcfg.fnvdict.get( self.var )['v'] 367 else: 368 addi = self.fnDict.get('additional','xxxx') 369 thiskey = '%s:%s' % (self.var,addi) 370 if self.pcfg.fnvdict.has_key( thiskey ): 371 self.var = self.pcfg.fnvdict.get( thiskey )['v'] 365 372 366 373 self.isFixed = self.freq in ['fx','fixed'] … … 462 469 def getId(self): 463 470 if self.fileId == None: 464 self.fileId = '%s.%s' % (self.globalAts['naming_authority'],self.globalAts['id']) 465 if self.globalAts['naming_authority'] == 'uk.ac.pml': 466 i0 = string.find(self.globalAts['id'],'OC4v6_QAA') 467 if i0 != -1: 468 self.fileId = '%s.%s' % (self.globalAts['naming_authority'],self.globalAts['id'][:i0+9]) 471 id = self.globalAts['id'] 472 if id != '': 473 self.fileId = '%s.%s' % (self.globalAts['naming_authority'],id) 474 if self.globalAts['naming_authority'] == 'uk.ac.pml': 475 i0 = string.find(self.globalAts['id'],'OC4v6_QAA') 476 if i0 != -1: 477 self.fileId = '%s.%s' % (self.globalAts['naming_authority'],self.globalAts['id'][:i0+9]) 478 else: 479 self.fileId = '%s.:%s' % (self.globalAts['naming_authority'],self.globalAts['title']) 469 480 470 481 def getDrs( self ): … … 1032 1043 for l in ll: 1033 1044 if l[0] != '#': 1034 dt, v, sn = string.split( string.strip(l) ) 1035 self.pcfg.fnvdict[dt] = { 'v':v, 'sn':sn } 1045 bits = string.split( string.strip(l), '|' ) 1046 if len(bits) == 2: 1047 p1,p2 = bits 1048 else: 1049 p1 = l 1050 p2 = None 1051 dt, v, sn = string.split( string.strip(p1) ) 1052 if p2 != None: 1053 bits = string.split( string.strip(p2), '=' ) 1054 eex = { bits[0]:bits[1] } 1055 else: 1056 eex = None 1057 self.pcfg.fnvdict[dt] = { 'v':v, 'sn':sn, 'ex':eex } 1036 1058 ar = [] 1037 1059 ac = []
Note: See TracChangeset
for help on using the changeset viewer.