Skip to content

ufs-dev PR303 #618

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
grantfirl merged 3 commits into from
Sep 23, 2025
Merged

ufs-dev PR303 #618

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bfb4e79
updates from ufs/dev PR303
hertneky Sep 17, 2025
be6b8f4
Merge branch 'main' into ufs-dev-PR303
grantfirl Sep 23, 2025
4553ac7
update ccpp/physics after merge
grantfirl Sep 23, 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: 2 additions & 2 deletions .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
branch = main
[submodule "ccpp-physics"]
path = ccpp/physics
url = https://github.com/NCAR/ccpp-physics
branch = main
url = https://github.com/hertneky/ccpp-physics
branch = ufs-dev-PR303
[submodule "CMakeModules"]
path = CMakeModules
url = https://github.com/noaa-emc/CMakeModules
Expand Down
2 changes: 1 addition & 1 deletion ccpp/physics
Open in desktop
Submodule physics updated 4 files
+4 −14 physics/PBL/SATMEDMF/mfscuq.f
+433 −430 physics/PBL/SATMEDMF/satmedmfvdifq.F
+7 −0 physics/PBL/SATMEDMF/satmedmfvdifq.meta
+4 −14 physics/PBL/mfpbltq.f
20 changes: 13 additions & 7 deletions scm/src/GFS_typedefs.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,11 +162,11 @@ module GFS_typedefs
real (kind=kind_phys), pointer :: vvl (:,:) => null() !< layer mean vertical velocity in pa/sec
real (kind=kind_phys), pointer :: tgrs (:,:) => null() !< model layer mean temperature in k
real (kind=kind_phys), pointer :: qgrs (:,:,:) => null() !< layer mean tracer concentration
!3D-SA-TKE
!SA-3D-TKE
real (kind=kind_phys), pointer :: def_1 (:,:) => null() !< deformation
real (kind=kind_phys), pointer :: def_2 (:,:) => null() !< deformation
real (kind=kind_phys), pointer :: def_3 (:,:) => null() !< deformation
!3D-SA-TKE-end
!SA-3D-TKE-end
! dissipation estimate
real (kind=kind_phys), pointer :: diss_est(:,:) => null() !< model layer mean temperature in k
! soil state variables - for soil SPPT - sfc-perts, mgehne
Expand Down Expand Up @@ -1188,6 +1188,8 @@ module GFS_typedefs
logical :: hybedmf !< flag for hybrid edmf pbl scheme
logical :: satmedmf !< flag for scale-aware TKE-based moist edmf
!< vertical turbulent mixing scheme
logical :: tte_edmf !< flag for scale-aware TTE-based moist edmf
!< vertical turbulent mixing scheme
logical :: shinhong !< flag for scale-aware Shinhong vertical turbulent mixing scheme
logical :: do_ysu !< flag for YSU turbulent mixing scheme
logical :: acm !< flag for ACM turbulent mixing scheme
Expand Down Expand Up @@ -2322,21 +2324,21 @@ subroutine statein_create (Statein, Model)
allocate (Statein%wgrs (IM,Model%levs))
endif
allocate (Statein%qgrs (IM,Model%levs,Model%ntrac))
!3D-SA-TKE
!SA-3D-TKE
allocate (Statein%def_1 (IM,Model%levs))
allocate (Statein%def_2 (IM,Model%levs))
allocate (Statein%def_3 (IM,Model%levs))
!3D-SA-TKE-end
!SA-3D-TKE-end

Statein%qgrs = clear_val
Statein%pgr = clear_val
Statein%ugrs = clear_val
Statein%vgrs = clear_val
!3D-SA-TKE
!SA-3D-TKE
Statein%def_1 = clear_val
Statein%def_2 = clear_val
Statein%def_3 = clear_val
!3D-SA-TKE-end
!SA-3D-TKE-end

if(Model%lightning_threat) then
Statein%wgrs = clear_val
Expand Down Expand Up @@ -3798,6 +3800,8 @@ subroutine control_initialize (Model, nlunit, fn_nml, me, &
logical :: hybedmf = .false. !< flag for hybrid edmf pbl scheme
logical :: satmedmf = .false. !< flag for scale-aware TKE-based moist edmf
!< vertical turbulent mixing scheme
logical :: tte_edmf = .false. !< flag for scale-aware TTE-based moist edmf
!< vertical turbulent mixing scheme
logical :: shinhong = .false. !< flag for scale-aware Shinhong vertical turbulent mixing scheme
logical :: do_ysu = .false. !< flag for YSU vertical turbulent mixing scheme
logical :: acm = .false. !< flag for ACM vertical turbulent mixing scheme
Expand Down Expand Up @@ -4234,7 +4238,7 @@ subroutine control_initialize (Model, nlunit, fn_nml, me, &
do_myjsfc, do_myjpbl, &
hwrf_samfdeep, hwrf_samfshal,progsigma,progomega,betascu, &
betamcu, betadcu,h2o_phys, pdfcld, shcnvcw, redrag, &
hybedmf, satmedmf, sigmab_coldstart, &
hybedmf, satmedmf, tte_edmf, sigmab_coldstart, &
shinhong, do_ysu, dspheat, lheatstrg, lseaspray, cnvcld, &
xr_cnvcld, random_clds, shal_cnv, imfshalcnv, imfdeepcnv, &
isatmedmf, conv_cf_opt, do_deep, jcap, &
Expand Down Expand Up @@ -5207,6 +5211,7 @@ subroutine control_initialize (Model, nlunit, fn_nml, me, &
Model%redrag = redrag
Model%hybedmf = hybedmf
Model%satmedmf = satmedmf
Model%tte_edmf = tte_edmf
Model%shinhong = shinhong
Model%do_ysu = do_ysu
Model%acm = acm
Expand Down Expand Up @@ -7135,6 +7140,7 @@ subroutine control_print(Model)
print *, ' redrag : ', Model%redrag
print *, ' hybedmf : ', Model%hybedmf
print *, ' satmedmf : ', Model%satmedmf
print *, ' tte_edmf : ', Model%tte_edmf
print *, ' isatmedmf : ', Model%isatmedmf
print *, ' shinhong : ', Model%shinhong
print *, ' do_ysu : ', Model%do_ysu
Expand Down
6 changes: 6 additions & 0 deletions scm/src/GFS_typedefs.meta
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5503,6 +5503,12 @@
units = flag
dimensions = ()
type = logical
[tte_edmf]
standard_name = flag_for_scale_aware_TTE_moist_EDMF_PBL
long_name = flag for scale-aware TTE moist EDMF PBL scheme
units = flag
dimensions = ()
type = logical
[shinhong]
standard_name = flag_for_scale_aware_Shinhong_PBL
long_name = flag for scale-aware Shinhong PBL scheme
Expand Down
Loading