-
Notifications
You must be signed in to change notification settings - Fork 170
cloud cover change associated with xu_randall #789
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
473eaf6
cloud cover change associated with xu_randall
RuiyuSun cc6b5a6
Merge branch 'cloud_cover_xr' of https://github.com/ruiyusun/ccpp-phy…
climbfuji 39954f5
Bug fixes for getting convectice cloud water into Thompson MP without…
climbfuji 890df49
Merge pull request #2 from climbfuji/cloud_cover_xr_dom
RuiyuSun d1bac25
Merge branch 'main' of https://github.com/NCAR/ccpp-physics into HEAD
climbfuji fe1ba70
remove comments and add back the missing if (.not. lmfshal) then block
RuiyuSun 5600c09
Merge pull request #3 from climbfuji/cloud_cover_xr_dom_20211217
RuiyuSun File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or 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 hidden or 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 |
|---|---|---|
|
|
@@ -2861,7 +2861,7 @@ subroutine progcld6 & | |
| & xlat,xlon,slmsk,dz,delp, & | ||
| & ntrac,ntcw,ntiw,ntrw,ntsw,ntgl, & | ||
| & IX, NLAY, NLP1, & | ||
| & uni_cld, lmfshal, lmfdeep2, cldcov, & | ||
| & uni_cld, lmfshal, lmfdeep2, cldcov, cnvw, & | ||
| & re_cloud,re_ice,re_snow, & | ||
| & dzlay, latdeg, julian, yearlen, & | ||
| & clouds,clds,mtop,mbot,de_lgth,alpha & ! --- outputs: | ||
|
|
@@ -2955,7 +2955,7 @@ subroutine progcld6 & | |
|
|
||
| real (kind=kind_phys), dimension(:,:), intent(in) :: plvl, plyr, & | ||
| & tlyr, qlyr, qstl, rhly, cldcov, delp, dz, dzlay, & | ||
| & re_cloud, re_ice, re_snow | ||
| & re_cloud, re_ice, re_snow, cnvw | ||
|
|
||
| real (kind=kind_phys), dimension(:,:,:), intent(in) :: clw | ||
|
|
||
|
|
@@ -2987,8 +2987,8 @@ subroutine progcld6 & | |
| integer :: i, k, id, nf | ||
|
|
||
| ! --- constant values | ||
| ! real (kind=kind_phys), parameter :: xrc3 = 200. | ||
| real (kind=kind_phys), parameter :: xrc3 = 100. | ||
| real (kind=kind_phys), parameter :: xrc3 = 200. | ||
| ! real (kind=kind_phys), parameter :: xrc3 = 100. | ||
|
|
||
| ! | ||
| !===> ... begin here | ||
|
|
@@ -3042,6 +3042,7 @@ subroutine progcld6 & | |
| do k = 1, NLAY | ||
| do i = 1, IX | ||
| clwf(i,k) = clw(i,k,ntcw) + clw(i,k,ntiw) + clw(i,k,ntsw) | ||
| & +clw(i,k,ntrw) + cnvw(i,k) | ||
| enddo | ||
| enddo | ||
| !> - Find top pressure for each cloud domain for given latitude. | ||
|
|
@@ -3068,8 +3069,9 @@ subroutine progcld6 & | |
| cwp(i,k) = max(0.0, clw(i,k,ntcw) * gfac * delp(i,k)) | ||
| cip(i,k) = max(0.0, clw(i,k,ntiw) * gfac * delp(i,k)) | ||
| crp(i,k) = max(0.0, clw(i,k,ntrw) * gfac * delp(i,k)) | ||
| csp(i,k) = max(0.0, (clw(i,k,ntsw)+clw(i,k,ntgl)) * & | ||
| & gfac * delp(i,k)) | ||
| ! csp(i,k) = max(0.0, (clw(i,k,ntsw)+clw(i,k,ntgl)) * & | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Graupel was removed, thank you. But I still wonder why we need the old line of code commented out rather than eliminated. |
||
| ! & gfac * delp(i,k)) | ||
| csp(i,k) = max(0.0, clw(i,k,ntsw) * gfac * delp(i,k)) | ||
| enddo | ||
| enddo | ||
|
|
||
|
|
@@ -3111,24 +3113,31 @@ subroutine progcld6 & | |
| else | ||
| do k = 1, NLAY | ||
| do i = 1, IX | ||
| clwt = 1.0e-6 * (plyr(i,k)*0.001) | ||
| ! clwt = 1.0e-6 * (plyr(i,k)*0.001) | ||
| ! clwt = 2.0e-6 * (plyr(i,k)*0.001) | ||
| clwt = 1.0e-10 * (plyr(i,k)*0.001) | ||
|
|
||
| if (clwf(i,k) > clwt) then | ||
| onemrh= max( 1.e-10, 1.0-rhly(i,k) ) | ||
| clwm = clwmin / max( 0.01, plyr(i,k)*0.001 ) | ||
| ! | ||
| tem1 = min(max((onemrh*qstl(i,k))**0.49,0.0001),1.0) !jhan | ||
| if (lmfdeep2) then | ||
| tem1 = xrc3 / tem1 | ||
| if(rhly(i,k) > 1.) then | ||
| cldtot(i,k) = 1. | ||
| else | ||
| tem1 = 100.0 / tem1 | ||
| endif | ||
| onemrh= max( 1.e-10, 1.0-rhly(i,k) ) | ||
| clwm = clwmin / max( 0.01, plyr(i,k)*0.001 ) | ||
| ! | ||
| value = max( min( tem1*(clwf(i,k)-clwm), 50.0 ), 0.0 ) | ||
| tem2 = sqrt( sqrt(rhly(i,k)) ) | ||
|
|
||
| cldtot(i,k) = max( tem2*(1.0-exp(-value)), 0.0 ) | ||
| tem1 = min(max((onemrh*qstl(i,k))**0.49,0.0001),1.0) !jhan | ||
| if (lmfdeep2) then | ||
| tem1 = xrc3 / tem1 | ||
| else | ||
| tem1 = 100.0 / tem1 | ||
| endif | ||
| ! | ||
| value = max( min( tem1*(clwf(i,k)-clwm), 50.0 ), 0.0 ) | ||
| tem2 = sqrt( sqrt(rhly(i,k)) ) | ||
|
|
||
| cldtot(i,k) = max( tem2*(1.0-exp(-value)), 0.0 ) | ||
| endif | ||
| else | ||
| cldtot(i,k) = 0.0 | ||
| endif | ||
| enddo | ||
| enddo | ||
|
|
||
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.
Not sure why we need to keep the old value of xrc3 in a comment. From doing git differences of versions, this can be detected pretty easily. Furthermore, this constant is used (I think) in only a single line of code, so is it really needed as a declared variable at all?