make sure that ocn bgc baselines are captured (#253)

* make sure that ocn bgc baselines are captured

* Clean up hist_file_ext_regex

Now streams that match string.string OR string.string.string will get archived,
so we don't need to explicitly list h.bgc.z and h.bgc.native

Also cleaned up the test_file_names section to include a restarts split across
two restart files and the current expected stream files.

* Update regex to handle multiple mom6.ic files

---------

Co-authored-by: Michael Levy <mike.levy.work@gmail.com>

Author: jedwards4b

cime_config/config_archive.xml

@@ -11,12 +11,27 @@
          h.bgc.*[._optional instance number].nc -->
     <hist_file_extension>h\.bgc\..*?.?[_\d+]+.nc$</hist_file_extension>
     <!-- match filenames of the form
-         ic.(date string)[._optional instance number].nc[.optional tile number] -->
-    <hist_file_extension>ic.[-\d+]+(\._\d*)?\.nc(\.\d*)?$</hist_file_extension>
-    <hist_file_ext_regex>\w+\.\w+(\._\d*)?</hist_file_ext_regex>
+         ic.(date string[_optional id for splitting date over many files)[._optional instance number].nc[.optional tile number] -->
+    <hist_file_extension>ic.[-\d(_\d)?+]+(\._\d*)?\.nc(\.\d*)?$</hist_file_extension>
+    <hist_file_ext_regex>\w+\.\w+(\.\w+)?(\._\d*)?</hist_file_ext_regex>
     <rpointer>
       <rpointer_file>rpointer.ocn$NINST_STRING.$DATENAME</rpointer_file>
       <rpointer_content>$CASE.mom6$NINST_STRING.r.$DATENAME.nc</rpointer_content>
     </rpointer>
+      <test_file_names>
+        <tfile disposition="copy">rpointer.ocn.1976-01-01-00000</tfile>
+        <tfile disposition="copy">casename.mom6.r.1976-01-01-00000.nc</tfile>
+        <tfile disposition="copy">casename.mom6.r.1976-01-01-00000_1.nc</tfile>
+        <tfile disposition="move">casename.mom6.h.bgc.native.1976-01-01.nc</tfile>
+        <tfile disposition="move">casename.mom6.h.bgc.z.1976-01-01.nc</tfile>
+        <tfile disposition="move">casename.mom6.h.native.1976-01-01-00000.nc</tfile>
+        <tfile disposition="move">casename.mom6.h.ocean_geometry.nc</tfile>
+        <tfile disposition="move">casename.mom6.h.rho2.1976-01-01-00000.nc</tfile>
+        <tfile disposition="move">casename.mom6.h.sfc.1976-01-01-00000.nc</tfile>
+        <tfile disposition="move">casename.mom6.h.static.nc</tfile>
+        <tfile disposition="move">casename.mom6.h.z.1976-01-01-00000.nc</tfile>
+        <tfile disposition="move">casename.mom6.ic.1976-01-01-00000.nc</tfile>
+        <tfile disposition="move">casename.mom6.ic.1976-01-01-00000_1.nc</tfile>
+      </test_file_names>
   </comp_archive_spec>
 </components>