From ecf3a6e83516451ef1d62efd1ffc947c3914e6a9 Mon Sep 17 00:00:00 2001 From: Tracy Date: Mon, 10 Mar 2025 22:40:35 -0600 Subject: [PATCH 1/4] changes from fv3atm #885 --- scm/src/CCPP_typedefs.F90 | 4 ++++ scm/src/CCPP_typedefs.meta | 7 +++++++ 2 files changed, 11 insertions(+) diff --git a/scm/src/CCPP_typedefs.F90 b/scm/src/CCPP_typedefs.F90 index 5b3dd2b81..bce491bf5 100644 --- a/scm/src/CCPP_typedefs.F90 +++ b/scm/src/CCPP_typedefs.F90 @@ -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() !< @@ -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)) @@ -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. & @@ -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 = 0 Interstitial%tprcp_ice = Model%huge Interstitial%tprcp_land = Model%huge Interstitial%tprcp_water = Model%huge diff --git a/scm/src/CCPP_typedefs.meta b/scm/src/CCPP_typedefs.meta index c16c20747..62a12e6bd 100644 --- a/scm/src/CCPP_typedefs.meta +++ b/scm/src/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 [active_phys_tend] standard_name = tendencies_for_active_process_in_ccpp_suite_simulator long_name = tendencies for active physics process in ccpp suite simulator From 79060d58bcb679b1cebf49ad1f26ae8a9c2c2d77 Mon Sep 17 00:00:00 2001 From: Tracy Date: Mon, 10 Mar 2025 23:23:17 -0600 Subject: [PATCH 2/4] latest ccpp-physics --- ccpp/physics | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ccpp/physics b/ccpp/physics index 0f1b7269f..9fdd4f93b 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit 0f1b7269f30770e40facf8a002c6d4443a37f578 +Subproject commit 9fdd4f93b6cc9dc7c72f65a752b246e94fa26082 From e8136716acd7fc824da6e56ed32a7103b0af0df6 Mon Sep 17 00:00:00 2001 From: Tracy Date: Tue, 11 Mar 2025 15:01:47 -0600 Subject: [PATCH 3/4] change initialization of tkeh --- scm/src/CCPP_typedefs.F90 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scm/src/CCPP_typedefs.F90 b/scm/src/CCPP_typedefs.F90 index bce491bf5..bda7a472c 100644 --- a/scm/src/CCPP_typedefs.F90 +++ b/scm/src/CCPP_typedefs.F90 @@ -1280,7 +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 = 0 + Interstitial%tkeh = clear_val Interstitial%tprcp_ice = Model%huge Interstitial%tprcp_land = Model%huge Interstitial%tprcp_water = Model%huge From e12b3f51c6bdfc9b18e50f81548ed9a97baf4ab5 Mon Sep 17 00:00:00 2001 From: Tracy Date: Thu, 20 Mar 2025 10:08:11 -0600 Subject: [PATCH 4/4] update ccpp/physics submodule pointer --- ccpp/physics | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ccpp/physics b/ccpp/physics index 9fdd4f93b..7e42e7ebf 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit 9fdd4f93b6cc9dc7c72f65a752b246e94fa26082 +Subproject commit 7e42e7ebf430b69030c1c2a8da14498cd954eae0