From 27f99d1660c3202f1220c9bf42696f59a5802488 Mon Sep 17 00:00:00 2001 From: helin wei Date: Wed, 9 Mar 2022 17:48:53 +0000 Subject: [PATCH 1/6] land surface upgrades for p8 --- .gitmodules | 4 ++-- ccpp/data/GFS_typedefs.F90 | 6 ++++++ ccpp/data/GFS_typedefs.meta | 6 ++++++ ccpp/physics | 2 +- 4 files changed, 15 insertions(+), 3 deletions(-) diff --git a/.gitmodules b/.gitmodules index 6bb663df1..a507e286a 100644 --- a/.gitmodules +++ b/.gitmodules @@ -8,8 +8,8 @@ branch = main [submodule "ccpp/physics"] path = ccpp/physics - url = https://github.com/NCAR/ccpp-physics - branch = main + url = https://github.com/HelinWei-NOAA/ccpp-physics + branch = lsm_upgrades_for_p8c [submodule "upp"] path = upp url = https://github.com/NOAA-EMC/UPP diff --git a/ccpp/data/GFS_typedefs.F90 b/ccpp/data/GFS_typedefs.F90 index e86237dad..28e8b2899 100644 --- a/ccpp/data/GFS_typedefs.F90 +++ b/ccpp/data/GFS_typedefs.F90 @@ -915,6 +915,7 @@ module GFS_typedefs integer :: iopt_snf !rainfall & snowfall (1-jordan91; 2->bats; 3->noah) integer :: iopt_tbot !lower boundary of soil temperature (1->zero-flux; 2->noah) integer :: iopt_stc !snow/soil temperature time scheme (only layer 1) + integer :: iopt_trs !thermal roughness scheme (1-z0h=z0m; 2-czil; 3-ec;4-kb inversed) logical :: use_ufo !< flag for gcycle surface option @@ -3333,6 +3334,7 @@ subroutine control_initialize (Model, nlunit, fn_nml, me, master, & integer :: iopt_snf = 1 !rainfall & snowfall (1-jordan91; 2->bats; 3->noah) integer :: iopt_tbot = 2 !lower boundary of soil temperature (1->zero-flux; 2->noah) integer :: iopt_stc = 1 !snow/soil temperature time scheme (only layer 1) + integer :: iopt_trs = 2 !thermal roughness scheme (1-z0h=z0m; 2-czil; 3-ec;4-kb reversed) logical :: use_ufo = .false. !< flag for gcycle surface option @@ -3682,6 +3684,7 @@ subroutine control_initialize (Model, nlunit, fn_nml, me, master, & ! Noah MP options iopt_dveg,iopt_crs,iopt_btr,iopt_run,iopt_sfc, iopt_frz, & iopt_inf, iopt_rad,iopt_alb,iopt_snf,iopt_tbot,iopt_stc, & + iopt_trs, & ! GFDL surface layer options lcurr_sf, pert_cd, ntsflg, sfenth, & !--- lake model control @@ -4298,6 +4301,7 @@ subroutine control_initialize (Model, nlunit, fn_nml, me, master, & Model%iopt_snf = iopt_snf Model%iopt_tbot = iopt_tbot Model%iopt_stc = iopt_stc + Model%iopt_trs = iopt_trs !--- tuning parameters for physical parameterizations Model%ras = ras @@ -5134,6 +5138,7 @@ subroutine control_initialize (Model, nlunit, fn_nml, me, master, & print *,'iopt_snf = ', Model%iopt_snf print *,'iopt_tbot = ',Model%iopt_tbot print *,'iopt_stc = ', Model%iopt_stc + print *,'iopt_trs = ', Model%iopt_trs elseif (Model%lsm == Model%lsm_ruc) then print *,' RUC Land Surface Model used' else @@ -5958,6 +5963,7 @@ subroutine control_print(Model) print *, ' iopt_snf : ', Model%iopt_snf print *, ' iopt_tbot : ', Model%iopt_tbot print *, ' iopt_stc : ', Model%iopt_stc + print *, ' iopt_trs : ', Model%iopt_trs endif print *, ' use_ufo : ', Model%use_ufo print *, ' lcurr_sf : ', Model%lcurr_sf diff --git a/ccpp/data/GFS_typedefs.meta b/ccpp/data/GFS_typedefs.meta index f8966b817..e6012a92e 100644 --- a/ccpp/data/GFS_typedefs.meta +++ b/ccpp/data/GFS_typedefs.meta @@ -4027,6 +4027,12 @@ units = index dimensions = () type = integer +[iopt_trs] + standard_name = control_for_land_surface_scheme_surface_thermal_roughness + long_name = choice for surface thermal roughness option (see noahmp module for definition) + units = index + dimensions = () + type = integer [use_ufo] standard_name = flag_for_gcycle_surface_option long_name = flag for gcycle surface option diff --git a/ccpp/physics b/ccpp/physics index 979324a89..2ae3f4813 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit 979324a89894133473c4663fc490d04cdce57ac0 +Subproject commit 2ae3f481378bc8a8c5a818cd44488fa597d98524 From 207a763c0413cad76b25451c53a239066688670b Mon Sep 17 00:00:00 2001 From: helin wei Date: Mon, 21 Mar 2022 17:54:22 +0000 Subject: [PATCH 2/6] update ccpp/physics path --- ccpp/physics | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ccpp/physics b/ccpp/physics index 1f8cf92bb..c8d65456b 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit 1f8cf92bb4d562ba1aa53966fc361fcd1331c2b3 +Subproject commit c8d65456bc99f8ea1d89001e4670d36e3ff11dc8 From 7eaa0a02204483ca522e74a4fdfd7c91668dc4f4 Mon Sep 17 00:00:00 2001 From: Helin Wei Date: Mon, 28 Mar 2022 10:38:38 -0400 Subject: [PATCH 3/6] update submodules --- ccpp/physics | 2 +- upp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ccpp/physics b/ccpp/physics index 1f8cf92bb..8f3c08426 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit 1f8cf92bb4d562ba1aa53966fc361fcd1331c2b3 +Subproject commit 8f3c084264d49da54b7f4a7e0e202d966232e22a diff --git a/upp b/upp index 0185bb9f2..0dc3c0c1d 160000 --- a/upp +++ b/upp @@ -1 +1 @@ -Subproject commit 0185bb9f23ca9c9e96a22bf7ce09baa04c7d3491 +Subproject commit 0dc3c0c1dbdcdc5025dff0c6b06b16aa2a7ddda9 From 0fc1417ecc6d005567d7d05f36d9dfceda89cc32 Mon Sep 17 00:00:00 2001 From: Helin Wei Date: Mon, 28 Mar 2022 12:00:03 -0400 Subject: [PATCH 4/6] update submodules --- upp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/upp b/upp index 0dc3c0c1d..0185bb9f2 160000 --- a/upp +++ b/upp @@ -1 +1 @@ -Subproject commit 0dc3c0c1dbdcdc5025dff0c6b06b16aa2a7ddda9 +Subproject commit 0185bb9f23ca9c9e96a22bf7ce09baa04c7d3491 From f6d47711bba261752531d34354379c3342ae471f Mon Sep 17 00:00:00 2001 From: Helin Wei Date: Tue, 29 Mar 2022 12:47:47 -0400 Subject: [PATCH 5/6] update .gitmodule --- .gitmodules | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitmodules b/.gitmodules index a507e286a..6bb663df1 100644 --- a/.gitmodules +++ b/.gitmodules @@ -8,8 +8,8 @@ branch = main [submodule "ccpp/physics"] path = ccpp/physics - url = https://github.com/HelinWei-NOAA/ccpp-physics - branch = lsm_upgrades_for_p8c + url = https://github.com/NCAR/ccpp-physics + branch = main [submodule "upp"] path = upp url = https://github.com/NOAA-EMC/UPP From 0d7718ed74e8e2e6cb434180077517cf6210be7f Mon Sep 17 00:00:00 2001 From: Helin Wei Date: Tue, 29 Mar 2022 13:08:34 -0400 Subject: [PATCH 6/6] update submodules --- ccpp/physics | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ccpp/physics b/ccpp/physics index 8f3c08426..85f21a47f 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit 8f3c084264d49da54b7f4a7e0e202d966232e22a +Subproject commit 85f21a47ff98bf039acca6be64e9fa36455057f5