Skip to content

Update rte-rrtmgp submodule + SCM-only bugfix #924

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

Merged
grantfirl merged 4 commits into from
May 25, 2022
Merged

Update rte-rrtmgp submodule + SCM-only bugfix #924

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
49c7096
make sure that tsfc_wat is calculated when wet = T
grantfirl May 10, 2022
b994063
Update rte-rrtmgp submodule
dustinswales May 16, 2022
87359d2
Merge branch 'main' into fix_SCM_specified_surface_flux_bug
grantfirl May 20, 2022
8dae03a
Merge pull request #18 from grantfirl/fix_SCM_specified_surface_flux_bug
May 20, 2022
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 physics/rte-rrtmgp
Open in desktop
Submodule rte-rrtmgp updated 2 files
+1 −1 rrtmgp/mo_gas_optics_rrtmgp.F90
+5 −5 rte/mo_optical_props.F90
21 changes: 13 additions & 8 deletions physics/scm_sfc_flux_spec.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,14 +153,11 @@ subroutine scm_sfc_flux_spec_run (im, u1, v1, z1, t1, q1, p1, roughness_length,
frland(i) = 1.0_kind_phys
cice(i) = 0.0_kind_phys
icy(i) = .false.
tsfcl(i) = T_surf(i) !GJF
else
frland(i) = 0.0_kind_phys
if (oceanfrac(i) > 0.0_kind_phys) then
if (cice(i) >= min_seaice) then
icy(i) = .true.
tisfc(i) = T_surf(i) !GJF
tisfc(i) = max(timin, min(tisfc(i), tgice))
! This cplice namelist option was added to deal with the
! situation of the FV3ATM-HYCOM coupling without an active sea
! ice (e.g., CICE6) component. By default, the cplice is true
Expand All @@ -186,8 +183,6 @@ subroutine scm_sfc_flux_spec_run (im, u1, v1, z1, t1, q1, p1, roughness_length,
else
if (cice(i) >= min_lakeice) then
icy(i) = .true.
tisfc(i) = T_surf(i) !GJF
tisfc(i) = max(timin, min(tisfc(i), tgice))
islmsk(i) = 2
else
cice(i) = 0.0_kind_phys
Expand All @@ -198,13 +193,23 @@ subroutine scm_sfc_flux_spec_run (im, u1, v1, z1, t1, q1, p1, roughness_length,
if (cice(i) < 1.0_kind_phys) then
wet(i) = .true. ! some open lake
endif
if (wet(i)) then ! Water
tsfc_wat(i) = T_surf(i)
endif
endif
endif
if (nint(slmsk(i)) /= 1) slmsk(i) = islmsk(i)
enddo

do i = 1, im
if (wet(i)) then
tsfc_wat(i) = T_surf(i)
end if
if (dry(i)) then
tsfcl(i) = T_surf(i)
end if
if (icy(i)) then
tisfc(i) = T_surf(i)
tisfc(i) = max(timin, min(tisfc(i), tgice))
end if
end do

! to prepare to separate lake from ocean under water category
do i = 1, im
Expand Down