physics/cam/qneg_module.F90

fixed problem if refactor - this will change answers

Author: mvertens

src/physics/cam/physics_types.F90

@@ -432,46 +432,29 @@ subroutine physics_update(state, ptend, dt, tend )
     if(ptend%ls) then
 
        if(compute_enthalpy_flux) then
-          !use conserved energy
-          call get_conserved_energy(levels_are_moist, ptend%top_level, ptend%bot_level  &
-               , cpairv_loc(:ncol,:), state%T(:ncol,:), state%q(:ncol,:,:), state%pdel(:ncol,:) &
-               , pdel(:ncol,:), te(:ncol,:))
-          te(:ncol,ptend%top_level:ptend%bot_level)=te(:ncol,ptend%top_level:ptend%bot_level) &
-               +ptend%s(:ncol,ptend%top_level:ptend%bot_level)*dt
-          call inv_conserved_energy(levels_are_moist, ptend%top_level, ptend%bot_level  &
-               , te(:ncol,:), cpairv_loc(:ncol,:), state%q(:ncol,:,:), state%pdel(:ncol,:) &
-               , pdel(:ncol,:), t_tmp(:ncol,:))
-          if (present(tend)) &
-               tend%dtdt(:ncol,ptend%top_level:ptend%bot_level)=tend%dtdt(:ncol,ptend%top_level:ptend%bot_level) + &
-               (T_tmp(:ncol,ptend%top_level:ptend%bot_level) &
-               -state%t(:ncol,ptend%top_level:ptend%bot_level))/dt
-          state%T(:ncol,ptend%top_level:ptend%bot_level)=T_tmp(:ncol,ptend%top_level:ptend%bot_level)
-       end if
-
-       ! if(compute_enthalpy_flux) then
-       !    !use conserved energy
-       !    call get_conserved_energy(levels_are_moist, ptend%top_level, ptend%bot_level,  &
-       !         cpairv_loc(:ncol,:), state%T(:ncol,:), state%q(:ncol,:,:), state%pdel(:ncol,:), &
-       !         pdel(:ncol,:), te(:ncol,:))
-       !    te(:ncol,ptend%top_level:ptend%bot_level) = te(:ncol,ptend%top_level:ptend%bot_level) + &
-       !         ptend%s(:ncol,ptend%top_level:ptend%bot_level)*dt
-       !    call inv_conserved_energy(levels_are_moist, ptend%top_level, ptend%bot_level,  &
-       !          te(:ncol,:), cpairv_loc(:ncol,:), state%q(:ncol,:,:), state%pdel(:ncol,:), &
-       !          pdel(:ncol,:), t_tmp(:ncol,:))
-       !    if (present(tend)) then
-       !       tend%dtdt(:ncol,ptend%top_level:ptend%bot_level) = tend%dtdt(:ncol,ptend%top_level:ptend%bot_level) + &
-       !            (T_tmp(:ncol,ptend%top_level:ptend%bot_level) - &
-       !            state%t(:ncol,ptend%top_level:ptend%bot_level))/dt
-       !    end if
-       !    state%T(:ncol,ptend%top_level:ptend%bot_level) = T_tmp(:ncol,ptend%top_level:ptend%bot_level)
-       ! else
-       !    do k = ptend%top_level, ptend%bot_level
-       !       state%t(:ncol,k) = state%t(:ncol,k) + ptend%s(:ncol,k)*dt/cpairv_loc(:ncol,k)
-       !       if (present(tend)) then
-       !          tend%dtdt(:ncol,k) = tend%dtdt(:ncol,k) + ptend%s(:ncol,k)/cpairv_loc(:ncol,k)
-       !       end if
-       !    end do
-       ! endif
+          !use conserved energy (pe and te are output variables in get_conserved_energy call)
+          call get_conserved_energy(levels_are_moist, ptend%top_level, ptend%bot_level,  &
+               cpairv_loc(:ncol,:), state%T(:ncol,:), state%q(:ncol,:,:), state%pdel(:ncol,:), &
+               pdel(:ncol,:), te(:ncol,:))
+          te(:ncol,ptend%top_level:ptend%bot_level) = te(:ncol,ptend%top_level:ptend%bot_level) + &
+               ptend%s(:ncol,ptend%top_level:ptend%bot_level)*dt
+          call inv_conserved_energy(levels_are_moist, ptend%top_level, ptend%bot_level,  &
+                te(:ncol,:), cpairv_loc(:ncol,:), state%q(:ncol,:,:), state%pdel(:ncol,:), &
+                pdel(:ncol,:), t_tmp(:ncol,:))
+          if (present(tend)) then
+             tend%dtdt(:ncol,ptend%top_level:ptend%bot_level) = tend%dtdt(:ncol,ptend%top_level:ptend%bot_level) + &
+                  (T_tmp(:ncol,ptend%top_level:ptend%bot_level) - &
+                  state%t(:ncol,ptend%top_level:ptend%bot_level))/dt
+          end if
+          state%T(:ncol,ptend%top_level:ptend%bot_level) = T_tmp(:ncol,ptend%top_level:ptend%bot_level)
+       else
+          do k = ptend%top_level, ptend%bot_level
+             state%t(:ncol,k) = state%t(:ncol,k) + ptend%s(:ncol,k)*dt/cpairv_loc(:ncol,k)
+             if (present(tend)) then
+                tend%dtdt(:ncol,k) = tend%dtdt(:ncol,k) + ptend%s(:ncol,k)/cpairv_loc(:ncol,k)
+             end if
+          end do
+       endif
 
     end if
 

src/physics/cam/qneg_module.F90

@@ -325,7 +325,7 @@ subroutine qneg4 (subnam, lchnk, ncol, ztodt,                            &
     ! Author: J. Olson
     !
     !-----------------------------------------------------------------------
-    use physconst,    only: gravit, latvap, latice !+tht
+    use physconst,    only: gravit, latvap, latice
     use constituents, only: qmin
     use cam_history,  only: outfld
 
@@ -391,18 +391,14 @@ subroutine qneg4 (subnam, lchnk, ncol, ztodt,                            &
           qflx (i,1) = qflx (i,1) - excess(i)
           lhflx(i) = lhflx(i) - excess(i)*latvap
           shflx(i) = shflx(i) + excess(i)*latvap
+          if (present(seflx)) then
+             seflx(i) = seflx(i) + excess(i)*(latvap+latice)
+          end if
           if (index > 0) then
              qneg4_warn_num(index) = qneg4_warn_num(index) + 1
           end if
        end if
     end do
-    if (present(seflx)) then
-       do i = 1, ncol
-          if (excess(i) < 0._r8) then
-             seflx(i) = seflx(i) + excess(i)*(latvap+latice)
-          end if
-       end do
-    end if
 
     ! Maybe output bad values
     if ((cnst_outfld((2*pcnst)+1)) .and. (worst < worst_reset)) then