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

Update master from NOAA-GSL: RUC ice, MYNN sfclay, stochastic land perturbations #558

Merged
merged 38 commits into from
Jan 21, 2021
Merged

Update master from NOAA-GSL: RUC ice, MYNN sfclay, stochastic land perturbations #558

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
38 commits
Select commit Hold shift + click to select a range
14e59ca
Merge pull request #5 from NOAA-GSD/gsd/develop
joeolson42 Sep 2, 2020
590d110
Reinstated sea ice option in RUC LSM. Additional CALL to LSMRUC for sea
tanyasmirnova Oct 16, 2020
2080766
Albedo computation fixes for RUC ice to get a successful run.
tanyasmirnova Oct 20, 2020
394dfa5
Noah soil variables (smc,stc,slc) are removed from the list of
tanyasmirnova Oct 20, 2020
13bf350
Removed Noah soil variables from sfc_drv_ruc.meta as well.
tanyasmirnova Oct 20, 2020
9a53be6
Bug fix from Dom.
tanyasmirnova Oct 21, 2020
9c23523
Merge pull request #6 from NOAA-GSD/gsd/develop
joeolson42 Oct 26, 2020
58bee86
Bug fix in hydraulic conductivity computation.
tanyasmirnova Nov 3, 2020
7b0434b
A version that uses local arrays for albedo over land and ice.
tanyasmirnova Nov 4, 2020
e3f7f64
Fix uninitialized variable mvd_r in physics/module_mp_thompson.F90
climbfuji Oct 20, 2020
8b3545a
Add reminders for sncovr_ice initialization to GFS_phys_time_vary.{fv…
climbfuji Nov 5, 2020
f2291a5
physics/sfc_drv_ruc.{F90,meta}: use local variables where possible, r…
climbfuji Nov 9, 2020
ea8b130
Update physics/GFS_debug.F90 with changes to RUC LSM arrays
climbfuji Nov 9, 2020
e6cac7b
Remove physics/lsm_ruc_sfc_sice_interstitial.F90
climbfuji Nov 10, 2020
dccce95
Merge pull request #3 from climbfuji/dom_rucice_for_tanya
tanyasmirnova Nov 10, 2020
7fa0ec8
Merge pull request #62 from climbfuji/update_gsd_develop_from_master_…
DomHeinzeller Nov 20, 2020
83654f1
Bugfixes in RUC LSM for land-ice implementation
climbfuji Nov 24, 2020
dc007b0
Update MYNN surface layer scheme to work with RUC ICE
climbfuji Nov 24, 2020
d12329a
Update CODEOWNERS for gsl/develop branch
climbfuji Nov 25, 2020
da2b6ff
Merge branch 'ruclsm_bugfixes_dom' of https://github.com/climbfuji/cc…
climbfuji Nov 25, 2020
63742d4
Remove lsm_ruc_sfc_sice_interstitial from source code and documentation
climbfuji Nov 30, 2020
11fc839
Remove sfc_sice from physics/docs/pdftxt/GSD_adv_suite.txt
climbfuji Dec 1, 2020
bafcc9e
Merge pull request #65 from climbfuji/rucice_gsl_develop
DomHeinzeller Dec 1, 2020
e41f9a8
Merge branch 'master' of https://github.com/NCAR/ccpp-physics into HEAD
climbfuji Dec 3, 2020
91b7726
Merge pull request #66 from climbfuji/update_gsl_develop_from_master_…
DomHeinzeller Dec 8, 2020
13b8d8d
Merge pull request #7 from NOAA-GSL/gsd/develop
joeolson42 Dec 14, 2020
beeb14e
Updates to mynn sfc layer: 1) bugfix for init routine, 2) bugfix for …
joeolson42 Dec 14, 2020
2dafd6b
Merge pull request #8 from NOAA-GSL/gsl/develop
joeolson42 Dec 15, 2020
0ac8068
Merge pull request #67 from joeolson42/gsd/develop
DomHeinzeller Dec 16, 2020
96cce1f
The max and min soil moisture for a given soil type is saved in the
tanyasmirnova Dec 18, 2020
b52215c
Add machine(kind_physics) ti init.
tanyasmirnova Dec 29, 2020
0bc4b34
Remove tracer_sanitizer*
tanyasmirnova Dec 29, 2020
acf281a
Merge pull request #71 from tanyasmirnova/gsl_landstoch_withruc
DomHeinzeller Jan 9, 2021
dc7f954
Bugfixes in physics/shinhongvdif.F90 and physics/ysuvdif.F90: use ass…
climbfuji Jan 16, 2021
042c61d
Merge pull request #75 from climbfuji/shinhong_ysu_bugfix_3d_tendencies
DomHeinzeller Jan 16, 2021
0dfdd8d
Remove Diag%cldcov from physics/GFS_debug.F90, comment out other unus…
climbfuji Jan 17, 2021
1fd346f
Merge pull request #76 from climbfuji/additional_bugfixes_gsl_develop…
DomHeinzeller Jan 17, 2021
95ae408
Merge branch 'master' of https://github.com/NCAR/ccpp-physics into HEAD
climbfuji Jan 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
32 changes: 16 additions & 16 deletions physics/GFS_debug.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -491,18 +491,19 @@ subroutine GFS_diagtoscreen_run (Model, Statein, Stateout, Sfcprop, Coupling,
end if
! CCPP/RUC only
if (Model%lsm == Model%lsm_ruc) then
call print_var(mpirank, omprank, blkno, Grid%xlat_d, Grid%xlon_d, 'Model%zs', Model%zs)
call print_var(mpirank, omprank, blkno, Grid%xlat_d, Grid%xlon_d, 'Sfcprop%sh2o', Sfcprop%sh2o)
call print_var(mpirank, omprank, blkno, Grid%xlat_d, Grid%xlon_d, 'Sfcprop%smois', Sfcprop%smois)
call print_var(mpirank, omprank, blkno, Grid%xlat_d, Grid%xlon_d, 'Sfcprop%tslb', Sfcprop%tslb)
call print_var(mpirank, omprank, blkno, Grid%xlat_d, Grid%xlon_d, 'Sfcprop%clw_surf', Sfcprop%clw_surf)
call print_var(mpirank, omprank, blkno, Grid%xlat_d, Grid%xlon_d, 'Sfcprop%qwv_surf', Sfcprop%qwv_surf)
call print_var(mpirank, omprank, blkno, Grid%xlat_d, Grid%xlon_d, 'Sfcprop%cndm_surf', Sfcprop%cndm_surf)
call print_var(mpirank, omprank, blkno, Grid%xlat_d, Grid%xlon_d, 'Sfcprop%flag_frsoil', Sfcprop%flag_frsoil)
call print_var(mpirank, omprank, blkno, Grid%xlat_d, Grid%xlon_d, 'Sfcprop%rhofr', Sfcprop%rhofr)
call print_var(mpirank, omprank, blkno, Grid%xlat_d, Grid%xlon_d, 'Sfcprop%tsnow', Sfcprop%tsnow)
call print_var(mpirank, omprank, blkno, Grid%xlat_d, Grid%xlon_d, 'Sfcprop%snowfallac ', Sfcprop%snowfallac)
call print_var(mpirank, omprank, blkno, Grid%xlat_d, Grid%xlon_d, 'Sfcprop%acsnow ', Sfcprop%acsnow)
call print_var(mpirank, omprank, blkno, Grid%xlat_d, Grid%xlon_d, 'Sfcprop%sh2o', Sfcprop%sh2o)
call print_var(mpirank, omprank, blkno, Grid%xlat_d, Grid%xlon_d, 'Sfcprop%smois', Sfcprop%smois)
call print_var(mpirank, omprank, blkno, Grid%xlat_d, Grid%xlon_d, 'Sfcprop%tslb', Sfcprop%tslb)
call print_var(mpirank, omprank, blkno, Grid%xlat_d, Grid%xlon_d, 'Sfcprop%clw_surf_land', Sfcprop%clw_surf_land)
call print_var(mpirank, omprank, blkno, Grid%xlat_d, Grid%xlon_d, 'Sfcprop%clw_surf_ice', Sfcprop%clw_surf_ice)
call print_var(mpirank, omprank, blkno, Grid%xlat_d, Grid%xlon_d, 'Sfcprop%qwv_surf_land', Sfcprop%qwv_surf_land)
call print_var(mpirank, omprank, blkno, Grid%xlat_d, Grid%xlon_d, 'Sfcprop%qwv_surf_ice', Sfcprop%qwv_surf_ice)
call print_var(mpirank, omprank, blkno, Grid%xlat_d, Grid%xlon_d, 'Sfcprop%flag_frsoil', Sfcprop%flag_frsoil)
call print_var(mpirank, omprank, blkno, Grid%xlat_d, Grid%xlon_d, 'Sfcprop%rhofr', Sfcprop%rhofr)
call print_var(mpirank, omprank, blkno, Grid%xlat_d, Grid%xlon_d, 'Sfcprop%tsnow_land', Sfcprop%tsnow_land)
call print_var(mpirank, omprank, blkno, Grid%xlat_d, Grid%xlon_d, 'Sfcprop%tsnow_ice', Sfcprop%tsnow_ice)
call print_var(mpirank, omprank, blkno, Grid%xlat_d, Grid%xlon_d, 'Sfcprop%snowfallac_land', Sfcprop%snowfallac_land)
call print_var(mpirank, omprank, blkno, Grid%xlat_d, Grid%xlon_d, 'Sfcprop%snowfallac_ice', Sfcprop%snowfallac_ice)
end if
! Radtend
call print_var(mpirank, omprank, blkno, Grid%xlat_d, Grid%xlon_d, 'Radtend%sfcfsw%upfxc', Radtend%sfcfsw(:)%upfxc)
Expand Down Expand Up @@ -647,10 +648,9 @@ subroutine GFS_diagtoscreen_run (Model, Statein, Stateout, Sfcprop, Coupling,
do n=1,size(Diag%dq3dt(1,1,:))
call print_var(mpirank, omprank, blkno, Grid%xlat_d, Grid%xlon_d, 'Diag%dq3dt_n ', Diag%dq3dt(:,:,n))
end do
call print_var(mpirank, omprank, blkno, Grid%xlat_d, Grid%xlon_d, 'Diag%upd_mf ', Diag%upd_mf)
call print_var(mpirank, omprank, blkno, Grid%xlat_d, Grid%xlon_d, 'Diag%dwn_mf ', Diag%dwn_mf)
call print_var(mpirank, omprank, blkno, Grid%xlat_d, Grid%xlon_d, 'Diag%det_mf ', Diag%det_mf)
call print_var(mpirank, omprank, blkno, Grid%xlat_d, Grid%xlon_d, 'Diag%cldcov ', Diag%cldcov)
!call print_var(mpirank, omprank, blkno, Grid%xlat_d, Grid%xlon_d, 'Diag%upd_mf ', Diag%upd_mf)
!call print_var(mpirank, omprank, blkno, Grid%xlat_d, Grid%xlon_d, 'Diag%dwn_mf ', Diag%dwn_mf)
!call print_var(mpirank, omprank, blkno, Grid%xlat_d, Grid%xlon_d, 'Diag%det_mf ', Diag%det_mf)
end if
if(Model%lradar) then
call print_var(mpirank, omprank, blkno, Grid%xlat_d, Grid%xlon_d, 'Diag%refl_10cm ', Diag%refl_10cm)
Expand Down
1 change: 1 addition & 0 deletions physics/GFS_phys_time_vary.scm.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -389,6 +389,7 @@ subroutine GFS_phys_time_vary_run (Grid, Statein, Model, Tbd, Sfcprop, Cldprop,
endif
endif
enddo
! DH* 20201104: don't forget snocvr_ice for RUC LSM (see FV3GFS_io.F90)
endif
endif
#endif
Expand Down
2 changes: 1 addition & 1 deletion physics/GFS_surface_composites.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -607,7 +607,7 @@ subroutine GFS_surface_composites_post_run (
tsfco(i) = tsfc(i)
endif
tsfcl(i) = tsfc(i)
do k=1,kice ! store tiice in stc to reduce output in the nonfrac grid case
do k=1,min(kice,km) ! store tiice in stc to reduce output in the nonfrac grid case
stc(i,k) = tiice(i,k)
end do
endif
Expand Down
3 changes: 0 additions & 3 deletions physics/docs/pdftxt/GSD_adv_suite.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,9 +77,6 @@ The GSD_v1 physics suite uses the parameterizations in the following order:
<scheme>sfc_nst</scheme>
<scheme>sfc_nst_post</scheme>
<scheme>lsm_ruc</scheme>
<scheme>lsm_ruc_sfc_sice_pre</scheme>
<scheme>sfc_sice</scheme>
<scheme>lsm_ruc_sfc_sice_post</scheme>
<scheme>GFS_surface_loop_control_part2</scheme>
</subcycle>
<!-- End of surface iteration loop -->
Expand Down
123 changes: 0 additions & 123 deletions physics/lsm_ruc_sfc_sice_interstitial.F90
View file
Open in desktop

This file was deleted.

Loading