Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

RRTMGP refactoring #1571

Merged
merged 34 commits into from
Feb 7, 2023
Merged

RRTMGP refactoring #1571

merged 34 commits into from
Feb 7, 2023

Conversation

dustinswales
Copy link
Collaborator

@dustinswales dustinswales commented Jan 18, 2023 •
edited by BrianCurtis-NOAA
Loading

Description

This PR contains changes to FV3/ccpp-physics for the RRTMGP scheme, along with additional cleanup of the RRTMGP UFS regression tests (to harmonize the GP tests to be consistent with their counterparts).

Changes to NOAA-EMC/fv3atm #619

  • Cleanup of RRTMGP Interstitial variables.
  • New namelist options for RRTMGP scheme.
  • Simplification to RRTMGP SDFs.

Changes toufs-communitu/ccpp-physics #34

  • Major refactoring of RRTMGP interstitials. collapse all rrtmgp_lw(sw) scheme files into rrtmgp_lw(sw)_main schemes. This reduces the number of Interstitial fields needed by the GP scheme and allows us to use the rte-rrtmgp submodule directly, w/o the need for a special branch containing the CCPP hooks.
  • For longwave radiation calculation, add "blocking" capability to main loop.
  • Fix bug in coupling of RRTMGP shortwave radiation to surface.
  • CMake cleanup.

Top of commit queue on: TBD

Input data additions/changes

  • No changes are expected to input data.
  • There will be new input data.
  • Input data will be updated.

Anticipated changes to regression tests:

  • No changes are expected to any regression test.
  • Changes are expected to the following tests: (RRTMGP enabled tests)

Subcomponents involved:

  • AQM
  • CDEPS
  • CICE
  • CMEPS
  • CMakeModules
  • FV3
  • GOCART
  • HYCOM
  • MOM6
  • NOAHMP
  • WW3
  • stochastic_physics
  • none

Combined with PR's (If Applicable):

Commit Queue Checklist:

  • Link PR's from all sub-components involved
  • Confirm reviews completed in sub-component PR's
  • Add all appropriate labels to this PR.
  • Run full RT suite on either Hera/Cheyenne with both Intel/GNU compilers
  • Add list of any failed regression tests to "Anticipated changes to regression tests" section.

Linked PR's and Issues:

Testing Day Checklist:

  • 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.
  • Move new/updated input data on RDHPCS Hera and propagate input data changes to all supported systems.

