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 test #344

Merged
merged 4 commits into from
Dec 23, 2020
Merged

zsalinity test #344

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1c51e14
zsalinity test
eclare108213 Dec 12, 2020
0281dcf
Merge branch 'master' of https://github.com/cice-consortium/Icepack i…
eclare108213 Dec 18, 2020
b8cb1ac
bug fixes: set solve_zsal as an icepack parameter, and fix diagnostic…
eclare108213 Dec 20, 2020
97f33cb
cosmetic
eclare108213 Dec 20, 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
23 changes: 12 additions & 11 deletions configuration/driver/icedrv_diagnostics_bgc.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -794,7 +794,7 @@ subroutine zsal_diags ()
!-----------------------------------------------------------------
! NOTE these are computed for the last timestep only (not avg)

do n = 1, nx
do n = 1, nx
pfzsal = fzsal(n)
pfzsal_g = fzsal_g(n)
phinS = c0
Expand Down Expand Up @@ -850,25 +850,24 @@ subroutine zsal_diags ()
do k = 1,nilyr
pSice(k) = trcr(n,nt_sice+k-1)
enddo
enddo ! nx

!-----------------------------------------------------------------
! start spewing
!-----------------------------------------------------------------

write(nu_diag_out+n-1,*) ' '
write(nu_diag_out+n-1,*) ' Brine height '
write(nu_diag_out+n-1,900) 'hbrin = ',phinS
write(nu_diag_out+n-1,900) 'hbrin cat 1 = ',phinS1
write(nu_diag_out+n-1,900) 'Freeboard = ',phbrn
write(nu_diag_out+n-1,900) 'dhbrin cat 1 top = ',pdh_top1
write(nu_diag_out+n-1,900) 'dhbrin cat 1 bottom = ',pdh_bot1
write(nu_diag_out+n-1,900) 'hbrin = ',phinS(n)
write(nu_diag_out+n-1,900) 'hbrin cat 1 = ',phinS1(n)
write(nu_diag_out+n-1,900) 'Freeboard = ',phbrn(n)
write(nu_diag_out+n-1,900) 'dhbrin cat 1 top = ',pdh_top1(n)
write(nu_diag_out+n-1,900) 'dhbrin cat 1 bottom = ',pdh_bot1(n)
write(nu_diag_out+n-1,*) ' '
write(nu_diag_out+n-1,*) ' zSalinity '
write(nu_diag_out+n-1,900) 'Avg density (kg/m^3) = ',psice_rho
write(nu_diag_out+n-1,900) 'Salt flux (kg/m^2/s) = ',pfzsal
write(nu_diag_out+n-1,900) 'Grav. Drain. Salt flux = ',pfzsal_g
write(nu_diag_out+n-1,900) 'Darcy V cat 1 (m/s) = ',pdarcy_V1
write(nu_diag_out+n-1,900) 'Avg density (kg/m^3) = ',psice_rho(n)
write(nu_diag_out+n-1,900) 'Salt flux (kg/m^2/s) = ',pfzsal(n)
write(nu_diag_out+n-1,900) 'Grav. Drain. Salt flux = ',pfzsal_g(n)
write(nu_diag_out+n-1,900) 'Darcy V cat 1 (m/s) = ',pdarcy_V1(n)
write(nu_diag_out+n-1,*) ' '
write(nu_diag_out+n-1,*) ' Top down bgc Layer Model'
write(nu_diag_out+n-1,*) ' '
Expand Down Expand Up @@ -901,6 +900,8 @@ subroutine zsal_diags ()
write(nu_diag_out+n-1,802) (pSice(k), k = 1,nilyr)
write(nu_diag_out+n-1,*) ' '

enddo ! nx

802 format (f24.17,2x)
803 format (a25,2x)
900 format (a25,2x,f24.17)
Expand Down
2 changes: 1 addition & 1 deletion configuration/driver/icedrv_init_column.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1225,7 +1225,7 @@ subroutine init_zbgc
fr_dFe_in=fr_dFe, k_nitrif_in=k_nitrif, t_iron_conv_in=t_iron_conv, &
max_loss_in=max_loss, max_dfe_doc1_in=max_dfe_doc1, fr_resp_in=fr_resp, &
fr_resp_s_in=fr_resp_s, y_sk_DMS_in=y_sk_DMS, t_sk_conv_in=t_sk_conv, &
t_sk_ox_in=t_sk_ox, modal_aero_in=modal_aero)
t_sk_ox_in=t_sk_ox, modal_aero_in=modal_aero, solve_zsal_in=solve_zsal)
call icepack_warnings_flush(nu_diag)
if (icepack_warnings_aborted()) call icedrv_system_abort(string=subname, &
file=__FILE__, line=__LINE__)
Expand Down
10 changes: 10 additions & 0 deletions configuration/scripts/options/set_env.zsal
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
### Layers
setenv NICELYR 7 # number of vertical layers in the ice
setenv NSNWLYR 1 # number of vertical layers in the snow
setenv NICECAT 5 # number of ice thickness categories

### Tracers # match icepack_in tracer_nml to conserve memory
setenv TRBRI 1 # set to 1 for brine height tracer
setenv TRZS 1 # set to 1 for zsalinity tracer
# (needs TRBRI = 1)
setenv NBGCLYR 7 # number of zbgc layers
5 changes: 5 additions & 0 deletions configuration/scripts/options/set_nml.zsal
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
ktherm = 1
sw_redist = .true.
tfrz_option = 'linear_salt'
tr_brine = .true.
solve_zsal = .true.
2 changes: 2 additions & 0 deletions configuration/scripts/tests/base_suite.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ smoke col 1x1 debug,run1year
smoke col 1x1 debug,bgcISPOL
smoke col 1x1 debug,bgcNICE
smoke col 1x1 debug,bgcsklNICE
smoke col 1x1 debug,run1year,zsal
smoke col 1x1 debug,run1year,thermo1
smoke col 1x1 debug,run1year,swredist
smoke col 1x1 debug,run1year,swccsm3
Expand All @@ -21,6 +22,7 @@ restart col 1x1 pondcesm
restart col 1x1 pondlvl
restart col 1x1 pondtopo
restart col 1x1 bgcISPOL
restart col 1x1 zsal
restart col 1x1 thermo1
restart col 1x1 swccsm3
restart col 1x1 isotope
Expand Down