From 4d5460aa4ac5d47ed05722b17c5dfb9c0bda2660 Mon Sep 17 00:00:00 2001 From: bo yang Date: Tue, 15 Apr 2025 14:14:49 +0000 Subject: [PATCH 1/5] Point to user branch --- .gitmodules | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitmodules b/.gitmodules index 22c723ac12..f0068aded4 100644 --- a/.gitmodules +++ b/.gitmodules @@ -8,8 +8,8 @@ branch = main [submodule "ccpp/physics"] path = ccpp/physics - url = https://github.com/ufs-community/ccpp-physics - branch = ufs/dev + url = https://github.com/BoYang-NOAA/ccpp-physics + branch = ecmwf [submodule "upp"] path = upp url = https://github.com/NOAA-EMC/UPP From 184357cc5f20412b15e29850effb97bac2a1bbd0 Mon Sep 17 00:00:00 2001 From: bo yang Date: Tue, 15 Apr 2025 15:51:59 +0000 Subject: [PATCH 2/5] modified two ecmwf ngwd related files --- ccpp/data/GFS_typedefs.F90 | 6 +++++- ccpp/data/GFS_typedefs.meta | 6 ++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/ccpp/data/GFS_typedefs.F90 b/ccpp/data/GFS_typedefs.F90 index 668450b5eb..335ba97ab6 100644 --- a/ccpp/data/GFS_typedefs.F90 +++ b/ccpp/data/GFS_typedefs.F90 @@ -1156,6 +1156,7 @@ module GFS_typedefs logical :: do_ugwp_v1 !< flag for version 1 ugwp GWD logical :: do_ugwp_v1_orog_only !< flag for version 1 ugwp GWD (orographic drag only) logical :: do_ugwp_v1_w_gsldrag !< flag for version 1 ugwp with OGWD of GSL + logical :: do_ngw_ec !< flag for ecmwf ngw logical :: mstrat !< flag for moorthi approach for stratus logical :: moist_adj !< flag for moist convective adjustment logical :: cscnv !< flag for Chikira-Sugiyama convection @@ -3706,6 +3707,7 @@ subroutine control_initialize (Model, nlunit, fn_nml, me, master, & logical :: do_ugwp_v1_orog_only = .false. !< flag for version 1 ugwp GWD (orographic drag only) logical :: do_ugwp_v1_w_gsldrag = .false. !< flag for version 1 ugwp GWD (orographic drag only) !--- vay-2018 + logical :: do_ngw_ec = .false. !< flag for ecmwf ngw logical :: ldiag_ugwp = .false. !< flag for UGWP diag fields logical :: ugwp_seq_update = .false. !< flag for updating winds between UGWP steps logical :: do_ugwp = .false. !< flag do UGWP+RF @@ -4142,7 +4144,7 @@ subroutine control_initialize (Model, nlunit, fn_nml, me, master, & gwd_opt, do_ugwp_v0, do_ugwp_v0_orog_only, & do_ugwp_v0_nst_only, & do_gsl_drag_ls_bl, do_gsl_drag_ss, do_gsl_drag_tofd, & - do_gwd_opt_psl, & + do_gwd_opt_psl, do_ngw_ec, & do_ugwp_v1, do_ugwp_v1_orog_only, do_ugwp_v1_w_gsldrag, & ugwp_seq_update, var_ric, coef_ric_l, coef_ric_s, hurr_pbl, & do_myjsfc, do_myjpbl, & @@ -5070,6 +5072,7 @@ subroutine control_initialize (Model, nlunit, fn_nml, me, master, & Model%do_gsl_drag_ss = do_gsl_drag_ss Model%do_gsl_drag_tofd = do_gsl_drag_tofd Model%do_gwd_opt_psl = do_gwd_opt_psl + Model%do_ngw_ec = do_ngw_ec Model%do_ugwp_v1 = do_ugwp_v1 Model%do_ugwp_v1_orog_only = do_ugwp_v1_orog_only Model%do_ugwp_v1_w_gsldrag = do_ugwp_v1_w_gsldrag @@ -6942,6 +6945,7 @@ subroutine control_print(Model) print *, ' do_gsl_drag_tofd : ', Model%do_gsl_drag_tofd print *, ' do_gwd_opt_psl : ', Model%do_gwd_opt_psl print *, ' do_ugwp_v1 : ', Model%do_ugwp_v1 + print *, ' do_ngw_ec : ', Model%do_ngw_ec print *, ' do_ugwp_v1_orog_only : ', Model%do_ugwp_v1_orog_only print *, ' do_ugwp_v1_w_gsldrag : ', Model%do_ugwp_v1_w_gsldrag print *, ' hurr_pbl : ', Model%hurr_pbl diff --git a/ccpp/data/GFS_typedefs.meta b/ccpp/data/GFS_typedefs.meta index 6ba48f9f71..2352c0dbda 100644 --- a/ccpp/data/GFS_typedefs.meta +++ b/ccpp/data/GFS_typedefs.meta @@ -7663,6 +7663,12 @@ dimensions = () type = real kind = kind_phys +[do_ngw_ec] + standard_name = flag_for_ngw_ec + long_name = flag to activate ecmwf ngwd + units = flag + dimensions = () + type = logical [do_ugwp_v1] standard_name = flag_for_ugwp_version_1 long_name = flag to activate ver 1 CIRES UGWP From 8bbd1385477b8a178e8652138c7aca1c453d6b8c Mon Sep 17 00:00:00 2001 From: bo yang Date: Tue, 15 Apr 2025 18:22:25 +0000 Subject: [PATCH 3/5] modified comment line --- ccpp/data/GFS_typedefs.F90 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ccpp/data/GFS_typedefs.F90 b/ccpp/data/GFS_typedefs.F90 index 335ba97ab6..8718a4776d 100644 --- a/ccpp/data/GFS_typedefs.F90 +++ b/ccpp/data/GFS_typedefs.F90 @@ -3707,7 +3707,7 @@ subroutine control_initialize (Model, nlunit, fn_nml, me, master, & logical :: do_ugwp_v1_orog_only = .false. !< flag for version 1 ugwp GWD (orographic drag only) logical :: do_ugwp_v1_w_gsldrag = .false. !< flag for version 1 ugwp GWD (orographic drag only) !--- vay-2018 - logical :: do_ngw_ec = .false. !< flag for ecmwf ngw + logical :: do_ngw_ec = .false. !< flag for ecmwf ngwd logical :: ldiag_ugwp = .false. !< flag for UGWP diag fields logical :: ugwp_seq_update = .false. !< flag for updating winds between UGWP steps logical :: do_ugwp = .false. !< flag do UGWP+RF From 40d2670c45f9d5782d87ed75319925570abfd486 Mon Sep 17 00:00:00 2001 From: bo yang Date: Tue, 15 Apr 2025 18:42:45 +0000 Subject: [PATCH 4/5] modify comment with ngwd algorithm --- ccpp/data/GFS_typedefs.F90 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ccpp/data/GFS_typedefs.F90 b/ccpp/data/GFS_typedefs.F90 index 8718a4776d..9335ad9d4a 100644 --- a/ccpp/data/GFS_typedefs.F90 +++ b/ccpp/data/GFS_typedefs.F90 @@ -3707,7 +3707,7 @@ subroutine control_initialize (Model, nlunit, fn_nml, me, master, & logical :: do_ugwp_v1_orog_only = .false. !< flag for version 1 ugwp GWD (orographic drag only) logical :: do_ugwp_v1_w_gsldrag = .false. !< flag for version 1 ugwp GWD (orographic drag only) !--- vay-2018 - logical :: do_ngw_ec = .false. !< flag for ecmwf ngwd + logical :: do_ngw_ec = .false. !< flag for ecmwf ngwd algorithm logical :: ldiag_ugwp = .false. !< flag for UGWP diag fields logical :: ugwp_seq_update = .false. !< flag for updating winds between UGWP steps logical :: do_ugwp = .false. !< flag do UGWP+RF From 52030fb7e7b72e10b5f091431181df049aeaacbb Mon Sep 17 00:00:00 2001 From: bo yang Date: Tue, 22 Apr 2025 13:38:16 +0000 Subject: [PATCH 5/5] update ccpp/physics --- ccpp/physics | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ccpp/physics b/ccpp/physics index 4b5e0c3e17..5e2d6476a8 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit 4b5e0c3e17d2a9804eb354497a3e1ca66677e7d8 +Subproject commit 5e2d6476a8e55012eacedd17d8f11417e46bac78