From 5641aa414375a3b393dafcef8a66c86b0d2b0021 Mon Sep 17 00:00:00 2001 From: "samuel.trahan" Date: Fri, 15 Dec 2023 16:57:11 +0000 Subject: [PATCH 01/18] pressure is not density --- ccpp/physics | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ccpp/physics b/ccpp/physics index c0aa212db..929b71683 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit c0aa212dbc255ac5d77934c3cd6283c994bbfd99 +Subproject commit 929b716834927b0b832335ef189dad6a4470042b From cc3277a0b7f00294f1b7c929c34083c25c0e4024 Mon Sep 17 00:00:00 2001 From: "samuel.trahan" Date: Fri, 15 Dec 2023 16:57:38 +0000 Subject: [PATCH 02/18] wrong variable sent for snodi --- ccpp/driver/GFS_diagnostics.F90 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ccpp/driver/GFS_diagnostics.F90 b/ccpp/driver/GFS_diagnostics.F90 index 42b1d1d66..f7f6d0caf 100644 --- a/ccpp/driver/GFS_diagnostics.F90 +++ b/ccpp/driver/GFS_diagnostics.F90 @@ -4005,12 +4005,12 @@ subroutine GFS_externaldiag_populate (ExtDiag, Model, Statein, Stateout, Sfcprop idx = idx + 1 ExtDiag(idx)%axes = 2 ExtDiag(idx)%name = 'snodi' - ExtDiag(idx)%desc = 'water equivalent snow depth over ice' + ExtDiag(idx)%desc = 'snow depth over ice' ExtDiag(idx)%unit = 'mm' ExtDiag(idx)%mod_name = 'gfs_sfc' allocate (ExtDiag(idx)%data(nblks)) do nb = 1,nblks - ExtDiag(idx)%data(nb)%var2 => sfcprop(nb)%weasdi(:) + ExtDiag(idx)%data(nb)%var2 => sfcprop(nb)%snodi(:) enddo idx = idx + 1 From 90f53d3b9afcc75c60845d41ac757699c5990e85 Mon Sep 17 00:00:00 2001 From: "samuel.trahan" Date: Fri, 15 Dec 2023 18:13:38 +0000 Subject: [PATCH 03/18] point to sam's branch --- .gitmodules | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitmodules b/.gitmodules index 22c723ac1..611b159fa 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/SamuelTrahanNOAA/ccpp-physics + branch = clm-unit-fix [submodule "upp"] path = upp url = https://github.com/NOAA-EMC/UPP From aef4d41611255ee6c92a156a98e4dc398d7372ca Mon Sep 17 00:00:00 2001 From: "samuel.trahan" Date: Mon, 18 Dec 2023 15:13:17 +0000 Subject: [PATCH 04/18] revisions to slowfall accumulation from @tanyasmirnova --- ccpp/physics | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ccpp/physics b/ccpp/physics index c0aa212db..0889de144 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit c0aa212dbc255ac5d77934c3cd6283c994bbfd99 +Subproject commit 0889de1446e11f26a0570baa056ceb0bfb65512e From c64291087e4cbd72e5aaac46540ca7a6acdb90de Mon Sep 17 00:00:00 2001 From: "samuel.trahan" Date: Mon, 18 Dec 2023 15:14:21 +0000 Subject: [PATCH 05/18] point to sam's branch --- .gitmodules | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitmodules b/.gitmodules index 22c723ac1..641fa55ec 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/SamuelTrahanNOAA/ccpp-physics + branch = tanya-snow [submodule "upp"] path = upp url = https://github.com/NOAA-EMC/UPP From 37e7fac7ca44c76d16361356673eae42753d8655 Mon Sep 17 00:00:00 2001 From: "samuel.trahan" Date: Mon, 18 Dec 2023 16:52:38 +0000 Subject: [PATCH 06/18] explain lakedepth corruption safeguards --- ccpp/physics | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ccpp/physics b/ccpp/physics index 929b71683..b1bb75a8f 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit 929b716834927b0b832335ef189dad6a4470042b +Subproject commit b1bb75a8fca26ef8f790eb091c6f9db62809a94b From 94673556e00a717eda338171479fe62377973c2a Mon Sep 17 00:00:00 2001 From: "samuel.trahan" Date: Mon, 18 Dec 2023 18:11:05 +0000 Subject: [PATCH 07/18] module_sf_ruclsm.f90: explain the snow_mosaic=0 line --- ccpp/physics | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ccpp/physics b/ccpp/physics index 0889de144..c6e09641f 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit 0889de1446e11f26a0570baa056ceb0bfb65512e +Subproject commit c6e09641f25767d0008c7c555c2f10b53cb2d0aa From 3b92892a6c6aced6e1640bfad20353bf3a0730ed Mon Sep 17 00:00:00 2001 From: Jili Dong Date: Mon, 18 Dec 2023 18:13:31 +0000 Subject: [PATCH 08/18] point ccpp/physics to personal fork --- .gitmodules | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.gitmodules b/.gitmodules index 22c723ac1..73f13a652 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/JiliDong-NOAA/ccpp-physics + branch = clm_lake_ice_fix [submodule "upp"] path = upp url = https://github.com/NOAA-EMC/UPP From 551c120c1d6e346f38a398efc2c372f9ee727918 Mon Sep 17 00:00:00 2001 From: Jili Dong Date: Mon, 18 Dec 2023 18:25:48 +0000 Subject: [PATCH 09/18] add flag to track new freezing lake ice grids --- ccpp/data/CCPP_typedefs.F90 | 3 +++ ccpp/data/CCPP_typedefs.meta | 6 ++++++ ccpp/physics | 2 +- 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/ccpp/data/CCPP_typedefs.F90 b/ccpp/data/CCPP_typedefs.F90 index a7da2eca9..06e1be434 100644 --- a/ccpp/data/CCPP_typedefs.F90 +++ b/ccpp/data/CCPP_typedefs.F90 @@ -140,6 +140,7 @@ module CCPP_typedefs logical, pointer :: flag_cice(:) => null() !< logical, pointer :: flag_guess(:) => null() !< logical, pointer :: flag_iter(:) => null() !< + logical, pointer :: lake_freeze(:) => null() !< real (kind=kind_phys), pointer :: ffmm_ice(:) => null() !< real (kind=kind_phys), pointer :: ffmm_land(:) => null() !< real (kind=kind_phys), pointer :: ffmm_water(:) => null() !< @@ -607,6 +608,7 @@ subroutine gfs_interstitial_create (Interstitial, IM, Model) allocate (Interstitial%flag_cice (IM)) allocate (Interstitial%flag_guess (IM)) allocate (Interstitial%flag_iter (IM)) + allocate (Interstitial%lake_freeze (IM)) allocate (Interstitial%ffmm_ice (IM)) allocate (Interstitial%ffmm_land (IM)) allocate (Interstitial%ffmm_water (IM)) @@ -1297,6 +1299,7 @@ subroutine gfs_interstitial_phys_reset (Interstitial, Model) Interstitial%flag_cice = .false. Interstitial%flag_guess = .false. Interstitial%flag_iter = .true. + Interstitial%lake_freeze = .false. Interstitial%ffmm_ice = Model%huge Interstitial%ffmm_land = Model%huge Interstitial%ffmm_water = Model%huge diff --git a/ccpp/data/CCPP_typedefs.meta b/ccpp/data/CCPP_typedefs.meta index 3ecb69be7..dddb14f51 100644 --- a/ccpp/data/CCPP_typedefs.meta +++ b/ccpp/data/CCPP_typedefs.meta @@ -890,6 +890,12 @@ units = flag dimensions = (horizontal_loop_extent) type = logical +[lake_freeze] + standard_name = flag_for_lake_water_freeze + long_name = flag for lake water freeze + units = flag + dimensions = (horizontal_loop_extent) + type = logical [ffmm_water] standard_name = Monin_Obukhov_similarity_function_for_momentum_over_water long_name = Monin-Obukhov similarity function for momentum over water diff --git a/ccpp/physics b/ccpp/physics index c0aa212db..99997c677 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit c0aa212dbc255ac5d77934c3cd6283c994bbfd99 +Subproject commit 99997c677be9f60768a467996fb99ff993f51b0f From 45f14376cb09915e2bd765e8b573d59ddc26616c Mon Sep 17 00:00:00 2001 From: Jili Dong Date: Mon, 18 Dec 2023 18:53:27 +0000 Subject: [PATCH 10/18] update ccpp/physics --- ccpp/physics | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ccpp/physics b/ccpp/physics index 99997c677..2ceb88bb7 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit 99997c677be9f60768a467996fb99ff993f51b0f +Subproject commit 2ceb88bb7c32f37e80c63deba174c8ebb1240a85 From 13703716dc29e9e164ab587081e6a769a35a7d7a Mon Sep 17 00:00:00 2001 From: Jili Dong Date: Tue, 19 Dec 2023 00:33:45 +0000 Subject: [PATCH 11/18] update ccpp/physics --- ccpp/physics | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ccpp/physics b/ccpp/physics index 2ceb88bb7..8941516ed 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit 2ceb88bb7c32f37e80c63deba174c8ebb1240a85 +Subproject commit 8941516ed69145557a90794a2fb1253e373c3661 From d466b78e66656bf9fb7236e45141132c7d06b47e Mon Sep 17 00:00:00 2001 From: Jili Dong Date: Tue, 19 Dec 2023 15:28:22 +0000 Subject: [PATCH 12/18] change name of lake_freeze to flag_lakefreeze --- ccpp/data/CCPP_typedefs.F90 | 6 +++--- ccpp/data/CCPP_typedefs.meta | 2 +- ccpp/physics | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ccpp/data/CCPP_typedefs.F90 b/ccpp/data/CCPP_typedefs.F90 index 06e1be434..7d9351337 100644 --- a/ccpp/data/CCPP_typedefs.F90 +++ b/ccpp/data/CCPP_typedefs.F90 @@ -140,7 +140,7 @@ module CCPP_typedefs logical, pointer :: flag_cice(:) => null() !< logical, pointer :: flag_guess(:) => null() !< logical, pointer :: flag_iter(:) => null() !< - logical, pointer :: lake_freeze(:) => null() !< + logical, pointer :: flag_lakefreeze(:) => null() !< real (kind=kind_phys), pointer :: ffmm_ice(:) => null() !< real (kind=kind_phys), pointer :: ffmm_land(:) => null() !< real (kind=kind_phys), pointer :: ffmm_water(:) => null() !< @@ -608,7 +608,7 @@ subroutine gfs_interstitial_create (Interstitial, IM, Model) allocate (Interstitial%flag_cice (IM)) allocate (Interstitial%flag_guess (IM)) allocate (Interstitial%flag_iter (IM)) - allocate (Interstitial%lake_freeze (IM)) + allocate (Interstitial%flag_lakefreeze (IM)) allocate (Interstitial%ffmm_ice (IM)) allocate (Interstitial%ffmm_land (IM)) allocate (Interstitial%ffmm_water (IM)) @@ -1299,7 +1299,7 @@ subroutine gfs_interstitial_phys_reset (Interstitial, Model) Interstitial%flag_cice = .false. Interstitial%flag_guess = .false. Interstitial%flag_iter = .true. - Interstitial%lake_freeze = .false. + Interstitial%flag_lakefreeze = .false. Interstitial%ffmm_ice = Model%huge Interstitial%ffmm_land = Model%huge Interstitial%ffmm_water = Model%huge diff --git a/ccpp/data/CCPP_typedefs.meta b/ccpp/data/CCPP_typedefs.meta index dddb14f51..428970f2d 100644 --- a/ccpp/data/CCPP_typedefs.meta +++ b/ccpp/data/CCPP_typedefs.meta @@ -890,7 +890,7 @@ units = flag dimensions = (horizontal_loop_extent) type = logical -[lake_freeze] +[flag_lakefreeze] standard_name = flag_for_lake_water_freeze long_name = flag for lake water freeze units = flag diff --git a/ccpp/physics b/ccpp/physics index 8941516ed..0fbcc9f62 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit 8941516ed69145557a90794a2fb1253e373c3661 +Subproject commit 0fbcc9f62ad182ded98fcde2e4c2287ee3334738 From 1e814d6e1ed9d17b6461461e081d99693f426ae3 Mon Sep 17 00:00:00 2001 From: Jili Dong Date: Tue, 19 Dec 2023 16:48:25 +0000 Subject: [PATCH 13/18] ccpp/physics updated --- ccpp/physics | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ccpp/physics b/ccpp/physics index 0fbcc9f62..a9208405a 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit 0fbcc9f62ad182ded98fcde2e4c2287ee3334738 +Subproject commit a9208405adffd6b1b6389ac3f1331097b05069ad From beb11529977c30963fe6f583f214134efdbf7579 Mon Sep 17 00:00:00 2001 From: Jili Dong Date: Tue, 19 Dec 2023 19:30:50 +0000 Subject: [PATCH 14/18] update ccpp/physics --- ccpp/physics | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ccpp/physics b/ccpp/physics index a9208405a..c61295f82 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit a9208405adffd6b1b6389ac3f1331097b05069ad +Subproject commit c61295f8227dbb3b91c4413a2b60c774897218e1 From 996c78d5d3f323097351b1ddcdd1181cbce32ac2 Mon Sep 17 00:00:00 2001 From: "samuel.trahan" Date: Tue, 19 Dec 2023 20:29:50 +0000 Subject: [PATCH 15/18] ccpp/physics: merge ccpp-physics#142 and ufs/dev --- ccpp/physics | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ccpp/physics b/ccpp/physics index b1bb75a8f..407db6bca 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit b1bb75a8fca26ef8f790eb091c6f9db62809a94b +Subproject commit 407db6bcac14084124f514bcba88c9c8bddd2567 From 4c0ad7e37dc32f2c48be618e468d76a9d0f4fd59 Mon Sep 17 00:00:00 2001 From: "samuel.trahan" Date: Tue, 19 Dec 2023 20:42:52 +0000 Subject: [PATCH 16/18] merge ccpp-physics#148 into ccpp/physics --- ccpp/physics | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ccpp/physics b/ccpp/physics index 407db6bca..111d2733a 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit 407db6bcac14084124f514bcba88c9c8bddd2567 +Subproject commit 111d2733aac926fa4e8aba76459b188dcce31920 From 4a371d6c166688849f1958f4720eba272cebd425 Mon Sep 17 00:00:00 2001 From: "samuel.trahan" Date: Wed, 20 Dec 2023 03:09:10 +0000 Subject: [PATCH 17/18] fix mistake in merge: extra rho0 argument --- ccpp/physics | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ccpp/physics b/ccpp/physics index 111d2733a..846ec8e00 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit 111d2733aac926fa4e8aba76459b188dcce31920 +Subproject commit 846ec8e0075e9e330401e03d5e0880963926d9d7 From c99a88681339e56234cc57ecc3715cb02f5d7e7e Mon Sep 17 00:00:00 2001 From: "samuel.trahan" Date: Thu, 21 Dec 2023 15:43:42 +0000 Subject: [PATCH 18/18] point to ufs/dev for ccpp/physics --- .gitmodules | 4 ++-- ccpp/physics | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitmodules b/.gitmodules index 611b159fa..22c723ac1 100644 --- a/.gitmodules +++ b/.gitmodules @@ -8,8 +8,8 @@ branch = main [submodule "ccpp/physics"] path = ccpp/physics - url = https://github.com/SamuelTrahanNOAA/ccpp-physics - branch = clm-unit-fix + url = https://github.com/ufs-community/ccpp-physics + branch = ufs/dev [submodule "upp"] path = upp url = https://github.com/NOAA-EMC/UPP diff --git a/ccpp/physics b/ccpp/physics index 846ec8e00..0cdfc9d74 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit 846ec8e0075e9e330401e03d5e0880963926d9d7 +Subproject commit 0cdfc9d7465358debb4de292861fef970b44874a