MPAS: Add instance string to output filenames
To solve issue #5122:
- Create a stream file for multiple instances of MPAS Ocean and Sea Ice
- Adds the instance string to
streams.ocean_*andstreams.seaice_*output and restart filenames
@akturner please review
@akturner please review.
@akturner please review.
Compiled stand-alone MPAS-Ocean with gnu debug and intel debug. Passes nightly suite for both. This is not surprising because ocn_comp_mct.F is the only file altered in this PR that affects stand-alone. I tested
SMS_D_Ln9.T62_oQU120_ais20.MPAS_LISIO_TEST.cori-haswell_gnu
and it failed the run step, but the error was not clear. Since cori is nearing its end, I'll test on other machines.
telecon notes: Needs another review.
passes:
- ERS.ne11_oQU240.WCYCL1850NS.chrysalis_intel
- SMS_D_Ld3.T62_oQU120.CMPASO-IAF.chrysalis_intel
- SMS_D_Ld1.ne30pg2_EC30to60E2r2.WCYCL1850.chrysalis_intel.allactive-wcprod
merged to next
re-merged to next with fix for branch and hybrid tests. Now passes:
- SMS_Ld1.ne30pg2_EC30to60E2r2.WCYCLSSP370.chrysalis_intel.allactive-wcprodssp
- ERS.ne30pg2_EC30to60E2r2.WCYCLSSP370.chrysalis_intel.allactive-wcprodssp
The current NCK test failures are related to the mpas files now having instance strings in their names, as they should, and not having baselines for those filenames.
merged to master and NCK test DIFFs blessed
Do we need to now bless the NCK test on all machines?
@ndkeen -- I did bless them, but apparently the baselines need to be regenerated instead of simply blessed. @jgfouca and I worked on this yesterday and he came up with some commands to add to the bless in order to do so. So I made new requests for that yesterday, at least for chrysalis. The other machine reporting this failure is perlmutter and it's still down.
@ndkeen - on today's cdash for chrysalis-next, it now appears as a NML DIFF instead of a regular DIFF. I submitted a request to bless the NML DIFF as well
OK great -- you're on it. I just didn't want to lose the fact that I tracked down an issue to this PR and we had to re-investigate later.
Note, I learned you can add commenter:@me into github search to show issues/PR's that you commented on (which doesnt count as a mention).