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

Jump to bottom

Sm sep09092020 #497

Closed
wants to merge 3 commits into from
Closed

Sm sep09092020 #497

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f94cc61
adding print of iaermdl
SMoorthi-emc Aug 31, 2020
6b561c7
Merge remote-tracking branch 'upstream/master' into SM_Sep09092020
SMoorthi-emc Sep 9, 2020
736f8f6
some surface fixes
SMoorthi-emc Sep 11, 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
3 changes: 2 additions & 1 deletion physics/GFS_rrtmg_setup.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -292,7 +292,8 @@ subroutine GFS_rrtmg_setup_init ( &
print *,' In rad_initialize (GFS_rrtmg_setup_init), before calling radinit'
print *,' si =',si
print *,' levr=',levr,' ictm=',ictm,' isol=',isol,' ico2=',ico2,&
& ' iaer=',iaer,' ialb=',ialb,' iems=',iems,' ntcw=',ntcw
& ' iaer=',iaer,' ialb=',ialb,' iems=',iems,' ntcw=',ntcw,&
& ' iaermdl=',iaermdl,' iaerflg=',iaerflg
print *,' np3d=',num_p3d,' ntoz=',ntoz,' iovr_sw=',iovr_sw, &
& ' iovr_lw=',iovr_lw,' isubc_sw=',isubc_sw, &
& ' isubc_lw=',isubc_lw,' icliq_sw=',icliq_sw, &
Expand Down
16 changes: 9 additions & 7 deletions physics/GFS_surface_composites.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -478,6 +478,9 @@ subroutine GFS_surface_composites_post_run (
fh2(i) = fh2_lnd(i)
!tsurf(i) = tsurf_lnd(i)
tsfcl(i) = tsfc_lnd(i) ! over land
tsfc(i) = tsfcl(i)
tsfco(i) = tsfc(i)
tisfc(i) = tsfc(i)
cmm(i) = cmm_lnd(i)
chh(i) = chh_lnd(i)
gflx(i) = gflx_lnd(i)
Expand All @@ -488,11 +491,8 @@ subroutine GFS_surface_composites_post_run (
evap(i) = evap_lnd(i)
hflx(i) = hflx_lnd(i)
qss(i) = qss_lnd(i)
tsfc(i) = tsfc_lnd(i)
hice(i) = zero
cice(i) = zero
tisfc(i) = tsfc(i)
tsfco(i) = tsfc(i)
elseif (islmsk(i) == 0) then
zorl(i) = zorl_wat(i)
cd(i) = cd_wat(i)
Expand All @@ -506,7 +506,9 @@ subroutine GFS_surface_composites_post_run (
fh2(i) = fh2_wat(i)
!tsurf(i) = tsurf_wat(i)
tsfco(i) = tsfc_wat(i) ! over lake (and ocean when uncoupled)
tsfc(i) = tsfco(i)
tsfcl(i) = tsfc(i)
tisfc(i) = tsfc(i)
cmm(i) = cmm_wat(i)
chh(i) = chh_wat(i)
gflx(i) = gflx_wat(i)
Expand All @@ -517,10 +519,8 @@ subroutine GFS_surface_composites_post_run (
evap(i) = evap_wat(i)
hflx(i) = hflx_wat(i)
qss(i) = qss_wat(i)
tsfc(i) = tsfc_wat(i)
hice(i) = zero
cice(i) = zero
tisfc(i) = tsfc(i)
else ! islmsk(i) == 2
zorl(i) = zorl_ice(i)
cd(i) = cd_ice(i)
Expand All @@ -544,9 +544,11 @@ subroutine GFS_surface_composites_post_run (
evap(i) = evap_ice(i)
hflx(i) = hflx_ice(i)
qss(i) = qss_ice(i)
tisfc(i) = tice(i)
if (.not. flag_cice(i)) then
tisfc(i) = tice(i) ! over lake ice (and sea ice when uncoupled)
! tisfc(i) = tice(i) ! over lake ice (and sea ice when uncoupled)
zorl(i) = cice(i) * zorl_ice(i) + (one - cice(i)) * zorl_wat(i)
tsfc(i) = tsfc_ice(i) ! over lake (and ocean when uncoupled)
elseif (wet(i)) then
if (cice(i) > min_seaice) then ! this was already done for lake ice in sfc_sice
txi = cice(i)
Expand Down Expand Up @@ -575,7 +577,7 @@ subroutine GFS_surface_composites_post_run (
endif
tsfcl(i) = tsfc(i)
do k=1,kice ! store tiice in stc to reduce output in the nonfrac grid case
stc(i,k)=tiice(i,k)
stc(i,k) = tiice(i,k)
end do
endif

Expand Down
4 changes: 2 additions & 2 deletions physics/sfc_sice.f
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,7 +219,7 @@ subroutine sfc_sice_run &
endif
if (fice(i) > tem) then
islmsk_local(i) = 2
tice(i) =min( tice(i), tgice)
tice(i) = min(tice(i), tgice)
endif
endif
enddo
Expand Down Expand Up @@ -399,7 +399,6 @@ subroutine sfc_sice_run &
print *,'fix layer 2 ice temp: reset it to:',stsice(i,2)
endif

tskin(i) = tice(i)*fice(i) + tgice*ffw(i)
endif
enddo

Expand All @@ -424,6 +423,7 @@ subroutine sfc_sice_run &
#endif
hflx(i) = fice(i)*hflxi + ffw(i)*hflxw
evap(i) = fice(i)*evapi(i) + ffw(i)*evapw(i)
tskin(i) = fice(i)*tice(i) + ffw(i)*tgice
!
! --- ... the rest of the output

Expand Down