Update maint1.2: add 3D varying GM

[mark-petersen]

This update adds the following PRs from MPAS ocean/develop:

• Adds options for 3d varying GM bolus and 2d varying phase speed Adds options for 3d varying GM bolus and 2d varying phase speed MPAS-Dev/MPAS-Model#288
• Add GM bolus eddy stats Add GM bolus eddy stats MPAS-Dev/MPAS-Model#339
• Fix threading issue in MPAS-O GM routine Fix threading issue in MPAS-O GM routine MPAS-Dev/MPAS-Model#376
• compute landIceMask using geometric_features compute landIceMask using geometric_features MPAS-Dev/MPAS-Model#447
• bug fixes for the nonlocal source term in KPP bug fixes for the nonlocal source term in KPP MPAS-Dev/MPAS-Model#305

and from E3SM master:

• Change all ocean output files to single precision Change all ocean output files to single precision #3360

[non-BFB]

[mark-petersen]

@jonbob This needs the additional 5 GM flags noted here:
MPAS-Dev/MPAS-Model#487 (review)
I already added the single precision output and the land_ice_flux_mode. I think that is everything, but I only tested in stand-alone, so we shall see...

[jonbob]

Thanks @mark-petersen - I'll run the scripts to auto-generate the corresponding bid changes and commit them to your branch

[jonbob]

@mark-petersen - I did a test merge and some testing. I don't think we want that last E3SM PR:

• Fix the setting of ocn_c2_glcshelf based on value of land_ice_flux_mode Fix the setting of ocn_c2_glcshelf based on value of land_ice_flux_mode #2948

The corresponding changes in the cpl aren't there, and it requires more changes to the ocean driver

[mark-petersen]

@jonbob I took off that last commit that added #2948. Let me know now that goes.

[xylar]

@darincomeau, and @matthewhoffman, will melt rates work as expected without #2948?

[matthewhoffman]

@xylar , I don't recall. @jonbob , I don't remember the details of #2948 , but the concerning thing is that without it, if config_land_ice_flux_mode=='standalone' (which is what we currently use to get ISMF calculated, as far as I recall), then ocn_c2_glcshelf will be set to .true.. Presumably that will trigger the parts of the coupler code you are referring to as not being in this branch.

[jonbob]

I think the larger PR that #2948 was fixing was one of Jeremy's (#2726) that @matthewhoffman and I reworked. We would have to integrate both of them into maint-1.2 to get that functionality

[jonbob]

@mark-petersen - my initial tests pass now, with that last commit removed. My inclination is that we should merge this to maint-1.2 and decide separately about the land_ice_flux_mode, which could come in as a different PR. @matthewhoffman , @xylar - is that OK with you?

[xylar]

@jonbob, yep, that sounds fine to me. I just want us to make sure that melt fluxes work as expected before we get too far running with maint-1.2.

[jonbob]

Looks good visually and initial testing passes after the last commit was removed

[mark-petersen]

Since it is just us using maint-1.2, I think it is OK to merge this and then make more corrections or additions next week.

@jonbob is worthwhile requesting that the software engineering team run the E3SM regression suite on maint-1.2 after this (what they normally do for next)? So we get the full suite of tests?

[jonbob]

I think it's easier if we run whatever tests we think are important. I can run a suite of test if you think we need to

[darincomeau]

Is it too late to add #3516, which was just opened?

[jonbob]

No, never too late!

[jonbob]

@darincomeau - though that should probably be a separate PR into maint-1.2, since it's not at all related to this mpas one

[jonbob]

@mark-petersen - I ran at least some small fully-coupled tests. Since this PR will change answers, we're only really going to be able to pass smoke tests... We could try some ERS tests, just to make sure restarts are still BFB

[darincomeau]

@darincomeau - though that should probably be a separate PR into maint-1.2, since it's not at all related to this mpas one

That occurred to me, but I saw E3SM master commits in as well. But a separate PR works.

[jonbob]

Passed:

• ERS.T62_oEC60to30v3.GMPAS-IAF.anvil_intel
• SMS.ne4_oQU240.A_WCYCL1850.anvil_intel

@mark-petersen - it's your PR, so please weigh in on the amount of testing required

[jonbob]

We'll run a longer test after merging

[jonbob]

merged to maint-1.2

[mark-petersen]

@jonbob thanks for merging, I didn't check email over the weekend. It sounds like we need to add #3516 on a separate PR to maint-1.2?

[jonbob]

@mark-petersen - no, I'm ahead of you on that one! Please see #3517

[jonbob]

@mark-petersen - however, we do need to decide whether or not to include Jeremy's work from PR #2726 and PR #2948