Changeset 592

Timestamp:

08/02/16 12:10:38 (3 years ago)

Author:

apm

Message:

remove redundant commented-out code; add trap for cdms2.error.CDMSError

File:

• CCCC/branches/branch-apm/ceda_cc/c4_run.py (modified) (6 diffs)

CCCC/branches/branch-apm/ceda_cc/c4_run.py

@@ -39 +39 @@
 ## pkgutil is used in file_utils
 # Third party imports
-
+import cdms2
 ## Local imports with 3rd party dependencies
 #### netcdf --- currently only support for cmds2 -- re-arranged to facilitate support for alternative modules
@@ -57 +57 @@
 from fcc_utils2 import tupsort
 
-
-#driving_model_ensemble_member = <CMIP5Ensemble_member>
-#rcm_version_id = <RCMVersionID>                     
+         
 
 class dummy(object):
@@ -186 +184 @@
 
     # Define vocabs based on project
-    ##self.vocabs = getVocabs(pcgf)
     self.vocabs = pcfg.vocabs
 
@@ -230 +227 @@
       return
 
-    ##self.cgd.plevRequired = config.plevRequired
-    ##self.cgd.plevValues = config.plevValues
-    ##self.cgd.heightRequired = config.heightRequired
-    ##self.cgd.heightValues = config.heightValues
-    ##self.cgd.heightRange = config.heightRange
     self.cgd.check( self.cfn.var, self.cfn.freq, self.da, self.va, self.cga.isInstantaneous, self.vocabs )
     self.calendar = self.cgd.calendar
@@ -242 +234 @@
 
     if self.info.pcfg.doCheckGrids:
-      ##self.cgg.rotatedPoleGrids = config.rotatedPoleGrids
-      ##self.cgg.interpolatedGrids = config.interpolatedGrids
       self.cgg.check( self.cfn.var, self.cfn.domain, self.da, self.va )
     
@@ -365 +355 @@
           c4i.logger.info( 'Done -- testing aborted because of severity of errors' )
           rec.addErr( f, 'ERRORS FOUND AND CHECKS ABORTED' )
+      except cdms2.error.CDMSError as cdms_error:
+        kf -= 1
+        c4i.logger.error("CDMSError has occured" )
+        c4i.logger.error(cdms_error )
+        #print "CDMSError has occured" , cdms_error
+        if fileLogOpen:
+          fLogger.error("C4.100.001: [exception]: FAILED:: CDMSError has occured")
+          #c4i.closeFileLog( )
+          #fileLogOpen = False
+        rec.addErr( f, 'ERROR: CDMSError' )
+
       except:
         c4i.logger.error("Exception has occured" ,exc_info=1)