Testing Log (for CM's):

  • RDHPCS
    • Intel
      • Hera
      • Orion
      • Jet
      • Gaea
      • Cheyenne
    • GNU
      • Hera
      • Cheyenne
  • WCOSS2
    • Dogwood/Cactus
    • Acorn
  • CI
    • Completed
  • opnReqTest
    • N/A
    • Log attached to comment

dustinswales and others added 18 commits September 7, 2022 15:20
@dustinswales
RRTMGP refactoring
2a947c2
Added RRTMGP p8 coupled RT. Update other GP RTs.
8cae15b
update rt.sh for auto rts
578d85f
Adding GP physics blocking to UFS GP RT configurations
ab96e84
Merge branch 'develop' of https://github.com/ufs-community/ufs-weathe…
bb508ad 
…r-model into rrtmgp_refactor
@dustinswales
Stash before sync
f3c3f8e
@dustinswales
Merge branch 'rrtmgp_refactor' of https://github.com/dustinswales/ufs…
662742f 
…-weather-model into rrtmgp_refactor
Update FV3/ccpp-physics
626f101
Merge branch 'develop' of https://github.com/ufs-community/ufs-weathe…
c3896e6 
…r-model into rrtmgp_refactor
Updated with ufs-community:develop
5e3ad78
Updated GOCART submodule
96ad906
Updated GOCART submodule
c4eb27e
Update FV3
e2e92b8
Merge branch 'develop' of https://github.com/ufs-community/ufs-weathe…
844e463 
…r-model into rrtmgp_refactor
Update submodule pointer
c7d5a79
@dustinswales
update fv3atm
f41fcba
@dustinswales
Merge branch 'develop' of https://github.com/ufs-community/ufs-weathe…
371a4f8 
…r-model into rrtmgp_refactor
@dustinswales
Trim old RRTMGP RTs
763e5a6
@jkbk2004 jkbk2004 added Baseline Updates Current baselines will be updated. Waiting for Reviews The PR is waiting for reviews from associated component PR's. labels Feb 1, 2023
@jkbk2004 jkbk2004 mentioned this pull request Feb 1, 2023
Merged
@jkbk2004
Copy link
Collaborator

jkbk2004 commented Feb 1, 2023

@dustinswales can you resolve the conflicts?

@jkbk2004 jkbk2004 self-requested a review February 1, 2023 20:51
@jkbk2004 jkbk2004 added the Ready for Commit Queue The PR is ready for the Commit Queue. All checkboxes in PR template have been checked. label Feb 6, 2023
@BrianCurtis-NOAA
[AutoRT] hera.gnu Job Completed.
1dc161e 
on-behalf-of @ufs-community <brian.curtis@noaa.gov>
@BrianCurtis-NOAA
Copy link
Collaborator

Automated RT Failure Notification
Machine: jet
Compiler: intel
Job: BL
[BL] Repo location: /lfs4/HFIP/h-nems/emc.nemspara/autort/pr/1202119880/20230206181514/ufs-weather-model
Please make changes and add the following label back: jet-intel-BL

@zach1221
Copy link
Collaborator

zach1221 commented Feb 6, 2023

@jkbk2004 I'm running the rest of the Jet tests manually.

@jkbk2004
Copy link
Collaborator

jkbk2004 commented Feb 7, 2023

All tests are done. We can start merging process.

@jkbk2004
Copy link
Collaborator

jkbk2004 commented Feb 7, 2023

@dustinswales can you update the fv3 pointer and revert the change in gitmodules here?

@jkbk2004 jkbk2004 merged commit 30b847d into ufs-community:develop Feb 7, 2023
dustinswales pushed a commit to dustinswales/ufs-weather-model that referenced this pull request Feb 7, 2023
@jkbk2004 @BrianCurtis-NOAA
RRTMGP refactoring (ufs-community#1571)
37bc5fe 
* RRTMGP refactoring

* Added RRTMGP p8 coupled RT. Update other GP RTs.

* Adding GP physics blocking to UFS GP RT configurations

* Trim old RRTMGP RTs

* Interface changes for SP build in GP

Co-authored-by: JONG KIM <jong.kim@noaa.gov>
Co-authored-by: Brian Curtis <brian.curtis@noaa.gov>
@dustinswales dustinswales mentioned this pull request Feb 7, 2023
Closed
dustinswales pushed a commit to dustinswales/ufs-weather-model that referenced this pull request Mar 1, 2023
@jkbk2004 @BrianCurtis-NOAA
RRTMGP refactoring (ufs-community#1571)
ddaf18b 
* RRTMGP refactoring

* Added RRTMGP p8 coupled RT. Update other GP RTs.

* Adding GP physics blocking to UFS GP RT configurations

* Trim old RRTMGP RTs

* Interface changes for SP build in GP

Co-authored-by: JONG KIM <jong.kim@noaa.gov>
Co-authored-by: Brian Curtis <brian.curtis@noaa.gov>
@dustinswales dustinswales mentioned this pull request Mar 1, 2023
Merged
@dustinswales dustinswales mentioned this pull request May 11, 2023
Closed
@dustinswales dustinswales deleted the rrtmgp_refactor branch January 6, 2025 22:24
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jkbk2004 jkbk2004 jkbk2004 approved these changes

@ChunxiZhang-NOAA ChunxiZhang-NOAA ChunxiZhang-NOAA approved these changes

@DusanJovic-NOAA DusanJovic-NOAA Awaiting requested review from DusanJovic-NOAA

Assignees
No one assigned
Labels
Baseline Updates Current baselines will be updated. Ready for Commit Queue The PR is ready for the Commit Queue. All checkboxes in PR template have been checked. Waiting for Reviews The PR is waiting for reviews from associated component PR's.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@dustinswales @jkbk2004 @BrianCurtis-NOAA @support-epic @zach1221 @ChunxiZhang-NOAA