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

update icepack calls in CICE to add keywords #378

Merged
merged 1 commit into from
Nov 22, 2019
Merged

update icepack calls in CICE to add keywords #378

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 7 additions & 7 deletions cicecore/cicedynB/dynamics/ice_dyn_eap.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -346,13 +346,13 @@ subroutine eap (dt)
do ij = 1, icellt(iblk)
i = indxti(ij, iblk)
j = indxtj(ij, iblk)
call icepack_ice_strength (ncat, &
aice (i,j, iblk), &
vice (i,j, iblk), &
aice0 (i,j, iblk), &
aicen (i,j,:,iblk), &
vicen (i,j,:,iblk), &
strength(i,j, iblk) )
call icepack_ice_strength(ncat=ncat, &
aice = aice (i,j, iblk), &
vice = vice (i,j, iblk), &
aice0 = aice0 (i,j, iblk), &
aicen = aicen (i,j,:,iblk), &
vicen = vicen (i,j,:,iblk), &
strength = strength(i,j, iblk) )
enddo ! ij

! load velocity into array for boundary updates
Expand Down
14 changes: 7 additions & 7 deletions cicecore/cicedynB/dynamics/ice_dyn_evp.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -286,13 +286,13 @@ subroutine evp (dt)
do ij = 1, icellt(iblk)
i = indxti(ij, iblk)
j = indxtj(ij, iblk)
call icepack_ice_strength (ncat, &
aice (i,j, iblk), &
vice (i,j, iblk), &
aice0 (i,j, iblk), &
aicen (i,j,:,iblk), &
vicen (i,j,:,iblk), &
strength(i,j, iblk) )
call icepack_ice_strength(ncat = ncat, &
aice = aice (i,j, iblk), &
vice = vice (i,j, iblk), &
aice0 = aice0 (i,j, iblk), &
aicen = aicen (i,j,:,iblk), &
vicen = vicen (i,j,:,iblk), &
strength = strength(i,j, iblk) )
enddo ! ij

! load velocity into array for boundary updates
Expand Down
16 changes: 9 additions & 7 deletions cicecore/cicedynB/dynamics/ice_transport_driver.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1679,13 +1679,15 @@ subroutine work_to_state (nx_block, ny_block, &
i = indxi(ij)
j = indxj(ij)

call icepack_compute_tracers (ntrcr, trcr_depend(:), &
work (ij,narrays+1:narrays+ntrcr), &
aicen(i,j,n), &
vicen(i,j,n), vsnon(i,j,n), &
trcr_base(:,:), n_trcr_strata(:), &
nt_strata(:,:), &
trcrn(i,j,:,n))
call icepack_compute_tracers(ntrcr=ntrcr, trcr_depend=trcr_depend(:), &
atrcrn = work (ij,narrays+1:narrays+ntrcr), &
aicen = aicen(i,j,n), &
vicen = vicen(i,j,n), &
vsnon = vsnon(i,j,n), &
trcr_base = trcr_base(:,:), &
n_trcr_strata = n_trcr_strata(:), &
nt_strata = nt_strata(:,:), &
trcrn = trcrn(i,j,:,n))
enddo
narrays = narrays + ntrcr

Expand Down
41 changes: 21 additions & 20 deletions cicecore/cicedynB/general/ice_init.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1481,21 +1481,21 @@ subroutine init_state
enddo

if (tmask(i,j,iblk)) &
call icepack_aggregate (ncat, &
aicen(i,j,:,iblk), &
trcrn(i,j,:,:,iblk), &
vicen(i,j,:,iblk), &
vsnon(i,j,:,iblk), &
aice (i,j, iblk), &
trcr (i,j,:,iblk), &
vice (i,j, iblk), &
vsno (i,j, iblk), &
aice0(i,j, iblk), &
ntrcr, &
trcr_depend (:), &
trcr_base (:,:), &
n_trcr_strata(:), &
nt_strata (:,:))
call icepack_aggregate(ncat = ncat, &
aicen = aicen(i,j,:,iblk), &
trcrn = trcrn(i,j,:,:,iblk), &
vicen = vicen(i,j,:,iblk), &
vsnon = vsnon(i,j,:,iblk), &
aice = aice (i,j, iblk), &
trcr = trcr (i,j,:,iblk), &
vice = vice (i,j, iblk), &
vsno = vsno (i,j, iblk), &
aice0 = aice0(i,j, iblk), &
ntrcr = ntrcr, &
trcr_depend = trcr_depend(:), &
trcr_base = trcr_base(:,:), &
n_trcr_strata = n_trcr_strata(:), &
nt_strata = nt_strata(:,:))

aice_init(i,j,iblk) = aice(i,j,iblk)

Expand Down Expand Up @@ -1797,11 +1797,12 @@ subroutine set_state_var (nx_block, ny_block, &
endif
vsnon(i,j,n) = min(aicen(i,j,n)*hsno_init,p2*vicen(i,j,n))

call icepack_init_trcr(Tair(i,j), Tf(i,j), &
salinz(i,j,:), Tmltz(i,j,:), &
Tsfc, &
nilyr, nslyr, &
qin(:), qsn(:))
call icepack_init_trcr(Tair = Tair(i,j), Tf = Tf(i,j), &
Sprofile = salinz(i,j,:), &
Tprofile = Tmltz(i,j,:), &
Tsfc = Tsfc, &
nilyr = nilyr, nslyr = nslyr, &
qin = qin(:), qsn = qsn(:))

! surface temperature
trcrn(i,j,nt_Tsfc,n) = Tsfc ! deg C
Expand Down
Loading