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

Physics separation merge: Step12 #32

Merged
merged 12 commits into from
Dec 26, 2017
Merged

Physics separation merge: Step12 #32

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
b6faf63
Separated version of sea ice routine sfc_sice.
Nov 30, 2017
bbb73f3
Fixed typos in parameter table.
Nov 30, 2017
6ff8a29
Added init and finalize for pre and post for completeness.
Nov 30, 2017
b83dc90
Fixed typo in argument list and in parameter table.
Dec 7, 2017
cc46731
Added sfc_sice_pre and post calls to driver.
Dec 7, 2017
c05b06b
Trying again to post commit
kellylittleblackdog Dec 7, 2017
1b4d417
Added two descriptions to sfc_sice_pre_run variable table that were m…
kellylittleblackdog Dec 7, 2017
454d0ce
Cleaned up some typos, cformatting errors and missing statements.
kellylittleblackdog Dec 22, 2017
d300ec2
Cleaned up formatting errors and typos.
kellylittleblackdog Dec 22, 2017
2b206f7
Merge branch 'seaice_separator_work_gfs' of https://github.com/kellyl…
llpcarson Dec 22, 2017
cdd0565
More bug-fixes, syntax, etc.
llpcarson Dec 22, 2017
7618c80
Formatting changes
climbfuji Dec 26, 2017
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
52 changes: 26 additions & 26 deletions GFS_layer/GFS_physics_driver.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,9 @@ module module_physics_driver
use surface_diagnose
use GFS_surface_loop_control_part1
use GFS_surface_loop_control_part2
use sfc_sice_pre, only: sfc_sice_pre_run
use sfc_sice, only: sfc_sice_run
use sfc_sice_post, only: sfc_sice_post_run
use gwdps_pre, only: gwdps_pre_run
use gwdps, only: gwdps_run
use gwdps_post, only: gwdps_post_run
Expand Down Expand Up @@ -666,19 +669,13 @@ subroutine GFS_physics_driver &

! frain = dtf / dtp

! --- ... xw: transfer ice thickness & concentration from global to local variables
call sfc_sice_pre_run &
& (im, Sfcprop%fice, Sfcprop%hice, Sfcprop%tisfc, &
& Statein%prsik(:,1), Statein%prslk(:,1), &
& cice, zice, tice, work3)
do i = 1, im
! --- ... xw: transfer ice thickness & concentration from global to local variables
zice(i) = Sfcprop%hice(i)
cice(i) = Sfcprop%fice(i)
tice(i) = Sfcprop%tisfc(i)
!
!GFDL work1(i) = (log(coslat(i) / (nlons(i)*latr)) - dxmin) * dxinv
! work1(i) = (log(Grid%dx(i)) - dxmin) * dxinv
! work1(i) = (log(Grid%area(i)) - dxmin) * dxinv
! work1(i) = max(0.0, min(1.0,work1(i)))
! work2(i) = 1.0 - work1(i)
! Diag%psurf(i) = Statein%pgr(i)
!GFDL tem1 = con_rerth * (con_pi+con_pi)*coslat(i)/nlons(i)
!GFDL tem1 = con_rerth * (con_pi+con_pi)*coslat(i)/nlons(i)
!GFDL tem2 = con_rerth * con_pi / latr
!GFDL garea(i) = tem1 * tem2
! tem1 = Grid%dx(i)
Expand Down Expand Up @@ -1019,13 +1016,13 @@ subroutine GFS_physics_driver &
enddo
endif

call sfc_sice &
call sfc_sice_run &
! --- inputs:
(im, Model%lsoil, Statein%pgr, Statein%ugrs, Statein%vgrs, &
Statein%tgrs, Statein%qgrs, dtf, Radtend%semis, gabsbdlw, &
adjsfcnsw, adjsfcdsw, Sfcprop%srflag, cd, cdq, &
Statein%prsl(1,1), work3, islmsk, &
Tbd%phy_f2d(1,Model%num_p2d), flag_iter, Model%mom4ice, &
Statein%prsl(:,1), work3, islmsk, &
Tbd%phy_f2d(:,Model%num_p2d), flag_iter, Model%mom4ice, &
Model%lsm, lprnt, ipr, &
! --- input/outputs:
zice, cice, tice, Sfcprop%weasd, Sfcprop%tsfc, &
Expand Down Expand Up @@ -2742,17 +2739,20 @@ subroutine GFS_physics_driver &
Model%lssav,dtf,drain,runof,Diag%runoff(:),Diag%srunoff(:))

! --- ... xw: return updated ice thickness & concentration to global array
do i = 1, im
if (islmsk(i) == 2) then
Sfcprop%hice(i) = zice(i)
Sfcprop%fice(i) = cice(i)
Sfcprop%tisfc(i) = tice(i)
else
Sfcprop%hice(i) = 0.0
Sfcprop%fice(i) = 0.0
Sfcprop%tisfc(i) = Sfcprop%tsfc(i)
endif
enddo
call sfc_sice_post_run &
& (im, islmsk, cice, zice, tice, Sfcprop%tsfc, &
& Sfcprop%fice, Sfcprop%hice, Sfcprop%tisfc)
!DRS do i = 1, im
!DRS
!DRS Sfcprop%hice(i) = zice(i)
!DRS Sfcprop%fice(i) = cice(i)
!DRS Sfcprop%tisfc(i) = tice(i)
!DRS else
!DRS Sfcprop%hice(i) = 0.0
!DRS Sfcprop%fice(i) = 0.0
!DRS Sfcprop%tisfc(i) = Sfcprop%tsfc(i)
!DRS endif
!DRS enddo

! --- ... return updated smsoil and stsoil to global arrays
! Sfcprop%smc(:,:) = smsoil(:,:)
Expand Down
Loading