diff --git a/.gitmodules b/.gitmodules index 22c723ac1..70ee867da 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,15 +1,19 @@ [submodule "atmos_cubed_sphere"] path = atmos_cubed_sphere - url = https://github.com/NOAA-GFDL/GFDL_atmos_cubed_sphere - branch = dev/emc + url = https://github.com/laurenchilutti/GFDL_atmos_cubed_sphere + branch = remap_io_emc +# url = https://github.com/NOAA-GFDL/GFDL_atmos_cubed_sphere +# branch = dev/emc [submodule "ccpp/framework"] path = ccpp/framework url = https://github.com/NCAR/ccpp-framework 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..9e9a09fcb 100644 --- a/ccpp/data/CCPP_typedefs.F90 +++ b/ccpp/data/CCPP_typedefs.F90 @@ -285,6 +285,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() !< @@ -696,6 +697,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)) @@ -1039,6 +1041,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. & @@ -1346,6 +1349,7 @@ subroutine gfs_interstitial_phys_reset (Interstitial, Model) Interstitial%stress_land = Model%huge Interstitial%stress_water = Model%huge Interstitial%theta = clear_val + Interstitial%tkeh = 0 Interstitial%tprcp_ice = Model%huge Interstitial%tprcp_land = Model%huge Interstitial%tprcp_water = Model%huge diff --git a/ccpp/data/CCPP_typedefs.meta b/ccpp/data/CCPP_typedefs.meta index e8ec56b8d..518a0fc10 100644 --- a/ccpp/data/CCPP_typedefs.meta +++ b/ccpp/data/CCPP_typedefs.meta @@ -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 ######################################################################## [ccpp-table-properties] diff --git a/ccpp/physics b/ccpp/physics index dce8be651..52331b240 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit dce8be6515a5bdac7f281d0c8c2bdbc227592a6f +Subproject commit 52331b2400eb4a8b87641f86a3751acd0d0dd672