Skip to content

Rm restart flags from icepack #8

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
apcraig merged 5 commits into from
Jun 22, 2017
Merged

Rm restart flags from icepack #8

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
1141dea
adding icepack with restart flags removed
eclare108213 Jun 9, 2017
660e48f
Trying again to add Icepack with restart flags removed
eclare108213 Jun 9, 2017
45eb085
update icepack submodule
eclare108213 Jun 10, 2017
02f9246
Adding Nicole's changes for bgc initialization
eclare108213 Jun 15, 2017
99b50db
Switching Icepack to the consortium version
eclare108213 Jun 17, 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
3 changes: 2 additions & 1 deletion .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
[submodule "icepack"]
path = icepack
url = https://github.com/CICE-Consortium/Icepack
url = https://github.com/eclare108213/Icepack.git
branch = icepack_initial_driver
149 changes: 72 additions & 77 deletions cicecore/dynamics/cicedynB/ice_init_column.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -487,9 +487,10 @@ subroutine init_bgc()
max_nbtrcr

! column package includes
use icepack_intfc, only: icepack_init_bgc, icepack_init_zsalinity, icepack_init_ocean_conc
use icepack_intfc, only: icepack_init_bgc, icepack_init_zsalinity, &
icepack_init_ocean_conc, icepack_init_OceanConcArray
use icepack_intfc_tracers, only: nbtrcr, ntrcr, nt_bgc_S, ntrcr_o, &
nt_sice, nt_fbri
nt_sice, nt_fbri

! local variables

Expand All @@ -503,7 +504,8 @@ subroutine init_bgc()
logical (kind=log_kind) :: &
l_print_point, & ! flag to print designated grid point diagnostics
debug , & ! prints debugging output if true
l_stop ! if true, print diagnostics and abort on return
l_stop , & ! if true, print diagnostics and abort on return
RayleighC

character (char_len) :: stop_label

Expand All @@ -516,6 +518,9 @@ subroutine init_bgc()
real(kind=dbl_kind), dimension(nilyr,ncat) :: &
sicen

real(kind=dbl_kind) :: &
RayleighR

! Initialize

l_stop = .false.
Expand All @@ -530,16 +535,15 @@ subroutine init_bgc()
snow_bio_net (:,:,:,:) = c0 ! integrated snow tracer conc (mmol/m^2 or mg/m^2)
zfswin (:,:,:,:,:) = c0 ! shortwave flux on bio grid
trcrn_sw (:,:,:,:,:) = c0 ! tracers active in the shortwave calculation
trcrn_bgc (:,:) = c0

if (.not. solve_zsal) restart_zsal = .false.
if (restart_zsal .or. restart_bgc) call read_restart_bgc
trcrn_bgc (:,:) = c0
RayleighR = c0
RayleighC = .false.

!-----------------------------------------------------------------
! zsalinity initialization
!-----------------------------------------------------------------

if (solve_zsal) then
if (solve_zsal) then ! default values

!$OMP PARALLEL DO PRIVATE(iblk,i,j,n,ilo,ihi,jlo,jhi,this_block)
do iblk = 1, nblocks
Expand All @@ -552,54 +556,31 @@ subroutine init_bgc()

do j = jlo, jhi
do i = ilo, ihi
call icepack_init_zsalinity(nblyr, ntrcr_o, restart_zsal, Rayleigh_criteria(i,j,iblk), &
Rayleigh_real(i,j,iblk), trcrn_bgc, nt_bgc_S, ncat, sss(i,j,iblk))
call icepack_init_zsalinity(nblyr, ntrcr_o, RayleighC, &
RayleighR, trcrn_bgc, nt_bgc_S, ncat, sss(i,j,iblk))
if (.not. restart_zsal) then
do n = 1,ncat
do k = 1, nblyr
trcrn(i,j,nt_bgc_S+k-1,n,iblk) = trcrn_bgc(nt_bgc_S-1+k-ntrcr_o,n)
enddo
enddo
Rayleigh_real (i,j,iblk) = RayleighR
Rayleigh_criteria(i,j,iblk) = RayleighC
do n = 1,ncat
do k = 1, nblyr
trcrn (i,j,nt_bgc_S+k-1, n,iblk) = &
trcrn_bgc( nt_bgc_S+k-1-ntrcr_o,n)
enddo
enddo
endif
enddo ! i
enddo ! j
enddo ! iblk
endif ! solve_zsal

if (.not. solve_zsal) restart_zsal = .false.

!-----------------------------------------------------------------
! biogeochemistry initialization
!-----------------------------------------------------------------

if (restart_bgc) then
if (.not. restart_bgc) then

!$OMP PARALLEL DO PRIVATE(iblk,i,j,n,ilo,ihi,jlo,jhi,this_block)
do iblk = 1, nblocks

this_block = get_block(blocks_ice(iblk),iblk)
ilo = this_block%ilo
ihi = this_block%ihi
jlo = this_block%jlo
jhi = this_block%jhi

do j = jlo, jhi
do i = ilo, ihi
l_print_point = .false.
debug = .false.
if (debug .and. print_points) then
do ipoint = 1, npnt
if (my_task == pmloc(ipoint) .and. &
i == piloc(ipoint) .and. &
j == pjloc(ipoint)) &
l_print_point = .true.
write (nu_diag, *) 'my_task = ',my_task
enddo ! ipoint
endif
enddo ! i
enddo ! j
enddo ! iblk

