From 71b2b64626b336c1c9d663dadc614c7df2d13357 Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Thu, 29 Feb 2024 14:30:45 -0700 Subject: [PATCH 1/3] Bug fix in ccpp/driver/GFS_diagnostics.F90: only output sfcprop(nb)%wetness for RUC LSM --- ccpp/driver/GFS_diagnostics.F90 | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/ccpp/driver/GFS_diagnostics.F90 b/ccpp/driver/GFS_diagnostics.F90 index 01d49593e..a96ac1197 100644 --- a/ccpp/driver/GFS_diagnostics.F90 +++ b/ccpp/driver/GFS_diagnostics.F90 @@ -4094,17 +4094,19 @@ subroutine GFS_externaldiag_populate (ExtDiag, Model, Statein, Stateout, Sfcprop ExtDiag(idx)%data(nb)%var2 => sfcprop(nb)%vfrac(:) enddo - idx = idx + 1 - ExtDiag(idx)%axes = 2 - ExtDiag(idx)%name = 'wetness' - ExtDiag(idx)%desc = 'soil moisture availability in top soil layer' - ExtDiag(idx)%unit = 'fraction' - ExtDiag(idx)%mod_name = 'gfs_sfc' - ExtDiag(idx)%cnvfac = cn_100 - allocate (ExtDiag(idx)%data(nblks)) - do nb = 1,nblks - ExtDiag(idx)%data(nb)%var2 => sfcprop(nb)%wetness(:) - enddo + if (Model%lsm==Model%lsm_ruc) then + idx = idx + 1 + ExtDiag(idx)%axes = 2 + ExtDiag(idx)%name = 'wetness' + ExtDiag(idx)%desc = 'soil moisture availability in top soil layer' + ExtDiag(idx)%unit = 'fraction' + ExtDiag(idx)%mod_name = 'gfs_sfc' + ExtDiag(idx)%cnvfac = cn_100 + allocate (ExtDiag(idx)%data(nblks)) + do nb = 1,nblks + ExtDiag(idx)%data(nb)%var2 => sfcprop(nb)%wetness(:) + enddo + end if idx = idx + 1 ExtDiag(idx)%axes = 2 From c0a7fd3a408ffece641c7b523bd7e3ff28bfb287 Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Thu, 29 Feb 2024 14:36:42 -0700 Subject: [PATCH 2/3] Update .gitmodules and submodule pointer for ccpp-framework for code review and testing --- .gitmodules | 6 ++++-- ccpp/framework | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.gitmodules b/.gitmodules index 22c723ac1..995db2017 100644 --- a/.gitmodules +++ b/.gitmodules @@ -4,8 +4,10 @@ branch = dev/emc [submodule "ccpp/framework"] path = ccpp/framework - url = https://github.com/NCAR/ccpp-framework - branch = main + #url = https://github.com/NCAR/ccpp-framework + ##branch = main + url = https://github.com/climbfuji/ccpp-framework + branch = bugfix/ccpp_prebuild_chunked_array_support_20240228 [submodule "ccpp/physics"] path = ccpp/physics url = https://github.com/ufs-community/ccpp-physics diff --git a/ccpp/framework b/ccpp/framework index f0b9a18b0..c315e4787 160000 --- a/ccpp/framework +++ b/ccpp/framework @@ -1 +1 @@ -Subproject commit f0b9a18b005d950cb9b0038fbc827b6b37500f43 +Subproject commit c315e47876057228ee105b348b8653f40836dbbb From 78fa1e382e61011e387641af0bdce34abea34f97 Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Mon, 11 Mar 2024 08:40:35 -0600 Subject: [PATCH 3/3] Revert .gitmodules and update submodule pointer for ccpp-framework --- .gitmodules | 6 ++---- ccpp/framework | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/.gitmodules b/.gitmodules index 995db2017..22c723ac1 100644 --- a/.gitmodules +++ b/.gitmodules @@ -4,10 +4,8 @@ branch = dev/emc [submodule "ccpp/framework"] path = ccpp/framework - #url = https://github.com/NCAR/ccpp-framework - ##branch = main - url = https://github.com/climbfuji/ccpp-framework - branch = bugfix/ccpp_prebuild_chunked_array_support_20240228 + url = https://github.com/NCAR/ccpp-framework + branch = main [submodule "ccpp/physics"] path = ccpp/physics url = https://github.com/ufs-community/ccpp-physics diff --git a/ccpp/framework b/ccpp/framework index c315e4787..221788f4e 160000 --- a/ccpp/framework +++ b/ccpp/framework @@ -1 +1 @@ -Subproject commit c315e47876057228ee105b348b8653f40836dbbb +Subproject commit 221788f4e2539af797eb02efe42465b153533201