fixes in energy diagnostics

Author: Andrea Rosendahl

src/physics/cam/cam_diagnostics.F90

@@ -308,11 +308,11 @@ subroutine diag_init_dry(pbuf2d)
     call addfld ('ZBOT',       horiz_only,  'A', 'm','Lowest model level height')
 
     call addfld ('ATMEINT',    horiz_only,  'A', 'J/m2','Vertically integrated total atmospheric energy ')
-    call addfld ('INTEnTrInt', horiz_only,  'A', 'W/m3', 'Meridional transport of internal energy - need to integrate in x to get the total')
-    call addfld ('POTEnTrInt', horiz_only,  'A', 'W/m3', 'Meridional transport of potential energy - need to integrate in x to get the total')
-    call addfld ('LATEnTrInt', horiz_only,  'A', 'W/m3', 'Meridional transport of latent energy - need to integrate in x to get the total')
-    call addfld ('KINEnTrInt', horiz_only,  'A', 'W/m3', 'Meridional transport of kinetic energy - need to integrate in x to get the total')
-    call addfld ('TOTEnTrInt', horiz_only,  'A', 'W/m3', 'Meridional transport of total energy - need to integrate in x to get the total')
+    call addfld ('INTEnTrInt', horiz_only,  'A', 'W/m3', 'Meridional transport of internal energy')
+    call addfld ('POTEnTrInt', horiz_only,  'A', 'W/m3', 'Meridional transport of potential energy')
+    call addfld ('LATEnTrInt', horiz_only,  'A', 'W/m3', 'Meridional transport of latent energy')
+    call addfld ('KINEnTrInt', horiz_only,  'A', 'W/m3', 'Meridional transport of kinetic energy')
+    call addfld ('TOTEnTrInt', horiz_only,  'A', 'W/m3', 'Meridional transport of total energy')
 
     if (history_amwg) then
       call add_default ('PHIS    '  , 1, ' ')
@@ -1437,7 +1437,7 @@ subroutine diag_phys_writeout_moist(state, pbuf, p_surf_t)
     do k=2,pver
       ftem3(:ncol) = ftem3(:ncol) + ftem(:ncol,k)
     end do
-    call outfld ('INTEnTrInt', ftem3(:ncol), ncol   ,ncol)
+    call outfld ('INTEnTrInt', ftem3(:ncol), ncol   ,lchnk)
 
     !! latent energy transport Lv*Q*v*dp/g
     ftem(:ncol,:) = (latvap*state%q(:ncol,:,ixq)*state%v(:ncol,:))*(state%pdel(:ncol,:)/gravit)
@@ -1447,7 +1447,7 @@ subroutine diag_phys_writeout_moist(state, pbuf, p_surf_t)
     do k=2,pver
       ftem3(:ncol) = ftem3(:ncol) + ftem(:ncol,k)
     end do
-    call outfld ('LATEnTrInt', ftem3(:ncol)  ,ncol   ,ncol    )
+    call outfld ('LATEnTrInt', ftem3(:ncol)  ,ncol   ,lchnk    )
 
     !! potential energy transport g*z*v*dp/g 
     ftem(:ncol,:) = (gravit*z3(:ncol,:)*state%v(:ncol,:))*(state%pdel(:ncol,:)/gravit)
@@ -1457,7 +1457,7 @@ subroutine diag_phys_writeout_moist(state, pbuf, p_surf_t)
     do k=2,pver
       ftem3(:ncol) = ftem3(:ncol) + ftem(:ncol,k)
     end do
-    call outfld ('POTEnTrInt',ftem3(:ncol)  ,ncol   ,ncol     )
+    call outfld ('POTEnTrInt',ftem3(:ncol)  ,ncol   ,lchnk   )
 
     !! kinetic energy transport 0.5*(u²+v²)*v*dp/g
     ftem(:ncol,:) = ((0.5_r8*(state%u(:ncol,:)**2+state%v(:ncol,:)**2))*state%v(:ncol,:))*(state%pdel(:ncol,:)/gravit)
@@ -1467,7 +1467,7 @@ subroutine diag_phys_writeout_moist(state, pbuf, p_surf_t)
     do k=2,pver
       ftem3(:ncol) = ftem3(:ncol) + ftem(:ncol,k)
     end do
-    call outfld ('KINEnTrInt',ftem3(:ncol) ,ncol   ,ncol     )
+    call outfld ('KINEnTrInt',ftem3(:ncol) ,ncol   ,lchnk   )
 
     !! Total energy transport Cp*T*v*dp/g + Lv*Q*v*dp/g + g*z*v*dp/g + 0.5*(u²+v²)*v*dp/g
     ftem(:ncol,:) = (cpair*state%t(:ncol,:) + latvap*state%q(:ncol,:,ixq) + gravit*z3(:ncol,:) + &
@@ -1478,7 +1478,7 @@ subroutine diag_phys_writeout_moist(state, pbuf, p_surf_t)
     do k=2,pver
       ftem3(:ncol) = ftem3(:ncol) + ftem(:ncol,k)
     end do
-    call outfld ('TOTEnTrInt',ftem3(:ncol)  ,ncol   ,ncol     )
+    call outfld ('TOTEnTrInt',ftem3(:ncol)  ,ncol   ,lchnk   )
 
 
     !! Boundary layer atmospheric stability, temperature, water vapor diagnostics