Extended mkexp for use with MPIOM

* Added functionality to reformat date/time strings to 6-element lists

mkexp

@@ -77,6 +77,15 @@ def expand_template(template_dict, template_name, expanded_name):
 
 # Namelist formatting
 
+def format_datetime(result):
+    '''Re-format datetime string to list for use in namelists'''
+    match = re.match('^(["'r"'])0*(\d+)-0*(\d+)-0*(\d+)"
+                     r"([T ]0*(\d+)(:0*(\d+)(:0*(\d+))?)?)?\1$", result)
+    if match:
+        numbers = match.groups('0')
+        result = ', '.join([numbers[i] for i in [1,2,3,5,7,9]])
+    return result
+
 def format_atom(value):
     '''Format atomic value for use in namelists'''
     result = repr(value)
@@ -88,6 +97,7 @@ def format_atom(value):
     # 
     result = re.sub('^(["'r"'])\.?t(rue)?\.?\1$", '.true.', result, flags=re.I)
     result = re.sub('^(["'r"'])\.?f(alse)?\.?\1$", '.false.', result, flags=re.I)
+    result = format_datetime(result)
     return result
 
 def format_value(value):