From 75ef9ef836f4591bbe2d7e7a1c9eaa7171c60200 Mon Sep 17 00:00:00 2001 From: Grant Firl Date: Tue, 9 May 2023 11:05:27 -0400 Subject: [PATCH 1/2] udpate GFS_typedefs and ccpp/physics submodule pointer to work with ufs-dev-PR64 --- .gitmodules | 6 ++++-- ccpp/physics | 2 +- scm/src/GFS_typedefs.F90 | 3 +++ scm/src/GFS_typedefs.meta | 8 ++++++++ 4 files changed, 16 insertions(+), 3 deletions(-) diff --git a/.gitmodules b/.gitmodules index dc0798c32..bf51a795b 100644 --- a/.gitmodules +++ b/.gitmodules @@ -4,8 +4,10 @@ branch = main [submodule "ccpp-physics"] path = ccpp/physics - url = https://github.com/NCAR/ccpp-physics - branch = main + #url = https://github.com/NCAR/ccpp-physics + #branch = main + url = https://github.com/grantfirl/ccpp-physics + branch = ufs-dev-PR64 [submodule "CMakeModules"] path = CMakeModules url = https://github.com/noaa-emc/CMakeModules diff --git a/ccpp/physics b/ccpp/physics index 3dc962cbc..3ba292419 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit 3dc962cbc0a89beccd1a4343e5e96d7bf60e6145 +Subproject commit 3ba29241946dedd3dfb0d7bbada38d1edc635acf diff --git a/scm/src/GFS_typedefs.F90 b/scm/src/GFS_typedefs.F90 index bd53ee1fd..3b038ff86 100644 --- a/scm/src/GFS_typedefs.F90 +++ b/scm/src/GFS_typedefs.F90 @@ -267,6 +267,7 @@ module GFS_typedefs real (kind=kind_phys), pointer :: spec_lh_flux (:) => null() !< specified kinematic surface latent heat flux !-- In/Out + real (kind=kind_phys), pointer :: maxupmf(:) => null() !< maximum up draft mass flux for Grell-Freitas real (kind=kind_phys), pointer :: conv_act(:) => null() !< convective activity counter for Grell-Freitas real (kind=kind_phys), pointer :: conv_act_m(:)=> null() !< midlevel convective activity counter for Grell-Freitas real (kind=kind_phys), pointer :: hice (:) => null() !< sea ice thickness @@ -2554,8 +2555,10 @@ subroutine sfcprop_create (Sfcprop, IM, Model) Sfcprop%lh = clear_val end if if (Model%imfdeepcnv == Model%imfdeepcnv_gf .or. Model%imfdeepcnv == Model%imfdeepcnv_unified) then + allocate (Sfcprop%maxupmf(IM)) allocate (Sfcprop%conv_act(IM)) allocate (Sfcprop%conv_act_m(IM)) + Sfcprop%maxupmf = zero Sfcprop%conv_act = zero Sfcprop%conv_act_m = zero end if diff --git a/scm/src/GFS_typedefs.meta b/scm/src/GFS_typedefs.meta index 58feecd68..0d589dc75 100644 --- a/scm/src/GFS_typedefs.meta +++ b/scm/src/GFS_typedefs.meta @@ -972,6 +972,14 @@ dimensions = (horizontal_loop_extent) type = real kind = kind_phys +[maxupmf] + standard_name = maximum_convective_updraft_mass_flux + long_name = maximum convective updraft mass flux within a column + units = m s-1 + dimensions = (horizontal_loop_extent) + type = real + kind = kind_phys + active = (control_for_deep_convection_scheme == identifier_for_grell_freitas_deep_convection) [conv_act] standard_name = consecutive_calls_for_grell_freitas_convection long_name = Memory counter for GF From e86f0890f94ec59a954f2b7730ce30cd691ec593 Mon Sep 17 00:00:00 2001 From: Grant Firl Date: Tue, 13 Jun 2023 15:38:45 -0400 Subject: [PATCH 2/2] update .gitmodules and ccpp/physics pointer" --- .gitmodules | 6 ++---- ccpp/physics | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/.gitmodules b/.gitmodules index bf51a795b..dc0798c32 100644 --- a/.gitmodules +++ b/.gitmodules @@ -4,10 +4,8 @@ branch = main [submodule "ccpp-physics"] path = ccpp/physics - #url = https://github.com/NCAR/ccpp-physics - #branch = main - url = https://github.com/grantfirl/ccpp-physics - branch = ufs-dev-PR64 + url = https://github.com/NCAR/ccpp-physics + branch = main [submodule "CMakeModules"] path = CMakeModules url = https://github.com/noaa-emc/CMakeModules diff --git a/ccpp/physics b/ccpp/physics index 3ba292419..d8a5b1fe1 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit 3ba29241946dedd3dfb0d7bbada38d1edc635acf +Subproject commit d8a5b1fe1046c818f5e50180f8c1d22d8bff69eb