From 30f64065fe5cddf3ea878d40a2367d4bc13eceaa Mon Sep 17 00:00:00 2001 From: pjpegion Date: Fri, 6 May 2022 14:04:03 +0000 Subject: [PATCH 1/3] modify fhzero logic in empyting buckets --- ccpp/driver/CCPP_driver.F90 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ccpp/driver/CCPP_driver.F90 b/ccpp/driver/CCPP_driver.F90 index fd6814bf5..278d745ea 100644 --- a/ccpp/driver/CCPP_driver.F90 +++ b/ccpp/driver/CCPP_driver.F90 @@ -149,7 +149,8 @@ subroutine CCPP_step (step, nblks, ierr) endif !--- determine if physics diagnostics buckets need to be cleared - if (mod(GFS_control%kdt,GFS_control%nszero) == 1) then + !if (mod(GFS_control%kdt,GFS_control%nszero) == 1) then + if ((mod(GFS_control%kdt-1,GFS_control%nszero)+1) == 1) then do nb = 1,nblks call GFS_data(nb)%Intdiag%phys_zero(GFS_control) end do From 337ea6cde19193e9e623252f197e7eedbc7fd9fa Mon Sep 17 00:00:00 2001 From: pjpegion Date: Fri, 6 May 2022 18:29:28 +0000 Subject: [PATCH 2/3] remove commented line --- ccpp/driver/CCPP_driver.F90 | 1 - 1 file changed, 1 deletion(-) diff --git a/ccpp/driver/CCPP_driver.F90 b/ccpp/driver/CCPP_driver.F90 index 278d745ea..e42506bff 100644 --- a/ccpp/driver/CCPP_driver.F90 +++ b/ccpp/driver/CCPP_driver.F90 @@ -149,7 +149,6 @@ subroutine CCPP_step (step, nblks, ierr) endif !--- determine if physics diagnostics buckets need to be cleared - !if (mod(GFS_control%kdt,GFS_control%nszero) == 1) then if ((mod(GFS_control%kdt-1,GFS_control%nszero)+1) == 1) then do nb = 1,nblks call GFS_data(nb)%Intdiag%phys_zero(GFS_control) From 74c885279f8db93170d66f464b296f91881bc32f Mon Sep 17 00:00:00 2001 From: pjpegion Date: Mon, 16 May 2022 20:44:16 +0000 Subject: [PATCH 3/3] clean up mod test --- ccpp/driver/CCPP_driver.F90 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ccpp/driver/CCPP_driver.F90 b/ccpp/driver/CCPP_driver.F90 index e42506bff..ec36e2ad3 100644 --- a/ccpp/driver/CCPP_driver.F90 +++ b/ccpp/driver/CCPP_driver.F90 @@ -149,7 +149,7 @@ subroutine CCPP_step (step, nblks, ierr) endif !--- determine if physics diagnostics buckets need to be cleared - if ((mod(GFS_control%kdt-1,GFS_control%nszero)+1) == 1) then + if ((mod(GFS_control%kdt-1,GFS_control%nszero)) == 0) then do nb = 1,nblks call GFS_data(nb)%Intdiag%phys_zero(GFS_control) end do