Update default stream file

[mark-petersen]

This PR updates the time series stats streams to match the file names in E3SM, rather than the somewhat arbitrary names we first chose several years ago. It also updates the monthly time averaged variables to those used in E3SM.

These changes only alter the default streams.ocean* files that are produces on compile, and are not autogenerated in any run directories. Thus this PR can't break anything, but is for better uniformity with E3SM.

[mark-petersen]

@xylar and @milenaveneziani this PR goes a little ways towards matching E3SM file names and variables. I decided to not mess with the restart and snapshot (output) names, because those are used throughout COMPASS testing scripts, and would be very involved. Conveniently, the number of lines to revise the time series stats is small.

[mark-petersen]

One reason for uniformity is to try to run MPAS-Analysis on the MPAS-Ocean stand alone runs. I don't have time to test that, so maybe this should just be considered clean-up PR.

[mark-petersen]

@xylar, feel free to alter or add to any of these things and push a commit on this PR.

[xylar]

@mark-petersen, I think this is some useful clean-up and I'll be happy to test it, both on its own and with MPAS-Analysis.

Just to be clear, MPAS-Analysis works fine with standalone MPAS-Ocean without these changes. MPAS-Analysis can read the streams file and figure out where the output is stored. It creates symbolic links to the timeSeriesStatsMonthly files so they play nice with ncremap (though this isn't necessary with the most recent version of NCO, so we may get rid of this in the future).

[milenaveneziani]

all looks good to me @mark-petersen. And I am glad that @xylar confirmed what I was telling you earlier today about MPAS-Analysis being able to handle the filename changes as well as the different location of the output files.

[mark-petersen]

@xylar we are planning to make the MPAS release branch today. I can respond quickly if you have comments today.

Since this is clean-up, if you think it is good enough, please approve and I'll merge before the release.

[maltrud]

@mark-petersen does this mean that all of the mpas monthly average files for the DECK runs will have different names than the v1 release?

[mark-petersen]

No, all file names in E3SM are specified in the E3SM file

components/mpas-o/cime_config/buildnml

That file builds the whole streams file. The file names altered in this PR are redundant, and just make a default streams.ocean file in the stand-alone compile directory. That's why this is really just a clean-up, to avoid confusion.

[mark-petersen]

I ran COMPASS nightly test suite, this PR passed with intel/debug and gnu/optimized.

[maltrud]

thanks, @mark-petersen

[xylar]

@mark-petersen, I'm unfortunately not able to review this today. I think it would be more honest to remove me as a reviewer if you need to merge this today.

[mark-petersen]

Since this is clean-up, I feel this is sufficiently tested and vetted given our time line. Merging in.