From 53c67d80bc35bcd95b294577b983c7d3fc9e6713 Mon Sep 17 00:00:00 2001 From: Haipeng Lin Date: Thu, 13 Mar 2025 14:27:16 -0400 Subject: [PATCH 1/5] Preliminary registry.xml for rk --- src/data/registry.xml | 46 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) diff --git a/src/data/registry.xml b/src/data/registry.xml index fa9914bb..2a578d1d 100644 --- a/src/data/registry.xml +++ b/src/data/registry.xml @@ -582,6 +582,14 @@ 0.0_kind_phys landfrac cam_in_landfrac + + horizontal_dimension + 1.0_kind_phys + ocnfrac cam_in_ocnfrac + 273.15_kind_phys sst cam_in_sst + + horizontal_dimension + + 0.0_kind_phys + LANDM_COSLAT pbuf_LANDM + @@ -655,6 +672,35 @@ 0.0_kind_phys + + + horizontal_dimension vertical_layer_dimension + + -1.0_kind_phys + pbuf_QCWAT + + + horizontal_dimension vertical_layer_dimension + + -1.0_kind_phys + pbuf_TCWAT + + + horizontal_dimension vertical_layer_dimension + + -1.0_kind_phys + pbuf_LCWAT + + Date: Thu, 3 Apr 2025 17:06:25 -0400 Subject: [PATCH 2/5] Add SMS_Ln2 physics test for RK; update CAM4 --- cime_config/testdefs/testlist_cam.xml | 11 +++- .../shell_commands | 1 + .../outfrq_rk_stratiform_derecho/user_nl_cam | 51 +++++++++++++++++++ 3 files changed, 62 insertions(+), 1 deletion(-) create mode 100644 cime_config/testdefs/testmods_dirs/cam/outfrq_rk_stratiform_derecho/shell_commands create mode 100644 cime_config/testdefs/testmods_dirs/cam/outfrq_rk_stratiform_derecho/user_nl_cam diff --git a/cime_config/testdefs/testlist_cam.xml b/cime_config/testdefs/testlist_cam.xml index eb195073..e246f659 100644 --- a/cime_config/testdefs/testlist_cam.xml +++ b/cime_config/testdefs/testlist_cam.xml @@ -49,7 +49,7 @@ - + @@ -61,6 +61,15 @@ + + + + + + + + + diff --git a/cime_config/testdefs/testmods_dirs/cam/outfrq_rk_stratiform_derecho/shell_commands b/cime_config/testdefs/testmods_dirs/cam/outfrq_rk_stratiform_derecho/shell_commands new file mode 100644 index 00000000..43c95f95 --- /dev/null +++ b/cime_config/testdefs/testmods_dirs/cam/outfrq_rk_stratiform_derecho/shell_commands @@ -0,0 +1 @@ + ./xmlchange CAM_CONFIG_OPTS="--dyn none --physics-suites rasch_kristjansson" diff --git a/cime_config/testdefs/testmods_dirs/cam/outfrq_rk_stratiform_derecho/user_nl_cam b/cime_config/testdefs/testmods_dirs/cam/outfrq_rk_stratiform_derecho/user_nl_cam new file mode 100644 index 00000000..ec9078cf --- /dev/null +++ b/cime_config/testdefs/testmods_dirs/cam/outfrq_rk_stratiform_derecho/user_nl_cam @@ -0,0 +1,51 @@ +! these are QPC4 snapshots and require custom physical constant definitions. +ncdata = '/glade/campaign/cesm/community/amwg/sima_baselines/cam_sima_test_snapshots/cam_ne3pg3_rasch_kristjansson_rk_stratiform_snapshot_derecho_gnu_before_c20250328.nc' +ncdata_check = '/glade/campaign/cesm/community/amwg/sima_baselines/cam_sima_test_snapshots/cam_ne3pg3_rasch_kristjansson_rk_stratiform_snapshot_derecho_gnu_after_c20250328.nc' + +! qpc4 +pver = 26 +user_defined_cpwv = 1.846e3 +user_defined_gravit = 9.79764 +user_defined_mwdry = 28.96623324623746 +user_defined_mwh2o = 18.01618112892741 +user_defined_rearth = 6.37100e6 +user_defined_sday = 86164.10063718943 + +! rk + cldfrc_dp1 = 0.10D0 + cldfrc_dp2 = 500.0D0 + cldfrc_freeze_dry = .true. + cldfrc_ice = .false. + cldfrc_icecrit = 0.95D0 + cldfrc_iceopt = 1 + cldfrc_premib = 750.0D2 + cldfrc_premit = 75000.0D0 + cldfrc_rhminh = 0.800D0 + cldfrc_rhminl = 0.910D0 + cldfrc_rhminl_adj_land = 0.100D0 + cldfrc_sh1 = 0.04D0 + cldfrc_sh2 = 500.0D0 + +! sima only: + cldfrc_inversion_cld_off = .false. + + cldsed_ice_stokes_fac = 1.0D0 + + rk_strat_conke = 5.0e-6 + rk_strat_icritc = 18.0e-6 + rk_strat_icritw = 2.0e-4 + rk_strat_r3lcrit = 10.0e-6 +! sima only: + rk_strat_polstrat_dorhmin = .false. + +hist_output_frequency;h1: 1*nsteps +hist_max_frames;h1: 1 +hist_add_inst_fields;h1:DQSED,DISED,DLSED,HSED,PRECSED,SNOWSED,RAINSED +hist_add_inst_fields;h1:SH_CLD,DP_CLD,CONCLD,AST +hist_add_inst_fields;h1:FICE,REPARTICE,REPARTLIQ,HREPART +hist_add_inst_fields;h1:FWAUT,FSAUT,FRACW,FSACW,FSACI,PCSNOW,CME,CMEICE,CMELIQ +hist_add_inst_fields;h1:ICE2PR,LIQ2PR,HPROGCLD,HEVAP,HMELT,HCME,HFREEZ +hist_add_inst_fields;h1:PRODPREC,EVAPPREC,EVAPSNOW,LS_FLXPRC,LS_FLXSNW,PRACWO,PSACWO,PSACIO +hist_add_inst_fields;h1:CLDLIQSTR,CLDICESTR,CLDLIQCON,CLDICECON +hist_add_inst_fields;h1:IWC,LWC,ICIMR,ICWMR,REI,REL +hist_precision;h1: REAL64 From af2efc91ff415089aa1b156fcbc9cf656d8014c6 Mon Sep 17 00:00:00 2001 From: Haipeng Lin Date: Tue, 6 May 2025 15:43:31 -0400 Subject: [PATCH 3/5] Update assigned standard names --- src/data/registry.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/data/registry.xml b/src/data/registry.xml index 2a578d1d..b1da4a83 100644 --- a/src/data/registry.xml +++ b/src/data/registry.xml @@ -664,7 +664,7 @@ .false. horizontal_dimension vertical_layer_dimension @@ -674,7 +674,7 @@ horizontal_dimension vertical_layer_dimension @@ -683,7 +683,7 @@ pbuf_QCWAT horizontal_dimension vertical_layer_dimension @@ -692,7 +692,7 @@ pbuf_TCWAT horizontal_dimension vertical_layer_dimension From 0652c91521a2537a0ca547eaa2c54c1b67f4607b Mon Sep 17 00:00:00 2001 From: Haipeng Lin Date: Mon, 16 Jun 2025 13:20:28 -0400 Subject: [PATCH 4/5] Update ncdata_check_err and tolerance --- .../cam/outfrq_rk_stratiform_derecho/user_nl_cam | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/cime_config/testdefs/testmods_dirs/cam/outfrq_rk_stratiform_derecho/user_nl_cam b/cime_config/testdefs/testmods_dirs/cam/outfrq_rk_stratiform_derecho/user_nl_cam index ec9078cf..dc3cd641 100644 --- a/cime_config/testdefs/testmods_dirs/cam/outfrq_rk_stratiform_derecho/user_nl_cam +++ b/cime_config/testdefs/testmods_dirs/cam/outfrq_rk_stratiform_derecho/user_nl_cam @@ -2,6 +2,10 @@ ncdata = '/glade/campaign/cesm/community/amwg/sima_baselines/cam_sima_test_snapshots/cam_ne3pg3_rasch_kristjansson_rk_stratiform_snapshot_derecho_gnu_before_c20250328.nc' ncdata_check = '/glade/campaign/cesm/community/amwg/sima_baselines/cam_sima_test_snapshots/cam_ne3pg3_rasch_kristjansson_rk_stratiform_snapshot_derecho_gnu_after_c20250328.nc' +! tolerances for testing +ncdata_check_err = .true. +min_difference = 2e-15 + ! qpc4 pver = 26 user_defined_cpwv = 1.846e3 From 20fba9fe45b0712d56e5d446c2e6987315828502 Mon Sep 17 00:00:00 2001 From: Haipeng Lin Date: Mon, 16 Jun 2025 17:50:21 -0400 Subject: [PATCH 5/5] Update ncar-physics submodule --- .gitmodules | 2 +- src/physics/ncar_ccpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitmodules b/.gitmodules index e11a5553..fbece332 100644 --- a/.gitmodules +++ b/.gitmodules @@ -20,7 +20,7 @@ [submodule "ncar-physics"] path = src/physics/ncar_ccpp url = https://github.com/ESCOMP/atmospheric_physics - fxtag = bb7c61028c1d6ead2c09b2c58cfbbfb3c3638a51 + fxtag = 4a31043bb8bd6179db3b59db4895b0563b78af88 fxrequired = AlwaysRequired fxDONOTUSEurl = https://github.com/ESCOMP/atmospheric_physics [submodule "rrtmgp-data"] diff --git a/src/physics/ncar_ccpp b/src/physics/ncar_ccpp index bb7c6102..4a31043b 160000 --- a/src/physics/ncar_ccpp +++ b/src/physics/ncar_ccpp @@ -1 +1 @@ -Subproject commit bb7c61028c1d6ead2c09b2c58cfbbfb3c3638a51 +Subproject commit 4a31043bb8bd6179db3b59db4895b0563b78af88