Misc NRL bugfixes

[grantfirl]

PR Checklist

• [X] This 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.

• [X] 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

• [X] 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.

• [X] Results for one or more of the regression tests change and the reasons for the changes are understood and explained below.

• [ ] New or updated input data is required by this PR. If checked, please work with the code managers to update input data sets on all platforms.

Description

See the descriptions in https://github.com/NCAR/ccpp-physics/pull/954 and https://github.com/NOAA-EMC/fv3atm/pull/576 for details.

Issue(s) addressed

https://github.com/NCAR/ccpp-physics/issues/955

Testing

See https://github.com/NOAA-EMC/fv3atm/pull/576 for testing details.

• [X] hera.intel
• [ ] hera.gnu
• [ ] orion.intel
• [ ] cheyenne.intel
• [ ] cheyenne.gnu
• [ ] gaea.intel
• [ ] jet.intel
• [ ] wcoss2.intel
• [ ] acorn.intel
• [ ] opnReqTest for newly added/changed feature
• [ ] CI

Dependencies

https://github.com/NOAA-EMC/fv3atm/pull/576 https://github.com/NCAR/ccpp-physics/pull/954