From 3ad9ff968d613666993f08c8149d3817004665fd Mon Sep 17 00:00:00 2001 From: rhaesung Date: Fri, 25 Oct 2024 20:15:33 +0000 Subject: [PATCH 1/7] bug fix in using vertical transports of hydrometer variables --- ccpp/data/CCPP_typedefs.F90 | 1 + 1 file changed, 1 insertion(+) diff --git a/ccpp/data/CCPP_typedefs.F90 b/ccpp/data/CCPP_typedefs.F90 index 32abd412a..6dd5ecb68 100644 --- a/ccpp/data/CCPP_typedefs.F90 +++ b/ccpp/data/CCPP_typedefs.F90 @@ -1068,6 +1068,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. & From 8e1d798a03527ebc2d4e03b0f45c246147d1b96d Mon Sep 17 00:00:00 2001 From: rhaesung Date: Fri, 25 Oct 2024 20:17:02 +0000 Subject: [PATCH 2/7] add TKE at model layer interfaces (tkeh) --- ccpp/data/GFS_typedefs.F90 | 9 +++++++++ ccpp/data/GFS_typedefs.meta | 7 +++++++ 2 files changed, 16 insertions(+) diff --git a/ccpp/data/GFS_typedefs.F90 b/ccpp/data/GFS_typedefs.F90 index 9e8bfc7d3..7b622b3f2 100644 --- a/ccpp/data/GFS_typedefs.F90 +++ b/ccpp/data/GFS_typedefs.F90 @@ -1962,6 +1962,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() ! @@ -7898,6 +7901,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)) @@ -8247,6 +8253,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 2fee7ba12..9a8e41ddf 100644 --- a/ccpp/data/GFS_typedefs.meta +++ b/ccpp/data/GFS_typedefs.meta @@ -9373,6 +9373,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 From c5aed69c2da5ecf39d7634890150d535bc445d65 Mon Sep 17 00:00:00 2001 From: rhaesung Date: Fri, 25 Oct 2024 20:19:03 +0000 Subject: [PATCH 3/7] update .gitmodules and ccpp/physics --- .gitmodules | 6 ++++-- ccpp/physics | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) 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/physics b/ccpp/physics index f3eeb3442..1ace72d8c 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit f3eeb3442775b7239d98e3d09acc6d4f1d42233e +Subproject commit 1ace72d8cf168909ef9fdc7012ceb4c33a52713c From 5849ac540f50418911ad62d9a79fd7e511fe744f Mon Sep 17 00:00:00 2001 From: rhaesung Date: Thu, 31 Oct 2024 15:24:30 +0000 Subject: [PATCH 4/7] update GFS_typedefs.meta --- ccpp/data/GFS_typedefs.meta | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ccpp/data/GFS_typedefs.meta b/ccpp/data/GFS_typedefs.meta index 9a8e41ddf..3167cd784 100644 --- a/ccpp/data/GFS_typedefs.meta +++ b/ccpp/data/GFS_typedefs.meta @@ -9378,7 +9378,7 @@ long_name = vertical turbulent kinetic energy at model layer interfaces units = m2 s-2 dimensions = (horizontal_loop_extent,vertical_layer_dimension) - type = real + type = real kind = kind_phys [dkt] standard_name = atmosphere_heat_diffusivity From 2f5213e34d84196e2a7fd0e9b1dc15e97670207f Mon Sep 17 00:00:00 2001 From: rhaesung Date: Thu, 31 Oct 2024 15:24:47 +0000 Subject: [PATCH 5/7] update physics --- ccpp/physics | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ccpp/physics b/ccpp/physics index 1ace72d8c..b325da7a1 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit 1ace72d8cf168909ef9fdc7012ceb4c33a52713c +Subproject commit b325da7a1937a70b40ee1fae3ca6b805e3c9d9f5 From fd9e3b7e6b158e9a42334da571922b0efaaffc07 Mon Sep 17 00:00:00 2001 From: rhaesung Date: Fri, 8 Nov 2024 14:36:43 +0000 Subject: [PATCH 6/7] update FV3 --- atmos_cubed_sphere | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/atmos_cubed_sphere b/atmos_cubed_sphere index e36e8572e..24686a256 160000 --- a/atmos_cubed_sphere +++ b/atmos_cubed_sphere @@ -1 +1 @@ -Subproject commit e36e8572e7643d7e59a3979a61bdd83743ff7b00 +Subproject commit 24686a2561f1414eb86c7b97c93960c36e4257b1 From 16903b9d1673fe54852623357268b31063b56991 Mon Sep 17 00:00:00 2001 From: rhaesung Date: Fri, 22 Nov 2024 12:40:03 +0000 Subject: [PATCH 7/7] update upp --- upp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/upp b/upp index ce5f3b146..6f5dd627d 160000 --- a/upp +++ b/upp @@ -1 +1 @@ -Subproject commit ce5f3b146861cf6c95e1c14c640ede1ed97e6eef +Subproject commit 6f5dd627d124ae94bb5ed7f5afd22f82c470b1b7