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

Implement re-organized CCPP physics external #306

Merged
merged 7 commits into from
Oct 15, 2024

Conversation

nusbaume
Copy link
Collaborator

@nusbaume nusbaume commented Oct 2, 2024

Originator(s): nusbaume

Summary (include the keyword ['closes', 'fixes', 'resolves'] and issue number):

This PR bring in a new atmospheric_physics version with a re-organized directory structure. The way this impacts CAM-SIMA is that now when a physics suite is listed it will first look in the case's SourceMods first, ncar_ccpp/suites second, and ncar_ccpp/test/test_suites third, after which it will error if it hasn't found the Suite Definition File (SDF). The CAM-SIMA build system also now looks in ncar_ccpp/schemes for any CCPP physics source code and metadata files.

Fixes #305

The associated atmospehric_physics PR can be found here: ESCOMP/atmospheric_physics#126

Describe any changes made to build system:

The CAM-SIMA configuration routines will now look under suites or test_suites for SDFs, with the suites entries taking precedence (unless the case has SourceMods, in which those always take precedence). All of the relevant source code and metadata files for atmospheric physics must also now be present under the schemes directory in the atmospheric_physics repo.

Describe any changes made to the namelist: N/A

List any changes to the defaults for the input datasets (e.g. boundary datasets): N/A

List all files eliminated and why:

Remove unused "test/include" directory:
D test/include/Makefile
D test/include/cam_abortutils.F90
D test/include/cam_logfile.F90
D test/include/ccpp_kinds.F90
D test/include/shr_infnan_mod.F90
D test/include/shr_kind_mod.F90
D test/include/spmd_utils.F90

List all files added and what they do: N/A

List all existing files that have been modified, and describe the changes:
(Helpful git command: git diff --name-status development...<your_branch_name>)

Update atmospheric_physics external:
M .gitmodules
M src/physics/ncar_ccpp

Update CCPP SDF, source, and metadata file search locations and precedence:
M cime_config/cam_autogen.py

Add FTJ16 compset and cleanup simple physics configuration options:
M cime_config/config_component.xml

If there are new failures (compare to the existing-test-failures.txt file),
have them OK'd by the gatekeeper, note them here, and add them to the file.
If there are baseline differences, include the test and the reason for the
diff. What is the nature of the change? Roundoff?

derecho/intel/aux_sima: ALL PASS

derecho/gnu/aux_sima: ALL PASS

CAM-SIMA date used for the baseline comparison tests if different than latest:

@nusbaume nusbaume added enhancement New feature or request externals externals updating issue or PR labels Oct 2, 2024
@nusbaume nusbaume self-assigned this Oct 2, 2024
Copy link
Member

@jimmielin jimmielin left a comment

Choose a reason for hiding this comment

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

This looks great! I have one comment that could be deferred to the future into an issue, feel free to address/ignore it at this time. Thanks!

cime_config/cam_autogen.py Show resolved Hide resolved
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.

one tiny question.

cime_config/cam_autogen.py Show resolved Hide resolved
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.

👍

@nusbaume nusbaume merged commit 112cc2b into ESCOMP:development Oct 15, 2024
8 checks passed
@nusbaume nusbaume deleted the atmos_phys_dirs branch October 16, 2024 15:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement New feature or request externals externals updating issue or PR
Projects
Status: Tag
Development

Successfully merging this pull request may close these issues.

3 participants