From bfe13b020d34e1d7a9dcfd416703281bebf542cb Mon Sep 17 00:00:00 2001
From: "Samuel Trahan (NOAA contractor)"
 <39415369+SamuelTrahanNOAA@users.noreply.github.com>
Date: Thu, 14 May 2020 09:04:06 -0400
Subject: [PATCH]  fix bugs found in pbl and ozone 3d diagnostic tendencies
 (#26)

PBL tendencies were missing in two schemes; now fixed. Squashed commit of the following:

* fix bugs found in pbl and ozone 3d diagnostic tendencies
* remove debugging prints
* implied shape arrays for five variables
* more block labels in CCPP
* make the logging less wordy
* point to hash 238c84cb3c789056c701b70d3373e640ed4fa599 of ccpp/physics
---
 ccpp/physics                          |  2 +-
 gfsphysics/GFS_layer/GFS_typedefs.F90 | 30 ++++++++++++++++++---------
 2 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/ccpp/physics b/ccpp/physics
index bbc6f3356..238c84cb3 160000
--- a/ccpp/physics
+++ b/ccpp/physics
@@ -1 +1 @@
-Subproject commit bbc6f3356afc33b504811049848af986d07263d9
+Subproject commit 238c84cb3c789056c701b70d3373e640ed4fa599
diff --git a/gfsphysics/GFS_layer/GFS_typedefs.F90 b/gfsphysics/GFS_layer/GFS_typedefs.F90
index a4704e976..f91af3f62 100644
--- a/gfsphysics/GFS_layer/GFS_typedefs.F90
+++ b/gfsphysics/GFS_layer/GFS_typedefs.F90
@@ -3311,42 +3311,52 @@ subroutine control_initialize (Model, nlunit, fn_nml, me, master, &
 #ifdef CCPP
 
     if(gwd_opt==1) then
-      write(0,*) 'FLAG: gwd_opt==1 so gwd not generic'
+      if(me==master) &
+           write(0,*) 'FLAG: gwd_opt==1 so gwd not generic'
       Model%flag_for_gwd_generic_tend=.false.
-    else
+    elseif(me==master) then
       write(0,*) 'NO FLAG: gwd is generic'
     endif
 
     if(satmedmf .and. isatmedmf==0) then
-      write(0,*) 'FLAG: satmedmf and isatedmf=0 so pbl not generic'
+      if(me==master) &
+           write(0,*) 'FLAG: satmedmf and isatedmf=0 so pbl not generic'
+      Model%flag_for_pbl_generic_tend=.false.
+    elseif(satmedmf .and. isatmedmf==1) then
+      if(me==master) &
+           write(0,*) 'FLAG: satmedmf and isatedmf=1 so pbl not generic'
       Model%flag_for_pbl_generic_tend=.false.
     else if(hybedmf) then
-      write(0,*) 'FLAG: hybedmf so pbl not generic'
+      if(me==master) &
+           write(0,*) 'FLAG: hybedmf so pbl not generic'
       Model%flag_for_pbl_generic_tend=.false.
     else if(do_mynnedmf) then
-      write(0,*) 'FLAG: do_mynnedmf so pbl not generic'
+      if(me==master) &
+           write(0,*) 'FLAG: do_mynnedmf so pbl not generic'
       Model%flag_for_pbl_generic_tend=.false.
-    else
+    elseif(me==master) then
       write(0,*) 'NO FLAG: pbl is generic'
     endif
 
     if(imfshalcnv == Model%imfshalcnv_gf) then
-      write(0,*) 'FLAG: imfshalcnv_gf so scnv not generic'
+      if(me==master) &
+           write(0,*) 'FLAG: imfshalcnv_gf so scnv not generic'
       Model%flag_for_scnv_generic_tend=.false.
     ! else if(imfshalcnv == Model%imfshalcnv_samf) then
     !   write(0,*) 'FLAG: imfshalcnv_samf so scnv not generic'
     !   Model%flag_for_scnv_generic_tend=.false.
-    else
+    elseif(me==master) then
       write(0,*) 'NO FLAG: scnv is generic'
     endif
 
     if(imfdeepcnv == Model%imfdeepcnv_gf) then
-      write(0,*) 'FLAG: imfdeepcnv_gf so dcnv not generic'
+      if(me==master) &
+           write(0,*) 'FLAG: imfdeepcnv_gf so dcnv not generic'
       Model%flag_for_dcnv_generic_tend=.false.
     ! else if(imfdeepcnv == Model%imfdeepcnv_samf) then
     !   write(0,*) 'FLAG: imfdeepcnv_samf so dcnv not generic'
     !   Model%flag_for_dcnv_generic_tend=.false.
-    else
+    elseif(me==master) then
       write(0,*) 'NO FLAG: dcnv is generic'
     endif
 #endif