From 8df3f834c23916fc5422bd564665a04f3d299330 Mon Sep 17 00:00:00 2001
From: Michael Deakin <mdeakin@sandia.gov>
Date: Wed, 18 Oct 2017 11:02:52 -0600
Subject: [PATCH] Fix for MPAS rpointer files

---
 config/acme/config_archive.xml      | 4 ++--
 scripts/lib/CIME/case_st_archive.py | 6 ++++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/config/acme/config_archive.xml b/config/acme/config_archive.xml
index 94f0e940dae..eefedb5037a 100644
--- 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
index 82aeb40eb80..6b9c1c1fc4a 100644
--- 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):