Skip to content

sima0_22_000: CCPPize conv_water_4rad, cloud_water_paths - #531

Merged
jimmielin merged 11 commits into
ESCOMP:developmentfrom
jimmielin:hplin/conv_water
Oct 1, 2026
Merged

jimmielin merged 11 commits into
ESCOMP:developmentfrom
jimmielin:hplin/conv_water

Conversation

@jimmielin

@jimmielin jimmielin commented Jul 28, 2026 •

Copy link
Copy Markdown
Collaborator

Tag name (required for release branches): sima0_22_000
Originator(s): @jimmielin co-authored with @nusbaume
AI tools used (if applicable; please also add the "AI-generated code" label to the PR):
What:
How:

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

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 input datasets (e.g. boundary datasets):

List all files eliminated and why:

List all files added and what they do:

A       cime_config/testdefs/testmods_dirs/cam/outfrq_cloud_water_derecho/shell_commands
A       cime_config/testdefs/testmods_dirs/cam/outfrq_cloud_water_derecho/user_nl_cam
  - new testmod

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

M       cime_config/testdefs/testlist_cam.xml
   - add outfrq_cloud_water_derecho testmod
M       src/data/registry.xml
   - add registry fields necessary

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) details:
  SMS_D_Ln9.ne3pg3_ne3pg3_mt233.F1850_C4.derecho_intel.cam-outfrq_se_cam4 (Overall: DIFF) details:
  SMS_D_Ln9.ne3pg3_ne3pg3_mt233.F2000_C4.derecho_intel.cam-outfrq_se_cam4 (Overall: DIFF) details:
  SMS_D_Ln9.ne3pg3_ne3pg3_mt233.QPC4.derecho_intel.cam-outfrq_se_cam4 (Overall: DIFF) details:
  SMS_Ln9.mpasa120_mpasa120.QPC4.derecho_intel.cam-outfrq_analy_ic_cam4 (Overall: DIFF) details:
  SMS_Ln9.ne3pg3_ne3pg3_mt233.QPC4.derecho_intel.cam-outfrq_se_cam4 (Overall: DIFF) details:
    - rk clamp update

  SMS_Ln9.ne3pg3_ne3pg3_mg37.FKESSLER.derecho_intel.cam-outfrq_se_cslam_multitape (Overall: NLFAIL) details:
    - pre-existing failure requiring cime update

  SMS_Ln9.ne3pg3_ne3pg3_mg37.F2000_C7.derecho_intel.cam-outfrq_se_cslam_analy_ic (Overall: FAIL) details:
    - pre-existing failure needs investigation

derecho/gnu/aux_sima:

  SMS_D_Ln9.mpasa120_mpasa120.QPC4.derecho_gnu.cam-outfrq_analy_ic_cam4 (Overall: DIFF) details:
  SMS_D_Ln9.ne3pg3_ne3pg3_mt233.F1850_C4.derecho_gnu.cam-outfrq_se_cam4 (Overall: DIFF) details:
  SMS_D_Ln9.ne3pg3_ne3pg3_mt233.F2000_C4.derecho_gnu.cam-outfrq_se_cam4 (Overall: DIFF) details:
  SMS_D_Ln9.ne3pg3_ne3pg3_mt233.QPC4.derecho_gnu.cam-outfrq_se_cam4 (Overall: DIFF) details:
  SMS_Ln9.mpasa120_mpasa120.QPC4.derecho_gnu.cam-outfrq_analy_ic_cam4 (Overall: DIFF) details:
  SMS_Ln9.ne3pg3_ne3pg3_mt233.QPC4.derecho_gnu.cam-outfrq_se_cam4 (Overall: DIFF) details:
  - rk precip clamp removal

  SMS_Ln2.ne3pg3_ne3pg3_mg37.FPHYStest.derecho_gnu.cam-outfrq_cloud_water_derecho (Overall: DIFF) details:'/glade/campaign/cesm/community/amwg/sima_baselines/latest_gnu/SMS_Ln2.ne3pg3_ne3pg3_mg37.FPHYStest.derecho_gnu.cam-outfrq_cloud_water_derecho' does not exist
  - new test

  SMS_Ln9.ne3pg3_ne3pg3_mg37.F2000_C7.derecho_gnu.cam-outfrq_se_cslam_analy_ic (Overall: FAIL) details:
  - pre-existing failure - I was hoping conv_water would fix it but it did not - needs investigation

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

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:

