Changeset 51 for FCC2

Timestamp:

18/07/13 10:24:33 (6 years ago)

Author:

mjuckes

Message:

corrected time period check for 3hr,6hr; removed potential mis-handling of bad file names

Location:

FCC2/trunk

Files:

• source/fcc_utils.py (modified) (3 diffs)
• work/cordex_vocabs/cordex_time_constraints.txt (modified) (1 diff)
• work/examples_good/prc_AFR-44_ECMWF-ERAINT_evaluation_r1i1p1_CLMcom-CCLM4-8-17_v1_3hr_1989010100-1990010100.nc (added)

FCC2/trunk/source/fcc_utils.py

@@ -197 +197 @@
 ######
 ######
-      qfns = self.qcc.fileNameSegments
-      ns = {}
-      for k in range(len(fbits)): 
+      else:
+       qfns = self.qcc.fileNameSegments
+       ns = {}
+       for k in range(len(fbits)): 
          ns['fn_%s' % qfns.segments[k][1]] = fbits[k]
          if qfns.segments[k][0] == 'vocabulary':
@@ -291 +292 @@
            raise 'segment test id %s not recognised' % qfns.segments[k][0]
 ##################################
-      versionned = False
-      if not versionned:
+       versionned = False
+       if not versionned:
         for k in self.qcc.datasets.keys():
           if self.qcc.datasets[k].datasetIdArg == 'fileNameBits':
@@ -663 +664 @@
                        tt = None
                      v = string.strip( v, "'" )
-                     cr0.append( (re.compile( v % self.gc ),v % self.gc,tt) )
+                     try:
+                       cr0.append( (re.compile( v % self.gc ),v % self.gc,tt) )
+                     except:
+                       print 'Error trying to compile: ', v % self.gc
+                       print 'Pattern: ',v
+                       raise
                      ## print 'compiled ' +  v % self.gc, tt
                  cr.append( (cc,cr0) )

FCC2/trunk/work/cordex_vocabs/cordex_time_constraints.txt

@@ -2 +2 @@
 sem: '(?P<d>[0-9]{3})012-(?P<e>[0-9]{3})011' '(?P<startyear>[0-9]{4})(12|03|06|09)-(?P<e>[0-9]{3}0)11'  '(?P<d>[0-9]{3})012-(?P<endyear>[0-9]{4})(11|02|05|08)'
 day: {$e==$d+1}'(?P<d>[0-9]{3})60101-(?P<e>[0-9]{3})012%(enddec)s' {$e==$d}'(?P<d>[0-9]{3})10101-(?P<e>[0-9]{3})512%(enddec)s' {$e<=$startyear+4}'(?P<startyear>[0-9]{4})(?P<d1>[0-9]{4})-(?P<e>[0-9]{3}(0|5))12%(enddec)s' {$d1<=$startyear+4}'(?P<startyear>[0-9]{4})(?P<d1>[0-9]{4})-(?P<e>[0-9]{3}(0|5))12%(enddec)s'  {$endyear<=$d+5}'(?P<d>[0-9]{3}(1|6))0101-(?P<endyear>[0-9]{4})(?P<d1>[0-9]{4})'
-3hr,6hr: '(?P<d>[0-9]{4})0101(?P<h1>[0-9]{2})-(?P<e>[0-9]{4})12%(enddec)s(?P<h2>[0-9]{2})' {$s=$startyear}'(?P<startyear>[0-9]{4})(?P<h1>[0-9]{6})-(?P<s>[0-9]{4})12%(enddec)s(?P<h2>[0-9]{2})' {$e==$endyear}'(?P<endyear>[0-9]{4})0101(?P<h1>[0-9]{2})-(?P<e>[0-9]{4})(?P<h2>[0-9]{6})'
+3hr,6hr: {$e==$d}'(?P<d>[0-9]{4})0101(?P<h1>[0-9]{2})-(?P<e>[0-9]{4})12%(enddec)s(?P<h2>[0-9]{2})' {$e==$d+1}'(?P<d>[0-9]{4})0101(?P<h1>[0-9]{2})-(?P<e>[0-9]{4})010100' {$s==$startyear}'(?P<startyear>[0-9]{4})(?P<h1>[0-9]{6})-(?P<s>[0-9]{4})12%(enddec)s(?P<h2>[0-9]{2})' {$e==$endyear}'(?P<endyear>[0-9]{4})0101(?P<h1>[0-9]{2})-(?P<e>[0-9]{4})(?P<h2>[0-9]{6})' {$e==$startyear+1}'(?P<startyear>[0-9]{4})(?P<h1>[0-9]{6})-(?P<e>[0-9]{4})010100' {$e==$endyear+1}'(?P<endyear>[0-9]{4})0101(?P<h1>[0-9]{2})-(?P<e>[0-9]{4})010100'