Changeset 325

Timestamp:

18/05/15 16:33:53 (6 years ago)

Author:

mjuckes

Message:

corrected frequency in ESA-CCI configuration file

Location:

CCCC/trunk/ceda_cc

Files:

• c4.py (modified) (3 diffs)
• config/esacci_vocabs/extraAtts.txt (modified) (1 diff)

CCCC/trunk/ceda_cc/c4.py

@@ -252 +252 @@
 class main(object):
 
-  def __init__(self,args=None,abortMessageCount=-1,printInfo=False,monitorFileHandles = False):
+  def __init__(self,args=None,abortMessageCount=-1,printInfo=False,monitorFileHandles = False,cmdl=None):
     logDict = {}
     ecount = 0
@@ -258 +258 @@
     c4i.logger.info( 'Starting batch -- number of file: %s' % (len(c4i.flist)) )
     c4i.logger.info( 'Source: %s' % c4i.source )
+    if cmdl != None:
+      c4i.logger.info( 'Command: %s' % cmdl )
       
     isDummy  = c4i.project[:2] == '__'
@@ -433 +435 @@
       print "Tests completed"
   else:
-     main(printInfo=True)
+     cmdl = string.join( sys.argv )
+     main(printInfo=True, cmdl=cmdl)
 
 if __name__ == '__main__':

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

@@ -1 +1 @@
 #Additional attributes for data publication
 org.ghrsst, AATSR-ESACCI-L3U-v1, algorithm=OE2, frequency=1sec
-uk.ac.pml, ESACCI-OC-L3S-OC_PRODUCTS-MERGED-1M_MONTHLY_4km_GEO_PML_OC4v6_QAA, algorithm=SeaDAS(v6.4-OCCCI), frequency=mon
+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
-org.ghrsst, OSTIA-ESACCI-L4-v01.0, algorithm=OSTIA(reanalysis_v2.0), frequency=mon
+org.ghrsst, OSTIA-ESACCI-L4-v01.0, algorithm=OSTIA2-0, frequency=day