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

zsalinity bug fix #346

Merged
merged 1 commit into from
Jan 8, 2021
Merged

zsalinity bug fix #346

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
9 changes: 4 additions & 5 deletions columnphysics/icepack_zbgc.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,9 +78,9 @@ subroutine add_new_ice_bgc (dt, nblyr, &

integer (kind=int_kind), intent(in) :: &
nblyr , & ! number of bio layers
ncat , & ! number of thickness categories
nilyr , & ! number of ice layers
nltrcr, & ! number of zbgc tracers
ncat , & ! number of thickness categories
nilyr , & ! number of ice layers
nltrcr , & ! number of zbgc tracers
nbtrcr , & ! number of biology tracers
ntrcr ! number of tracers in use

Expand Down Expand Up @@ -525,7 +525,7 @@ subroutine adjust_tracer_profile (nbtrcr, dt, ntrcr, &
do k = 1, nilyr
trcrn(nt_sice+k-1) = trtmp(nt_sice+k-1)
enddo !k
endif ! solve_zsal
endif ! solve_zsal

endif ! location

Expand All @@ -534,7 +534,6 @@ end subroutine adjust_tracer_profile
!=======================================================================
!autodocument_start icepack_init_bgc
!

subroutine icepack_init_bgc(ncat, nblyr, nilyr, ntrcr_o, &
cgrid, igrid, ntrcr, nbtrcr, &
sicen, trcrn, sss, ocean_bio_all)
Expand Down
19 changes: 10 additions & 9 deletions configuration/driver/icedrv_init_column.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -480,15 +480,6 @@ subroutine init_bgc()

do i = 1, nx

do n = 1, ncat
do k = 1, nilyr
sicen(k,n) = trcrn(i,nt_sice+k-1,n)
enddo
do k = ntrcr_o+1, ntrcr
trcrn_bgc(k-ntrcr_o,n) = trcrn(i,k,n)
enddo
enddo

call icepack_load_ocean_bio_array(max_nbtrcr=max_nbtrcr, &
max_algae=max_algae, max_don=max_don, max_doc=max_doc, &
max_aero =max_aero, max_dic=max_dic, max_fe =max_fe, &
Expand All @@ -504,6 +495,16 @@ subroutine init_bgc()
enddo ! i

do i = 1, nx

do n = 1, ncat
do k = 1, nilyr
sicen(k,n) = trcrn(i,nt_sice+k-1,n)
enddo
do k = ntrcr_o+1, ntrcr
trcrn_bgc(k-ntrcr_o,n) = trcrn(i,k,n)
enddo
enddo

call icepack_init_bgc(ncat=ncat, nblyr=nblyr, nilyr=nilyr, ntrcr_o=ntrcr_o, &
cgrid=cgrid, igrid=igrid, ntrcr=ntrcr, nbtrcr=nbtrcr, &
sicen=sicen(:,:), trcrn=trcrn_bgc(:,:), &
Expand Down