azamatm@thetalogin1:~/repos/E3SM> git diff components/cam/src/physics/cam/check_energy.F90
diff --git a/components/cam/src/physics/cam/check_energy.F90 b/components/cam/src/physics/cam/check_energy.F90
index f69569bb1..c91fe7ca2 100644
--- a/components/cam/src/physics/cam/check_energy.F90
+++ b/components/cam/src/physics/cam/check_energy.F90
@@ -672,7 +672,8 @@ subroutine ieflx_gmean(state, tend, pbuf2d, cam_in, cam_out, nstep)
     snow = 0._r8
     ienet = 0._r8

-!DIR$ CONCURRENT
+    if (ieflx_opt < 1 .or. ieflx_opt > 2) call endrun('*** incorrect ieflx_opt ***')
+
     do lchnk = begchunk, endchunk

        ncol = state(lchnk)%ncol
@@ -680,8 +681,6 @@ subroutine ieflx_gmean(state, tend, pbuf2d, cam_in, cam_out, nstep)
        snow(:ncol,lchnk) = cam_out(lchnk)%precsc(:ncol) + cam_out(lchnk)%precsl(:ncol)
        rain(:ncol,lchnk) = cam_out(lchnk)%precc(:ncol)  + cam_out(lchnk)%precl(:ncol) - snow(:ncol,lchnk)

-       select case (ieflx_opt)
-
        !!.....................................................................................
        !! Calculate the internal energy flux at surface (imitate what is considered in the ocean model)
        !!
@@ -693,27 +692,22 @@ subroutine ieflx_gmean(state, tend, pbuf2d, cam_in, cam_out, nstep)
        !! (rhow*) converts the unit of precipitation from m/s to kg/m2/s
        !!.....................................................................................

-       case(1)
+       if (ieflx_opt == 1) then
           ienet(:ncol,lchnk) = cpsw * qflx(:ncol,lchnk) * cam_in(lchnk)%ts(:ncol) - &
                                cpsw * rhow * ( rain(:ncol,lchnk) + snow(:ncol,lchnk) ) * cam_out(lchnk)%tbot(:ncol)
-       case(2)
+       else
           ienet(:ncol,lchnk) = cpsw * qflx(:ncol,lchnk) * cam_in(lchnk)%ts(:ncol) - &
                                cpsw * rhow * ( rain(:ncol,lchnk) + snow(:ncol,lchnk) ) * cam_in(lchnk)%ts(:ncol)
-       case default
-          call endrun('*** incorrect ieflx_opt ***')
-       end select
-
-
+       endif
     end do

     call gmean(ienet, ieflx_glob)

-!DIR$ CONCURRENT
-    do lchnk = begchunk, endchunk
+    ieflx = ieflx_glob

-       ieflx(:ncol) = ieflx_glob
+    do lchnk = begchunk, endchunk

-       call outfld('IEFLX', ieflx(:ncol), pcols, lchnk)
+       call outfld('IEFLX', ieflx, pcols, lchnk)

     end do