Skip to content

Commit

Permalink
Merge branch 'main' into fix_ij_logic
Browse files Browse the repository at this point in the history
  • Loading branch information
grantfirl committed Feb 12, 2025
2 parents 850141b + d115f28 commit 2d2dfd4
Show file tree
Hide file tree
Showing 19 changed files with 694 additions and 345 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/ci_run_scm_rts.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ jobs:
sp_ROOT: /home/runner/NCEPLIBS-sp
w3emc_ROOT: /home/runner/myw3emc
SCM_ROOT: /home/runner/work/ccpp-scm/ccpp-scm
suites: SCM_GFS_v15p2,SCM_GFS_v16,SCM_GFS_v17_p8,SCM_HRRR,SCM_RRFS_v1beta,SCM_RAP,SCM_WoFS_v0,SCM_HRRR_gf,SCM_GFS_v17_p8_ugwpv1,SCM_GFS_v16_RRTMGP,SCM_GFS_v16_debug
suites_ps: SCM_GFS_v15p2_ps,SCM_GFS_v16_ps,SCM_GFS_v17_p8_ps,SCM_HRRR_ps,SCM_RRFS_v1beta_ps,SCM_RAP_ps,SCM_WoFS_v0_ps,SCM_HRRR_gf_ps,SCM_GFS_v17_p8_ugwpv1_ps,SCM_GFS_v16_RRTMGP_ps,SCM_GFS_v16_debug_ps
suites: SCM_GFS_v15p2,SCM_GFS_v15p2_ntiedtke,SCM_GFS_v16,SCM_GFS_v17_p8,SCM_HRRR,SCM_RRFS_v1beta,SCM_RAP,SCM_WoFS_v0,SCM_HRRR_gf,SCM_GFS_v17_p8_ugwpv1,SCM_GFS_v16_RRTMGP,SCM_GFS_v16_debug
suites_ps: SCM_GFS_v15p2_ps,SCM_GFS_v15p2_ntiedtke_ps,SCM_GFS_v16_ps,SCM_GFS_v17_p8_ps,SCM_HRRR_ps,SCM_RRFS_v1beta_ps,SCM_RAP_ps,SCM_WoFS_v0_ps,SCM_HRRR_gf_ps,SCM_GFS_v17_p8_ugwpv1_ps,SCM_GFS_v16_RRTMGP_ps,SCM_GFS_v16_debug_ps
dir_rt: /home/runner/work/ccpp-scm/ccpp-scm/test/artifact-${{matrix.build-type}}
dir_bl: /home/runner/work/ccpp-scm/ccpp-scm/test/BL-${{matrix.build-type}}

Expand Down
2 changes: 1 addition & 1 deletion CODEOWNERS
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

# These owners will be the default owners for everything in the repo.
#* @defunkt
* @dustinswales @grantfirl @mkavulich
* @dustinswales @grantfirl @mkavulich @scrasmussen @hertneky

