From 54647b1d096731f283687fdb55f1404055c00bc9 Mon Sep 17 00:00:00 2001 From: Eric Aligo Date: Thu, 6 Aug 2020 16:17:22 +0000 Subject: [PATCH 1/8] point to location of branch --- .gitmodules | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitmodules b/.gitmodules index d253f6966..4237868e7 100644 --- a/.gitmodules +++ b/.gitmodules @@ -8,5 +8,5 @@ branch = master [submodule "ccpp/physics"] path = ccpp/physics - url = https://github.com/NCAR/ccpp-physics - branch = master + url = https://github.com/ericaligo-NOAA/ccpp-physics.git + branch = cldfra From 0193cc9efb53332e3ffb6298cda0fd1f60cb179a Mon Sep 17 00:00:00 2001 From: Eric Aligo Date: Thu, 6 Aug 2020 17:09:43 +0000 Subject: [PATCH 2/8] Diagnonstic 3D instantaneous cloud fractions added --- ccpp/physics | 2 +- gfsphysics/GFS_layer/GFS_diagnostics.F90 | 11 +++++++++++ gfsphysics/GFS_layer/GFS_typedefs.F90 | 12 +++++++++++- gfsphysics/GFS_layer/GFS_typedefs.meta | 7 +++++++ 4 files changed, 30 insertions(+), 2 deletions(-) diff --git a/ccpp/physics b/ccpp/physics index 82a73dddd..ffc35d3c8 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit 82a73dddd8789f268fd6f8020b5b303540d68d0d +Subproject commit ffc35d3c80b08e528a26af9ed002496db98ccdf7 diff --git a/gfsphysics/GFS_layer/GFS_diagnostics.F90 b/gfsphysics/GFS_layer/GFS_diagnostics.F90 index ed2e5d51a..1b6fabe96 100644 --- a/gfsphysics/GFS_layer/GFS_diagnostics.F90 +++ b/gfsphysics/GFS_layer/GFS_diagnostics.F90 @@ -1937,6 +1937,17 @@ subroutine GFS_externaldiag_populate (ExtDiag, Model, Statein, Stateout, Sfcprop ExtDiag(idx)%data(nb)%var3 => IntDiag(nb)%refl_10cm(:,:) enddo + idx = idx + 1 + ExtDiag(idx)%axes = 3 + ExtDiag(idx)%name = 'cldfra' + ExtDiag(idx)%desc = 'Instantaneous 3D Cloud Fraction' + ExtDiag(idx)%unit = 'frac' + ExtDiag(idx)%mod_name = 'gfs_phys' + allocate (ExtDiag(idx)%data(nblks)) + do nb = 1,nblks + ExtDiag(idx)%data(nb)%var3 => IntDiag(nb)%cldfra(:,:) + enddo + idx = idx + 1 ExtDiag(idx)%axes = 3 ExtDiag(idx)%name = 'cnvw' diff --git a/gfsphysics/GFS_layer/GFS_typedefs.F90 b/gfsphysics/GFS_layer/GFS_typedefs.F90 index 70a565a36..afee54ef5 100644 --- a/gfsphysics/GFS_layer/GFS_typedefs.F90 +++ b/gfsphysics/GFS_layer/GFS_typedefs.F90 @@ -1549,7 +1549,9 @@ module GFS_typedefs #ifdef CCPP real (kind=kind_phys), pointer :: TRAIN (:,:) => null() !< accumulated stratiform T tendency (K s-1) #endif - +#ifdef CCPP + real (kind=kind_phys), pointer :: cldfra (:,:) => null() !< instantaneous 3D cloud fraction +#endif !--- MP quantities for 3D diagnositics real (kind=kind_phys), pointer :: refl_10cm(:,:) => null() !< instantaneous refl_10cm ! @@ -5593,6 +5595,10 @@ subroutine diag_create (Diag, IM, Model) end if #endif +#ifdef CCPP + allocate (Diag%cldfra (IM,Model%levs)) +#endif + allocate (Diag%ca_deep (IM)) allocate (Diag%ca_turb (IM)) allocate (Diag%ca_shal (IM)) @@ -5910,6 +5916,10 @@ subroutine diag_phys_zero (Diag, Model, linit, iauwindow_center) Diag%TRAIN = zero end if #endif +#ifdef CCPP + Diag%cldfra = zero +#endif + Diag%totprcpb = zero Diag%cnvprcpb = zero Diag%toticeb = zero diff --git a/gfsphysics/GFS_layer/GFS_typedefs.meta b/gfsphysics/GFS_layer/GFS_typedefs.meta index 49023a1df..c542f96ed 100644 --- a/gfsphysics/GFS_layer/GFS_typedefs.meta +++ b/gfsphysics/GFS_layer/GFS_typedefs.meta @@ -5979,6 +5979,13 @@ dimensions = (horizontal_dimension,vertical_dimension) type = real kind = kind_phys +[cldfra] + standard_name = instantaneous_3d_cloud_fraction + long_name = instantaneous 3D cloud fraction for all MPs + units = frac + dimensions = (horizontal_dimension,vertical_dimension) + type = real + kind = kind_phys [ndust] standard_name = number_of_dust_bins_for_diagnostics long_name = number of dust bins for diagnostics From 3228146e6565d00f101ea1d5c9600025e37bb5e7 Mon Sep 17 00:00:00 2001 From: Eric Aligo Date: Thu, 13 Aug 2020 16:43:56 +0000 Subject: [PATCH 3/8] Bug fix for reflectivity in restart files. --- gfsphysics/GFS_layer/GFS_restart.F90 | 1 - 1 file changed, 1 deletion(-) diff --git a/gfsphysics/GFS_layer/GFS_restart.F90 b/gfsphysics/GFS_layer/GFS_restart.F90 index 52b3d7b83..bbd8dcebd 100644 --- a/gfsphysics/GFS_layer/GFS_restart.F90 +++ b/gfsphysics/GFS_layer/GFS_restart.F90 @@ -264,7 +264,6 @@ subroutine GFS_restart_populate (Restart, Model, Statein, Stateout, Sfcprop, & endif #ifdef CCPP !--- RAP/HRRR-specific variables, 3D - num = Model%ntot3d ! GF if (Model%imfdeepcnv == Model%imfdeepcnv_gf) then From 2ee496ba07b6b1cbc719158f9d729d4f014f6407 Mon Sep 17 00:00:00 2001 From: Eric Aligo Date: Fri, 14 Aug 2020 13:53:25 +0000 Subject: [PATCH 4/8] Update to GFS_restart.F90 to include if block to test for reflectivity flag. --- gfsphysics/GFS_layer/GFS_restart.F90 | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/gfsphysics/GFS_layer/GFS_restart.F90 b/gfsphysics/GFS_layer/GFS_restart.F90 index bbd8dcebd..17d598c83 100644 --- a/gfsphysics/GFS_layer/GFS_restart.F90 +++ b/gfsphysics/GFS_layer/GFS_restart.F90 @@ -117,6 +117,7 @@ subroutine GFS_restart_populate (Restart, Model, Statein, Stateout, Sfcprop, & #endif Restart%num3d = Model%ntot3d + print *,'aligo1 Restart%num3d,Model%ntot3d',Restart%num3d,Model%ntot3d if(Model%lrefres) then Restart%num3d = Model%ntot3d+1 endif @@ -263,8 +264,12 @@ subroutine GFS_restart_populate (Restart, Model, Statein, Stateout, Sfcprop, & enddo endif #ifdef CCPP + if (Model%lrefres) then + num = Model%ntot3d+1 + else + num = Model%ntot3d + endif !--- RAP/HRRR-specific variables, 3D - ! GF if (Model%imfdeepcnv == Model%imfdeepcnv_gf) then num = num + 1 From 79d711a4f63643f94c92657822fb224603017a1c Mon Sep 17 00:00:00 2001 From: Eric Aligo Date: Fri, 14 Aug 2020 21:41:05 +0000 Subject: [PATCH 5/8] removed print statement --- gfsphysics/GFS_layer/GFS_restart.F90 | 1 - 1 file changed, 1 deletion(-) diff --git a/gfsphysics/GFS_layer/GFS_restart.F90 b/gfsphysics/GFS_layer/GFS_restart.F90 index 17d598c83..eada1fc3d 100644 --- a/gfsphysics/GFS_layer/GFS_restart.F90 +++ b/gfsphysics/GFS_layer/GFS_restart.F90 @@ -117,7 +117,6 @@ subroutine GFS_restart_populate (Restart, Model, Statein, Stateout, Sfcprop, & #endif Restart%num3d = Model%ntot3d - print *,'aligo1 Restart%num3d,Model%ntot3d',Restart%num3d,Model%ntot3d if(Model%lrefres) then Restart%num3d = Model%ntot3d+1 endif From cd9136457f7daff77bc2d767bb94cb3cedfee973 Mon Sep 17 00:00:00 2001 From: Eric Aligo Date: Tue, 18 Aug 2020 15:56:09 +0000 Subject: [PATCH 6/8] revert back to 6ee0b62 --- ccpp/physics | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ccpp/physics b/ccpp/physics index 691239234..0aa188123 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit 691239234eee0cd01e1b4fbc79f58da060cdcd78 +Subproject commit 0aa188123ed446633f82379999c8187fbca74841 From e5379d42c2f9ba5a8c55a2941877dff04409a470 Mon Sep 17 00:00:00 2001 From: Eric Aligo Date: Thu, 20 Aug 2020 19:17:28 +0000 Subject: [PATCH 7/8] point to NCAR ccpp/physics --- ccpp/physics | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ccpp/physics b/ccpp/physics index 0aa188123..8617587ed 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit 0aa188123ed446633f82379999c8187fbca74841 +Subproject commit 8617587edb95aa097b7bbc2735990393bc6d9b90 From 539bef24aa843e2ce7365d1fca7bd80cb6aacfdf Mon Sep 17 00:00:00 2001 From: Eric Aligo Date: Thu, 20 Aug 2020 19:46:23 +0000 Subject: [PATCH 8/8] commit gitmodules --- .gitmodules | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitmodules b/.gitmodules index 4237868e7..789f67889 100644 --- a/.gitmodules +++ b/.gitmodules @@ -8,5 +8,5 @@ branch = master [submodule "ccpp/physics"] path = ccpp/physics - url = https://github.com/ericaligo-NOAA/ccpp-physics.git - branch = cldfra + url = https://github.com/NCAR/ccpp-physics.git + branch = master