Wrapper PR for #479, #508, #507: zorl interstitial, ocn -> wat, merra2 threading

[climbfuji]

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.

Description

This PR combines the changes in #479, #508, #507. For details about each of these PRs, please see there. No new input data is required, changes are expected only for coupled model runs that use the wave component. New baseline date tag is 20210414. See below in section testing for more information.

Issue(s) addressed

Fixes NCAR/ccpp-physics#552
Fixes NCAR/ccpp-physics#455
Fixes NCAR/ccpp-physics#608

Testing

Regression tests for each of the PRs listed above were run separately, see information on those PRs.

For the combined PRs, regression tests were run against the existing baseline on Hera using GNU and Intel.

For GNU, all tests passed:

rt_hera_gnu_against_existing.log

For Intel, all tests passed except the following ones:

fv3_gfdlmprad
fv3_gfdlmprad_atmwav
fv3_wrtGauss_nemsio_c768
cpld_bmark_wave
cpld_bmarkfrac_wave
cpld_bmarkfrac_wave_v16
cpld_control_wave

For each of those tests, all files were identical, including all restart files, except RESTART/sfc_data.tile?.nc. The difference for these files is the name of the wave model zorl variable, which has changed from zorlw to zorlwav. This has been accepted by the physics developers and the physics chief, see #508.

rt_hera_intel_against_existing.log
rt_hera_intel_against_existing_fail_test.log
rt_hera_intel_against_existing_fail_test_details.log

Note. In order to retain b4b reproducibility with the existing code for all other tests and files, the surface roughness length variables zorl_{land,ice,water} need to be reset to huge in PR NCAR/ccpp-physics#596. See the description of this PR for more information. An issue has been created (NCAR/ccpp-physics#624) to follow-up on whether this resetting to huge should be done or not. Given the size of this combined PR, it is better to not change the answers this time.

Regression tests for the combined PRs will be run on all tier-1 platforms listed below.

• hera.intel
• hera.gnu
• orion.intel
• cheyenne.intel
• cheyenne.gnu
• gaea.intel
• jet.intel
• wcoss_cray
• wcoss_dell_p3

Dependencies

NCAR/ccpp-physics#623
NOAA-EMC/fv3atm#279
#520

[BrianCurtis-NOAA]

Machine: jet
Compiler: intel
Job: BL
Repo location: /lfs4/HFIP/h-nems/emc.nemspara/autort/pr/615506885/20210414213010/ufs-weather-model
Please manually delete: /lfs4/HFIP/h-nems/emc.nemspara/RT_RUNDIRS/emc.nemspara/FV3_RT/rt_99770
Test fv3_thompson_no_aero 033 failed in run_test failed
Test fv3_gsd 031 failed in run_test failed
Please make changes and add the following label back:
jet-intel-BL

[climbfuji]

Notes on regression testing (to be updated):

• auto-bl/rt passed for: hera.intel, hera.gnu, gaea.intel, orion.intel
• auto-bl/rt failed for: jet.intel - reason: the usual slurm issues on jet, the two failing tests had the following error:

sbatch: error: Batch job submission failed: Socket timed out on send/recv operation

• manual tests passed for: wcoss_cray, wcoss_dell_p3 (thanks @DeniseWorthen), cheyenne.gnu, cheyenne.intel, jet.intel
• ci tests passed for commit d34e398

[DeniseWorthen]

WCOSS logs are posted: /scratch2/NCEPDEV/stmp1/Denise.Worthen/PR520

[climbfuji]

@junwang-noaa @DusanJovic-NOAA ready for merging.

[junwang-noaa]

Merged

…

On Thu, Apr 15, 2021 at 12:19 PM Dom Heinzeller ***@***.***> wrote: @junwang-noaa <https://github.com/junwang-noaa> @DusanJovic-NOAA <https://github.com/DusanJovic-NOAA> ready for merging. — You are receiving this because you were mentioned. Reply to this email directly, view it on GitHub <#520 (comment)>, or unsubscribe <https://github.com/notifications/unsubscribe-auth/AI7D6TOI2LCROBS7GBUBAPTTI4G2NANCNFSM426BR3RQ> .

[climbfuji]

Merged
…

Thank you, that was a big set of changes.