Skip to content

HWRF Ferrier-Aligo MP scheme updates#405

Closed
mzhangw wants to merge 119 commits into
NCAR:dtc/developfrom
mzhangw:HAFS_fer_hires
Closed

HWRF Ferrier-Aligo MP scheme updates#405
mzhangw wants to merge 119 commits into
NCAR:dtc/developfrom
mzhangw:HAFS_fer_hires

Conversation

@mzhangw
Copy link
Copy Markdown
Contributor

@mzhangw mzhangw commented Mar 11, 2020

This PR passed full RTs.
rt_full.log

This PR is HWRF Ferrier-Aligo MP scheme updates of @ericaligo-NOAA, @ChunxiZhang-NOAA and @mzhangw , which includes:

  • cloud fraction and optical property calculation
  • FA scientific documentation
  • proper tracer update and PBL mixing

The associated PR is
NCAR/fv3atm#28
NCAR/ufs-weather-model#25

mzhangw and others added 30 commits July 1, 2019 16:31
                  Deleted QS since it will not be used. we only need QI.
module_mp_fer_hires_pre.F90: changes related to f_ice, f_rain and f_rimef
module_mp_fer_hires_pre.F90: added
GFS_PBL_generic.F90: define tracers for vertical diffusion
GFS_rrtmg_pre.F90: change ncnd
module_mp_fer_hires_pre.F90: revised the definition to tracers
mp_fer_hires.F90: revised the definition to tracers
@climbfuji
Copy link
Copy Markdown
Collaborator

@mzhangw, cc @grantfirl @ligiabernardet, not sure what to do with this PR. The commit history is completely off, I am showing 70+ commits with 12 changed files. The history goes back to July 1, 2019.

Also, I see changes in files that you have overwritten in the meanwhile, for example in physics/GFS_rrtmg_pre.F90. The current code in branch dtc/hwrf-physics is, after your HWRF RRTMG code went in:

...
        elseif(Model%imp_physics == 15) then
          if (Model%kdt == 1) then
            Tbd%phy_f3d(:,:,Model%nleffr) = 10.
            Tbd%phy_f3d(:,:,Model%nieffr) = 50.
            Tbd%phy_f3d(:,:,Model%nseffr) = 250.
          endif

          call progcld5 (plyr,plvl,tlyr,tvly,qlyr,qstl,rhly,tracer1,    &  !  --- inputs
                         Grid%xlat,Grid%xlon,Sfcprop%slmsk,dz,delp,     &
                         ntrac-1, ntcw-1,ntiw-1,ntrw-1,                 &
                         ntsw-1,ntgl-1,                                 &
                         im, lmk, lmp, Model%icloud,Model%uni_cld,      &
                         Model%lmfshal,Model%lmfdeep2,                  &
                         cldcov(:,1:LMK),Tbd%phy_f3d(:,:,1),            &
                         Tbd%phy_f3d(:,:,2), Tbd%phy_f3d(:,:,3),        &
                         clouds,cldsa,mtopa,mbota, de_lgth)            !  --- outputs

        endif                            ! end if_imp_physics
...

but in this PR, I am seeing

...
        elseif(Model%imp_physics == 15) then
           call progcld2 (plyr,plvl,tlyr,qlyr,qstl,rhly,tvly,tracer1,&  !  --- inputs
                          Grid%xlat,Grid%xlon,Sfcprop%slmsk,dz,delp, &
                          ntrac-1, ntcw-1,ntiw-1,ntrw-1,             &
                          im, lmk, lmp,                              &
                          Model%lmfshal,Model%lmfdeep2,              &
                          clouds,cldsa,mtopa,mbota, de_lgth)            !  --- outputs
 !  ---  output
...

So ... which is correct?

@mzhangw
Copy link
Copy Markdown
Contributor Author

mzhangw commented Apr 13, 2020

FA updates PR was committed before HWRF RRTMG, in which I (after consulting with you )decided to use progcld5 for FA, so progcld6 was left for GSD suite. Progcld2 in FA PR is legacy program for Ferrier scheme, we do not call it anymore when FA is interfaced with HWRF RRTMG. I think that other changes in this PR are straightforward.

@climbfuji
Copy link
Copy Markdown
Collaborator

Ok, I am sorry but I need you to work on this PR, I cannot take it like it is.

Please let me know if you want to start from scratch by doing a manual comparison with what is in dtc/hwrf-physics now and come up with a replacement PR (and close the current PR), or try to update the current PR. Thanks!

@mzhangw
Copy link
Copy Markdown
Contributor Author

mzhangw commented Apr 14, 2020 via email

@climbfuji
Copy link
Copy Markdown
Collaborator

I just merged dtc/hwrf-physics into this PR.

I see, thanks. The commit history is dirty. But I could merge/squash your branch, will create the PR that sits on top of yours and see what the actual diffs are.

@climbfuji
Copy link
Copy Markdown
Collaborator

This PR has been merged (with the commit history squashed) into #435 for target branch dtc/hwrf-physics. Once #435 gets merged, this PR can be closed.

@mzhangw
Copy link
Copy Markdown
Contributor Author

mzhangw commented Apr 14, 2020 via email

@climbfuji
Copy link
Copy Markdown
Collaborator

climbfuji commented Apr 14, 2020

Well, given that it somehow depends on the HWRF RRTMG progcld5 changes, it can only go to master once HWRF RRTMG goes to master - which is when dtc/hwrf-physics goes to master.

@climbfuji
Copy link
Copy Markdown
Collaborator

This PR has been pulled into #435 and will be merged to dtc/hwrf-physics first, later to master. Therefore closing this PR.

@climbfuji climbfuji closed this Apr 14, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

8 participants