else ! not restarting

!-----------------------------------------------------------------
! Initial Ocean Values if not coupled to the ocean bgc
!-----------------------------------------------------------------
Expand All @@ -613,12 +594,13 @@ subroutine init_bgc()
jhi = this_block%jhi

do j = jlo, jhi
do i = ilo, ihi
call icepack_init_ocean_conc (amm(i,j, iblk), dmsp(i,j, iblk), dms(i,j, iblk), &
algalN(i,j, :, iblk), doc(i,j,:, iblk), dic(i,j,:, iblk), don(i,j,:, iblk), &
fed(i,j,:, iblk), fep(i,j,:, iblk), hum(i,j, iblk), nit(i,j, iblk), &
sil(i,j, iblk), zaeros(i,j, :, iblk), max_dic, max_don, max_fe, max_aero)

do i = ilo, ihi
call icepack_init_ocean_conc ( &
amm (i,j, iblk), dmsp(i,j, iblk), dms(i,j, iblk), &
algalN(i,j,:,iblk), doc (i,j,:,iblk), dic(i,j,:,iblk), &
don (i,j,:,iblk), fed (i,j,:,iblk), fep(i,j,:,iblk), &
hum (i,j, iblk), nit (i,j, iblk), sil(i,j, iblk), &
zaeros(i,j,:,iblk), max_dic, max_don, max_fe, max_aero)
enddo ! i
enddo ! j

Expand All @@ -627,11 +609,7 @@ subroutine init_bgc()
call init_bgc_data(fed(:,:,1,:),fep(:,:,1,:)) ! input dFe from file
call get_forcing_bgc ! defines nit and sil

endif ! restart

!-----------------------------------------------------------------
! Complete bgc initialization
!-----------------------------------------------------------------
endif ! .not. restart

!$OMP PARALLEL DO PRIVATE(iblk,i,j,n,ilo,ihi,jlo,jhi,this_block)
do iblk = 1, nblocks
Expand All @@ -654,38 +632,55 @@ subroutine init_bgc()
enddo
enddo

call icepack_init_bgc(dt, ncat, nblyr, nilyr, &
ntrcr_o, &
cgrid, igrid, &
restart_bgc, ntrcr, nbtrcr, &
sicen(:,:), &
trcrn_bgc(:,:), &
sss(i,j, iblk), &
nit(i,j, iblk), amm (i,j, iblk), &
sil(i,j, iblk), dmsp (i,j, iblk), &
dms(i,j, iblk), algalN(i,j,:,iblk), &
doc(i,j,:,iblk), don (i,j,:,iblk), &
dic(i,j,:,iblk), fed (i,j,:,iblk), &
fep(i,j,:,iblk), zaeros(i,j,:,iblk), &
hum(i,j, iblk), &
ocean_bio_all(i,j,:,iblk), &
max_algae, max_doc, max_dic, max_don, max_fe, max_nbtrcr, max_aero, &
l_stop, stop_label)
call icepack_init_OceanConcArray(max_nbtrcr, &
max_algae, max_don, max_doc, &
max_dic, max_aero, max_fe, &
nit (i,j, iblk), amm(i,j, iblk), sil (i,j, iblk), &
dmsp(i,j, iblk), dms(i,j, iblk), algalN(i,j,:,iblk), &
doc (i,j,:,iblk), don(i,j,:,iblk), dic (i,j,:,iblk), &
fed (i,j,:,iblk), fep(i,j,:,iblk), zaeros(i,j,:,iblk), &
ocean_bio_all(i,j,:,iblk), hum (i,j, iblk))

if (l_stop) then
call diagnostic_abort(i, j, iblk, istep1, stop_label)
endif
do n = 1, ncat
do k = ntrcr_o+1, ntrcr
trcrn(i,j,k,n,iblk) = trcrn_bgc(k-ntrcr_o,n)
enddo
enddo

enddo ! i
enddo ! j

enddo ! iblk

if (.not. restart_bgc) then

!$OMP PARALLEL DO PRIVATE(iblk,i,j,n,ilo,ihi,jlo,jhi,this_block)
do iblk = 1, nblocks

this_block = get_block(blocks_ice(iblk),iblk)
ilo = this_block%ilo
ihi = this_block%ihi
jlo = this_block%jlo
jhi = this_block%jhi

do j = jlo, jhi
do i = ilo, ihi

call icepack_init_bgc(dt, ncat, nblyr, nilyr, ntrcr_o, &
cgrid, igrid, ntrcr, nbtrcr, &
sicen(:,:), trcrn_bgc(:,:), sss(i,j, iblk), &
ocean_bio_all(i,j,:,iblk), &
l_stop, stop_label)
enddo ! i
enddo ! j
enddo ! iblk

endif ! .not. restart

!-----------------------------------------------------------------
! read restart to complete BGC initialization
!-----------------------------------------------------------------

if (restart_zsal .or. restart_bgc) call read_restart_bgc

end subroutine init_bgc

!=======================================================================
Expand Down
2 changes: 1 addition & 1 deletion icepack
Open in desktop
Submodule icepack updated 1 files
+16 −83 columnphysics/icepack_intfc.F90