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

Port recent Noah-MP upgrades / fixes to public version of SHiELD #42

Merged
merged 10 commits into from
Jun 6, 2024
Merged

Port recent Noah-MP upgrades / fixes to public version of SHiELD #42

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
b472197
Fixed a bug where albedo over the ocean is computed incorrectly when …
kaiyuan-cheng May 1, 2024
08e918b
Revert changes on snow cover
kaiyuan-cheng May 3, 2024
f106601
https://github.com/NCAR/noahmp/commit/e1b83ad4c55e5e186be1cf726a222c7…
kaiyuan-cheng May 8, 2024
03766b5
https://github.com/NCAR/ccpp-physics/commit/3407bf1bc11c4c37e6bf28307…
spencerkclark May 20, 2024
4755314
https://github.com/NCAR/ccpp-physics/commit/d344faa1c6b42a8faeadd4b35…
spencerkclark May 20, 2024
8d9e9a6
https://github.com/NCAR/ccpp-physics/commit/363c82cf4a4759387909dafec…
spencerkclark May 20, 2024
be1b33a
revert maximum water depth to 5 meters
kaiyuan-cheng May 24, 2024
7a61cf9
Update file GFS_typedefs.F90
kaiyuan-cheng May 24, 2024
a4ea3ac
Update file module_sf_noahmp_glacier.f90
kaiyuan-cheng May 24, 2024
3c7a76a
Update file module_sf_noahmp_glacier.f90
kaiyuan-cheng May 24, 2024
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
2 changes: 1 addition & 1 deletion GFS_layer/GFS_physics_driver.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1320,7 +1320,7 @@ subroutine GFS_physics_driver &
Model%iopt_dveg, Model%iopt_crs, Model%iopt_btr, &
Model%iopt_run, Model%iopt_sfc, Model%iopt_frz, &
Model%iopt_inf, Model%iopt_rad, Model%iopt_alb, &
Model%iopt_snf, Model%iopt_tbot, Model%iopt_stc, &
Model%iopt_snf, Model%iopt_tbot, Model%iopt_stc, Model%iopt_gla, &
grid%xlat, xcosz, Model%yearlen, Model%julian, Model%imn,&
Sfcprop%drainncprv, Sfcprop%draincprv, Sfcprop%dsnowprv, &
Sfcprop%dgraupelprv, Sfcprop%diceprv, &
Expand Down
6 changes: 6 additions & 0 deletions GFS_layer/GFS_typedefs.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -609,6 +609,7 @@ module GFS_typedefs
integer :: iopt_snf !rainfall & snowfall (1-jordan91; 2->bats; 3->noah)
integer :: iopt_tbot !lower boundary of soil temperature (1->zero-flux; 2->noah)
integer :: iopt_stc !snow/soil temperature time scheme (only layer 1)
integer :: iopt_gla !glacier option (1->phase change; 2->simple)

!--- tuning parameters for physical parameterizations
logical :: ras !< flag for ras convection scheme
Expand Down Expand Up @@ -2228,6 +2229,7 @@ subroutine control_initialize (Model, nlunit, fn_nml, me, master, &
integer :: iopt_snf = 1 !rainfall & snowfall (1-jordan91; 2->bats; 3->noah)
integer :: iopt_tbot = 2 !lower boundary of soil temperature (1->zero-flux; 2->noah)
integer :: iopt_stc = 1 !snow/soil temperature time scheme (only layer 1)
integer :: iopt_gla = 2 !glacier option (1->phase change; 2->simple)

!--- tuning parameters for physical parameterizations
logical :: ras = .false. !< flag for ras convection scheme
Expand Down Expand Up @@ -2479,6 +2481,7 @@ subroutine control_initialize (Model, nlunit, fn_nml, me, master, &
! Noah MP options
iopt_dveg,iopt_crs,iopt_btr,iopt_run,iopt_sfc, iopt_frz, &
iopt_inf, iopt_rad,iopt_alb,iopt_snf,iopt_tbot,iopt_stc, &
iopt_gla, &
!--- physical parameterizations
ras, trans_trac, old_monin, cnvgwd, mstrat, moist_adj, &
cscnv, cal_pre, do_aw, do_shoc, shocaftcnv, shoc_cld, &
Expand Down Expand Up @@ -2692,6 +2695,7 @@ subroutine control_initialize (Model, nlunit, fn_nml, me, master, &
Model%iopt_snf = iopt_snf
Model%iopt_tbot = iopt_tbot
Model%iopt_stc = iopt_stc
Model%iopt_gla = iopt_gla


!--- tuning parameters for physical parameterizations
Expand Down Expand Up @@ -3070,6 +3074,7 @@ subroutine control_initialize (Model, nlunit, fn_nml, me, master, &
print *,'iopt_snf = ', Model%iopt_snf
print *,'iopt_tbot = ',Model%iopt_tbot
print *,'iopt_stc = ', Model%iopt_stc
print *,'iopt_gla = ', Model%iopt_gla



Expand Down Expand Up @@ -3389,6 +3394,7 @@ subroutine control_print(Model)
print *, ' iopt_snf : ', Model%iopt_snf
print *, ' iopt_tbot : ', Model%iopt_tbot
print *, ' iopt_stc : ', Model%iopt_stc
print *, ' iopt_gla : ', Model%iopt_gla

endif

Expand Down
Loading
Loading