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.

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

SCM-only updates to match changes in FV3 versions of *time_vary schemes #3

Merged
merged 1 commit into from
Jul 2, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
37 changes: 18 additions & 19 deletions physics/GFS_phys_time_vary.scm.F90
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ subroutine GFS_phys_time_vary_init (
isot, ivegsrc, nlunit, sncovr, sncovr_ice, lsm, lsm_noahmp, lsm_ruc, min_seaice, &
fice, landfrac, vtype, weasd, lsoil, zs, dzs, lsnow_lsm_lbound, lsnow_lsm_ubound, &
tvxy, tgxy, tahxy, canicexy, canliqxy, eahxy, cmxy, chxy, fwetxy, sneqvoxy, alboldxy,&
qsnowxy, wslakexy, albdvis_lnd, albdnir_lnd, albivis_lnd, albinir_lnd, albdvis_ice, &
qsnowxy, wslakexy, albdvis_lnd, albdnir_lnd, albivis_lnd, albinir_lnd, albdvis_ice, &
albdnir_ice, albivis_ice, albinir_ice, emiss_lnd, emiss_ice, taussxy, waxy, wtxy, &
zwtxy, xlaixy, xsaixy, lfmassxy, stmassxy, rtmassxy, woodxy, stblcpxy, fastcpxy, &
smcwtdxy, deeprechxy, rechxy, snowxy, snicexy, snliqxy, tsnoxy , smoiseq, zsnsoxy, &
Expand Down Expand Up @@ -281,10 +281,10 @@ subroutine GFS_phys_time_vary_init (
jindx2_aer, ddy_aer, xlon_d, &
iindx1_aer, iindx2_aer, ddx_aer, &
me, master)
iamin=min(minval(iindx1_aer), iamin)
iamax=max(maxval(iindx2_aer), iamax)
jamin=min(minval(jindx1_aer), jamin)
jamax=max(maxval(jindx2_aer), jamax)
iamin = min(minval(iindx1_aer), iamin)
iamax = max(maxval(iindx2_aer), iamax)
jamin = min(minval(jindx1_aer), jamin)
jamax = max(maxval(jindx2_aer), jamax)
endif

!> - Call setindxci() to initialize IN and CCN data
Expand Down Expand Up @@ -691,8 +691,7 @@ subroutine GFS_phys_time_vary_timestep_init (
integer, intent(out) :: errflg

! Local variables
integer :: i, j, k, iseed, iskip, ix, kdt_rad
real(kind=kind_phys) :: sec_zero, rsnow
integer :: i, j, k, iseed, iskip, ix
real(kind=kind_phys) :: wrk(1)
real(kind=kind_phys) :: rannie(cny)
real(kind=kind_phys) :: rndval(cnx*cny*nrcm)
Expand Down Expand Up @@ -792,18 +791,18 @@ subroutine GFS_phys_time_vary_timestep_init (

! Not needed for SCM:
!> - Call gcycle() to repopulate specific time-varying surface properties for AMIP/forecast runs
!if (nscyc > 0) then
! if (mod(kdt,nscyc) == 1) THEN
! call gcycle (me, nthrds, nx, ny, isc, jsc, nsst, tile_num, nlunit, &
! input_nml_file, lsoil, lsoil_lsm, kice, idate, ialb, isot, ivegsrc, &
! use_ufo, nst_anl, fhcyc, phour, lakefrac, min_seaice, min_lakeice, &
! frac_grid, smc, slc, stc, smois, sh2o, tslb, tiice, tg3, tref, tsfc, &
! tsfco, tisfc, hice, fice, facsf, facwf, alvsf, alvwf, alnsf, alnwf, &
! zorli, zorll, zorlo, weasd, slope, snoalb, canopy, vfrac, vtype, &
! stype, shdmin, shdmax, snowd, cv, cvb, cvt, oro, oro_uf, &
! xlat_d, xlon_d, slmsk, imap, jmap)
! endif
!endif
! if (nscyc > 0) then
! if (mod(kdt,nscyc) == 1) THEN
! call gcycle (me, nthrds, nx, ny, isc, jsc, nsst, tile_num, nlunit, &
! input_nml_file, lsoil, lsoil_lsm, kice, idate, ialb, isot, ivegsrc, &
! use_ufo, nst_anl, fhcyc, phour, landfrac, lakefrac, min_seaice, min_lakeice,&
! frac_grid, smc, slc, stc, smois, sh2o, tslb, tiice, tg3, tref, tsfc, &
! tsfco, tisfc, hice, fice, facsf, facwf, alvsf, alvwf, alnsf, alnwf, &
! zorli, zorll, zorlo, weasd, slope, snoalb, canopy, vfrac, vtype, &
! stype, shdmin, shdmax, snowd, cv, cvb, cvt, oro, oro_uf, &
! xlat_d, xlon_d, slmsk, imap, jmap)
! endif
! endif

end subroutine GFS_phys_time_vary_timestep_init
!! @}
Expand Down
5 changes: 2 additions & 3 deletions physics/GFS_time_vary_pre.scm.F90
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ end subroutine GFS_time_vary_pre_finalize
!> \section arg_table_GFS_time_vary_pre_timestep_init Argument Table
!! \htmlinclude GFS_time_vary_pre_timestep_init.html
!!
subroutine GFS_time_vary_pre_timestep_init (jdat, idat, dtp, lsm, lsm_noahmp, nsswr, &
subroutine GFS_time_vary_pre_timestep_init (jdat, idat, dtp, nsswr, &
nslwr, idate, debug, me, master, nscyc, sec, phour, zhour, fhour, kdt, &
julian, yearlen, ipt, lprnt, lssav, lsswr, lslwr, solhr, errmsg, errflg)

Expand All @@ -75,8 +75,7 @@ subroutine GFS_time_vary_pre_timestep_init (jdat, idat, dtp, lsm, lsm_noahmp, ns

integer, intent(in) :: idate(:)
integer, intent(in) :: jdat(:), idat(:)
integer, intent(in) :: lsm, lsm_noahmp, &
nsswr, nslwr, me, &
integer, intent(in) :: nsswr, nslwr, me, &
master, nscyc
logical, intent(in) :: debug
real(kind=kind_phys), intent(in) :: dtp
Expand Down
16 changes: 0 additions & 16 deletions physics/GFS_time_vary_pre.scm.meta
Original file line number Diff line number Diff line change
Expand Up @@ -76,22 +76,6 @@
kind = kind_phys
intent = in
optional = F
[lsm]
standard_name = flag_for_land_surface_scheme
long_name = flag for land surface model
units = flag
dimensions = ()
type = integer
intent = in
optional = F
[lsm_noahmp]
standard_name = flag_for_noahmp_land_surface_scheme
long_name = flag for NOAH MP land surface model
units = flag
dimensions = ()
type = integer
intent = in
optional = F
[nsswr]
standard_name = number_of_timesteps_between_shortwave_radiation_calls
long_name = number of timesteps between shortwave radiation calls
Expand Down