incorporate csawMG update and pass both intel and GNU RT tests #171
Conversation
AnningCheng-NOAA
requested review from
grantfirl,
Qingfu-Liu,
dustinswales and
mzhangw
as code owners
|
Qingfu, nice catch! and fixed.
…On Thu, Feb 15, 2024 at 11:33 AM Qingfu Liu ***@***.***> wrote:
***@***.**** commented on this pull request.
------------------------------
In physics/CONV/Chikira_Sugiyama/cs_conv.F90
<#171 (comment)>
:
> @@ -3841,64 +4083,66 @@ SUBROUTINE CUMFXR1 & ! Tracer mass fixer
! 2: mass fixer is applied, total mass never change through cumulus scheme
! e.g. CO2
INTEGER ISTS, IENS
+ REAL(kind_phys) sigmai (IM,KMAX+1,NCTP), sigma(IM,KMAX+1) !!DDsigma cloud updraft fraction
Variables sigmai and sigma are not used in SUBROUTINE CUMFXR1, so
variables sigmai, sigma and nctp can be removed from SUBROUTINE CUMFXR1
—
Reply to this email directly, view it on GitHub
<#171 (review)>,
or unsubscribe
<https://github.com/notifications/unsubscribe-auth/ALQPMIOK4NPVCUOCHWUJOU3YTY2G7AVCNFSM6AAAAABDGXNNRKVHI2DSMVQWIX3LMV43YUDVNRWFEZLROVSXG5CSMV3GSZLXHMYTQOBTGMYDSOJRGA>
.
You are receiving this because you authored the thread.Message ID:
***@***.***>
|
There was a problem hiding this comment.
There are lots of whitespace/indentation changes, along with quite a few code changes, making reviewing this difficult. I feel the changes aren't terribly invasive, but it's hard to tell in it's current form.
It also seems that the inline documentation for the Chikira-Sugiyama convective scheme was removed. This will need to be added back in, and potentially updated with any recent algorithm modifications.
| module cs_conv | ||
| !--------------------------------------------------------------------------------- | ||
| ! Purpose: | ||
| ! | ||
| !>--------------------------------------------------------------------------------- | ||
| ! Purpose: | ||
| ! | ||
| !> Interface for Chikira-Sugiyama convection scheme | ||
| !! |
There was a problem hiding this comment.
The "!!" are needed for documentation (e.g. https://dtcenter.ucar.edu/GMTB/v5.0.0/sci_doc/group__cs__scheme.html#details), please revert.
There was a problem hiding this comment.
done. Please check.
| !--------------------------------------------------------------------------------- | ||
| ! | ||
| use machine , only : kind_phys | ||
| use machine , only : kind_phys |
There was a problem hiding this comment.
done. Please check.
| @@ -70,7 +70,6 @@ subroutine cs_conv_aw_adj_run(im, levs, do_cscnv, do_aw, do_shoc, & | |||
|
|
|||
| ! adjust sfc rainrate for conservation | |||
| ! vertically integrate reduction of water increments, reduce precip by that amount | |||
|
|
|||
|
Sorry for those empty lines, coming from debugging or from the old version of the code. |
|
@AnningCheng-NOAA I'm going to try to clean up some of the whitespace and documentation changes so that the PR only shows actually meaningful changes. I may open another PR to make it easier to track and ask for you to review. |
|
sure. Thank you! @grant Firl ***@***.***>
…On Wed, Mar 6, 2024 at 1:19 PM Grant Firl ***@***.***> wrote:
@AnningCheng-NOAA <https://github.com/AnningCheng-NOAA> I'm going to try
to clean up some of the whitespace and documentation changes so that the PR
only shows actually meaningful changes. I may open another PR to make it
easier to track and ask for you to review.
—
Reply to this email directly, view it on GitHub
<#171 (comment)>,
or unsubscribe
<https://github.com/notifications/unsubscribe-auth/ALQPMIL5QYY23TIINMKMAWLYW5M2DAVCNFSM6AAAAABDGXNNRKVHI2DSMVQWIX3LMV43OSLTON2WKQ3PNVWWK3TUHMYTSOBRGUYTMMRTGY>
.
You are receiving this because you were mentioned.Message ID:
***@***.***>
|
|
Closed in favor of #181 that started from the top of ufs/dev and has fewer whitespace/comment changes that make it difficult to review and understand the changes. |
ajor updated CSAW deep convective scheme: considering sigma vertical veriantion and reduction on fluxes instead of tendency etc.
• Regression tests are performed on the new version of CSAW for GNU and intel compilers
Here is a EMail from Don describe the changes:
On Thu, Oct 24, 2019 at 3:01 PM Donald Dazlich - NOAA Affiliate <[email protected]> wrote:
Hi Moorthi, Anning,
Dave and I have been using the GFS version of CS to redo our implementation of AW more completely and consistently. Now, you will find that the fix_form implemetation of the tendencies match up very closely with the traditional form. Also you will notice that it is the fluxes for each cloud type (and the downdraft) that are saved and the reduction is done on the fluxes, not the tendency computed from the flux divergence. Since sigma is a function of height the latter approach is incorrect. I’ve also dimensioned several cloud type variables nctp+1 - the nctp+1 slot has downdraft output. Another addition is the sorting of the lamdas after they are computed for all cloud types, then computing the sigma. This approach is detailed in a manuscript Dave is working on. Also, sigma is not applied to the inputs to the downdraft routine, but to the outputs, which are now mass fluxes not tendencies. The water and thermodynamic budgets remain satisfied now.
I’ve attached my version below. It should be pretty close to your version with regards to the interface so you shouldn’t have to do much work with it.
Regards,
Don