Merge pull request #4944 from alperaltuntas/fix_mom_ic_skip_logic

Skip MOM6 .ic. history file comparison in multi-instance runs 

Currently, copy_histfiles skips the mom6 initial conditions (ic) files for single-instance files, but not for multi-instance files. This PR fixes the logic by skipping these files for both single instance and multi instance runs.

Author: billsacks

CIME/hist_utils.py

@@ -101,7 +101,7 @@ def copy_histfiles(case, suffix, match_suffix=None):
                 if "ocean_geometry" in test_hist:
                     comments += "    skipping '{}'\n".format(test_hist)
                     continue
-                if "mom6.ic" in test_hist:
+                if re.search(r"mom6(_[0-9]{4})?\.ic", os.path.basename(test_hist)):
                     comments += "    skipping '{}'\n".format(test_hist)
                     continue
             comments += "  Copying hist files for model '{}'\n".format(model)