Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions cime_config/testdefs/testlist_cam.xml
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,15 @@
<option name="comment">Test for Hack shallow convection scheme</option>
</options>
</test>
<test compset="FPHYStest" grid="ne3pg3_ne3pg3_mg37" name="SMS_Ln2" testmods="cam/outfrq_uw_shallow_derecho">
<machines>
<machine name="derecho" compiler="gnu" category="aux_sima"/>
</machines>
<options>
<option name="wallclock">00:10:00</option>
<option name="comment">Test for UW shallow convection scheme</option>
</options>
</test>
<test compset="FPHYStest" grid="ne3pg3_ne3pg3_mg37" name="SMS_Ln2" testmods="cam/outfrq_dme_adjust_derecho">
<machines>
<machine name="derecho" compiler="gnu" category="aux_sima"/>
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
./xmlchange CAM_CONFIG_OPTS="--dyn none --physics-suites convect_shallow_uw"
Original file line number Diff line number Diff line change
@@ -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

30 changes: 30 additions & 0 deletions src/data/registry.xml
Original file line number Diff line number Diff line change
Expand Up @@ -617,6 +617,20 @@
<dimensions>horizontal_dimension vertical_layer_dimension</dimensions>
<ic_file_input_names>CLDICE cnst_CLDICE</ic_file_input_names>
</variable>
<variable local_name="numliq"
standard_name="mass_number_concentration_of_cloud_liquid_wrt_moist_air_and_condensed_water"
units="kg-1" type="real" constituent="true">
<long_name>Cloud liquid number with respect to moist air plus all airborne condensates</long_name>
<dimensions>horizontal_dimension vertical_layer_dimension</dimensions>
<ic_file_input_names>NUMLIQ cnst_NUMLIQ</ic_file_input_names>
</variable>
<variable local_name="numice"
standard_name="mass_number_concentration_of_ice_wrt_moist_air_and_condensed_water"
units="kg-1" type="real" constituent="true">
<long_name>Cloud ice number with respect to moist air plus all airborne condensates</long_name>
<dimensions>horizontal_dimension vertical_layer_dimension</dimensions>
<ic_file_input_names>NUMICE cnst_NUMICE</ic_file_input_names>
</variable>
<variable local_name="rainqm"
standard_name="rain_mixing_ratio_wrt_moist_air_and_condensed_water"
units="kg kg-1" type="real" constituent="true">
Expand Down Expand Up @@ -1553,6 +1567,22 @@
<!-- only used if use_shfrc is .true. -->
<initial_value>0.0_kind_phys</initial_value>
</variable>
<variable local_name="cush"
standard_name="shallow_convective_scale_height"
units="m" type="real" kind="kind_phys"
allocatable="allocatable">
<dimensions>horizontal_dimension</dimensions>
<initial_value>0.0_kind_phys</initial_value>
<ic_file_input_names>pbuf_cush</ic_file_input_names>
</variable>
<variable local_name="tke"
standard_name="specific_turbulent_kinetic_energy_at_interfaces"
units="m2 s-2" type="real" kind="kind_phys"
allocatable="allocatable">
<dimensions>horizontal_dimension vertical_interface_dimension</dimensions>
<initial_value>0.0_kind_phys</initial_value>
<ic_file_input_names>pbuf_tke</ic_file_input_names>
</variable>

<!-- rk_stratiform microphysics/macrophysics variables - need to be kept in the CAM registry -->
<variable local_name="qcwat"
Expand Down
Loading