MCC test failure

[alperaltuntas]

As reported by @fischer-ncar:

An issue I've run into is the output filenames for the mom6 multi-instance history files. It looks like the instance number is being placed in the wrong place. For example,

SMS_C2.TL319_t232.G_JRA.derecho_intel.allactive-defaultio.alpha08a.mom6.h.z._0001.0001-01-01.nc

But the mom6 ic file looks correct.

SMS_C2.TL319_t232.G_JRA.derecho_intel.allactive-defaultio.alpha08a.mom6_0001.ic.0001-01-01.nc

I'll submit a PR to fix this and few other similar issues shortly.

[iangrooms]

I have encountered this too. See also this issue related to the auto mask table in multi-instance cases.