Changeset 423 for CMIP6dreqbuild/trunk/src

Timestamp:

15/10/15 16:12:52 (7 years ago)

Author:

mjuckes

Message:

added choice configuration

Location:

CMIP6dreqbuild/trunk/src/workbook

Files:

• choiceCfg.py (added)
• importShDreq.py (modified) (3 diffs)

CMIP6dreqbuild/trunk/src/workbook/importShDreq.py

@@ -13 +13 @@
 from utils_wb import uniCleanFunc
 import ivg
+
+freqmap = {'daily':'day', u'Annual':'yr', u'Timestep':'subhr',  u'1day':'day', u'1mon':'mon', 'month':'mon', 'year':'yr', 'monthly':'mon', 'Day':'day', '6h':'6hr', '3 hourly':'3hr'  }
 
 class s1(object):
@@ -149 +151 @@
                 elif string.find( tt.mipTable, '_' ) != -1:
                   prov = '%s [%s]' % tuple( string.split( tt.mipTable, '_' ) )
+                else:
+                  prov = '%s' %  tt.mipTable
+
                 if tt.var[:5] == 'ccmi_':
                   pass
@@ -895 +900 @@
               if n == "stid":
                 item.setAttribute( n, stid )
+              elif n == "freq":
+                fr = freqmap.get( str(r[k]), str(r[k]) )
+                item.setAttribute( n, fr )
               else:
                 item.setAttribute( n, str(r[k]) )
+
             self.ff[ksect][0].appendChild( item )
         elif ksect == u'structure':