Skip to content

UFS dev PR#232/256 #566

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
hertneky merged 5 commits into from
Mar 20, 2025
Merged

UFS dev PR#232/256 #566

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ecf3a6e
changes from fv3atm #885
hertneky Mar 11, 2025
79060d5
latest ccpp-physics
hertneky Mar 11, 2025
e813671
change initialization of tkeh
hertneky Mar 11, 2025
127425b
Merge remote-tracking branch 'NCAR-fork/main' into ufs-dev-PR232
hertneky Mar 13, 2025
e12b3f5
update ccpp/physics submodule pointer
hertneky Mar 20, 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
2 changes: 1 addition & 1 deletion ccpp/physics
Open in desktop
Submodule physics updated 13 files
+0 −1 CODEOWNERS
+3 −3 physics/CONV/C3/cu_c3_deep.F90
+3 −3 physics/CONV/C3/cu_c3_sh.F90
+23 −6 physics/CONV/SAMF/samfdeepcnv.f
+8 −0 physics/CONV/SAMF/samfdeepcnv.meta
+23 −6 physics/CONV/SAMF/samfshalcnv.f
+8 −0 physics/CONV/SAMF/samfshalcnv.meta
+60 −52 physics/CONV/progsigma_calc.f90
+0 −45 physics/MP/GFDL/GFDL_parse_tracers.F90
+4 −9 physics/MP/Morrison_Gettelman/aerinterp.F90
+8 −7 physics/PBL/SATMEDMF/satmedmfvdifq.F
+8 −0 physics/PBL/SATMEDMF/satmedmfvdifq.meta
+0 −1 physics/docs/ccpp_doxyfile
4 changes: 4 additions & 0 deletions scm/src/CCPP_typedefs.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -282,6 +282,7 @@ module CCPP_typedefs
real (kind=kind_phys), pointer :: t2mmp(:) => null() !<
real (kind=kind_phys), pointer :: theta(:) => null() !<
real (kind=kind_phys), pointer :: tlvl(:,:) => null() !<
real (kind=kind_phys), pointer :: tkeh(:,:) => null() !< vertical turbulent kinetic energy (m2/s2) at the model layer interfaces
real (kind=kind_phys), pointer :: tlyr(:,:) => null() !<
real (kind=kind_phys), pointer :: tprcp_ice(:) => null() !<
real (kind=kind_phys), pointer :: tprcp_land(:) => null() !<
Expand Down Expand Up @@ -621,6 +622,7 @@ subroutine gfs_interstitial_create (Interstitial, IM, Model)
allocate (Interstitial%stress_land (IM))
allocate (Interstitial%stress_water (IM))
allocate (Interstitial%theta (IM))
allocate (Interstitial%tkeh (IM,Model%levs+1)) !Vertical turbulent kinetic energy at model layer interfaces
allocate (Interstitial%tlvl (IM,Model%levr+1+LTP))
allocate (Interstitial%tlyr (IM,Model%levr+LTP))
allocate (Interstitial%tprcp_ice (IM))
Expand Down Expand Up @@ -970,6 +972,7 @@ subroutine gfs_interstitial_setup_tracers(Interstitial, Model)
do n=2,Model%ntrac
ltest = ( n /= Model%ntcw .and. n /= Model%ntiw .and. n /= Model%ntclamt .and. &
n /= Model%ntrw .and. n /= Model%ntsw .and. n /= Model%ntrnc .and. &
n /= Model%ntlnc .and. n /= Model%ntinc .and. &
n /= Model%ntsnc .and. n /= Model%ntgl .and. n /= Model%ntgnc .and. &
n /= Model%nthl .and. n /= Model%nthnc .and. n /= Model%ntgv .and. &
n /= Model%nthv .and. n /= Model%ntccn .and. n /= Model%ntccna .and. &
Expand Down Expand Up @@ -1277,6 +1280,7 @@ subroutine gfs_interstitial_phys_reset (Interstitial, Model)
Interstitial%stress_land = Model%huge
Interstitial%stress_water = Model%huge
Interstitial%theta = clear_val
Interstitial%tkeh = clear_val
Interstitial%tprcp_ice = Model%huge
Interstitial%tprcp_land = Model%huge
Interstitial%tprcp_water = Model%huge
Expand Down
7 changes: 7 additions & 0 deletions scm/src/CCPP_typedefs.meta
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2836,6 +2836,13 @@
units = count
dimensions = ()
type = integer
[tkeh]
standard_name = vertical_turbulent_kinetic_energy_at_interface
long_name = vertical turbulent kinetic energy at model layer interfaces
units = m2 s-2
dimensions = (horizontal_loop_extent,vertical_interface_dimension)
type = real
kind = kind_phys
[active_phys_tend]
standard_name = tendencies_for_active_process_in_ccpp_suite_simulator
long_name = tendencies for active physics process in ccpp suite simulator
Expand Down