diff --git a/.gitmodules b/.gitmodules index 22c723ac1..d824520fb 100644 --- a/.gitmodules +++ b/.gitmodules @@ -8,8 +8,10 @@ branch = main [submodule "ccpp/physics"] path = ccpp/physics - url = https://github.com/ufs-community/ccpp-physics - branch = ufs/dev +# url = https://github.com/ufs-community/ccpp-physics +# branch = ufs/dev + url = https://github.com/rhaesung/ccpp-physics + branch = conv_hr5update [submodule "upp"] path = upp url = https://github.com/NOAA-EMC/UPP diff --git a/ccpp/data/CCPP_typedefs.F90 b/ccpp/data/CCPP_typedefs.F90 index 1f5deaec2..90d35244a 100644 --- a/ccpp/data/CCPP_typedefs.F90 +++ b/ccpp/data/CCPP_typedefs.F90 @@ -1039,6 +1039,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. & diff --git a/ccpp/data/GFS_typedefs.F90 b/ccpp/data/GFS_typedefs.F90 index 4614c087b..68c753313 100644 --- a/ccpp/data/GFS_typedefs.F90 +++ b/ccpp/data/GFS_typedefs.F90 @@ -1993,6 +1993,9 @@ module GFS_typedefs real (kind=kind_phys), pointer :: tsnowpb(:) => null() !< accumulated surface snowfall in bucket (m) real (kind=kind_phys), pointer :: rhonewsn1(:) => null() !< precipitation ice density outside RUC LSM (kg/m3) + !--- TKE used by convection schemes + real (kind=kind_phys), pointer :: tkeh(:,:) => null() !< vertical turbulent kinetic energy (m2/s2) at the model layer interfaces + !--- MYNN variables real (kind=kind_phys), pointer :: edmf_a (:,:) => null() ! real (kind=kind_phys), pointer :: edmf_w (:,:) => null() ! @@ -7952,6 +7955,9 @@ subroutine diag_create (Diag, Model) allocate (Diag%refl_10cm(IM,Model%levs)) allocate (Diag%max_hail_diam_sfc(IM)) + !--- Vertical turbulent kinetic energy at model layer interfaces + allocate (Diag%tkeh(IM,Model%levs)) + !--- New PBL Diagnostics allocate (Diag%dkt(IM,Model%levs)) allocate (Diag%dku(IM,Model%levs)) @@ -8289,6 +8295,9 @@ subroutine diag_phys_zero (Diag, Model, linit, iauwindow_center) ! !----------------------------- +! Vertical turbulent kinetic energy at modle layer interfaces + Diag%tkeh = zero + ! Extra PBL diagnostics Diag%dkt = zero Diag%dku = zero diff --git a/ccpp/data/GFS_typedefs.meta b/ccpp/data/GFS_typedefs.meta index bd0e34975..1232c04c9 100644 --- a/ccpp/data/GFS_typedefs.meta +++ b/ccpp/data/GFS_typedefs.meta @@ -9440,6 +9440,13 @@ dimensions = (horizontal_dimension) type = real kind = kind_phys +[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_layer_dimension) + type = real + kind = kind_phys [dkt] standard_name = atmosphere_heat_diffusivity long_name = atmospheric heat diffusivity diff --git a/ccpp/physics b/ccpp/physics index db19a6d1d..485a7c7ea 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit db19a6d1d7fa7ed56f62318501c4abb5fb8b1138 +Subproject commit 485a7c7ea3f959731253124b68bcff7f2c0a2732