From 18910aa3f6c5b16b1e8aefe985fb811a1bb83699 Mon Sep 17 00:00:00 2001 From: Philip Pegion Date: Fri, 20 Mar 2020 14:12:54 +0000 Subject: [PATCH 1/2] make rain/snow tendency consistent with accumulated rain/snow --- .gitmodules | 2 +- ccpp/framework | 2 +- ccpp/physics | 2 +- gfsphysics/GFS_layer/GFS_physics_driver.F90 | 21 ++++----------------- 4 files changed, 7 insertions(+), 20 deletions(-) diff --git a/.gitmodules b/.gitmodules index d253f6966..746cbc1b5 100644 --- a/.gitmodules +++ b/.gitmodules @@ -8,5 +8,5 @@ branch = master [submodule "ccpp/physics"] path = ccpp/physics - url = https://github.com/NCAR/ccpp-physics + url = https://github.com/pjpegion/ccpp-physics branch = master diff --git a/ccpp/framework b/ccpp/framework index d32b965b1..e77210986 160000 --- a/ccpp/framework +++ b/ccpp/framework @@ -1 +1 @@ -Subproject commit d32b965b11882a42d9db522dc13823b7720b63aa +Subproject commit e7721098639ee73c2a69ee0e8423e8905549e240 diff --git a/ccpp/physics b/ccpp/physics index 3d45390dc..322f5b17c 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit 3d45390dcd118c3cb0c6fb008e2d21608bbf0648 +Subproject commit 322f5b17c13015b23e075463459b9077eb8943e3 diff --git a/gfsphysics/GFS_layer/GFS_physics_driver.F90 b/gfsphysics/GFS_layer/GFS_physics_driver.F90 index c2bf254ac..266672c8d 100644 --- a/gfsphysics/GFS_layer/GFS_physics_driver.F90 +++ b/gfsphysics/GFS_layer/GFS_physics_driver.F90 @@ -911,10 +911,6 @@ subroutine GFS_physics_driver & ! --- set initial quantities for stochastic physics deltas if (Model%do_sppt) then Tbd%dtdtr = zero - do i=1,im - Tbd%drain_cpl(i) = Coupling%rain_cpl (i) - Tbd%dsnow_cpl(i) = Coupling%snow_cpl (i) - enddo endif ! mg, sfc-perts @@ -5463,10 +5459,10 @@ subroutine GFS_physics_driver & if (Model%cplflx .or. Model%cplchm) then do i = 1, im - Coupling%rain_cpl(i) = Coupling%rain_cpl(i) & - + Diag%rain(i) * (one-Sfcprop%srflag(i)) - Coupling%snow_cpl(i) = Coupling%snow_cpl(i) & - + Diag%rain(i) * Sfcprop%srflag(i) + Coupling%drain_cpl(i)= Diag%rain(i) * (one-Sfcprop%srflag(i)) + Coupling%dsnow_cpl(i)= Diag%rain(i) * Sfcprop%srflag(i) + Coupling%rain_cpl(i) = Coupling%rain_cpl(i) + Coupling%drain_cpl(i) + Coupling%snow_cpl(i) = Coupling%snow_cpl(i) + Coupling%dsnow_cpl(i) enddo endif @@ -5557,15 +5553,6 @@ subroutine GFS_physics_driver & if (Model%do_sppt) then !--- radiation heating rate Tbd%dtdtr(1:im,:) = Tbd%dtdtr(1:im,:) + dtdtc(1:im,:)*dtf - do i = 1, im - if (t850(i) > 273.16) then -!--- change in change in rain precip - Tbd%drain_cpl(i) = Diag%rain(i) - Tbd%drain_cpl(i) - else -!--- change in change in snow precip - Tbd%dsnow_cpl(i) = Diag%rain(i) - Tbd%dsnow_cpl(i) - endif - enddo endif !*## CCPP ## !## CCPP ##* This block is not in the CCPP since it is not needed in the CCPP. From 589ecfdcaaa66d5834e3380d33714a627b77b67b Mon Sep 17 00:00:00 2001 From: Philip Pegion Date: Fri, 20 Mar 2020 15:01:07 +0000 Subject: [PATCH 2/2] put drain_cpl and dsnow_cpl in proper container --- gfsphysics/GFS_layer/GFS_physics_driver.F90 | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gfsphysics/GFS_layer/GFS_physics_driver.F90 b/gfsphysics/GFS_layer/GFS_physics_driver.F90 index 266672c8d..fa2403347 100644 --- a/gfsphysics/GFS_layer/GFS_physics_driver.F90 +++ b/gfsphysics/GFS_layer/GFS_physics_driver.F90 @@ -5459,10 +5459,10 @@ subroutine GFS_physics_driver & if (Model%cplflx .or. Model%cplchm) then do i = 1, im - Coupling%drain_cpl(i)= Diag%rain(i) * (one-Sfcprop%srflag(i)) - Coupling%dsnow_cpl(i)= Diag%rain(i) * Sfcprop%srflag(i) - Coupling%rain_cpl(i) = Coupling%rain_cpl(i) + Coupling%drain_cpl(i) - Coupling%snow_cpl(i) = Coupling%snow_cpl(i) + Coupling%dsnow_cpl(i) + Tbd%drain_cpl(i)= Diag%rain(i) * (one-Sfcprop%srflag(i)) + Tbd%dsnow_cpl(i)= Diag%rain(i) * Sfcprop%srflag(i) + Coupling%rain_cpl(i) = Coupling%rain_cpl(i) + Tbd%drain_cpl(i) + Coupling%snow_cpl(i) = Coupling%snow_cpl(i) + Tbd%dsnow_cpl(i) enddo endif