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

(Remove interstitial variables for land and ice emissivity and update the land and ice emissivity in the routine setemis) Sm sept21 pr #736

Merged
merged 58 commits into from
Oct 22, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
58 commits
Select commit Hold shift + click to select a range
1a77835
minor change in ras
SMoorthi-emc Aug 18, 2021
2cae156
Merge remote-tracking branch 'upstream/main' into SM_Jul302021
SMoorthi-emc Aug 18, 2021
3721df1
a fix for slianl in sfcsub.F
SMoorthi-emc Aug 19, 2021
915ce6f
adding alternate cires*solv2 routine
SMoorthi-emc Aug 21, 2021
5f323e2
commit double couning of cloud diagnostic arrays in rrtmgp
SMoorthi-emc Aug 27, 2021
7748289
after merging with ccpp-physics/main
SMoorthi-emc Sep 3, 2021
252313d
Merge remote-tracking branch 'upstream/main' into SM_Jul302021
SMoorthi-emc Sep 10, 2021
2c6f85a
removing interstitial land and ice emissivities
SMoorthi-emc Sep 16, 2021
7d169b3
Merge remote-tracking branch 'upstream/main' into SM_Sep142021
SMoorthi-emc Sep 16, 2021
12d85af
improing treatment of emissivity and remove related unnecessary inter…
SMoorthi-emc Sep 17, 2021
2dd3ce4
reverting some changes to main version
SMoorthi-emc Sep 21, 2021
38a637e
fixing a bug as pointed out by Tanya Smirnova
SMoorthi-emc Sep 23, 2021
70f84bd
fixing the error in my last fix
SMoorthi-emc Sep 23, 2021
8eae622
reverting a change that happened while merging with PR branch
SMoorthi-emc Sep 23, 2021
32af5e9
just adding ablank
SMoorthi-emc Sep 23, 2021
f506e4d
some cimin bug fix
SMoorthi-emc Sep 24, 2021
2dbfdbd
after merging with ccpp-physics/main and also sfter removing lsm,lsm_…
SMoorthi-emc Sep 24, 2021
6a2cb7d
after merging with ccpp-physics/main and also sfter removing lsm,lsm_…
SMoorthi-emc Sep 24, 2021
1d3e762
updating radiation_surface.f
SMoorthi-emc Sep 25, 2021
34aa8c8
updating radiation_surface.f
SMoorthi-emc Sep 25, 2021
e39d4e6
fixing a typo in a comment line
SMoorthi-emc Sep 25, 2021
f7d4395
removing some blanks and fixing a typo in comment lines
SMoorthi-emc Sep 26, 2021
9e14237
remove some blanks in radiation_surface
SMoorthi-emc Sep 26, 2021
c0b1f13
Merge remote-tracking branch 'upstream/main' into SM_Sept21_PR
SMoorthi-emc Sep 27, 2021
f452fc5
after merging with ccpp/main
SMoorthi-emc Sep 27, 2021
bb59e96
fix typo in comments
SMoorthi-emc Sep 27, 2021
3618e66
updating to use estimated emissivity from the ice model when coupled
SMoorthi-emc Sep 28, 2021
78eb236
updating to include estimated emissivity from CICE
SMoorthi-emc Sep 28, 2021
4d33e71
fixing a bug in radiation_surface.f
SMoorthi-emc Sep 29, 2021
d09eb9c
fixing a bug in radiation_surface.f
SMoorthi-emc Sep 29, 2021
ecdb670
Merge remote-tracking branch 'upstream/main' into SM_Sept21_PR
SMoorthi-emc Sep 29, 2021
84956ba
Merge remote-tracking branch 'upstream/main' into SM_Sep142021
SMoorthi-emc Sep 29, 2021
7445eb0
making 'huge' a namelist variable
SMoorthi-emc Sep 30, 2021
4cdbcb0
Merge remote-tracking branch 'upstream/main' into SM_Sep142021
SMoorthi-emc Sep 30, 2021
d6f8ad4
Merge remote-tracking branch 'upstream/main' into SM_Sept21_PR
SMoorthi-emc Sep 30, 2021
19e675a
The ice/water flux composition is removed for consistency with the
tanyasmirnova Sep 30, 2021
6c709c9
Merge pull request #4 from tanyasmirnova/PR_moorthi_tanya_30sept21
SMoorthi-emc Sep 30, 2021
8ae21d6
Added updating of snow temperature and some clean-up.
tanyasmirnova Sep 30, 2021
dd89ac6
Merge pull request #6 from tanyasmirnova/PR_moorthi_ruclsm
SMoorthi-emc Sep 30, 2021
0fd3702
minor fix in sfc_drv_ruc.meta and removing some blanks in sfc_drv_ruc…
SMoorthi-emc Sep 30, 2021
76f0b35
changing ^ to & in radiation_surface.f
SMoorthi-emc Oct 1, 2021
9b2c6e6
after merging with main and updating radiation_surface to handle emis…
SMoorthi-emc Oct 4, 2021
b8a5bc0
fixing radiation_surface and GFS_surface_composite
SMoorthi-emc Oct 4, 2021
cbc9212
Merge branch 'SM_Sept21_PR' of https://github.com/SMoorthi-emc/ccpp-p…
SMoorthi-emc Oct 4, 2021
c1d781b
Merge remote-tracking branch 'upstream/main' into SM_Sept21_PR
SMoorthi-emc Oct 7, 2021
174f549
Merge remote-tracking branch 'upstream/main' into SM_Sep142021
SMoorthi-emc Oct 7, 2021
efd7e5a
Update documentation for input/output variables in radiation_surface.…
climbfuji Oct 8, 2021
85ffbb2
fixing some errors in radiation_surface and rearranging dcyc2.meta to…
SMoorthi-emc Oct 9, 2021
44d4974
Merge branch 'SM_Sep142021' of https://github.com/SMoorthi-emc/ccpp-p…
SMoorthi-emc Oct 9, 2021
e7dfdef
additional updates to emissivity calculation etc
SMoorthi-emc Oct 15, 2021
7c1b474
updating rte-rrtmgp pointer
SMoorthi-emc Oct 18, 2021
a6f1be8
Merge branch 'SM_Sept21_PR' into doc_update_moorthi_sep21
SMoorthi-emc Oct 19, 2021
daa52f9
Merge pull request #7 from climbfuji/doc_update_moorthi_sep21
SMoorthi-emc Oct 19, 2021
f6f3ce0
updating GFS_surface_composites to import sfcemis_wat
SMoorthi-emc Oct 19, 2021
42e7b97
fix a typo in GFS_radiation_surface.F90
SMoorthi-emc Oct 19, 2021
bc6a7c3
fix typo in GFS_surface_composites.meta
SMoorthi-emc Oct 19, 2021
3d4e056
replacing snodl by snodi in call to setalb
SMoorthi-emc Oct 20, 2021
6c0183e
updating comments in radiation_surface.f
SMoorthi-emc Oct 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: 3 additions & 3 deletions physics/GFS_PBL_generic.F90
Original file line number Diff line number Diff line change
Expand Up @@ -336,7 +336,7 @@ subroutine GFS_PBL_generic_post_run (im, levs, nvdiff, ntrac,
dqsfc_diag, dusfci_diag, dvsfci_diag, dtsfci_diag, dqsfci_diag, &
rd, cp, fvirt, hvap, t1, q1, prsl, hflx, ushfsfci, oceanfrac, kdt, dusfc_cice, dvsfc_cice, &
dtsfc_cice, dqsfc_cice, wet, dry, icy, wind, stress_wat, hflx_wat, evap_wat, ugrs1, vgrs1, hffac, &
ugrs, vgrs, tgrs, qgrs, save_u, save_v, save_t, save_q, errmsg, errflg)
ugrs, vgrs, tgrs, qgrs, save_u, save_v, save_t, save_q, huge, errmsg, errflg)

