Merge pull request ESCOMP#3067 from jedwards4b/st_arvchive_fix

fix some st_archive issues with rpointer files

Author: ekluzek

cime_config/config_archive.xml

@@ -8,12 +8,14 @@
     <hist_file_extension>e</hist_file_extension>
     <rest_history_varname>locfnh</rest_history_varname>
     <rpointer>
-      <rpointer_file>rpointer.lnd$NINST_STRING</rpointer_file>
+      <rpointer_file>rpointer.lnd$NINST_STRING.$DATENAME</rpointer_file>
       <rpointer_content>./$CASE.clm2$NINST_STRING.r.$DATENAME.nc</rpointer_content>
     </rpointer>
     <test_file_names>
-      <tfile disposition="copy">rpointer.lnd</tfile>
-      <tfile disposition="copy">rpointer.lnd_9999</tfile>
+      <tfile disposition="copy">rpointer.lnd.1976-01-01-00000</tfile>
+      <tfile disposition="copy">rpointer.lnd_9999.1976-01-01-00000</tfile>
+      <tfile disposition="ignore">rpointer.lnd.0000-01-01-00000</tfile>
+      <tfile disposition="ignore">rpointer.lnd_9999.1976-01-03-00000</tfile>
       <tfile disposition="copy">casename.clm2.r.1976-01-01-00000.nc</tfile>
       <tfile disposition="copy">casename.clm2.rh4.1976-01-01-00000.nc</tfile>
       <tfile disposition="move">casename.clm2.h0.1976-01-01-00000.nc</tfile>
@@ -32,12 +34,14 @@
     <hist_file_extension>e</hist_file_extension>
     <rest_history_varname>locfnh</rest_history_varname>
     <rpointer>
-      <rpointer_file>rpointer.lnd$NINST_STRING</rpointer_file>
+      <rpointer_file>rpointer.lnd$NINST_STRING.$DATENAME</rpointer_file>
       <rpointer_content>./$CASE.ctsm$NINST_STRING.r.$DATENAME.nc</rpointer_content>
     </rpointer>
     <test_file_names>
-      <tfile disposition="copy">rpointer.lnd</tfile>
-      <tfile disposition="copy">rpointer.lnd_9999</tfile>
+      <tfile disposition="copy">rpointer.lnd.1976-01-01-00000</tfile>
+      <tfile disposition="copy">rpointer.lnd_9999.1976-01-01-00000</tfile>
+      <tfile disposition="ignore">rpointer.lnd.0000-01-01-00000</tfile>
+      <tfile disposition="ignore">rpointer.lnd_9999.1976-01-03-00000</tfile>
       <tfile disposition="copy">casename.ctsm.r.1976-01-01-00000.nc</tfile>
       <tfile disposition="copy">casename.ctsm.rh4.1976-01-01-00000.nc</tfile>
       <tfile disposition="move">casename.ctsm.h0.1976-01-01-00000.nc</tfile>