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

EMC flake #471

Merged
merged 7 commits into from
Jul 20, 2020
+4,079 −10
Merged

EMC flake #471

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
1c64f9f
This EMC flake physics
YihuaWu-NOAA Jul 10, 2020
8ecadc4
Updated the four files for S2S
YihuaWu-NOAA Jul 15, 2020
ccec758
To resolve conflict if any
YihuaWu-NOAA Jul 16, 2020
e228481
Removed some print lines
YihuaWu-NOAA Jul 16, 2020
e0422ea
Changed radians to radian in flake_driver.meta file
YihuaWu-NOAA Jul 17, 2020
3373999
Chenged radians to radian
YihuaWu-NOAA Jul 18, 2020
9d43e41
Delete CCPP_VARIABLES_FV3.html
YihuaWu-NOAA Jul 20, 2020
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
21 changes: 17 additions & 4 deletions physics/GFS_surface_composites.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ end subroutine GFS_surface_composites_pre_finalize
!> \section arg_table_GFS_surface_composites_pre_run Argument Table
!! \htmlinclude GFS_surface_composites_pre_run.html
!!
subroutine GFS_surface_composites_pre_run (im, frac_grid, flag_cice, cplflx, cplwav2atm, &
landfrac, lakefrac, oceanfrac, &
subroutine GFS_surface_composites_pre_run (im, lkm, frac_grid, flag_cice, cplflx, cplwav2atm, &
landfrac, lakefrac, lakedepth, oceanfrac, &
frland, dry, icy, lake, ocean, wet, cice, cimin, zorl, zorlo, zorll, zorl_wat, &
zorl_lnd, zorl_ice, snowd, snowd_wat, snowd_lnd, snowd_ice, tprcp, tprcp_wat, &
tprcp_lnd, tprcp_ice, uustar, uustar_wat, uustar_lnd, uustar_ice, &
Expand All @@ -38,12 +38,12 @@ subroutine GFS_surface_composites_pre_run (im, frac_grid, flag_cice, cplflx, cpl
implicit none

! Interface variables
integer, intent(in ) :: im
integer, intent(in ) :: im, lkm
logical, intent(in ) :: frac_grid, cplflx, cplwav2atm
logical, dimension(im), intent(in ) :: flag_cice
logical, dimension(im), intent(inout) :: dry, icy, lake, ocean, wet
real(kind=kind_phys), intent(in ) :: cimin
real(kind=kind_phys), dimension(im), intent(in ) :: landfrac, lakefrac, oceanfrac
real(kind=kind_phys), dimension(im), intent(in ) :: landfrac, lakefrac, lakedepth, oceanfrac
real(kind=kind_phys), dimension(im), intent(inout) :: cice
real(kind=kind_phys), dimension(im), intent( out) :: frland
real(kind=kind_phys), dimension(im), intent(in ) :: zorl, snowd, tprcp, uustar, weasd, qss, hflx
Expand Down Expand Up @@ -182,6 +182,19 @@ subroutine GFS_surface_composites_pre_run (im, frac_grid, flag_cice, cplflx, cpl
endif
enddo

! to prepare to separate lake from ocean in later
Copy link
Collaborator

Choose a reason for hiding this comment

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

This comment is a bit confusing - can you remove the in later part, please?

do i = 1, im
if(lkm == 1) then
if(lakefrac(i) .ge. 0.15 .and. lakedepth(i) .gt. 1.0) then
lake(i) = .true.
else
lake(i) = .false.
endif
else
lake(i) = .false.
Copy link
Collaborator

Choose a reason for hiding this comment

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

Why not use "flake" instead of "lake"? Even without flake model, lakes exist.
Also, I concur with Dom that instead of "lkm" why not use logical, say "flake_model" (true or flase)?

Copy link
Collaborator

Choose a reason for hiding this comment

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

@YihuaWu-NOAA said that there will be additional options later (lkm=0,1,2,...), so in this case it is ok to keep it as an integer as far as I am concerned.

endif
enddo

! Assign sea ice temperature to interstitial variable
do i = 1, im
tice(i) = tisfc(i)
Expand Down
17 changes: 17 additions & 0 deletions physics/GFS_surface_composites.meta
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,14 @@
type = integer
intent = in
optional = F
[lkm]
standard_name = flag_for_lake_surface_scheme
long_name = flag for lake surface model
units = flag
dimensions = ()
type = integer
intent = in
optional = F
[frac_grid]
standard_name = flag_for_fractional_grid
long_name = flag for fractional grid
Expand Down Expand Up @@ -59,6 +67,15 @@
kind = kind_phys
intent = in
optional = F
[lakedepth]
standard_name = lake_depth
long_name = lake depth
units = m
dimensions = (horizontal_dimension)
type = real
kind = kind_phys
intent = in
optional = F
[oceanfrac]
standard_name = sea_area_fraction
long_name = fraction of horizontal grid area occupied by ocean
Expand Down
9 changes: 5 additions & 4 deletions physics/GFS_time_vary_pre.fv3.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,8 +65,8 @@ end subroutine GFS_time_vary_pre_finalize
!> \section arg_table_GFS_time_vary_pre_run Argument Table
!! \htmlinclude GFS_time_vary_pre_run.html
!!
subroutine GFS_time_vary_pre_run (jdat, idat, dtp, lsm, lsm_noahmp, nsswr, &
nslwr, nhfrad, idate, debug, me, master, nscyc, sec, phour, zhour, fhour, &
subroutine GFS_time_vary_pre_run (jdat, idat, dtp, lkm, lsm, lsm_noahmp, nsswr, &
nslwr, nhfrad, idate, debug, me, master, nscyc, sec, phour, zhour, fhour, &
kdt, julian, yearlen, ipt, lprnt, lssav, lsswr, lslwr, solhr, errmsg, errflg)

use machine, only: kind_phys
Expand All @@ -75,7 +75,7 @@ subroutine GFS_time_vary_pre_run (jdat, idat, dtp, lsm, lsm_noahmp, nsswr, &

integer, intent(in) :: idate(4)
integer, intent(in) :: jdat(1:8), idat(1:8)
integer, intent(in) :: lsm, lsm_noahmp, &
integer, intent(in) :: lkm, lsm, lsm_noahmp, &
nsswr, nslwr, me, &
master, nscyc, nhfrad
logical, intent(in) :: debug
Expand Down Expand Up @@ -121,7 +121,8 @@ subroutine GFS_time_vary_pre_run (jdat, idat, dtp, lsm, lsm_noahmp, nsswr, &
fhour = (sec + dtp)/con_hr
kdt = nint((sec + dtp)/dtp)

if(lsm == lsm_noahmp) then
if(lsm == lsm_noahmp .or. lkm == 1) then
! flake need this too
!GJF* These calculations were originally in GFS_physics_driver.F90 for
! NoahMP. They were moved to this routine since they only depend
! on time (not space). Note that this code is included as-is from
Expand Down
8 changes: 8 additions & 0 deletions physics/GFS_time_vary_pre.fv3.meta
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,14 @@
kind = kind_phys
intent = in
optional = F
[lkm]
standard_name = flag_for_lake_surface_scheme
long_name = flag for lake surface model
units = flag
dimensions = ()
type = integer
intent = in
optional = F
[lsm]
standard_name = flag_for_land_surface_scheme
long_name = flag for land surface model
Expand Down
Loading