Move suite and scheme files to new directories #126
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This was referenced Oct 2, 2024
peverwhee
approved these changes
Oct 2, 2024
nusbaume
added a commit
to ESCOMP/CAM-SIMA
that referenced
this pull request
Oct 15, 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:
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR reorganizes the directory structure in this repo so that all top-level Suite Definition Files (SDFs, e.g.
suite_ABC.xml) are now under thesuitesdirectory, while all of the top-level scheme directories are now under theschemesdirectory. This PR also renames thetest_sdfsdirectory to betest_suitesto avoid confusion, and fixes a bug in the testing routines that was introduced by these directory changes.Fixes #124
Tests run:
Ran the GNU regression suite in CAM with these changes (no diffs), all of the current unit tests in CAM-SIMA (all passed), and performed some build tests with CAM-SIMA to ensure that the correct SDFs were grabbed and that the CCPP caps were generated successfully.