remove q1 clipping; change ktcon1 initialization from Jongil Han's re…

…view
NCAR · Aug 25, 2022 · 1944081 · 1944081
1 parent 042557e
commit 1944081
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 8 deletions.
diff --git a/physics/samfdeepcnv.f b/physics/samfdeepcnv.f
@@ -1618,7 +1618,7 @@ subroutine samfdeepcnv_run (im,km,first_time_step,restart,        &
 c
       do i = 1, im
         flg(i) = cnvflg(i)
-        ktcon1(i) = kmax(i)
+        ktcon1(i) = ktcon(i)
       enddo
       do k = 2, km1
         do i = 1, im
@@ -3056,9 +3056,6 @@ subroutine samfdeepcnv_run (im,km,first_time_step,restart,        &
               dellat = (dellah(i,k) - hvap * dellaq(i,k)) / cp
               t1(i,k) = t1(i,k) + tem2 * dellat
               q1(i,k) = q1(i,k) + tem2 * dellaq(i,k)
-! NRL MNM: Limit q1
-              val = epsilon(1.0_kind_phys)
-              q1(i,k) = max(q1(i,k), val  )
 !             tem = tem2 / rcs(i)
 !             u1(i,k) = u1(i,k) + dellau(i,k) * tem
 !             v1(i,k) = v1(i,k) + dellav(i,k) * tem

diff --git a/physics/sascnvn.F b/physics/sascnvn.F
@@ -987,7 +987,7 @@ subroutine sascnvn_run(
 !
       do i = 1, im
         flg(i) = cnvflg(i)
-        ktcon1(i) = kmax(i) - 1
+        ktcon1(i) = ktcon(i)
       enddo
       do k = 2, km1
         do i = 1, im
@@ -1878,9 +1878,6 @@ subroutine sascnvn_run(
               dellat = (dellah(i,k) - hvap * dellaq(i,k)) / cp
               t1(i,k) = t1(i,k) + dellat * xmb(i) * dt2
               q1(i,k) = q1(i,k) + dellaq(i,k) * xmb(i) * dt2
-! NRL MNM: Limit q1
-              val = epsilon(1.0_kind_phys)
-              q1(i,k) = max(q1(i,k), val  )
 !             tem = 1./rcs(i)
 !             u1(i,k) = u1(i,k) + dellau(i,k) * xmb(i) * dt2 * tem
 !             v1(i,k) = v1(i,k) + dellav(i,k) * xmb(i) * dt2 * tem