Skip to content

Commit 7f77e1c

Browse files
dustinswalesdustinswales
committed
Merge branch 'main' of https://github.com/NCAR/ccpp-physics into HEAD
2 parents 52235d0 + c9b47a4 commit 7f77e1c

32 files changed

Lines changed: 12911 additions & 269 deletions

‎.gitmodules‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,7 @@
22
path = physics/Radiation/RRTMGP/rte-rrtmgp
33
url = https://github.com/earth-system-radiation/rte-rrtmgp
44
branch = main
5+
[submodule "physics/MP/TEMPO/TEMPO"]
6+
path = physics/MP/TEMPO/TEMPO
7+
url = https://github.com/NCAR/TEMPO
8+
branch = main

‎CODEOWNERS‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,10 @@ physics/GWD/ugwpv1_gsldrag_post.* @md
3636
physics/GWD/unified_ugwp* @mdtoyNOAA @grantfirl @rhaesung @Qingfu-Liu @dustinswales
3737
physics/MP/Ferrier_Aligo/module_MP_FER_HIRES.* @ericaligo-NOAA @grantfirl @rhaesung @Qingfu-Liu @dustinswales
3838
physics/MP/Ferrier_Aligo/mp_fer_hires.* @ericaligo-NOAA @grantfirl @rhaesung @Qingfu-Liu @dustinswales
39-
physics/MP/GFDL/gfdl_cloud_microphys.* @RuiyuSun @grantfirl @rhaesung @Qingfu-Liu @dustinswales
40-
physics/MP/GFDL/module_gfdl_cloud_microphys.* @RuiyuSun @grantfirl @rhaesung @Qingfu-Liu @dustinswales
39+
physics/MP/GFDL/v1_2019/gfdl_cloud_microphys.* @RuiyuSun @grantfirl @rhaesung @Qingfu-Liu @dustinswales
40+
physics/MP/GFDL/v1_2019/gfdl_cloud_microphys_mod.* @RuiyuSun @grantfirl @rhaesung @Qingfu-Liu @dustinswales
41+
physics/MP/GFDL/v3_2022/gfdl_cloud_microphys_v3.* @RuiyuSun @grantfirl @rhaesung @Qingfu-Liu @dustinswales
42+
physics/MP/GFDL/v3_2022/gfdl_cloud_microphys_v3_mod.* @RuiyuSun @grantfirl @rhaesung @Qingfu-Liu @dustinswales
4143
physics/MP/GFDL/fv_sat_adj.* @RuiyuSun @grantfirl @rhaesung @Qingfu-Liu @dustinswales
4244
physics/MP/GFDL/multi_gases.F90 @RuiyuSun @grantfirl @rhaesung @Qingfu-Liu @dustinswales
4345
physics/MP/Morrison_Gettelman/aer_cloud.F @AnningCheng-NOAA @andrewgettelman @grantfirl @rhaesung @Qingfu-Liu @dustinswales

