Fix CICE decomposition settings; update MOM6 to GFDL 20210914 main branch commit (was PR#803)

[DeniseWorthen]

PR Checklist

• Ths PR is up-to-date with the top of all sub-component repositories except for those sub-components which are the subject of this PR. Please consult the ufs-weather-model wiki if you are unsure how to do this.

• This PR has been tested using a branch which is up-to-date with the top of all sub-component repositories except for those sub-components which are the subject of this PR

• An Issue describing the work contained in this PR has been created either in the subcomponent(s) or in the ufs-weather-model. The Issue should be created in the repository that is most relevant to the changes in contained in the PR. The Issue and the dependent sub-component PR
  are specified below.

• If new or updated input data is required by this PR, it is clearly stated in the text of the PR.

Instructions: All subsequent sections of text should be filled in as appropriate.

The information provided below allows the code managers to understand the changes relevant to this PR, whether those changes are in the ufs-weather-model repository or in a subcomponent repository. Ufs-weather-model code managers will use the information provided to add any applicable labels, assign reviewers and place it in the Commit Queue. Once the PR is in the Commit Queue, it is the PR owner's responsiblity to keep the PR up-to-date with the develop branch of ufs-weather-model.

Description

Fixes cice decomposition parameters for ice_in_template. The change in decomposition was not correctly accounted for in PR #791 with the removal of edit_inputs. When NPROC_ICE is set to a non-default value, new values of the decomposition parameters need to be set.

Issue(s) addressed

• fixes cpld_bmark_v16 regression test ice_in inconsistency #815
• fixes update MOM6 to GFDL main branch 20210914 commit #802

Testing

How were these changes tested? What compilers / HPCs was it tested with? Are the changes covered by regression tests? (If not, why? Do new tests need to be added?) Have regression tests and unit tests (utests) been run? On which platforms and with which compilers? (Note that unit tests can only be run on tier-1 platforms)

• Testing on hera.intel for all tests which utilize CICE showed no changes to baselines are expected.
• Ice_in files from 1deg,1/2deg and 1/4deg coupled and datm runs were compared to copies from an RT prior to the commit of PR#791 and were found to be identical.
• hera.intel
• hera.gnu
• orion.intel
• cheyenne.intel
• cheyenne.gnu
• gaea.intel
• jet.intel
• wcoss_cray
• wcoss_dell_p3
• CI

Dependencies

MOM6 PR #76

[jiandewang]

@DeniseWorthen I scp-ed wcoss-cray RT log to HERA at
/scratch2/NCEPDEV/climate/Jiande.Wang/For-others/For_Denise/UFS-RT-log-20210920

[jiandewang]

job failed on P3 due to disk full, re-run them now by switching from using ptmp to stmp

[BrianCurtis-NOAA]

Automated RT Failure Notification
Machine: gaea
Compiler: intel
Job: RT
Repo location: /lustre/f2/pdata/ncep/emc.nemspara/autort/pr/736926843/20210920173008/ufs-weather-model
Please manually delete: /lustre/f2/scratch/emc.nemspara/FV3_RT/rt_6727
Test cpld_control_c384 008 failed failed
Test cpld_control_c384 008 failed in run_test failed
Test hafs_regional_datm_cdeps 088 failed failed
Test hafs_regional_datm_cdeps 088 failed in run_test failed
Please make changes and add the following label back:
gaea-intel-RT

[jiandewang]

I am kept on having disk full issue on wcoss-p3.
A question here: after one job is done and run log show PASS, can I delete that directory in rt-xxxx ? I understand there are few cases that restart run will rely on previous run.

[junwang-noaa]

I believe you can delete the run directory rt-xxxx/test if you see the rt_test under ufs-weather-model/tests/log*dell*. But you can not delete the whole RT directory rt-xxxx

…

On Mon, Sep 20, 2021 at 8:23 PM jiandewang ***@***.***> wrote: I am kept on having disk full issue on wcoss-p3. A question here: after one job is done and run log show PASS, can I delete that directory in rt-xxxx ? I understand there are few cases that restart run will rely on previous run. — You are receiving this because your review was requested. Reply to this email directly, view it on GitHub <#816 (comment)>, or unsubscribe <https://github.com/notifications/unsubscribe-auth/AI7D6TLMYHEF3RPQGVLAGFLUC7GANANCNFSM5EJKR3GA> . Triage notifications on the go with GitHub Mobile for iOS <https://apps.apple.com/app/apple-store/id1477376905?ct=notification-email&mt=8&pt=524675> or Android <https://play.google.com/store/apps/details?id=com.github.android&referrer=utm_campaign%3Dnotification-email%26utm_medium%3Demail%26utm_source%3Dgithub>.

[jiandewang]

@junwang-noaa this is what I am doing now, otherwise rt.sh won't be able to finish

[jiandewang]

@DeniseWorthen dell-p3 run log is on HERA
/scratch2/NCEPDEV/climate/Jiande.Wang/For-others/For_Denise/UFS-RT-log-20210920

[DeniseWorthen]

@jiandewang We're ready to merge this PR once MOM6 has been updated. @JessicaMeixner-NOAA would you please review the MOM6 PR? Thanks.

[jiandewang]

@DeniseWorthen updated MOM6, thanks