add check if progsigma is true

XiaqiongZhou-NOAA · Jun 25, 2024 · 891959c · 891959c
1 parent b73269f
commit 891959c
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 6 deletions.
diff --git a/physics/CONV/SAMF/samfdeepcnv.f b/physics/CONV/SAMF/samfdeepcnv.f
@@ -3431,9 +3431,13 @@ subroutine samfdeepcnv_run (im,km,first_time_step,restart,        &
           if (cnvflg(i) .and. rn(i) > 0.) then
             if (k >= kbcon(i) .and. k < ktcon(i)) then
                cnvw(i,k) = cnvwt(i,k) * xmb(i) * dt2
-               tem=max(sigmaout(i,k),0.)
-               tem1=min(tem,1.0)
-               cnvw(i,k)=cnvw(i,k)*tem1
+               if(progsigma)then
+                tem=max(sigmaout(i,k),0.)
+                tem1=min(tem,1.0)
+                cnvw(i,k)=cnvw(i,k)*tem1
+               else
+                cnvw(i,k)=cnvw(i,k)*sigmagfm(i)
+               endif
             endif
           endif
         enddo

diff --git a/physics/CONV/SAMF/samfshalcnv.f b/physics/CONV/SAMF/samfshalcnv.f
@@ -2405,9 +2405,13 @@ subroutine samfshalcnv_run(im,km,itc,ntc,cliq,cp,cvap,            &
           if (cnvflg(i)) then
             if (k >= kbcon(i) .and. k < ktcon(i)) then
               cnvw(i,k) = cnvwt(i,k) * xmb(i) * dt2
-              tem=max(sigmaout(i,k),0.)
-              tem1=min(tem,1.0)
-              cnvw(i,k)=cnvw(i,k)*tem1
+              if(progsigma)then
+                tem=max(sigmaout(i,k),0.)
+                tem1=min(tem,1.0)
+		cnvw(i,k)=cnvw(i,k)*tem1
+              else
+                cnvw(i,k)=cnvw(i,k)*sigmagfm(i)
+             endif
            endif
           endif
         enddo