‎physics/Interstitials/UFS_SCM_NEPTUNE/GFS_MP_generic_post.F90‎

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,13 @@ module GFS_MP_generic_post
1616
!! \htmlinclude GFS_MP_generic_post_run.html
1717
!!
1818
subroutine GFS_MP_generic_post_run( &
19-
im, levs, kdt, nrcm, nncl, ntcw, ntrac, imp_physics, imp_physics_gfdl, imp_physics_thompson, imp_physics_nssl, &
20-
imp_physics_mg, imp_physics_fer_hires, cal_pre, cplflx, cplchm, cpllnd, progsigma, con_g, rhowater, rainmin, dtf, &
21-
frain, rainc, rain1, rann, xlat, xlon, gt0, gq0, prsl, prsi, phii, tsfc, ice, phil, htop, refl_10cm, &
22-
imfshalcnv,imfshalcnv_gf,imfdeepcnv,imfdeepcnv_gf,imfdeepcnv_samf, con_t0c, snow, graupel, save_t, save_q, &
23-
rain0, ice0, snow0, graupel0, del, rain, domr_diag, domzr_diag, domip_diag, doms_diag, tprcp, srflag, sr, cnvprcp,&
24-
totprcp, totice, totsnw, totgrp, cnvprcpb, totprcpb, toticeb, totsnwb, totgrpb, rain_cpl, rainc_cpl, snow_cpl, &
25-
pwat, frzr, frzrb, frozr, frozrb, tsnowp, tsnowpb, rhonewsn1, exticeden, &
19+
im, levs, kdt, nrcm, nncl, ntcw, ntrac, imp_physics, imp_physics_gfdl, imp_physics_thompson, imp_physics_tempo, &
20+
imp_physics_nssl, imp_physics_mg, imp_physics_fer_hires, cal_pre, cplflx, cplchm, cpllnd, progsigma, con_g, &
21+
rhowater, rainmin, dtf, frain, rainc, rain1, rann, xlat, xlon, gt0, gq0, prsl, prsi, phii, tsfc, ice, phil, htop, &
22+
refl_10cm, imfshalcnv,imfshalcnv_gf,imfdeepcnv,imfdeepcnv_gf,imfdeepcnv_samf, con_t0c, snow, graupel, save_t, &
23+
save_q, rain0, ice0, snow0, graupel0, del, rain, domr_diag, domzr_diag, domip_diag, doms_diag, tprcp, srflag, sr, &
24+
cnvprcp, totprcp, totice, totsnw, totgrp, cnvprcpb, totprcpb, toticeb, totsnwb, totgrpb, rain_cpl, rainc_cpl, &
25+
snow_cpl, pwat, frzr, frzrb, frozr, frozrb, tsnowp, tsnowpb, rhonewsn1, exticeden, &
2626
drain_cpl, dsnow_cpl, lsm, ilsm_ruc, ilsm_noahmp, raincprv, rainncprv, iceprv, snowprv, &
2727
graupelprv, draincprv, drainncprv, diceprv, dsnowprv, dgraupelprv, dtp, dfi_radar_max_intervals, &
2828
dtend, dtidx, index_of_temperature, index_of_process_mp,ldiag3d, qdiag3d,dqdt_qmicro, lssav, num_dfi_radar, &
@@ -35,7 +35,7 @@ subroutine GFS_MP_generic_post_run(
3535

3636
integer, intent(in) :: im, levs, kdt, nrcm, nncl, ntcw, ntrac, num_dfi_radar, index_of_process_dfi_radar
3737
integer, intent(in) :: imp_physics, imp_physics_gfdl, imp_physics_thompson, imp_physics_mg, imp_physics_fer_hires
38-
integer, intent(in) :: imp_physics_nssl, iopt_lake_clm, iopt_lake, lkm
38+
integer, intent(in) :: imp_physics_nssl, iopt_lake_clm, iopt_lake, lkm, imp_physics_tempo
3939
logical, intent(in) :: cal_pre, lssav, ldiag3d, qdiag3d, cplflx, cplchm, cpllnd, progsigma, exticeden
4040
integer, intent(in) :: index_of_temperature,index_of_process_mp,use_lake_model(:)
4141
integer, intent(in) :: imfshalcnv,imfshalcnv_gf,imfdeepcnv,imfdeepcnv_gf,imfdeepcnv_samf
@@ -134,7 +134,7 @@ subroutine GFS_MP_generic_post_run(
134134
!
135135
! Combine convective reflectivity with MP reflectivity for selected
136136
! parameterizations.
137-
if ( (imp_physics==imp_physics_thompson .or. imp_physics==imp_physics_nssl) .and. &
137+
if ( (imp_physics==imp_physics_thompson .or. imp_physics==imp_physics_tempo .or. imp_physics==imp_physics_nssl) .and. &
138138
(imfdeepcnv==imfdeepcnv_samf .or. imfdeepcnv==imfdeepcnv_gf .or. imfshalcnv==imfshalcnv_gf) ) then
139139
do i=1,im
140140
factor(i) = 0.0
@@ -179,7 +179,8 @@ subroutine GFS_MP_generic_post_run(
179179
endif
180180

181181
! compute surface snowfall, graupel/sleet, freezing rain and precip ice density
182-
if (imp_physics == imp_physics_gfdl .or. imp_physics == imp_physics_thompson .or. imp_physics == imp_physics_nssl ) then
182+
if (imp_physics == imp_physics_gfdl .or. imp_physics == imp_physics_thompson .or. &
183+
imp_physics == imp_physics_tempo .or. imp_physics == imp_physics_nssl ) then
183184
do i = 1, im
184185
if (gt0(i,1) .le. 273) then
185186
frzr(i) = frzr(i) + rain0(i)
@@ -257,7 +258,7 @@ subroutine GFS_MP_generic_post_run(
257258
ice = ice0
258259
snow = snow0
259260
! Do it right from the beginning for Thompson
260-
else if (imp_physics == imp_physics_thompson .or. imp_physics == imp_physics_nssl ) then
261+
else if (imp_physics == imp_physics_thompson .or. imp_physics == imp_physics_tempo .or. imp_physics == imp_physics_nssl ) then
261262
tprcp = max (zero, rainc + frain * rain1) ! time-step convective and explicit precip
262263
graupel = frain*graupel0 ! time-step graupel
263264
ice = frain*ice0 ! time-step ice
@@ -303,7 +304,8 @@ subroutine GFS_MP_generic_post_run(
303304
!
304305
! HCHUANG: use new precipitation type to decide snow flag for LSM snow accumulation
305306

306-
if (imp_physics /= imp_physics_gfdl .and. imp_physics /= imp_physics_thompson .and. imp_physics /= imp_physics_nssl) then
307+
if (imp_physics /= imp_physics_gfdl .and. imp_physics /= imp_physics_thompson .and. &
308+
imp_physics /= imp_physics_tempo .and. imp_physics /= imp_physics_nssl) then
307309
do i=1,im
308310
tprcp(i) = max(zero, rain(i) )
309311
if(doms(i) > zero .or. domip(i) > zero) then
@@ -391,7 +393,7 @@ subroutine GFS_MP_generic_post_run(
391393
!! \f$0^oC\f$.
392394

393395
if (imp_physics == imp_physics_gfdl .or. imp_physics == imp_physics_thompson .or. &
394-
imp_physics == imp_physics_nssl ) then
396+
imp_physics == imp_physics_tempo .or. imp_physics == imp_physics_nssl ) then
395397

396398
! determine convective rain/snow by surface temperature
397399
! determine large-scale rain/snow by rain/snow coming out directly from MP

‎physics/Interstitials/UFS_SCM_NEPTUNE/GFS_MP_generic_post.meta‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,13 @@
7878
dimensions = ()
7979
type = integer
8080
intent = in
81+
[imp_physics_tempo]
82+
standard_name = identifier_for_tempo_microphysics_scheme
83+
long_name = choice of TEMPO microphysics scheme
84+
units = flag
85+
dimensions = ()
86+
type = integer
87+
intent = in
8188
[imp_physics_nssl]
8289
standard_name = identifier_for_nssl_microphysics_scheme
8390
long_name = choice of NSSL 2-moment microphysics scheme

0 commit comments

Comments
 (0)