use machine, only : kind_phys
use GFS_PBL_generic_common, only : set_aerosol_tracer_index
Expand All @@ -357,7 +357,7 @@ subroutine GFS_PBL_generic_post_run (im, levs, nvdiff, ntrac,
real(kind=kind_phys), dimension(:,:, :), intent(in) :: save_q

real(kind=kind_phys), intent(in) :: dtf
real(kind=kind_phys), intent(in) :: rd, cp, fvirt, hvap
real(kind=kind_phys), intent(in) :: rd, cp, fvirt, hvap, huge
real(kind=kind_phys), dimension(:), intent(in) :: t1, q1, hflx, oceanfrac
real(kind=kind_phys), dimension(:,:), intent(in) :: prsl
real(kind=kind_phys), dimension(:), intent(in) :: dusfc_cice, dvsfc_cice, dtsfc_cice, dqsfc_cice, &
Expand Down Expand Up @@ -392,7 +392,7 @@ subroutine GFS_PBL_generic_post_run (im, levs, nvdiff, ntrac,
integer, intent(out) :: errflg

real(kind=kind_phys), parameter :: zero = 0.0_kp, one = 1.0_kp
real(kind=kind_phys), parameter :: huge = 9.9692099683868690E36 ! NetCDF float FillValue, same as in GFS_typedefs.F90
! real(kind=kind_phys), parameter :: huge = 9.9692099683868690E36 ! NetCDF float FillValue, same as in GFS_typedefs.F90
real(kind=kind_phys), parameter :: qmin = 1.0e-8_kp
integer :: i, k, kk, k1, n
real(kind=kind_phys) :: tem, rho
Expand Down
9 changes: 9 additions & 0 deletions physics/GFS_PBL_generic.meta
Original file line number Diff line number Diff line change
Expand Up @@ -1383,6 +1383,15 @@
kind = kind_phys
intent = in
optional = F
[huge]
standard_name = netcdf_float_fillvalue
long_name = definition of NetCDF float FillValue
units = none
dimensions = ()
type = real
kind = kind_phys
intent = in
optional = F
[errmsg]
standard_name = ccpp_error_message
long_name = error message for error handling in CCPP
Expand Down
2 changes: 1 addition & 1 deletion physics/GFS_debug.F90
Original file line number Diff line number Diff line change
Expand Up @@ -1307,7 +1307,7 @@ subroutine GFS_interstitialtoscreen_run (Model, Statein, Stateout, Sfcprop, Coup
call print_var(mpirank, omprank, blkno, Grid%xlat_d, Grid%xlon_d, 'Interstitial%scmpsw%visdf ', Interstitial%scmpsw%visdf )
call print_var(mpirank, omprank, blkno, Grid%xlat_d, Grid%xlon_d, 'Interstitial%semis_ice ', Interstitial%semis_ice )
call print_var(mpirank, omprank, blkno, Grid%xlat_d, Grid%xlon_d, 'Interstitial%semis_land ', Interstitial%semis_land )
call print_var(mpirank, omprank, blkno, Grid%xlat_d, Grid%xlon_d, 'Interstitial%semis_water ', Interstitial%semis_water )
! call print_var(mpirank, omprank, blkno, Grid%xlat_d, Grid%xlon_d, 'Interstitial%semis_water ', Interstitial%semis_water )
call print_var(mpirank, omprank, blkno, Grid%xlat_d, Grid%xlon_d, 'Interstitial%sfcalb ', Interstitial%sfcalb )
call print_var(mpirank, omprank, blkno, Grid%xlat_d, Grid%xlon_d, 'Interstitial%sigma ', Interstitial%sigma )
call print_var(mpirank, omprank, blkno, Grid%xlat_d, Grid%xlon_d, 'Interstitial%sigmaf ', Interstitial%sigmaf )
Expand Down
4 changes: 2 additions & 2 deletions physics/GFS_phys_time_vary.fv3.meta
Original file line number Diff line number Diff line change
Expand Up @@ -1744,8 +1744,8 @@
intent = inout
optional = F
[tisfc]
standard_name = sea_ice_temperature
long_name = sea ice surface skin temperature
standard_name = surface_skin_temperature_over_ice
long_name = surface skin temperature over ice
units = K
dimensions = (horizontal_dimension)
type = real
Expand Down
43 changes: 23 additions & 20 deletions physics/GFS_radiation_surface.F90
Original file line number Diff line number Diff line change
Expand Up @@ -58,11 +58,11 @@ end subroutine GFS_radiation_surface_init
subroutine GFS_radiation_surface_run ( &
im, frac_grid, lslwr, lsswr, lsm, lsm_noahmp, lsm_ruc, &
xlat, xlon, slmsk, lndp_type, n_var_lndp, sfc_alb_pert, &
lndp_var_list, lndp_prt_list, landfrac, snowd, sncovr, &
lndp_var_list, lndp_prt_list, landfrac, snodl, snodi, sncovr, &
sncovr_ice, fice, zorl, hprime, tsfg, tsfa, tisfc, coszen, &
min_seaice, min_lakeice, lakefrac, &
cplice, min_seaice, min_lakeice, lakefrac, use_flake, &
alvsf, alnsf, alvwf, alnwf, facsf, facwf, &
semis_lnd, semis_ice, snoalb, use_cice_alb, &
semis_lnd, semis_ice, semis_wat, snoalb, use_cice_alb, &
albdvis_lnd, albdnir_lnd, albivis_lnd, albinir_lnd, &
albdvis_ice, albdnir_ice, albivis_ice, albinir_ice, &
semisbase, semis, sfcalb, sfc_alb_dif, errmsg, errflg)
Expand All @@ -73,28 +73,31 @@ subroutine GFS_radiation_surface_run ( &

implicit none

integer, intent(in) :: im
logical, intent(in) :: frac_grid, lslwr, lsswr, use_cice_alb
integer, intent(in) :: lsm, lsm_noahmp, lsm_ruc, lndp_type, n_var_lndp
real(kind=kind_phys), intent(in) :: min_seaice, min_lakeice
integer, intent(in) :: im
logical, intent(in) :: frac_grid, lslwr, lsswr, use_cice_alb, cplice
integer, intent(in) :: lsm, lsm_noahmp, lsm_ruc, lndp_type, n_var_lndp
real(kind=kind_phys), intent(in) :: min_seaice, min_lakeice
logical, dimension(:), intent(in) :: use_flake

real(kind=kind_phys), dimension(:), intent(in) :: xlat, xlon, slmsk, &
sfc_alb_pert, lndp_prt_list, &
landfrac, lakefrac, &
snowd, sncovr, &
snodl, snodi, sncovr, &
sncovr_ice, fice, zorl, &
hprime, tsfg, tsfa, tisfc, &
coszen, alvsf, alnsf, alvwf, &
alnwf, facsf, facwf, &
semis_lnd, semis_ice, snoalb
alnwf, facsf, facwf, snoalb
character(len=3) , dimension(:), intent(in) :: lndp_var_list
real(kind=kind_phys), dimension(:), intent(inout) :: albdvis_lnd, albdnir_lnd, &
albivis_lnd, albinir_lnd
real(kind=kind_phys), dimension(:), intent(in) :: albdvis_ice, albdnir_ice, &
albivis_ice, albinir_ice

real(kind=kind_phys), dimension(:), intent(inout) :: albdvis_lnd, albdnir_lnd, &
albivis_lnd, albinir_lnd, &
semis_lnd, semis_ice, semis_wat
real(kind=kind_phys), dimension(:), intent(inout) :: semisbase, semis
real(kind=kind_phys), dimension(:,:), intent(inout) :: sfcalb
real(kind=kind_phys), dimension(:), intent(inout) :: sfc_alb_dif

character(len=*), intent(out) :: errmsg
integer, intent(out) :: errflg

Expand Down Expand Up @@ -158,13 +161,13 @@ subroutine GFS_radiation_surface_run ( &
if (lslwr) then
!> - Call module_radiation_surface::setemis(),to set up surface
!! emissivity for LW radiation.
call setemis (lsm, lsm_noahmp, lsm_ruc, &
frac_grid, xlon, xlat, slmsk, &
! frac_grid, min_seaice, xlon, xlat, slmsk, &
snowd, sncovr, sncovr_ice, zorl, tsfg, tsfa, &
hprime, semis_lnd, semis_ice, im, &
fracl, fraco, fraci, icy, & ! --- inputs
semisbase, semis) ! --- outputs
call setemis (lsm, lsm_noahmp, lsm_ruc, frac_grid, cplice, &
use_flake, lakefrac, xlon, xlat, slmsk, &
! frac_grid, min_seaice, xlon, xlat, slmsk, &
snodl, snodi, sncovr, sncovr_ice, zorl, tsfg, &
tsfa, hprime, semis_lnd, semis_ice, semis_wat,&
im, fracl, fraco, fraci, icy, & ! --- inputs
semisbase, semis) ! --- outputs
endif

if (lsswr) then
Expand All @@ -181,7 +184,7 @@ subroutine GFS_radiation_surface_run ( &
!> - Call module_radiation_surface::setalb(),to set up surface
!! albedor for SW radiation.

call setalb (slmsk, lsm, lsm_noahmp, lsm_ruc, use_cice_alb, snowd, sncovr, sncovr_ice, &
call setalb (slmsk, lsm, lsm_noahmp, lsm_ruc, use_cice_alb, snodi, sncovr, sncovr_ice, &
snoalb, zorl, coszen, tsfg, tsfa, hprime, frac_grid, lakefrac, &
! snoalb, zorl, coszen, tsfg, tsfa, hprime, frac_grid, min_seaice, &
alvsf, alnsf, alvwf, alnwf, facsf, facwf, fice, tisfc, &
Expand Down
44 changes: 39 additions & 5 deletions physics/GFS_radiation_surface.meta
Original file line number Diff line number Diff line change
Expand Up @@ -197,9 +197,18 @@
kind = kind_phys
intent = in
optional = F
[snowd]
standard_name = lwe_surface_snow
long_name = water equivalent snow depth
[snodl]
standard_name = surface_snow_thickness_water_equivalent_over_land
long_name = water equivalent snow depth over land
units = mm
dimensions = (horizontal_loop_extent)
type = real
kind = kind_phys
intent = in
optional = F
[snodi]
standard_name = surface_snow_thickness_water_equivalent_over_ice
long_name = water equivalent snow depth over ice
units = mm
dimensions = (horizontal_loop_extent)
type = real
Expand Down Expand Up @@ -270,8 +279,8 @@
intent = in
optional = F
[tisfc]
standard_name = sea_ice_temperature
long_name = sea ice surface skin temperature
standard_name = surface_skin_temperature_over_ice
long_name = surface_skin_temperature_over_ice
units = K
dimensions = (horizontal_loop_extent)
type = real
Expand All @@ -287,6 +296,14 @@
kind = kind_phys
intent = in
optional = F
[cplice]
standard_name = flag_for_sea_ice_coupling
long_name = flag controlling cplice collection (default on)
units = flag
dimensions = ()
type = logical
intent = in
optional = F
[min_seaice]
standard_name = min_sea_ice_area_fraction
long_name = minimum sea ice value
Expand Down Expand Up @@ -314,6 +331,14 @@
kind = kind_phys
intent = in
optional = F
[use_flake]
standard_name = flag_for_using_flake
long_name = flag indicating lake points using flake model
units = flag
dimensions = (horizontal_loop_extent)
type = logical
intent = inout
optional = F
[alvsf]
standard_name = vis_albedo_strong_cosz
long_name = mean vis albedo with strong cosz dependency
Expand Down Expand Up @@ -386,6 +411,15 @@
kind = kind_phys
intent = in
optional = F
[semis_wat]
standard_name = surface_longwave_emissivity_over_water
long_name = surface lw emissivity in fraction over water
units = frac
dimensions = (horizontal_loop_extent)
type = real
kind = kind_phys
intent = inout
optional = F
[snoalb]
standard_name = upper_bound_of_max_albedo_assuming_deep_snow
long_name = maximum snow albedo
Expand Down
Loading