Changeset 65

Timestamp:

03/10/13 10:07:03 (7 years ago)

Author:

mjuckes

Message:

cleaned up mipVocab to support SPECS extension

File:

• CCCC/trunk/utils_c4.py (modified) (1 diff)

CCCC/trunk/utils_c4.py

@@ -546 +546 @@
 class mipVocab:
 
-  def __init__(self):
+  def __init__(self,project='CORDEX'):
+     assert project in ['CORDEX','SPECS'],'Project %s not recognised' % project
+     if project == 'CORDEX':
+       dir = 'cordex_vocabs/mip/'
+       tl = ['fx','sem','mon','day','6h','3h']
+       vgmap = {'6h':'6hr','3h':'3hr'}
+       fnpat = 'CORDEX_%s'
      ms = mipTableScan()
-     dir = 'cordex_vocabs/mip/'
      self.varInfo = {}
      self.varcons = {}
-     for f in ['fx','sem','mon','day','6h','3h']:
-        vg = f
-        if f in ['6h','3h']:
-          vg += 'r'
+     for f in tl:
+        vg = vgmap.get( f, f )
         self.varcons[vg] = {}
-        fn = 'CORDEX_%s' % f
+        fn = fnpat % f
         ll = open( '%s%s' % (dir,fn) ).readlines()
         ee = ms.scan_table(ll,None,asDict=True)