Skip to content

Commit 2d2dfd4

Browse files
grantfirlgrantfirl
committed
Merge branch 'main' into fix_ij_logic
2 parents 850141b + d115f28 commit 2d2dfd4

19 files changed

+694
-345
lines changed

‎.github/workflows/ci_run_scm_rts.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ jobs:
2222
sp_ROOT: /home/runner/NCEPLIBS-sp
2323
w3emc_ROOT: /home/runner/myw3emc
2424
SCM_ROOT: /home/runner/work/ccpp-scm/ccpp-scm
25-
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
26-
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
25+
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
26+
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
2727
dir_rt: /home/runner/work/ccpp-scm/ccpp-scm/test/artifact-${{matrix.build-type}}
2828
dir_bl: /home/runner/work/ccpp-scm/ccpp-scm/test/BL-${{matrix.build-type}}
2929

‎CODEOWNERS‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
# These owners will be the default owners for everything in the repo.
55
#* @defunkt
6-
* @dustinswales @grantfirl @mkavulich
6+
* @dustinswales @grantfirl @mkavulich @scrasmussen @hertneky
77

88
# Order is important. The last matching pattern has the most precedence.
99
# So if a pull request only touches javascript files, only these owners

‎ccpp/config/ccpp_prebuild_config.py‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
'ccpp/physics/physics/Radiation/RRTMG/radlw_param.f',
2222
'ccpp/physics/physics/photochem/module_ozphys.F90',
2323
'ccpp/physics/physics/photochem/module_h2ophys.F90',
24+
'ccpp/physics/physics/SFC_Models/Land/Noahmp/lnd_iau_mod.F90',
2425
'ccpp/physics/physics/Interstitials/UFS_SCM_NEPTUNE/module_ccpp_suite_simulator.F90',
2526
'scm/src/CCPP_typedefs.F90',
2627
'scm/src/GFS_typedefs.F90',
@@ -53,6 +54,12 @@
5354
'module_h2ophys' : '',
5455
'ty_h2ophys' : '',
5556
},
57+
'land_iau_mod' : {
58+
'land_iau_mod' : '',
59+
'land_iau_external_data_type' : '',
60+
'land_iau_state_type' : '',
61+
'land_iau_control_type' : '',
62+
},
5663
'CCPP_typedefs' : {
5764
'GFS_interstitial_type' : 'physics%Interstitial(cdata%thrd_no)',
5865
'CCPP_typedefs' : '',

‎ccpp/framework‎

Submodule framework updated 118 files

‎ccpp/physics‎

Submodule physics updated 41 files

‎ccpp/physics_namelists/input_GFS_v15p2_ntiedtke.nml‎

Lines changed: 113 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,113 @@
1+
&gfs_physics_nml
2+
fhzero = 0.16667
3+
h2o_phys = .true.
4+
ldiag3d = .true.
5+
qdiag3d = .true.
6+
fhcyc = 24.
7+
use_ufo = .true.
8+
pre_rad = .false.
9+
imp_physics = 11
10+
pdfcld = .false.
11+
fhswr = 3600.
12+
fhlwr = 3600.
13+
ialb = 1
14+
iems = 1
15+
iaer = 111
16+
ico2 = 2
17+
isubc_sw = 2
18+
isubc_lw = 2
19+
isol = 2
20+
lwhtr = .true.
21+
swhtr = .true.
22+
cnvgwd = .true.
23+
shal_cnv = .true.
24+
cal_pre = .false.
25+
redrag = .true.
26+
dspheat = .true.
27+
hybedmf = .true.
28+
random_clds = .false.
29+
trans_trac = .true.
30+
cnvcld = .true.
31+
imfshalcnv = 4
32+
imfdeepcnv = 4
33+
cdmbgwd = 3.5,0.25
34+
prslrd0 = 0.
35+
ivegsrc = 1
36+
isot = 1
37+
debug = .false.
38+
oz_phys = .false.
39+
oz_phys_2015 = .true.
40+
nstf_name = 2,1,0,0,0
41+
nst_anl = .true.
42+
psautco = 0.0008,0.0005
43+
prautco = 0.00015,0.00015
44+
lgfdlmprad = .true.
45+
effr_in = .true.
46+
do_sppt = .false.
47+
do_shum = .false.
48+
do_skeb = .false.
49+
/
50+
51+
&gfdl_cloud_microphysics_nml
52+
sedi_transport = .true.
53+
do_sedi_heat = .false.
54+
rad_snow = .true.
55+
rad_graupel = .true.
56+
rad_rain = .true.
57+
const_vi = .F.
58+
const_vs = .F.
59+
const_vg = .F.
60+
const_vr = .F.
61+
vi_max = 1.
62+
vs_max = 2.
63+
vg_max = 12.
64+
vr_max = 12.
65+
qi_lim = 1.
66+
prog_ccn = .false.
67+
do_qa = .false.
68+
fast_sat_adj = .false.
69+
tau_l2v = 225.
70+
tau_v2l = 150.
71+
tau_g2v = 900.
72+
rthresh = 10.e-6 ! This is a key parameter for cloud water
73+
dw_land = 0.16
74+
dw_ocean = 0.10
75+
ql_gen = 1.0e-3
76+
ql_mlt = 1.0e-3
77+
qi0_crt = 8.0E-5
78+
qs0_crt = 1.0e-3
79+
tau_i2s = 1000.
80+
c_psaci = 0.05
81+
c_pgacs = 0.01
82+
rh_inc = 0.30
83+
rh_inr = 0.30
84+
rh_ins = 0.30
85+
ccn_l = 300.
86+
ccn_o = 100.
87+
c_paut = 0.5
88+
c_cracw = 0.8
89+
use_ppm = .false.
90+
use_ccn = .true.
91+
mono_prof = .true.
92+
z_slope_liq = .true.
93+
z_slope_ice = .true.
94+
de_ice = .false.
95+
fix_negative = .true.
96+
icloud_f = 1
97+
mp_time = 150.
98+
/
99+
100+
&cires_ugwp_nml
101+
knob_ugwp_solver = 2
102+
knob_ugwp_source = 1,1,0,0
103+
knob_ugwp_wvspec = 1,25,25,25
104+
knob_ugwp_azdir = 2,4,4,4
105+
knob_ugwp_stoch = 0,0,0,0
106+
knob_ugwp_effac = 1,1,1,1
107+
knob_ugwp_doaxyz = 1
108+
knob_ugwp_doheat = 1
109+
knob_ugwp_dokdis = 1
110+
knob_ugwp_ndx4lh = 1
111+
knob_ugwp_version = 0
112+
launch_level = 25
113+
/

‎ccpp/physics_namelists/input_HRRR_gf.nml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@
117117
sfclay_compute_flux = .true.
118118
shal_cnv = .false.
119119
smoke_conv_wet_coef = 0.5, 0.5, 0.5
120-
smoke_forecast = 1
120+
hwp_method = 1
121121
swhtr = .true.
122122
thsfc_loc = .false.
123123
trans_trac = .true.

‎ccpp/suites/suite_SCM_GFS_v15p2_ntiedtke.xml‎

Lines changed: 83 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,83 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
3+
<suite name="SCM_GFS_v15p2_ntiedtke" version="1">
4+
<!-- <init></init> -->
5+
<group name="time_vary">
6+
<subcycle loop="1">
7+
<scheme>GFS_time_vary_pre</scheme>
8+
<scheme>GFS_rrtmg_setup</scheme>
9+
<scheme>GFS_rad_time_vary</scheme>
10+
<scheme>GFS_phys_time_vary</scheme>
11+
</subcycle>
12+
</group>
13+
<group name="radiation">
14+
<subcycle loop="1">
15+
<scheme>GFS_suite_interstitial_rad_reset</scheme>
16+
<scheme>GFS_rrtmg_pre</scheme>
17+
<scheme>GFS_radiation_surface</scheme>
18+
<scheme>rad_sw_pre</scheme>
19+
<scheme>rrtmg_sw</scheme>
20+
<scheme>rrtmg_sw_post</scheme>
21+
<scheme>rrtmg_lw</scheme>
22+
<scheme>rrtmg_lw_post</scheme>
23+
<scheme>GFS_rrtmg_post</scheme>
24+
</subcycle>
25+
</group>
26+
<group name="physics">
27+
<subcycle loop="1">
28+
<scheme>GFS_suite_interstitial_phys_reset</scheme>
29+
<scheme>GFS_suite_stateout_reset</scheme>
30+
<scheme>get_prs_fv3</scheme>
31+
<scheme>GFS_suite_interstitial_1</scheme>
32+
<scheme>GFS_surface_generic_pre</scheme>
33+
<scheme>GFS_surface_composites_pre</scheme>
34+
<scheme>dcyc2t3</scheme>
35+
<scheme>GFS_surface_composites_inter</scheme>
36+
<scheme>GFS_suite_interstitial_2</scheme>
37+
</subcycle>
38+
<!-- Surface iteration loop -->
39+
<subcycle loop="2">
40+
<scheme>sfc_diff</scheme>
41+
<scheme>GFS_surface_loop_control_part1</scheme>
42+
<scheme>sfc_nst_pre</scheme>
43+
<scheme>sfc_nst</scheme>
44+
<scheme>sfc_nst_post</scheme>
45+
<scheme>lsm_noah</scheme>
46+
<scheme>sfc_sice</scheme>
47+
<scheme>GFS_surface_loop_control_part2</scheme>
48+
</subcycle>
49+
<!-- End of surface iteration loop -->
50+
<subcycle loop="1">
51+
<scheme>GFS_surface_composites_post</scheme>
52+
<scheme>sfc_diag</scheme>
53+
<scheme>sfc_diag_post</scheme>
54+
<scheme>GFS_surface_generic_post</scheme>
55+
<scheme>GFS_PBL_generic_pre</scheme>
56+
<scheme>hedmf</scheme>
57+
<scheme>GFS_PBL_generic_post</scheme>
58+
<scheme>GFS_GWD_generic_pre</scheme>
59+
<scheme>cires_ugwp</scheme>
60+
<scheme>cires_ugwp_post</scheme>
61+
<scheme>GFS_GWD_generic_post</scheme>
62+
<scheme>GFS_suite_stateout_update</scheme>
63+
<scheme>GFS_photochemistry</scheme>
64+
<scheme>get_phi_fv3</scheme>
65+
<scheme>GFS_suite_interstitial_3</scheme>
66+
<scheme>GFS_DCNV_generic_pre</scheme>
67+
<scheme>cu_ntiedtke_pre</scheme>
68+
<scheme>cu_ntiedtke</scheme>
69+
<scheme>GFS_DCNV_generic_post</scheme>
70+
<scheme>GFS_SCNV_generic_pre</scheme>
71+
<scheme>GFS_SCNV_generic_post</scheme>
72+
<scheme>GFS_suite_interstitial_4</scheme>
73+
<scheme>cnvc90</scheme>
74+
<scheme>GFS_MP_generic_pre</scheme>
75+
<scheme>gfdl_cloud_microphys</scheme>
76+
<scheme>GFS_MP_generic_post</scheme>
77+
<scheme>cu_ntiedtke_post</scheme>
78+
<scheme>maximum_hourly_diagnostics</scheme>
79+
<scheme>GFS_physics_post</scheme>
80+
</subcycle>
81+
</group>
82+
<!-- <finalize></finalize> -->
83+
</suite>

‎ccpp/suites/suite_SCM_GFS_v15p2_ntiedtke_ps.xml‎

Lines changed: 64 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,64 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
3+
<suite name="SCM_GFS_v15p2_ntiedtke_ps" version="1">
4+
<!-- <init></init> -->
5+
<group name="time_vary">
6+
<subcycle loop="1">
7+
<scheme>GFS_time_vary_pre</scheme>
8+
<scheme>GFS_rrtmg_setup</scheme>
9+
<scheme>GFS_rad_time_vary</scheme>
10+
<scheme>GFS_phys_time_vary</scheme>
11+
</subcycle>
12+
</group>
13+
<group name="radiation">
14+
<subcycle loop="1">
15+
<scheme>GFS_suite_interstitial_rad_reset</scheme>
16+
<scheme>GFS_rrtmg_pre</scheme>
17+
<scheme>GFS_radiation_surface</scheme>
18+
<scheme>rad_sw_pre</scheme>
19+
<scheme>rrtmg_sw</scheme>
20+
<scheme>rrtmg_sw_post</scheme>
21+
<scheme>rrtmg_lw</scheme>
22+
<scheme>rrtmg_lw_post</scheme>
23+
<scheme>GFS_rrtmg_post</scheme>
24+
</subcycle>
25+
</group>
26+
<group name="physics">
27+
<subcycle loop="1">
28+
<scheme>GFS_suite_interstitial_phys_reset</scheme>
29+
<scheme>GFS_suite_stateout_reset</scheme>
30+
<scheme>get_prs_fv3</scheme>
31+
<scheme>GFS_suite_interstitial_1</scheme>
32+
<scheme>GFS_surface_generic_pre</scheme>
33+
<scheme>scm_sfc_flux_spec</scheme>
34+
<scheme>dcyc2t3</scheme>
35+
<scheme>GFS_suite_interstitial_2</scheme>
36+
<scheme>GFS_PBL_generic_pre</scheme>
37+
<scheme>hedmf</scheme>
38+
<scheme>GFS_PBL_generic_post</scheme>
39+
<scheme>GFS_GWD_generic_pre</scheme>
40+
<scheme>cires_ugwp</scheme>
41+
<scheme>cires_ugwp_post</scheme>
42+
<scheme>GFS_GWD_generic_post</scheme>
43+
<scheme>GFS_suite_stateout_update</scheme>
44+
<scheme>GFS_photochemistry</scheme>
45+
<scheme>get_phi_fv3</scheme>
46+
<scheme>GFS_suite_interstitial_3</scheme>
47+
<scheme>GFS_DCNV_generic_pre</scheme>
48+
<scheme>cu_ntiedtke_pre</scheme>
49+
<scheme>cu_ntiedtke</scheme>
50+
<scheme>GFS_DCNV_generic_post</scheme>
51+
<scheme>GFS_SCNV_generic_pre</scheme>
52+
<scheme>GFS_SCNV_generic_post</scheme>
53+
<scheme>GFS_suite_interstitial_4</scheme>
54+
<scheme>cnvc90</scheme>
55+
<scheme>GFS_MP_generic_pre</scheme>
56+
<scheme>gfdl_cloud_microphys</scheme>
57+
<scheme>GFS_MP_generic_post</scheme>
58+
<scheme>cu_ntiedtke_post</scheme>
59+
<scheme>maximum_hourly_diagnostics</scheme>
60+
<scheme>GFS_physics_post</scheme>
61+
</subcycle>
62+
</group>
63+
<!-- <finalize></finalize> -->
64+
</suite>

‎scm/doc/TechGuide/chap_ccpp.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -380,4 +380,4 @@ called ‘smoke’.
380380
physics (``ccpp-scm/scm/src/GFS_typedefs.F90/GFS_stateout_type/gq0``). If the tracer needs to be part of these arrays, there are
381381
a few additional steps to take. If you need help, please post on the
382382
support forum at:
383-
https://dtcenter.org/forum/ccpp-user-support/ccpp-single-column-model.
383+
https://github.com/NCAR/ccpp-scm/discussions

0 commit comments

Comments
 (0)