Changeset 456


Ignore:
Timestamp:
28/10/15 14:57:06 (4 years ago)
Author:
mjuckes
Message:

additions for CCI

Location:
CCCC/trunk/ceda_cc
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • CCCC/trunk/ceda_cc/c4_run.py

    r347 r456  
    189189    self.vocabs = pcfg.vocabs 
    190190 
    191   def checkFile(self,fpath,log=None,attributeMappings=[]): 
     191  def checkFile(self,fpath,log=None,attributeMappings=[], getdrs=True): 
    192192    self.calendar = 'None' 
    193193    self.info.log = log 
     
    250250        return 
    251251    self.completed = True 
    252     self.drs = self.cga.getDrs() 
    253     self.drs['project'] = self.info.pcfg.projectV.id 
     252    if getdrs: 
     253      self.drs = self.cga.getDrs() 
     254      self.drs['project'] = self.info.pcfg.projectV.id 
    254255    self.errorCount = self.cfn.errorCount + self.cga.errorCount + self.cgd.errorCount + self.cgg.errorCount 
    255256 
     
    327328        fLogger.info( 'Starting file %s' % fn ) 
    328329## default appending to myapp.log; mode='w' forces a new file (deleting old contents). 
    329         self.cc.checkFile( f, log=fLogger,attributeMappings=c4i.attributeMappings ) 
     330        self.cc.checkFile( f, log=fLogger,attributeMappings=c4i.attributeMappings, getdrs=c4i.getdrs ) 
    330331 
    331332        if self.cc.completed: 
  • CCCC/trunk/ceda_cc/ccinit.py

    r342 r456  
    7878    self.experimental = False 
    7979    self.forceNetcdfLib = None 
     80    self.getdrs = True 
    8081    fltype = None 
    8182    argu = [] 
     
    102103      elif next == '--force-pync4': 
    103104        self.forceNetcdfLib = 'netCDF4' 
     105      elif next == '--nodrs': 
     106        self.getdrs = False 
    104107      elif next == '--force-scientific': 
    105108        self.forceNetcdfLib = 'Scientific' 
  • CCCC/trunk/ceda_cc/config/esacci_vocabs/extraAtts.txt

    r428 r456  
    11#Additional attributes for data publication 
     2# namin authority, id, ... extra attributes 
    23org.ghrsst, AATSR-ESACCI-L3U-v1, algorithm=OE2, frequency=1sec 
    34uk.ac.pml, ESACCI-OC-L3S-OC_PRODUCTS-MERGED-1M_MONTHLY_4km_GEO_PML_OC4v6_QAA, algorithm=SeaDAS-6-4-OCCCI, frequency=mon 
Note: See TracChangeset for help on using the changeset viewer.