Minor modification and bug fix in GFS cumulus convection schemes #232
+144
−84
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -21,7 +21,7 @@ module progsigma | |
| !!\section gen_progsigma progsigma_calc General Algorithm | ||
| subroutine progsigma_calc (im,km,flag_init,flag_restart,flag_shallow,& | ||
| flag_mid,del,tmf,qmicro,dbyo1,zdqca,omega_u,zeta,hvap, & | ||
| delt,qadv,kb,kbcon1,ktcon,cnvflg,betascu,betamcu,betadcu, & | ||
| sigmind,sigminm,sigmins,sigmain,sigmaout,sigmab) | ||
| ! | ||
| ! | ||
|
|
@@ -31,7 +31,7 @@ subroutine progsigma_calc (im,km,flag_init,flag_restart,flag_shallow,& | |
| implicit none | ||
|
|
||
| ! intent in | ||
| integer, intent(in) :: im,km,kb(im),kbcon1(im),ktcon(im) | ||
| real(kind=kind_phys), intent(in) :: hvap,delt,betascu,betamcu,betadcu, & | ||
| sigmind,sigminm,sigmins | ||
| real(kind=kind_phys), intent(in) :: qadv(im,km),del(im,km), & | ||
|
|
@@ -48,13 +48,13 @@ subroutine progsigma_calc (im,km,flag_init,flag_restart,flag_shallow,& | |
| ! Local variables | ||
| integer :: i,k,km1 | ||
| real(kind=kind_phys) :: termA(im),termB(im),termC(im),termD(im) | ||
| real(kind=kind_phys) :: fdqa(im),form(im,km), & | ||
| dp(im,km),inbu(im,km) | ||
| real(kind=kind_phys) :: sumx(im) | ||
|
|
||
| real(kind=kind_phys) :: gcvalmx,epsilon,ZZ,cvg,mcon,buy2, & | ||
| fdqb,dtdyn,dxlim,rmulacvg,tem, & | ||
| DEN,dp1,invdelt,sigmind_new | ||
|
|
||
| !Parameters | ||
| gcvalmx = 0.1 | ||
|
|
@@ -63,6 +63,12 @@ subroutine progsigma_calc (im,km,flag_init,flag_restart,flag_shallow,& | |
| km1=km-1 | ||
| invdelt = 1./delt | ||
|
|
||
| if (flag_init) then | ||
| sigmind_new=0.0 | ||
| else | ||
| sigmind_new=sigmind | ||
| end if | ||
|
|
||
| !Initialization 2D | ||
| do k = 1,km | ||
| do i = 1,im | ||
|
|
@@ -80,7 +86,7 @@ subroutine progsigma_calc (im,km,flag_init,flag_restart,flag_shallow,& | |
| termC(i)=0. | ||
| termD(i)=0. | ||
| fdqa(i)=0. | ||
| sumx(i)=0. | ||
| enddo | ||
|
|
||
| do k = 2,km1 | ||
|
|
@@ -89,47 +95,49 @@ subroutine progsigma_calc (im,km,flag_init,flag_restart,flag_shallow,& | |
| dp(i,k) = 1000. * del(i,k) | ||
| endif | ||
| enddo | ||
| enddo | ||
|
|
||
| !compute sigmain averaged over cloud layers after advection and place it in sigmab | ||
| do k=2,km1 | ||
| do i=1,im | ||
| if(cnvflg(i))then | ||
| if(k > kbcon1(i) .and. k < ktcon(i)) then | ||
| sigmab(i) = sigmab(i) + sigmain(i,k) * dp(i,k) | ||
| sumx(i) = sumx(i) + dp(i,k) | ||
| endif | ||
| endif | ||
| enddo | ||
| enddo | ||
| do i = 1, im | ||
| if(cnvflg(i)) then | ||
| if(sumx(i) == 0.) then | ||
| k = kbcon1(i) | ||
| sigmab(i) = sigmain(i,k) | ||
| else | ||
| sigmab(i) = sigmab(i) / sumx(i) | ||
| sigmab(i) = min(sigmab(i), 1.0) | ||
| if(sigmab(i) < 1.E-5) sigmab(i)=0. | ||
| endif | ||
| endif | ||
| enddo | ||
|
|
||
| !compute termD "The vertical integral of the latent heat convergence is limited to the | ||
| ! layers with positive moisture convergence (accumulated from the updraft starting level). | ||
| do k = 1,km1 | ||
| do i = 1,im | ||
| if(cnvflg(i))then | ||
| if(k >= kb(i) .and. k < ktcon(i)) then | ||
| mcon = (hvap*(qadv(i,k)+tmf(i,k)+qmicro(i,k))*dp(i,k)) | ||
| buy2 = termD(i)+mcon | ||
| ! | ||
| ! Do the integral over buoyant layers with positive mcon acc from | ||
| ! updraft starting level | ||
| ! | ||
| if(buy2 > 0.)then | ||
| inbu(i,k)=1. | ||
| termD(i) = termD(i) + mcon | ||
| endif | ||
| endif | ||
| endif | ||
| enddo | ||
| enddo | ||
|
|
@@ -138,8 +146,10 @@ subroutine progsigma_calc (im,km,flag_init,flag_restart,flag_shallow,& | |
| do k = 2,km1 | ||
| do i = 1,im | ||
| if(cnvflg(i))then | ||
| if(k >= kbcon1(i) .and. k < ktcon(i)) then | ||
| tem=sigmab(i)*zeta(i,k)*inbu(i,k)*dbyo1(i,k)*dp(i,k) | ||
| termA(i)=termA(i)+tem | ||
| endif | ||
| endif | ||
| enddo | ||
| enddo | ||
|
|
@@ -148,8 +158,10 @@ subroutine progsigma_calc (im,km,flag_init,flag_restart,flag_shallow,& | |
| do k = 2,km1 | ||
| do i = 1,im | ||
| if(cnvflg(i))then | ||
| if(k >= kbcon1(i) .and. k < ktcon(i)) then | ||
| tem=zeta(i,k)*dbyo1(i,k)*inbu(i,k)*dp(i,k) | ||
| termB(i)=termB(i)+tem | ||
| endif | ||
| endif | ||
| enddo | ||
| enddo | ||
|
|
@@ -158,39 +170,33 @@ subroutine progsigma_calc (im,km,flag_init,flag_restart,flag_shallow,& | |
| do k = 2,km1 | ||
| do i = 1,im | ||
| if(cnvflg(i))then | ||
| if(k >= kbcon1(i) .and. k < ktcon(i)) then | ||
| form(i,k)=-1.0*inbu(i,k)*(omega_u(i,k)*delt) | ||
| fdqb=0.5*((form(i,k)*zdqca(i,k))) | ||
| termC(i)=termC(i)+inbu(i,k)* & | ||
| (fdqb+fdqa(i))*hvap*zeta(i,k) | ||
| fdqa(i)=fdqb | ||
| endif | ||
| endif | ||
| enddo | ||
| enddo | ||
|
|
||
| !sigmab | ||
| do i = 1,im | ||
| if(cnvflg(i))then | ||
| DEN=MIN(termC(i)+termB(i),1.E8) | ||
|
There was a problem hiding this comment. Same comment as above for all the fortran intrinsics in this block. (Explicitly setting the precision for these calls removes any ambiguity and makes to code more portable) There was a problem hiding this comment. @dustinswales Thanks! I've updated the code to replace the hardcoded precision constants with the appropriate precision. |
||
| cvg=termD(i)*delt | ||
| ZZ=MAX(0.0,SIGN(1.0,termA(i))) & | ||
| *MAX(0.0,SIGN(1.0,termB(i))) & | ||
| *MAX(0.0,SIGN(1.0,termC(i)-epsilon)) | ||
| cvg=MAX(0.0,cvg) | ||
| sigmab(i)=(ZZ*(termA(i)+cvg))/(DEN+(1.0-ZZ)) | ||
| if(sigmab(i)>0.)then | ||
| sigmab(i)=MIN(sigmab(i),0.95) | ||
| sigmab(i)=MAX(sigmab(i),sigmind_new) | ||
| endif | ||
| endif!cnvflg | ||
| enddo | ||
|
|
||
| do k=1,km | ||
| do i=1,im | ||
|
|
||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Change
1.0to1._kind_phys