Haipeng Lin added 4 commits July 22, 2026 14:55
Assisted-by: claude-fable:5

Add registry entries for the cloud_water physics suite

Snapshot-readable inputs (REI, CONCLD, QSOUT, QGOUT), the grid-mean total
cloud liquid/ice outputs of convective_cloud_water, and the one_mom_clouds
flag (hardcoded .false.: one-moment RK microphysics is not a supported
CAM-SIMA configuration; revisit if an RK+RRTMGP config arrives).
CONCLD/QSOUT/QGOUT serve the follow-on cloud_water_paths port.

Add outfrq_cloud_water_derecho test for the cloud_water physics suite

FPHYStest SMS_Ln2 (aux_sima, derecho gnu) running suite_cloud_water from
the CAM cloud_diagnostics_calc snapshot with ncdata_check, and writing
the 12 CAM conv_water history fields from
convective_cloud_water_diagnostics as an every-step REAL64 h1 baseline.

Update ncar_ccpp to hplin/conv_water development head.

Temporary hash pin for testing; replace with the atmos_phys tag
containing the cloud_water suite before merge.
@jimmielin jimmielin self-assigned this Jul 28, 2026
@jimmielin jimmielin added the enhancement New feature or request label Jul 28, 2026
@jimmielin
jimmielin temporarily deployed to CI-tests-on-CIRRUS July 28, 2026 14:43 — with GitHub Actions Inactive
@jimmielin
jimmielin deployed to CI-tests-on-CIRRUS September 10, 2026 19:42 — with GitHub Actions Active
@jimmielin

Copy link
Copy Markdown
Collaborator Author

A note that ideally #517 is merged in before this one, otherwise the conv_water regression test will FAIL due to the ncdata_check_exclude fields being commented out in the testmod (some fields legitimately cannot be tested via snapshot since they're PUMAS internal variables that are now registry variables)

@nusbaume nusbaume 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.

Just adding a note that I will approve this PR once ESCOMP/atmospheric_physics#447 has been merged and brought in as a submodule update.

@nusbaume
nusbaume deployed to CI-tests-on-CIRRUS September 19, 2026 02:25 — with GitHub Actions Active
@nusbaume
nusbaume deployed to CI-tests-on-CIRRUS September 22, 2026 15:20 — with GitHub Actions Active
@nusbaume
nusbaume requested a review from peverwhee September 22, 2026 15:34

@peverwhee peverwhee 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.

:)

@jimmielin jimmielin changed the title CCPPize conv_water_4rad, cloud_water_paths sima0_22_000: CCPPize conv_water_4rad, cloud_water_paths Sep 30, 2026
@jimmielin
jimmielin merged commit 47e1e63 into ESCOMP:development Oct 1, 2026
23 of 24 checks passed
jimmielin pushed a commit to jimmielin/CAM-SIMA that referenced this pull request Oct 1, 2026
Brings in conv_water_4rad/cloud_water_paths (ESCOMP#531), ncdata_check_exclude
(ESCOMP#517), the IC-read set-before-use skip (ESCOMP#547), misc code fixes (ESCOMP#507) and
the atmos_phys0_29_001 pin.

Conflict resolution:
- ncdata_check_exclude (namelist definition, string_core_utils, phys_comp,
  physics_data) and write_init_files set-before-use: take the landed
  upstream versions; drop the branch's duplicate exclusion declarations.
- registry.xml: keep the MAM wetdep/drydep/concld_old entries alongside
  the conv_water entries; drop the branch's duplicate icwmrsh.
- write_init_files samples regenerated with the merged generator.

Assisted-by: claude-opus:5.5

This branch is waiting to be deployed

1 waiting deployment
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

enhancement New feature or request

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants