Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
88 commits
Select commit Hold shift + click to select a range
404f961
deleted gfdl mp v1 files
RuiyuSun Jan 22, 2024
737f62a
removed the gfdlmp v1 files in the GFDL directory and moved them to v…
RuiyuSun Jan 22, 2024
57655a6
make a change in CMakeLists.txt corresponging to the moving of GFLDMP…
RuiyuSun Jan 29, 2024
ec416f7
removed GFDL directory but added GFDL_2019_v1 for GFDLMP v1 and moved…
RuiyuSun Feb 1, 2024
4026f1a
re-organized GFDLMP v1 and add v3
RuiyuSun Feb 1, 2024
23ef3b4
add GFDLMP v3
RuiyuSun Feb 1, 2024
26ac3dd
remove comment and previous tests
RuiyuSun Feb 2, 2024
deeb2cf
remove previous comments
RuiyuSun Feb 7, 2024
f61341c
remove comments in module_gfdl_cld_mp.F90
RuiyuSun Feb 7, 2024
3e31927
correct a bug
RuiyuSun Feb 7, 2024
3194de9
Merge branch 'ufs/dev' of https://github.com/ufs-community/ccpp-physi…
dustinswales Mar 18, 2024
47b8af3
refactor gfdlmp. work in progress
dustinswales Mar 19, 2024
b33604d
Some more changes
dustinswales Mar 20, 2024
3d75ef8
Merge branch 'ufs/dev' of https://github.com/ufs-community/ccpp-physi…
dustinswales Mar 20, 2024
a04c4e7
Merge branch 'ufs/dev' of https://github.com/ufs-community/ccpp-physi…
dustinswales Apr 3, 2024
c776501
Additional cleanup
dustinswales Apr 3, 2024
d65198c
Revert some changes
dustinswales Apr 3, 2024
a378a60
Revert some more changes
dustinswales Apr 3, 2024
ecc0692
Revert some even more changes
dustinswales Apr 3, 2024
4e83fde
Remove reference to gfdlmp_v3 switch in scheme file
dustinswales Apr 4, 2024
bdd4452
Some housekeeping
dustinswales Apr 12, 2024
153c9a1
Some more changes
dustinswales Apr 12, 2024
8b2d73e
Some reorg
dustinswales Apr 12, 2024
8aee3da
Some more cleanup. Nearly done
dustinswales Apr 22, 2024
3115d2c
Move gfdlmp init call to fv_sat_adj init().
dustinswales May 23, 2024
174f598
Merge branch 'ufs/dev' of https://github.com/ufs-community/ccpp-physi…
dustinswales May 23, 2024
5c43e68
Revert "Move gfdlmp init call to fv_sat_adj init()."
dustinswales May 23, 2024
45e99c9
Revert mp init move.
dustinswales May 23, 2024
ec5fcbd
Some more changes.
dustinswales Aug 26, 2024
b740df0
Merge branch 'ufs/dev' of https://github.com/ufs-community/ccpp-physi…
dustinswales Aug 26, 2024
aa23540
Some more changes.
dustinswales Oct 22, 2024
c9d4dca
Merge branch 'ufs/dev' of https://github.com/ufs-community/ccpp-physi…
dustinswales Oct 22, 2024
ec60776
Some of the last changes
dustinswales Nov 7, 2024
c05ed51
More changes!
dustinswales Nov 7, 2024
f7d8dbe
Final updates
dustinswales Nov 13, 2024
ab9aa26
Merge branch 'ufs/dev' of https://github.com/ufs-community/ccpp-physi…
dustinswales Nov 13, 2024
e9159cf
Cleanup module
dustinswales Nov 14, 2024
82e87e9
More changes...
dustinswales Nov 18, 2024
768161a
Bug fix
dustinswales Nov 18, 2024
b67bdbe
Thats it!
dustinswales Nov 18, 2024
a352eb3
Merge branch 'ufs/dev' of https://github.com/ufs-community/ccpp-physi…
dustinswales Nov 18, 2024
96e5198
Bug fix from GNU compile
dustinswales Nov 19, 2024
7496933
Doh!
dustinswales Nov 21, 2024
945bd99
Merge branch 'ufs/dev' of https://github.com/ufs-community/ccpp-physi…
dustinswales Dec 16, 2024
d797cdd
Merge branch 'ufs/dev' of https://github.com/ufs-community/ccpp-physi…
dustinswales Jan 24, 2025
b43e52d
Address reviewers comments
dustinswales Jan 24, 2025
fb11da5
Initial TEMPO commit to CCPP
AndersJensen-NOAA Jan 31, 2025
a42db1d
Changes for TEMPO to be called with imp_physics option 88
AndersJensen-NOAA Feb 1, 2025
dcda3f9
Support for TEMPO aerosol-aware in CCPP
AndersJensen-NOAA Feb 2, 2025
a2fc440
Couple TEMPO to radiation
AndersJensen-NOAA Feb 3, 2025
d8d35a6
Bugfix to radiation call TEMPO
AndersJensen-NOAA Feb 3, 2025
f46ecf2
Add support for TEMPO hail-aware option
AndersJensen-NOAA Feb 3, 2025
de7ebe9
Add hail-aware variables
AndersJensen-NOAA Feb 4, 2025
e1b64e4
rename module variables
AndersJensen-NOAA Feb 4, 2025
d568900
Add branch to gitmodules file
AndersJensen-NOAA Feb 4, 2025
857cd40
update TEMPO pointer to authoritative
AndersJensen-NOAA Feb 4, 2025
ddc703e
GFDL MP developer (Linjiong Zhou) provided the code changes. The fix …
dustinswales Feb 14, 2025
d9d3bcf
Merge branch 'ufs/dev' of https://github.com/ufs-community/ccpp-physi…
dustinswales Feb 14, 2025
f72ec6a
Merge branch 'ufs/dev' into feature/gfdlmpv3
grantfirl Feb 21, 2025
453ff63
Merge branch 'ufs/dev' of https://github.com/ufs-community/ccpp-physi…
dustinswales Feb 27, 2025
e412ed3
Merge branch 'feature/gfdlmpv3' of https://github.com/dustinswales/cc…
dustinswales Feb 27, 2025
704ee92
Bugfix for name conflict.
dustinswales Feb 28, 2025
450a15f
Add import reassignments to avoid error
dustinswales Mar 3, 2025
51563ff
Merge branch 'ufs/dev' of https://github.com/ufs-community/ccpp-physi…
dustinswales Mar 7, 2025
9b7f776
Merge branch 'ufs/dev' of https://github.com/ufs-community/ccpp-physi…
dustinswales Mar 12, 2025
b8ba10f
Merge branch 'ufs/dev' into tempo_dev
grantfirl Mar 21, 2025
7e47fa8
set TEMPO constants from host
grantfirl Mar 25, 2025
80687df
Merge branch 'ufs/dev' into tempo_dev
grantfirl Mar 25, 2025
cf80fd9
Merge branch 'ufs/dev' into tempo_dev_gjf
grantfirl Mar 25, 2025
279f1b1
Merge branch 'tempo_dev_gjf' into tempo_dev
grantfirl Mar 25, 2025
d9d9bf4
add re-initialization lines for am_i and am_g in mp_tempo_init (forgo…
grantfirl Mar 26, 2025
90d7d54
update TEMPO to latest main branch
grantfirl Mar 28, 2025
fa39282
Merge branch 'ufs/dev' into feature/gfdlmpv3
grantfirl Mar 28, 2025
137d7d0
Merge branch 'ufs/dev' of https://github.com/ufs-community/ccpp-physi…
dustinswales Apr 18, 2025
ffcafd2
Merge branch 'feature/gfdlmpv3' of https://github.com/dustinswales/cc…
dustinswales Apr 18, 2025
f7fa2e2
Merge branch 'ufs/dev' of https://github.com/ufs-community/ccpp-physi…
dustinswales Apr 25, 2025
7c95666
Merge branch 'ufs/dev' into tempo_dev
grantfirl May 2, 2025
98ac976
Merge branch 'ufs/dev' of https://github.com/ufs-community/ccpp-physi…
dustinswales May 2, 2025
73b851b
Remove PP directive
May 15, 2025
6eea755
Merge branch 'ufs/dev' into feature/gfdlmpv3
grantfirl Jun 26, 2025
6e92022
Merge branch 'ufs/dev' of https://github.com/ufs-community/ccpp-physi…
dustinswales Jun 30, 2025
b84dc41
Merge branch 'ufs/dev' of https://github.com/ufs-community/ccpp-physi…
dustinswales Jul 2, 2025
6e1a2ba
Update TEMPO submodule hash
dustinswales Jul 2, 2025
214f46a
Merge branch 'tempo_dev' of https://github.com/AndersJensen-NOAA/ccpp…
dustinswales Jul 2, 2025
c86be50
Merge pull request #295 from grantfirl/combo_20250625
rhaesung Jul 11, 2025
633e9ed
Merge branch 'ufs/dev' into feature/gfdlmpv3
grantfirl Jul 11, 2025
db52243
Merge branch 'feature/gfdlmpv3' into ufs-dev-PR195
grantfirl Aug 6, 2025
041e7b3
address reviewer's comments
grantfirl Aug 26, 2025
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
4 changes: 4 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,7 @@
path = physics/Radiation/RRTMGP/rte-rrtmgp
url = https://github.com/earth-system-radiation/rte-rrtmgp
branch = main
[submodule "physics/MP/TEMPO/TEMPO"]
path = physics/MP/TEMPO/TEMPO
url = https://github.com/NCAR/TEMPO
branch = main
6 changes: 4 additions & 2 deletions CODEOWNERS
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,10 @@ physics/GWD/ugwpv1_gsldrag_post.* @md
physics/GWD/unified_ugwp* @mdtoyNOAA @grantfirl @rhaesung @Qingfu-Liu @dustinswales
physics/MP/Ferrier_Aligo/module_MP_FER_HIRES.* @ericaligo-NOAA @grantfirl @rhaesung @Qingfu-Liu @dustinswales
physics/MP/Ferrier_Aligo/mp_fer_hires.* @ericaligo-NOAA @grantfirl @rhaesung @Qingfu-Liu @dustinswales
physics/MP/GFDL/gfdl_cloud_microphys.* @RuiyuSun @grantfirl @rhaesung @Qingfu-Liu @dustinswales
physics/MP/GFDL/module_gfdl_cloud_microphys.* @RuiyuSun @grantfirl @rhaesung @Qingfu-Liu @dustinswales
physics/MP/GFDL/v1_2019/gfdl_cloud_microphys.* @RuiyuSun @grantfirl @rhaesung @Qingfu-Liu @dustinswales
physics/MP/GFDL/v1_2019/gfdl_cloud_microphys_mod.* @RuiyuSun @grantfirl @rhaesung @Qingfu-Liu @dustinswales
physics/MP/GFDL/v3_2022/gfdl_cloud_microphys_v3.* @RuiyuSun @grantfirl @rhaesung @Qingfu-Liu @dustinswales
physics/MP/GFDL/v3_2022/gfdl_cloud_microphys_v3_mod.* @RuiyuSun @grantfirl @rhaesung @Qingfu-Liu @dustinswales
physics/MP/GFDL/fv_sat_adj.* @RuiyuSun @grantfirl @rhaesung @Qingfu-Liu @dustinswales
physics/MP/GFDL/multi_gases.F90 @RuiyuSun @grantfirl @rhaesung @Qingfu-Liu @dustinswales
physics/MP/Morrison_Gettelman/aer_cloud.F @AnningCheng-NOAA @andrewgettelman @grantfirl @rhaesung @Qingfu-Liu @dustinswales
Expand Down
28 changes: 15 additions & 13 deletions physics/Interstitials/UFS_SCM_NEPTUNE/GFS_MP_generic_post.F90
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,13 @@ module GFS_MP_generic_post
!! \htmlinclude GFS_MP_generic_post_run.html
!!
subroutine GFS_MP_generic_post_run( &
im, levs, kdt, nrcm, nncl, ntcw, ntrac, imp_physics, imp_physics_gfdl, imp_physics_thompson, imp_physics_nssl, &
imp_physics_mg, imp_physics_fer_hires, cal_pre, cplflx, cplchm, cpllnd, progsigma, con_g, rhowater, rainmin, dtf, &
frain, rainc, rain1, rann, xlat, xlon, gt0, gq0, prsl, prsi, phii, tsfc, ice, phil, htop, refl_10cm, &
imfshalcnv,imfshalcnv_gf,imfdeepcnv,imfdeepcnv_gf,imfdeepcnv_samf, con_t0c, snow, graupel, save_t, save_q, &
rain0, ice0, snow0, graupel0, del, rain, domr_diag, domzr_diag, domip_diag, doms_diag, tprcp, srflag, sr, cnvprcp,&
totprcp, totice, totsnw, totgrp, cnvprcpb, totprcpb, toticeb, totsnwb, totgrpb, rain_cpl, rainc_cpl, snow_cpl, &
pwat, frzr, frzrb, frozr, frozrb, tsnowp, tsnowpb, rhonewsn1, exticeden, &
im, levs, kdt, nrcm, nncl, ntcw, ntrac, imp_physics, imp_physics_gfdl, imp_physics_thompson, imp_physics_tempo, &
imp_physics_nssl, imp_physics_mg, imp_physics_fer_hires, cal_pre, cplflx, cplchm, cpllnd, progsigma, con_g, &
rhowater, rainmin, dtf, frain, rainc, rain1, rann, xlat, xlon, gt0, gq0, prsl, prsi, phii, tsfc, ice, phil, htop, &
refl_10cm, imfshalcnv,imfshalcnv_gf,imfdeepcnv,imfdeepcnv_gf,imfdeepcnv_samf, con_t0c, snow, graupel, save_t, &
save_q, rain0, ice0, snow0, graupel0, del, rain, domr_diag, domzr_diag, domip_diag, doms_diag, tprcp, srflag, sr, &
cnvprcp, totprcp, totice, totsnw, totgrp, cnvprcpb, totprcpb, toticeb, totsnwb, totgrpb, rain_cpl, rainc_cpl, &
snow_cpl, pwat, frzr, frzrb, frozr, frozrb, tsnowp, tsnowpb, rhonewsn1, exticeden, &
drain_cpl, dsnow_cpl, lsm, lsm_ruc, lsm_noahmp, raincprv, rainncprv, iceprv, snowprv, &
graupelprv, draincprv, drainncprv, diceprv, dsnowprv, dgraupelprv, dtp, &
dtend, dtidx, index_of_temperature, index_of_process_mp,ldiag3d, qdiag3d,dqdt_qmicro, lssav, num_dfi_radar, &
Expand All @@ -35,7 +35,7 @@ subroutine GFS_MP_generic_post_run(

integer, intent(in) :: im, levs, kdt, nrcm, nncl, ntcw, ntrac, num_dfi_radar, index_of_process_dfi_radar
integer, intent(in) :: imp_physics, imp_physics_gfdl, imp_physics_thompson, imp_physics_mg, imp_physics_fer_hires
integer, intent(in) :: imp_physics_nssl, iopt_lake_clm, iopt_lake, lkm
integer, intent(in) :: imp_physics_nssl, iopt_lake_clm, iopt_lake, lkm, imp_physics_tempo
logical, intent(in) :: cal_pre, lssav, ldiag3d, qdiag3d, cplflx, cplchm, cpllnd, progsigma, exticeden
integer, intent(in) :: index_of_temperature,index_of_process_mp,use_lake_model(:)
integer, intent(in) :: imfshalcnv,imfshalcnv_gf,imfdeepcnv,imfdeepcnv_gf,imfdeepcnv_samf
Expand Down Expand Up @@ -133,7 +133,7 @@ subroutine GFS_MP_generic_post_run(
!
! Combine convective reflectivity with MP reflectivity for selected
! parameterizations.
if ( (imp_physics==imp_physics_thompson .or. imp_physics==imp_physics_nssl) .and. &
if ( (imp_physics==imp_physics_thompson .or. imp_physics==imp_physics_tempo .or. imp_physics==imp_physics_nssl) .and. &
(imfdeepcnv==imfdeepcnv_samf .or. imfdeepcnv==imfdeepcnv_gf .or. imfshalcnv==imfshalcnv_gf) ) then
do i=1,im
factor(i) = 0.0
Expand Down Expand Up @@ -178,7 +178,8 @@ subroutine GFS_MP_generic_post_run(
endif

! compute surface snowfall, graupel/sleet, freezing rain and precip ice density
if (imp_physics == imp_physics_gfdl .or. imp_physics == imp_physics_thompson .or. imp_physics == imp_physics_nssl ) then
if (imp_physics == imp_physics_gfdl .or. imp_physics == imp_physics_thompson .or. &
imp_physics == imp_physics_tempo .or. imp_physics == imp_physics_nssl ) then
do i = 1, im
if (gt0(i,1) .le. 273) then
frzr(i) = frzr(i) + rain0(i)
Expand Down Expand Up @@ -256,7 +257,7 @@ subroutine GFS_MP_generic_post_run(
ice = ice0
snow = snow0
! Do it right from the beginning for Thompson
else if (imp_physics == imp_physics_thompson .or. imp_physics == imp_physics_nssl ) then
else if (imp_physics == imp_physics_thompson .or. imp_physics == imp_physics_tempo .or. imp_physics == imp_physics_nssl ) then
tprcp = max (zero, rainc + frain * rain1) ! time-step convective and explicit precip
graupel = frain*graupel0 ! time-step graupel
ice = frain*ice0 ! time-step ice
Expand Down Expand Up @@ -302,7 +303,8 @@ subroutine GFS_MP_generic_post_run(
!
! HCHUANG: use new precipitation type to decide snow flag for LSM snow accumulation

if (imp_physics /= imp_physics_gfdl .and. imp_physics /= imp_physics_thompson .and. imp_physics /= imp_physics_nssl) then
if (imp_physics /= imp_physics_gfdl .and. imp_physics /= imp_physics_thompson .and. &
imp_physics /= imp_physics_tempo .and. imp_physics /= imp_physics_nssl) then
do i=1,im
tprcp(i) = max(zero, rain(i) )
if(doms(i) > zero .or. domip(i) > zero) then
Expand Down Expand Up @@ -390,7 +392,7 @@ subroutine GFS_MP_generic_post_run(
!! \f$0^oC\f$.

if (imp_physics == imp_physics_gfdl .or. imp_physics == imp_physics_thompson .or. &
imp_physics == imp_physics_nssl ) then
imp_physics == imp_physics_tempo .or. imp_physics == imp_physics_nssl ) then

! determine convective rain/snow by surface temperature
! determine large-scale rain/snow by rain/snow coming out directly from MP
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,13 @@
dimensions = ()
type = integer
intent = in
[imp_physics_tempo]
standard_name = identifier_for_tempo_microphysics_scheme
long_name = choice of TEMPO microphysics scheme
units = flag
dimensions = ()
type = integer
intent = in
[imp_physics_mg]
standard_name = identifier_for_morrison_gettelman_microphysics_scheme
long_name = choice of Morrison-Gettelman microphysics scheme
Expand Down
Loading
Loading