# Order is important. The last matching pattern has the most precedence.
# So if a pull request only touches javascript files, only these owners
Expand Down
7 changes: 7 additions & 0 deletions ccpp/config/ccpp_prebuild_config.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
'ccpp/physics/physics/Radiation/RRTMG/radlw_param.f',
'ccpp/physics/physics/photochem/module_ozphys.F90',
'ccpp/physics/physics/photochem/module_h2ophys.F90',
'ccpp/physics/physics/SFC_Models/Land/Noahmp/lnd_iau_mod.F90',
'ccpp/physics/physics/Interstitials/UFS_SCM_NEPTUNE/module_ccpp_suite_simulator.F90',
'scm/src/CCPP_typedefs.F90',
'scm/src/GFS_typedefs.F90',
Expand Down Expand Up @@ -53,6 +54,12 @@
'module_h2ophys' : '',
'ty_h2ophys' : '',
},
'land_iau_mod' : {
'land_iau_mod' : '',
'land_iau_external_data_type' : '',
'land_iau_state_type' : '',
'land_iau_control_type' : '',
},
'CCPP_typedefs' : {
'GFS_interstitial_type' : 'physics%Interstitial(cdata%thrd_no)',
'CCPP_typedefs' : '',
Expand Down
2 changes: 1 addition & 1 deletion ccpp/framework
Submodule framework updated 118 files
2 changes: 1 addition & 1 deletion ccpp/physics
Submodule physics updated 41 files
+3 −3 physics/CONV/Grell_Freitas/cu_gf_driver.F90
+7 −0 physics/CONV/Grell_Freitas/cu_gf_driver.meta
+3 −2 physics/CONV/Grell_Freitas/cu_gf_driver_pre.F90
+7 −0 physics/CONV/Grell_Freitas/cu_gf_driver_pre.meta
+1,582 −1,314 physics/CONV/nTiedtke/cu_ntiedtke.F90
+0 −11 physics/Interstitials/UFS_SCM_NEPTUNE/GFS_debug.F90
+11 −28 physics/Interstitials/UFS_SCM_NEPTUNE/GFS_phys_time_vary.fv3.F90
+20 −19 physics/Interstitials/UFS_SCM_NEPTUNE/GFS_phys_time_vary.fv3.meta
+1 −1 physics/Interstitials/UFS_SCM_NEPTUNE/GFS_rrtmg_pre.F90
+1 −0 physics/Interstitials/UFS_SCM_NEPTUNE/GFS_rrtmg_pre.meta
+2 −5 physics/Interstitials/UFS_SCM_NEPTUNE/sgscloud_radpre.F90
+7 −0 physics/Interstitials/UFS_SCM_NEPTUNE/sgscloud_radpre.meta
+3,112 −3,084 physics/MP/Thompson/module_mp_thompson.F90
+7 −3 physics/MP/Thompson/module_mp_thompson_make_number_concentrations.F90
+63 −3 physics/MP/Thompson/mp_thompson.F90
+88 −0 physics/MP/Thompson/mp_thompson.meta
+19 −19 physics/PBL/MYNN_EDMF/module_bl_mynn.F90
+2 −1 physics/Radiation/RRTMG/radlw_main.F90
+1 −0 physics/Radiation/RRTMG/radlw_main.meta
+2 −1 physics/Radiation/RRTMG/radsw_main.F90
+1 −0 physics/Radiation/RRTMG/radsw_main.meta
+8 −2 physics/Radiation/radiation_clouds.f
+788 −0 physics/SFC_Models/Land/Noahmp/lnd_iau_mod.F90
+58 −0 physics/SFC_Models/Land/Noahmp/lnd_iau_mod.meta
+2 −0 physics/SFC_Models/Land/Noahmp/module_sf_noahmp_glacier.F90
+24 −10 physics/SFC_Models/Land/Noahmp/module_sf_noahmplsm.F90
+295 −2 physics/SFC_Models/Land/Noahmp/noahmpdrv.F90
+227 −0 physics/SFC_Models/Land/Noahmp/noahmpdrv.meta
+4 −3 physics/SFC_Models/Land/RUC/lsm_ruc.F90
+2 −0 physics/SFC_Models/Land/RUC/lsm_ruc.meta
+4 −4 physics/SFC_Models/Land/RUC/module_sf_ruclsm.F90
+122 −25 physics/SFC_Models/Land/sfc_land.F90
+185 −3 physics/SFC_Models/Land/sfc_land.meta
+4 −2 physics/SFC_Models/SeaIce/CICE/sfc_cice.f
+1 −0 physics/SFC_Models/SeaIce/CICE/sfc_cice.meta
+59 −63 physics/smoke_dust/module_add_emiss_burn.F90
+45 −53 physics/smoke_dust/module_plumerise.F90
+40 −212 physics/smoke_dust/module_smoke_plumerise.F90
+10 −3 physics/smoke_dust/rrfs_smoke_config.F90
+189 −96 physics/smoke_dust/rrfs_smoke_wrapper.F90
+59 −26 physics/smoke_dust/rrfs_smoke_wrapper.meta
113 changes: 113 additions & 0 deletions ccpp/physics_namelists/input_GFS_v15p2_ntiedtke.nml
Original file line number Diff line number Diff line change
@@ -0,0 +1,113 @@
&gfs_physics_nml
fhzero = 0.16667
h2o_phys = .true.
ldiag3d = .true.
qdiag3d = .true.
fhcyc = 24.
use_ufo = .true.
pre_rad = .false.
imp_physics = 11
pdfcld = .false.
fhswr = 3600.
fhlwr = 3600.
ialb = 1
iems = 1
iaer = 111
ico2 = 2
isubc_sw = 2
isubc_lw = 2
isol = 2
lwhtr = .true.
swhtr = .true.
cnvgwd = .true.
shal_cnv = .true.
cal_pre = .false.
redrag = .true.
dspheat = .true.
hybedmf = .true.
random_clds = .false.
trans_trac = .true.
cnvcld = .true.
imfshalcnv = 4
imfdeepcnv = 4
cdmbgwd = 3.5,0.25
prslrd0 = 0.
ivegsrc = 1
isot = 1
debug = .false.
oz_phys = .false.
oz_phys_2015 = .true.
nstf_name = 2,1,0,0,0
nst_anl = .true.
psautco = 0.0008,0.0005
prautco = 0.00015,0.00015
lgfdlmprad = .true.
effr_in = .true.
do_sppt = .false.
do_shum = .false.
do_skeb = .false.
/

&gfdl_cloud_microphysics_nml
sedi_transport = .true.
do_sedi_heat = .false.
rad_snow = .true.
rad_graupel = .true.
rad_rain = .true.
const_vi = .F.
const_vs = .F.
const_vg = .F.
const_vr = .F.
vi_max = 1.
vs_max = 2.
vg_max = 12.
vr_max = 12.
qi_lim = 1.
prog_ccn = .false.
do_qa = .false.
fast_sat_adj = .false.
tau_l2v = 225.
tau_v2l = 150.
tau_g2v = 900.
rthresh = 10.e-6 ! This is a key parameter for cloud water
dw_land = 0.16
dw_ocean = 0.10
ql_gen = 1.0e-3
ql_mlt = 1.0e-3
qi0_crt = 8.0E-5
qs0_crt = 1.0e-3
tau_i2s = 1000.
c_psaci = 0.05
c_pgacs = 0.01
rh_inc = 0.30
rh_inr = 0.30
rh_ins = 0.30
ccn_l = 300.
ccn_o = 100.
c_paut = 0.5
c_cracw = 0.8
use_ppm = .false.
use_ccn = .true.
mono_prof = .true.
z_slope_liq = .true.
z_slope_ice = .true.
de_ice = .false.
fix_negative = .true.
icloud_f = 1
mp_time = 150.
/

&cires_ugwp_nml
knob_ugwp_solver = 2
knob_ugwp_source = 1,1,0,0
knob_ugwp_wvspec = 1,25,25,25
knob_ugwp_azdir = 2,4,4,4
knob_ugwp_stoch = 0,0,0,0
knob_ugwp_effac = 1,1,1,1
knob_ugwp_doaxyz = 1
knob_ugwp_doheat = 1
knob_ugwp_dokdis = 1
knob_ugwp_ndx4lh = 1
knob_ugwp_version = 0
launch_level = 25
/
2 changes: 1 addition & 1 deletion ccpp/physics_namelists/input_HRRR_gf.nml
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@
sfclay_compute_flux = .true.
shal_cnv = .false.
smoke_conv_wet_coef = 0.5, 0.5, 0.5
smoke_forecast = 1
hwp_method = 1
swhtr = .true.
thsfc_loc = .false.
trans_trac = .true.
Expand Down
83 changes: 83 additions & 0 deletions ccpp/suites/suite_SCM_GFS_v15p2_ntiedtke.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,83 @@
<?xml version="1.0" encoding="UTF-8"?>

<suite name="SCM_GFS_v15p2_ntiedtke" version="1">
<!-- <init></init> -->
<group name="time_vary">
<subcycle loop="1">
<scheme>GFS_time_vary_pre</scheme>
<scheme>GFS_rrtmg_setup</scheme>
<scheme>GFS_rad_time_vary</scheme>
<scheme>GFS_phys_time_vary</scheme>
</subcycle>
</group>
<group name="radiation">
<subcycle loop="1">
<scheme>GFS_suite_interstitial_rad_reset</scheme>
<scheme>GFS_rrtmg_pre</scheme>
<scheme>GFS_radiation_surface</scheme>
<scheme>rad_sw_pre</scheme>
<scheme>rrtmg_sw</scheme>
<scheme>rrtmg_sw_post</scheme>
<scheme>rrtmg_lw</scheme>
<scheme>rrtmg_lw_post</scheme>
<scheme>GFS_rrtmg_post</scheme>
</subcycle>
</group>
<group name="physics">
<subcycle loop="1">
<scheme>GFS_suite_interstitial_phys_reset</scheme>
<scheme>GFS_suite_stateout_reset</scheme>
<scheme>get_prs_fv3</scheme>
<scheme>GFS_suite_interstitial_1</scheme>
<scheme>GFS_surface_generic_pre</scheme>
<scheme>GFS_surface_composites_pre</scheme>
<scheme>dcyc2t3</scheme>
<scheme>GFS_surface_composites_inter</scheme>
<scheme>GFS_suite_interstitial_2</scheme>
</subcycle>
<!-- Surface iteration loop -->
<subcycle loop="2">
<scheme>sfc_diff</scheme>
<scheme>GFS_surface_loop_control_part1</scheme>
<scheme>sfc_nst_pre</scheme>
<scheme>sfc_nst</scheme>
<scheme>sfc_nst_post</scheme>
<scheme>lsm_noah</scheme>
<scheme>sfc_sice</scheme>
<scheme>GFS_surface_loop_control_part2</scheme>
</subcycle>
<!-- End of surface iteration loop -->
<subcycle loop="1">
<scheme>GFS_surface_composites_post</scheme>
<scheme>sfc_diag</scheme>
<scheme>sfc_diag_post</scheme>
<scheme>GFS_surface_generic_post</scheme>
<scheme>GFS_PBL_generic_pre</scheme>
<scheme>hedmf</scheme>
<scheme>GFS_PBL_generic_post</scheme>
<scheme>GFS_GWD_generic_pre</scheme>
<scheme>cires_ugwp</scheme>
<scheme>cires_ugwp_post</scheme>
<scheme>GFS_GWD_generic_post</scheme>
<scheme>GFS_suite_stateout_update</scheme>
<scheme>GFS_photochemistry</scheme>
<scheme>get_phi_fv3</scheme>
<scheme>GFS_suite_interstitial_3</scheme>
<scheme>GFS_DCNV_generic_pre</scheme>
<scheme>cu_ntiedtke_pre</scheme>
<scheme>cu_ntiedtke</scheme>
<scheme>GFS_DCNV_generic_post</scheme>
<scheme>GFS_SCNV_generic_pre</scheme>
<scheme>GFS_SCNV_generic_post</scheme>
<scheme>GFS_suite_interstitial_4</scheme>
<scheme>cnvc90</scheme>
<scheme>GFS_MP_generic_pre</scheme>
<scheme>gfdl_cloud_microphys</scheme>
<scheme>GFS_MP_generic_post</scheme>
<scheme>cu_ntiedtke_post</scheme>
<scheme>maximum_hourly_diagnostics</scheme>
<scheme>GFS_physics_post</scheme>
</subcycle>
</group>
<!-- <finalize></finalize> -->
</suite>
64 changes: 64 additions & 0 deletions ccpp/suites/suite_SCM_GFS_v15p2_ntiedtke_ps.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,64 @@
<?xml version="1.0" encoding="UTF-8"?>

<suite name="SCM_GFS_v15p2_ntiedtke_ps" version="1">
<!-- <init></init> -->
<group name="time_vary">
<subcycle loop="1">
<scheme>GFS_time_vary_pre</scheme>
<scheme>GFS_rrtmg_setup</scheme>
<scheme>GFS_rad_time_vary</scheme>
<scheme>GFS_phys_time_vary</scheme>
</subcycle>
</group>
<group name="radiation">
<subcycle loop="1">
<scheme>GFS_suite_interstitial_rad_reset</scheme>
<scheme>GFS_rrtmg_pre</scheme>
<scheme>GFS_radiation_surface</scheme>
<scheme>rad_sw_pre</scheme>
<scheme>rrtmg_sw</scheme>
<scheme>rrtmg_sw_post</scheme>
<scheme>rrtmg_lw</scheme>
<scheme>rrtmg_lw_post</scheme>
<scheme>GFS_rrtmg_post</scheme>
</subcycle>
</group>
<group name="physics">
<subcycle loop="1">
<scheme>GFS_suite_interstitial_phys_reset</scheme>
<scheme>GFS_suite_stateout_reset</scheme>
<scheme>get_prs_fv3</scheme>
<scheme>GFS_suite_interstitial_1</scheme>
<scheme>GFS_surface_generic_pre</scheme>
<scheme>scm_sfc_flux_spec</scheme>
<scheme>dcyc2t3</scheme>
<scheme>GFS_suite_interstitial_2</scheme>
<scheme>GFS_PBL_generic_pre</scheme>
<scheme>hedmf</scheme>
<scheme>GFS_PBL_generic_post</scheme>
<scheme>GFS_GWD_generic_pre</scheme>
<scheme>cires_ugwp</scheme>
<scheme>cires_ugwp_post</scheme>
<scheme>GFS_GWD_generic_post</scheme>
<scheme>GFS_suite_stateout_update</scheme>
<scheme>GFS_photochemistry</scheme>
<scheme>get_phi_fv3</scheme>
<scheme>GFS_suite_interstitial_3</scheme>
<scheme>GFS_DCNV_generic_pre</scheme>
<scheme>cu_ntiedtke_pre</scheme>
<scheme>cu_ntiedtke</scheme>
<scheme>GFS_DCNV_generic_post</scheme>
<scheme>GFS_SCNV_generic_pre</scheme>
<scheme>GFS_SCNV_generic_post</scheme>
<scheme>GFS_suite_interstitial_4</scheme>
<scheme>cnvc90</scheme>
<scheme>GFS_MP_generic_pre</scheme>
<scheme>gfdl_cloud_microphys</scheme>
<scheme>GFS_MP_generic_post</scheme>
<scheme>cu_ntiedtke_post</scheme>
<scheme>maximum_hourly_diagnostics</scheme>
<scheme>GFS_physics_post</scheme>
</subcycle>
</group>
<!-- <finalize></finalize> -->
</suite>
2 changes: 1 addition & 1 deletion scm/doc/TechGuide/chap_ccpp.rst
Original file line number Diff line number Diff line change
Expand Up @@ -380,4 +380,4 @@ called ‘smoke’.
physics (``ccpp-scm/scm/src/GFS_typedefs.F90/GFS_stateout_type/gq0``). If the tracer needs to be part of these arrays, there are
a few additional steps to take. If you need help, please post on the
support forum at:
https://dtcenter.org/forum/ccpp-user-support/ccpp-single-column-model.
https://github.com/NCAR/ccpp-scm/discussions
Loading

0 comments on commit 2d2dfd4

Please sign in to comment.