From 07e70e3a8a7984ca698d79a0ffbd2e26393d95f1 Mon Sep 17 00:00:00 2001 From: Haipeng Lin Date: Wed, 18 Mar 2026 16:30:18 -0400 Subject: [PATCH 1/4] Add cush, tke to initializations from snapshot. --- src/data/registry.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/src/data/registry.xml b/src/data/registry.xml index 9df2e3dbd..25b6e5077 100644 --- a/src/data/registry.xml +++ b/src/data/registry.xml @@ -1546,6 +1546,22 @@ 0.0_kind_phys + + horizontal_dimension + 0.0_kind_phys + pbuf_cush + + + horizontal_dimension vertical_interface_dimension + 0.0_kind_phys + pbuf_tke + Date: Wed, 18 Mar 2026 17:04:19 -0400 Subject: [PATCH 2/4] Add numliq; numice to registry --- src/data/registry.xml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/src/data/registry.xml b/src/data/registry.xml index 25b6e5077..2971d174b 100644 --- a/src/data/registry.xml +++ b/src/data/registry.xml @@ -617,6 +617,20 @@ horizontal_dimension vertical_layer_dimension CLDICE cnst_CLDICE + + Cloud liquid number with respect to moist air plus all airborne condensates + horizontal_dimension vertical_layer_dimension + NUMLIQ cnst_NUMLIQ + + + Cloud ice number with respect to moist air plus all airborne condensates + horizontal_dimension vertical_layer_dimension + NUMICE cnst_NUMICE + From 31fab7a32da6beee40551696d3fc48ab9ea3e16c Mon Sep 17 00:00:00 2001 From: Haipeng Lin Date: Fri, 5 Jun 2026 12:41:20 -0400 Subject: [PATCH 3/4] Add outfrq_uw_shallow_derecho test. --- cime_config/testdefs/testlist_cam.xml | 9 ++++++++ .../outfrq_uw_shallow_derecho/shell_commands | 1 + .../cam/outfrq_uw_shallow_derecho/user_nl_cam | 23 +++++++++++++++++++ 3 files changed, 33 insertions(+) create mode 100644 cime_config/testdefs/testmods_dirs/cam/outfrq_uw_shallow_derecho/shell_commands create mode 100644 cime_config/testdefs/testmods_dirs/cam/outfrq_uw_shallow_derecho/user_nl_cam diff --git a/cime_config/testdefs/testlist_cam.xml b/cime_config/testdefs/testlist_cam.xml index 5b1f8c55d..b7aeb0284 100644 --- a/cime_config/testdefs/testlist_cam.xml +++ b/cime_config/testdefs/testlist_cam.xml @@ -61,6 +61,15 @@ + + + + + + + + + diff --git a/cime_config/testdefs/testmods_dirs/cam/outfrq_uw_shallow_derecho/shell_commands b/cime_config/testdefs/testmods_dirs/cam/outfrq_uw_shallow_derecho/shell_commands new file mode 100644 index 000000000..c49b49a88 --- /dev/null +++ b/cime_config/testdefs/testmods_dirs/cam/outfrq_uw_shallow_derecho/shell_commands @@ -0,0 +1 @@ + ./xmlchange CAM_CONFIG_OPTS="--dyn none --physics-suites convect_shallow_uw" diff --git a/cime_config/testdefs/testmods_dirs/cam/outfrq_uw_shallow_derecho/user_nl_cam b/cime_config/testdefs/testmods_dirs/cam/outfrq_uw_shallow_derecho/user_nl_cam new file mode 100644 index 000000000..58ba64556 --- /dev/null +++ b/cime_config/testdefs/testmods_dirs/cam/outfrq_uw_shallow_derecho/user_nl_cam @@ -0,0 +1,23 @@ +ncdata = '/glade/campaign/cesm/community/amwg/sima_baselines/cam_sima_test_snapshots/cam_ne3pg3_fhistc5_uw_convect_shallow_snapshot_derecho_gnu_before_c20260604.nc' +ncdata_check = '/glade/campaign/cesm/community/amwg/sima_baselines/cam_sima_test_snapshots/cam_ne3pg3_fhistc5_uw_convect_shallow_snapshot_derecho_gnu_after_c20260604.nc' + +debug_output = 1 + +! tolerances for testing +ncdata_check_err = .true. +min_difference = 2e-15 + +! FHIST_C5 snapshot: +pver = 30 + +! snapshot is sourced from the SE dycore: +uwshcu_rpen = 5.0 + +! history fields for CAM5 shallow convection: +hist_output_frequency;h1: 1*nsteps +hist_max_frames;h1: 1 +hist_add_inst_fields;h1: CMFDT,CMFDQ,CMFDLIQ,CMFDICE,CMFDQR,DQP,ICWMRSH,CMFSL,CMFLQ,FREQSH,CMFMCSH,PRECSH +hist_add_inst_fields;h1: UWFLXPRC,UWFLXSNW +hist_add_inst_fields;h1: qtflx_Cu, slflx_Cu, uflx_Cu, vflx_Cu, qtten_Cu, slten_Cu, uten_Cu, vten_Cu, qvten_Cu, qlten_Cu, qiten_Cu, cbmf_Cu, ufrcinvbase_Cu, ufrclcl_Cu, winvbase_Cu, wlcl_Cu, plcl_Cu, pinv_Cu, plfc_Cu, pbup_Cu, ppen_Cu, qtsrc_Cu, thlsrc_Cu, thvlsrc_Cu, emfkbup_Cu, cin_Cu, cinlcl_Cu, cbmflimit_Cu, tkeavg_Cu, zinv_Cu, rcwp_Cu, rlwp_Cu, riwp_Cu, tophgt_Cu, wu_Cu, ufrc_Cu, qtu_Cu, thlu_Cu, thvu_Cu, uu_Cu, vu_Cu, qtu_emf_Cu, thlu_emf_Cu, uu_emf_Cu, vu_emf_Cu, umf_Cu, uemf_Cu, qcu_Cu, qlu_Cu, qiu_Cu, cufrc_Cu, fer_Cu, fdr_Cu, dwten_Cu, diten_Cu, qrten_Cu, qsten_Cu, flxrain_Cu, flxsnow_Cu, ntraprd_Cu, ntsnprd_Cu, excessu_Cu, excess0_Cu, xc_Cu, aquad_Cu, bquad_Cu, cquad_Cu, bogbot_Cu, bogtop_Cu, exit_UWCu_Cu, exit_conden_Cu, exit_klclpver_Cu, exit_klfcpver_Cu, exit_ufrc_Cu, exit_wtw_Cu, exit_drycore_Cu, exit_wu_Cu, exit_cufilter_Cu, exit_kinv1_Cu, exit_rei_Cu, limit_shcu_Cu, limit_negcon_Cu, limit_ufrc_Cu, limit_ppen_Cu, limit_emf_Cu, limit_cinlcl_Cu, limit_cin_Cu, limit_cbmf_Cu, limit_rei_Cu, ind_delcin_Cu +hist_precision;h1: REAL64 + From 0042e26de7bf9ab43ccacb2cbbfe6a7c4a00a3b4 Mon Sep 17 00:00:00 2001 From: Haipeng Lin Date: Mon, 20 Jul 2026 12:16:54 -0400 Subject: [PATCH 4/4] Update tke standard name --- src/data/registry.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/data/registry.xml b/src/data/registry.xml index 6a4d90d11..a93a080d3 100644 --- a/src/data/registry.xml +++ b/src/data/registry.xml @@ -1576,7 +1576,7 @@ pbuf_cush horizontal_dimension vertical_interface_dimension