Skip to content
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.

Sign up for GitHub

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

CCPP cloud cover change for Thompson MP associated with Xu Randall #443

Merged
merged 5 commits into from
Dec 20, 2021
Merged

CCPP cloud cover change for Thompson MP associated with Xu Randall #443

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
6b921a3
Remove old comments from GFS_typedefs.F90, update .gitmodules and sub…
climbfuji Dec 15, 2021
93ab9c3
Update logic that sets Model%cnvcld = .false.
climbfuji Dec 16, 2021
5b1a6d5
Merge branch 'develop' of https://github.com/NOAA-EMC/fv3atm into clo…
climbfuji Dec 17, 2021
f87fa9c
Update submodule pointer for ccpp-physics
climbfuji Dec 17, 2021
b6eed5c
Revert change to .gitmodules and update submodule pointer for ccpp-ph…
climbfuji Dec 20, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,10 @@
branch = main
[submodule "ccpp/physics"]
path = ccpp/physics
url = https://github.com/NCAR/ccpp-physics
branch = main
#url = https://github.com/NCAR/ccpp-physics
#branch = main
url = https://github.com/RuiyuSun/ccpp-physics
branch = cloud_cover_xr
[submodule "upp"]
path = upp
url = https://github.com/NOAA-EMC/UPP
Expand Down
20 changes: 1 addition & 19 deletions ccpp/data/GFS_typedefs.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5063,7 +5063,6 @@ subroutine control_initialize (Model, nlunit, fn_nml, me, master, &
Model%num_p3d = 4
Model%num_p2d = 3
Model%shcnvcw = .false.
! Model%ncnd = 1 ! ncnd is the number of cloud condensate types
Model%nT2delt = 1
Model%nqv2delt = 2
Model%nTdelt = 3
Expand All @@ -5080,7 +5079,6 @@ subroutine control_initialize (Model, nlunit, fn_nml, me, master, &
Model%npdf3d = 3
Model%num_p3d = 4
Model%num_p2d = 3
! Model%ncnd = 1
if (Model%me == Model%master) print *,'Using Zhao/Carr/Sundqvist Microphysics with PDF Cloud'

else if (Model%imp_physics == Model%imp_physics_fer_hires) then ! Ferrier-Aligo scheme
Expand All @@ -5089,8 +5087,6 @@ subroutine control_initialize (Model, nlunit, fn_nml, me, master, &
Model%num_p2d = 1
Model%pdfcld = .false.
Model%shcnvcw = .false.
! DH* REALLY ?
! Model%ncnd = 3 !???????? need to clarify this - Moorthi
Model%nleffr = 1
Model%nieffr = 2
Model%nseffr = 3
Expand All @@ -5110,7 +5106,6 @@ subroutine control_initialize (Model, nlunit, fn_nml, me, master, &
!Model%num_p2d = 1
!Model%pdfcld = .false.
!Model%shcnvcw = .false.
! !Model%ncnd = 5
!Model%nleffr = 1
!Model%nieffr = 2
!Model%nseffr = 3
Expand All @@ -5122,7 +5117,6 @@ subroutine control_initialize (Model, nlunit, fn_nml, me, master, &
Model%num_p2d = 1
Model%pdfcld = .false.
Model%shcnvcw = .false.
! Model%ncnd = 5
Model%nleffr = 1
Model%nieffr = 2
Model%nseffr = 3
Expand Down Expand Up @@ -5153,7 +5147,6 @@ subroutine control_initialize (Model, nlunit, fn_nml, me, master, &
Model%num_p2d = 1
Model%pdfcld = .false.
Model%shcnvcw = .false.
! Model%ncnd = 2
Model%nleffr = 2
Model%nieffr = 3
Model%nreffr = 4
Expand All @@ -5166,16 +5159,6 @@ subroutine control_initialize (Model, nlunit, fn_nml, me, master, &
print *,' Morrison-Gettelman MP requires nwat to be set to 6 - job aborted'
stop
end if
! if (abs(Model%fprcp) == 1) then
! Model%ncnd = 4
! elseif (Model%fprcp >= 2) then
! Model%ncnd = 4
! if (Model%mg_do_graupel .or. Model%mg_do_hail) then
! Model%ncnd = 5
! endif
! Model%num_p3d = 6
! Model%ngeffr = 6
! endif
if (Model%me == Model%master) &
print *,' Using Morrison-Gettelman double moment microphysics', &
' iaerclm=', Model%iaerclm, ' iccn=', Model%iccn, &
Expand Down Expand Up @@ -5212,7 +5195,6 @@ subroutine control_initialize (Model, nlunit, fn_nml, me, master, &
Model%num_p2d = 1
Model%pdfcld = .false.
Model%shcnvcw = .false.
! Model%ncnd = 5
if (nwat /= 6) then
print *,' GFDL MP requires nwat to be set to 6 - job aborted'
stop
Expand All @@ -5226,7 +5208,7 @@ subroutine control_initialize (Model, nlunit, fn_nml, me, master, &
endif

if(Model%ras .or. Model%cscnv) Model%cnvcld = .false.
if(Model%do_shoc .or. Model%pdfcld .or. Model%do_mynnedmf) Model%cnvcld = .false.
if(Model%do_shoc .or. Model%pdfcld .or. Model%do_mynnedmf .or. Model%imfdeepcnv == Model%imfdeepcnv_gf) Model%cnvcld = .false.
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This change is to match the logic in GFS_rrtmg_pre.F90.

if(Model%cnvcld) Model%ncnvcld3d = 1

!--- get cnvwind index in phy_f2d; last entry in phy_f2d array
Expand Down
2 changes: 1 addition & 1 deletion ccpp/physics
Open in desktop
Submodule physics updated 2 files
+3 −4 physics/GFS_rrtmg_pre.F90
+50 −31 physics/radiation_clouds.f