Merge branch 'mfdeakin-sandia/st_archive/mpas_rpointer' PR #1852

This is a (hopefully temporary) fix for the short term archiver MPAS rpointer format, as documented in #1814.
ESMCI · Oct 26, 2017 · ddcbbf4 · ddcbbf4
2 parents 4d9db5b + 8df3f83
commit ddcbbf4
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/config/acme/config_archive.xml b/config/acme/config_archive.xml
@@ -86,7 +86,7 @@
     <rest_history_varname>unset</rest_history_varname>
     <rpointer>
       <rpointer_file>rpointer.ice$NINST_STRING</rpointer_file>
-      <rpointer_content>./mpascice$NINST_STRING.rst.$MPAS_DATENAME.nc</rpointer_content>
+      <rpointer_content>$MPAS_DATENAME</rpointer_content>
     </rpointer>
   </comp_archive_spec>
 
@@ -119,7 +119,7 @@
     <rest_history_varname>unset</rest_history_varname>
     <rpointer>
       <rpointer_file>rpointer.ocn$NINST_STRING</rpointer_file>
-      <rpointer_content>./mpaso$NINST_STRING.rst.$MPAS_DATENAME.nc</rpointer_content>
+      <rpointer_content>$MPAS_DATENAME</rpointer_content>
     </rpointer>
   </comp_archive_spec>
 

diff --git a/scripts/lib/CIME/case_st_archive.py b/scripts/lib/CIME/case_st_archive.py
@@ -144,11 +144,13 @@ def _datetime_str_mpas(date):
     '0011-12-09_00435'
     """
 
-    format_string = "{year:04d}-{month:02d}-{day:02d}_{seconds:05d}"
+    format_string = "{year:04d}-{month:02d}-{day:02d}_{hours:02d}:{minutes:02d}:{seconds:02d}"
     return format_string.format(year = date.year,
                                 month = date.month,
                                 day = date.day,
-                                seconds = _get_day_second(date))
+                                hours = date.hour,
+                                minutes = date.minute,
+                                seconds = date.second)
 
 ###############################################################################
 def _get_ninst_info(case, compclass):