Skip to content

Add F-compset CAM4 compsets/tests, and cleanup config_*.xml files. - #544

Merged
nusbaume merged 5 commits into
ESCOMP:developmentfrom
nusbaume:cam4_f_compset
Aug 24, 2026
Merged

Add F-compset CAM4 compsets/tests, and cleanup config_*.xml files.#544
nusbaume merged 5 commits into
ESCOMP:developmentfrom
nusbaume:cam4_f_compset

Conversation

@nusbaume

@nusbaume nusbaume commented Aug 23, 2026

Copy link
Copy Markdown
Collaborator

Tag name (required for release branches): sima0_20_001
Originator(s): nusbaume
AI tools used (if applicable; please also add the "AI-generated code" label to the PR):
What: Claude Opus 5
How: Had it replace all tab characters with spaces in the cime_config/config_*.xml files (which is why there are so many changes in config_pes.xml).

Description (include the issue title, and the keyword ['closes', 'fixes', 'resolves'] followed by the issue number):

Added F1850 and F2000 compsets using the SE dycore and the CAM4 + BAM physics/chemistry suite. Also added an updated atmospheric_physics external and regression tests to make sure those compsets worked as expected.

Along with the compset additions, the actual CIME configuration files used by CAM-SIMA were cleaned up in order to remove some options that were either not developed yet in CAM-SIMA, or that were deprecated. I also used Claude to get rid of all tabs (and replace them with the equivalent number of spaces).

Describe any changes made to build system:

M       cime_config/config_component.xml
M       cime_config/config_compsets.xml
M       cime_config/config_pes.xml
 - Removed some compset and component options that are either currently not-supported by CAM-SIMA, or that are deprecated.  Also replaced all tabs with spaces (which is what all of the `config_pes.xml` changes are).

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: N/A

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>)

M       .gitmodules
  - Updated atmospheric_physics external with new CAM4 physics suite mods.

M       cime_config/testdefs/testlist_cam.xml
M       cime_config/testdefs/testmods_dirs/cam/outfrq_se_cam4/shell_commands
 - Add F2000 and F1850 CAM4+BAM regression tests.

If there are new failures (compared to the test/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:

SMS_D_Ln9.mpasa120_mpasa120.QPC4.derecho_intel.cam-outfrq_analy_ic_cam4 (Overall: DIFF)
SMS_Ln9.mpasa120_mpasa120.QPC4.derecho_intel.cam-outfrq_analy_ic_cam4 (Overall: DIFF)

  • Answer differences in the precip variables the RK scheme sends to the coupler due to a new mass fixer in atmospheric_physics.

SMS_D_Ln9.ne3pg3_ne3pg3_mt233.F1850_C4.derecho_intel.cam-outfrq_se_cam4 (Overall: DIFF)
SMS_D_Ln9.ne3pg3_ne3pg3_mt233.F2000_C4.derecho_intel.cam-outfrq_se_cam4 (Overall: DIFF)

  • New regression tests (no baselines).

SMS_D_Ln9.ne3pg3_ne3pg3_mt233.QPC4.derecho_intel.cam-outfrq_se_cam4 (Overall: DIFF)
SMS_Ln9.ne3pg3_ne3pg3_mt233.QPC4.derecho_intel.cam-outfrq_se_cam4 (Overall: DIFF)

  • "New" regression tests due to the updated ocean mask (mt232 -> mt233)

SMS_Ln9.ne3pg3_ne3pg3_mg37.F2000_C7.derecho_intel.cam-outfrq_se_cslam_analy_ic (Overall: FAIL)

SMS_Ln9.ne3pg3_ne3pg3_mg37.FKESSLER.derecho_intel.cam-outfrq_se_cslam_multitape (Overall: NLFAIL)

  • Known Test Failure.

derecho/gnu/aux_sima:

SMS_D_Ln9.mpasa120_mpasa120.QPC4.derecho_gnu.cam-outfrq_analy_ic_cam4 (Overall: DIFF)
SMS_Ln9.mpasa120_mpasa120.QPC4.derecho_gnu.cam-outfrq_analy_ic_cam4 (Overall: DIFF)

  • Answer differences in the precip variables the RK scheme sends to the coupler due to a new mass fixer in atmospheric_physics.

SMS_D_Ln9.ne3pg3_ne3pg3_mt233.F1850_C4.derecho_gnu.cam-outfrq_se_cam4 (Overall: DIFF)
SMS_D_Ln9.ne3pg3_ne3pg3_mt233.F2000_C4.derecho_gnu.cam-outfrq_se_cam4

  • New regression tests (no baselines).

SMS_D_Ln9.ne3pg3_ne3pg3_mt233.QPC4.derecho_gnu.cam-outfrq_se_cam4 (Overall: DIFF)
SMS_Ln9.ne3pg3_ne3pg3_mt233.QPC4.derecho_gnu.cam-outfrq_se_cam4

  • "New" regression tests due to the updated ocean mask (mt232 -> mt233)

SMS_Ln9.ne3pg3_ne3pg3_mg37.F2000_C7.derecho_gnu.cam-outfrq_se_cslam_analy_ic (Overall: FAIL)

derecho/nvhpc/aux_sima (test is run via Github workflow. Only run the test manually if we need to save new baselines):

If this changes climate describe any run(s) done to evaluate the new
climate in enough detail that it(they) could be reproduced:

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

@nusbaume nusbaume self-assigned this Aug 23, 2026
@nusbaume nusbaume added the enhancement New feature or request label Aug 23, 2026
@nusbaume nusbaume added answer changing answer changing tag externals externals updating issue or PR code clean-up Made code simpler, better, and/or easier to read. AI-generated code labels Aug 23, 2026
@nusbaume
nusbaume temporarily deployed to CI-tests-on-CIRRUS August 23, 2026 03:35 — with GitHub Actions Inactive

@jimmielin jimmielin left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

Thanks @nusbaume! I just had a question and a reminder!

Comment thread cime_config/config_component.xml
Comment thread .gitmodules Outdated
@nusbaume
nusbaume deployed to CI-tests-on-CIRRUS August 24, 2026 15:56 — with GitHub Actions Active
@nusbaume
nusbaume merged commit 54344c0 into ESCOMP:development Aug 24, 2026
24 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

AI-generated code answer changing answer changing tag code clean-up Made code simpler, better, and/or easier to read. 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