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.

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

Integration of CCPP-ized TJ2016 implementation #271

Merged
merged 30 commits into from
Jul 23, 2024

Conversation

mwaxmonsky
Copy link
Collaborator

@mwaxmonsky mwaxmonsky commented Jun 27, 2024

Updates atmospheric_physics to the latest tag bringing in TJ2016 capability and additional changes needed in support of TJ2016.

Describe any changes made to build system: N/A

Describe any changes made to the namelist: N/A

List any changes to the defaults for the boundary datasets: N/A

Describe any substantial timing or memory changes: N/A

Code reviewed by: nusbaume, peverwhee

List all existing files that have been modified, old files eliminated, new files added and describe the changes:

M Externals_CAM.cfg

  • Updating to latest CCPP Framework needed for build.
  • Updating to latest atmospheric_physics needed to bring in TJ2016.

M src/control/cam_comp.F90

  • Removing CAM suite and dynamic_constituents to match new API.

M src/data/physconst.meta

  • Updating two standard names.

M src/data/registry.xml
A src/dynamics/utils/hycoef.meta

  • Exposing sum_of_sigma_pressure_hybrid_coordinate_a_coefficient_and_sigma_pressure_hybrid_coordinate_b_coefficient (etamid) to physics schemes.

M src/dynamics/utils/hycoef.F90

  • Updating lev, ilev, hybi, hyai to be read in by their standard names and updating PIO checks appropriately.

A tools/generate_input_to_stdnames_update.py

  • Adding new script to convert CSV file exported from standard names spreadsheet into the inputnames_dictionary.xml

M tools/inputnames_to_stdnames.py

  • Updating script to be tphysac/tphysbc aware to avoid duplicate standard names in snapshots.

M tools/stdnames_to_inputnames_dictionary.xml

  • Adding missing entry for standard_gravitational_acceleration.

M cime_config/testdefs/testlist_cam.xml
D cime_config/testdefs/testmods_dirs/cam/outfrq_held_suarez_izumi_nooutput/shell_commands
D cime_config/testdefs/testmods_dirs/cam/outfrq_held_suarez_izumi_nooutput/user_nl_cam
D cime_config/testdefs/testmods_dirs/cam/outfrq_kessler_izumi_nooutput/shell_commands
D cime_config/testdefs/testmods_dirs/cam/outfrq_kessler_izumi_nooutput/user_nl_cam
A cime_config/testdefs/testmods_dirs/cam/outfrq_tj2016_derecho_nooutput/shell_commands
A cime_config/testdefs/testmods_dirs/cam/outfrq_tj2016_derecho_nooutput/user_nl_cam

  • Adding derecho build test for tj2016, updating existing tests to build using both compilers (gnu and intel) and removing izumi tests based on discussion from 7/15/24 to simplify test setup process.

If there were any failures reported from running test_driver.sh on any test
platform, and checkin with these failures has been OK'd by the gatekeeper,
then copy the lines from the td.*.status files for the failed tests to the
appropriate machine below. All failed tests must be justified.

derecho/intel/aux_cam
derecho/gnu/aux_cam

  • All tests pass.

Summarize any changes to answers, i.e.,

  • what code configurations: N/A
  • what platforms/compilers: N/A
  • nature of change (roundoff; larger than roundoff but same climate; new climate): N/A

@mwaxmonsky mwaxmonsky marked this pull request as ready for review June 27, 2024 22:25
@cacraigucar cacraigucar removed their request for review July 1, 2024 19:12
@nusbaume nusbaume changed the title Ingetration of CCPP-ized TJ2016 implementation Integration of CCPP-ized TJ2016 implementation Jul 8, 2024
Copy link
Collaborator

@nusbaume nusbaume left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good! I know it appears like a decent number of change requests but most of them should just be related to changing a particular error message.

Also, can the PR description be updated to include the following two things:

  1. The PR URL (so we can grab it in the git log if need be, unless Github will do this for us?)

  2. The results of the regression tests run on Derecho.

Instructions for how to run the tests can be found here:

https://github.com/ESCOMP/CAM-SIMA/wiki/CAM-SIMA-testing#regression-testing-manual

Note that you'll need to do it twice, once for GNU and once for Intel. It might also be good to do snapshot test runs with the "official" snapshots that will live on Derecho here:

/glade/campaign/cesm/community/amwg/sima_baselines/cam_sima_test_snapshots

Mostly we just want to have a record that everything passed.

Thanks, and please let me know if you have any questions or concerns with any of my suggestions!

Externals_CAM.cfg Outdated Show resolved Hide resolved
src/dynamics/utils/hycoef.F90 Outdated Show resolved Hide resolved
src/dynamics/utils/hycoef.F90 Outdated Show resolved Hide resolved
src/dynamics/utils/hycoef.F90 Outdated Show resolved Hide resolved
src/dynamics/utils/hycoef.F90 Outdated Show resolved Hide resolved
src/dynamics/utils/hycoef.F90 Show resolved Hide resolved
tools/generate_input_to_stdnames_update.py Outdated Show resolved Hide resolved
tools/generate_input_to_stdnames_update.py Outdated Show resolved Hide resolved
tools/inputnames_to_stdnames.py Outdated Show resolved Hide resolved
tools/inputnames_to_stdnames.py Outdated Show resolved Hide resolved
@mwaxmonsky mwaxmonsky requested a review from nusbaume July 15, 2024 16:52
Copy link
Collaborator

@nusbaume nusbaume left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks great, thanks @mwaxmonsky!

Copy link
Collaborator

@peverwhee peverwhee left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

two more tiny error checks!

src/dynamics/utils/hycoef.F90 Show resolved Hide resolved
src/dynamics/utils/hycoef.F90 Show resolved Hide resolved
@peverwhee peverwhee self-requested a review July 19, 2024 16:53
Copy link
Collaborator

@peverwhee peverwhee left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

thanks!

@mwaxmonsky
Copy link
Collaborator Author

@peverwhee @nusbaume I fixed the merge conflicts and brought in the git-fleximod updates but if either of you had a sec, could you double check I didn't break anything with the fleximod update? Everything works on my end but I just want to make sure the git update works as expected on the user side.

@peverwhee
Copy link
Collaborator

@mwaxmonsky I ran a clean check-out of CAM-SIMA with your updates and git-fleximod worked well. I did run into this bug - #280 (introduced by me), but I vote for merging this PR!

@mwaxmonsky mwaxmonsky merged commit 40d1804 into ESCOMP:development Jul 23, 2024
6 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants