Skip to content

Deprecate zsalinity #1017

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 6 commits into from
Apr 25, 2025
Merged

Deprecate zsalinity #1017

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
a279c7d
Deprecate zsalinity
apcraig Apr 22, 2025
a019189
Deprecate zsalinity
apcraig Apr 22, 2025
b6b62c3
revert icepack
apcraig Apr 23, 2025
2f9db9c
Merge branch 'depzsal2' of https://github.com/apcraig/cice into depzsal2
apcraig Apr 23, 2025
66cddc3
revert icepack
apcraig Apr 23, 2025
e392863
Update Icepack to #5feadd007a58f
apcraig Apr 24, 2025
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
2 changes: 1 addition & 1 deletion cicecore/cicedyn/analysis/ice_history.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2322,7 +2322,7 @@ subroutine accum_hist (dt)
timedbl = (timesecs-dt)/(secday)
time_beg(ns) = real(timedbl,kind=real_kind)
endif
enddo
enddo ! ns

!---------------------------------------------------------------
! increment field
Expand Down
10 changes: 4 additions & 6 deletions cicecore/drivers/direct/hadgem3/CICE_InitMod.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -242,7 +242,7 @@ subroutine init_restart
restart_fsd, read_restart_fsd, &
restart_aero, read_restart_aero, &
restart_hbrine, read_restart_hbrine, &
restart_zsal, restart_bgc
restart_bgc
use ice_restart_driver, only: restartfile, restartfile_v4
use ice_restart_shared, only: runtype, restart
use ice_state ! almost everything
Expand All @@ -253,7 +253,7 @@ subroutine init_restart
logical(kind=log_kind) :: &
tr_iage, tr_FY, tr_lvl, tr_pond_lvl, &
tr_pond_topo, tr_fsd, tr_aero, tr_brine, &
skl_bgc, z_tracers, solve_zsal
skl_bgc, z_tracers
integer(kind=int_kind) :: &
ntrcr
integer(kind=int_kind) :: &
Expand All @@ -268,7 +268,7 @@ subroutine init_restart
file=__FILE__, line=__LINE__)

call icepack_query_parameters(skl_bgc_out=skl_bgc, &
z_tracers_out=z_tracers, solve_zsal_out=solve_zsal)
z_tracers_out=z_tracers)
call icepack_query_tracer_flags(tr_iage_out=tr_iage, tr_FY_out=tr_FY, &
tr_lvl_out=tr_lvl, tr_pond_lvl_out=tr_pond_lvl, &
tr_pond_topo_out=tr_pond_topo, tr_aero_out=tr_aero, tr_brine_out=tr_brine, &
Expand Down Expand Up @@ -381,8 +381,6 @@ subroutine init_restart
if (trim(runtype) == 'continue') then
if (tr_brine) &
restart_hbrine = .true.
if (solve_zsal) &
restart_zsal = .true.
if (skl_bgc .or. z_tracers) &
restart_bgc = .true.
endif
Expand All @@ -392,7 +390,7 @@ subroutine init_restart
if (tr_brine .and. restart_hbrine) call read_restart_hbrine
endif

if (solve_zsal .or. skl_bgc .or. z_tracers) then ! biogeochemistry
if (skl_bgc .or. z_tracers) then ! biogeochemistry
if (tr_fsd) then
write (nu_diag,*) 'FSD implementation incomplete for use with BGC'
call icepack_warnings_flush(nu_diag)
Expand Down
16 changes: 6 additions & 10 deletions cicecore/drivers/direct/hadgem3/CICE_RunMod.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ subroutine ice_step
use ice_boundary, only: ice_HaloUpdate
use ice_calendar, only: dt, dt_dyn, ndtd, diagfreq, write_restart, istep
use ice_diagnostics, only: init_mass_diags, runtime_diags
use ice_diagnostics_bgc, only: hbrine_diags, zsal_diags, bgc_diags
use ice_diagnostics_bgc, only: hbrine_diags, bgc_diags
use ice_domain, only: halo_info, nblocks
use ice_domain_size, only: nslyr
use ice_dyn_eap, only: write_restart_eap
Expand Down Expand Up @@ -169,12 +169,12 @@ subroutine ice_step
logical (kind=log_kind) :: &
tr_iage, tr_FY, tr_lvl, tr_fsd, &
tr_pond_lvl, tr_pond_topo, tr_brine, tr_aero, &
calc_Tsfc, skl_bgc, solve_zsal, z_tracers, wave_spec
calc_Tsfc, skl_bgc, z_tracers, wave_spec

character(len=*), parameter :: subname = '(ice_step)'

call icepack_query_parameters(calc_Tsfc_out=calc_Tsfc, skl_bgc_out=skl_bgc, &
solve_zsal_out=solve_zsal, z_tracers_out=z_tracers, ktherm_out=ktherm, &
z_tracers_out=z_tracers, ktherm_out=ktherm, &
wave_spec_out=wave_spec)
call icepack_query_tracer_flags(tr_iage_out=tr_iage, tr_FY_out=tr_FY, &
tr_lvl_out=tr_lvl, tr_pond_lvl_out=tr_pond_lvl, &
Expand Down Expand Up @@ -307,7 +307,6 @@ subroutine ice_step
call ice_timer_start(timer_diags) ! diagnostics
if (mod(istep,diagfreq) == 0) then
call runtime_diags(dt) ! log file
if (solve_zsal) call zsal_diags
if (skl_bgc .or. z_tracers) call bgc_diags
if (tr_brine) call hbrine_diags
endif
Expand All @@ -327,7 +326,7 @@ subroutine ice_step
if (tr_pond_topo) call write_restart_pond_topo
if (tr_fsd) call write_restart_fsd
if (tr_aero) call write_restart_aero
if (solve_zsal .or. skl_bgc .or. z_tracers) &
if (skl_bgc .or. z_tracers) &
call write_restart_bgc
if (tr_brine) call write_restart_hbrine
if (kdyn == 2) call write_restart_eap
Expand All @@ -347,7 +346,7 @@ end subroutine ice_step
subroutine coupling_prep (iblk)

use ice_arrays_column, only: alvdfn, alidfn, alvdrn, alidrn, &
albicen, albsnon, albpndn, apeffn, fzsal_g, fzsal, snowfracn
albicen, albsnon, albpndn, apeffn, snowfracn
use ice_blocks, only: nx_block, ny_block, get_block, block
use ice_domain, only: blocks_ice
use ice_calendar, only: dt, nstreams
Expand All @@ -361,7 +360,7 @@ subroutine coupling_prep (iblk)
swvdr, swidr, swvdf, swidf, Tf, Tair, Qa, strairxT, strairyt, &
fsens, flat, fswabs, flwout, evap, Tref, Qref, &
fsurfn_f, flatn_f, scale_fluxes, frzmlt_init, frzmlt
use ice_flux_bgc, only: faero_ocn, fzsal_ai, fzsal_g_ai, flux_bio, flux_bio_ai
use ice_flux_bgc, only: faero_ocn, flux_bio, flux_bio_ai
use ice_grid, only: tmask
use ice_state, only: aicen, aice, aice_init
use ice_step_mod, only: ocean_mixed_layer
Expand Down Expand Up @@ -508,8 +507,6 @@ subroutine coupling_prep (iblk)
fsalt_ai (i,j,iblk) = fsalt (i,j,iblk)
fhocn_ai (i,j,iblk) = fhocn (i,j,iblk)
fswthru_ai(i,j,iblk) = fswthru(i,j,iblk)
fzsal_ai (i,j,iblk) = fzsal (i,j,iblk)
fzsal_g_ai(i,j,iblk) = fzsal_g(i,j,iblk)

if (nbtrcr > 0) then
do k = 1, nbtrcr
Expand Down Expand Up @@ -553,7 +550,6 @@ subroutine coupling_prep (iblk)
faero_ocn(:,:,:,iblk), &
alvdr (:,:,iblk), alidr (:,:,iblk), &
alvdf (:,:,iblk), alidf (:,:,iblk), &
fzsal (:,:,iblk), fzsal_g (:,:,iblk), &
flux_bio(:,:,1:nbtrcr,iblk))

!echmod - comment this out for efficiency, if .not. calc_Tsfc
Expand Down
10 changes: 4 additions & 6 deletions cicecore/drivers/direct/nemo_concepts/CICE_InitMod.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -242,7 +242,7 @@ subroutine init_restart
restart_fsd, read_restart_fsd, &
restart_aero, read_restart_aero, &
restart_hbrine, read_restart_hbrine, &
restart_zsal, restart_bgc
restart_bgc
use ice_restart_driver, only: restartfile, restartfile_v4
use ice_restart_shared, only: runtype, restart
use ice_state ! almost everything
Expand All @@ -253,7 +253,7 @@ subroutine init_restart
logical(kind=log_kind) :: &
tr_iage, tr_FY, tr_lvl, tr_pond_lvl, &
tr_pond_topo, tr_fsd, tr_aero, tr_brine, &
skl_bgc, z_tracers, solve_zsal
skl_bgc, z_tracers
integer(kind=int_kind) :: &
ntrcr
integer(kind=int_kind) :: &
Expand All @@ -268,7 +268,7 @@ subroutine init_restart
file=__FILE__, line=__LINE__)

call icepack_query_parameters(skl_bgc_out=skl_bgc, &
z_tracers_out=z_tracers, solve_zsal_out=solve_zsal)
z_tracers_out=z_tracers)
call icepack_query_tracer_flags(tr_iage_out=tr_iage, tr_FY_out=tr_FY, &
tr_lvl_out=tr_lvl, tr_pond_lvl_out=tr_pond_lvl, &
tr_pond_topo_out=tr_pond_topo, tr_aero_out=tr_aero, tr_brine_out=tr_brine, &
Expand Down Expand Up @@ -381,8 +381,6 @@ subroutine init_restart
if (trim(runtype) == 'continue') then
if (tr_brine) &
restart_hbrine = .true.
if (solve_zsal) &
restart_zsal = .true.
if (skl_bgc .or. z_tracers) &
restart_bgc = .true.
endif
Expand All @@ -392,7 +390,7 @@ subroutine init_restart
if (tr_brine .and. restart_hbrine) call read_restart_hbrine
endif

if (solve_zsal .or. skl_bgc .or. z_tracers) then ! biogeochemistry
if (skl_bgc .or. z_tracers) then ! biogeochemistry
if (tr_fsd) then
write (nu_diag,*) 'FSD implementation incomplete for use with BGC'
call icepack_warnings_flush(nu_diag)
Expand Down
16 changes: 6 additions & 10 deletions cicecore/drivers/direct/nemo_concepts/CICE_RunMod.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ subroutine ice_step
use ice_boundary, only: ice_HaloUpdate
use ice_calendar, only: dt, dt_dyn, ndtd, diagfreq, write_restart, istep
use ice_diagnostics, only: init_mass_diags, runtime_diags
use ice_diagnostics_bgc, only: hbrine_diags, zsal_diags, bgc_diags
use ice_diagnostics_bgc, only: hbrine_diags, bgc_diags
use ice_domain, only: halo_info, nblocks
use ice_domain_size, only: nslyr
use ice_dyn_eap, only: write_restart_eap
Expand Down Expand Up @@ -169,12 +169,12 @@ subroutine ice_step
logical (kind=log_kind) :: &
tr_iage, tr_FY, tr_lvl, tr_fsd, &
tr_pond_lvl, tr_pond_topo, tr_brine, tr_aero, &
calc_Tsfc, skl_bgc, solve_zsal, z_tracers, wave_spec
calc_Tsfc, skl_bgc, z_tracers, wave_spec

character(len=*), parameter :: subname = '(ice_step)'

call icepack_query_parameters(calc_Tsfc_out=calc_Tsfc, skl_bgc_out=skl_bgc, &
solve_zsal_out=solve_zsal, z_tracers_out=z_tracers, ktherm_out=ktherm, &
z_tracers_out=z_tracers, ktherm_out=ktherm, &
wave_spec_out=wave_spec)
call icepack_query_tracer_flags(tr_iage_out=tr_iage, tr_FY_out=tr_FY, &
tr_lvl_out=tr_lvl, tr_pond_lvl_out=tr_pond_lvl, &
Expand Down Expand Up @@ -307,7 +307,6 @@ subroutine ice_step
call ice_timer_start(timer_diags) ! diagnostics
if (mod(istep,diagfreq) == 0) then
call runtime_diags(dt) ! log file
if (solve_zsal) call zsal_diags
if (skl_bgc .or. z_tracers) call bgc_diags
if (tr_brine) call hbrine_diags
endif
Expand All @@ -327,7 +326,7 @@ subroutine ice_step
if (tr_pond_topo) call write_restart_pond_topo
if (tr_fsd) call write_restart_fsd
if (tr_aero) call write_restart_aero
if (solve_zsal .or. skl_bgc .or. z_tracers) &
if (skl_bgc .or. z_tracers) &
call write_restart_bgc
if (tr_brine) call write_restart_hbrine
if (kdyn == 2) call write_restart_eap
Expand All @@ -347,7 +346,7 @@ end subroutine ice_step
subroutine coupling_prep (iblk)

use ice_arrays_column, only: alvdfn, alidfn, alvdrn, alidrn, &
albicen, albsnon, albpndn, apeffn, fzsal_g, fzsal, snowfracn
albicen, albsnon, albpndn, apeffn, snowfracn
use ice_blocks, only: nx_block, ny_block, get_block, block
use ice_domain, only: blocks_ice
use ice_calendar, only: dt, nstreams
Expand All @@ -361,7 +360,7 @@ subroutine coupling_prep (iblk)
swvdr, swidr, swvdf, swidf, Tf, Tair, Qa, strairxT, strairyt, &
fsens, flat, fswabs, flwout, evap, Tref, Qref, &
fsurfn_f, flatn_f, scale_fluxes, frzmlt_init, frzmlt
use ice_flux_bgc, only: faero_ocn, fzsal_ai, fzsal_g_ai, flux_bio, flux_bio_ai
use ice_flux_bgc, only: faero_ocn, flux_bio, flux_bio_ai
use ice_grid, only: tmask
use ice_state, only: aicen, aice, aice_init
use ice_step_mod, only: ocean_mixed_layer
Expand Down Expand Up @@ -508,8 +507,6 @@ subroutine coupling_prep (iblk)
fsalt_ai (i,j,iblk) = fsalt (i,j,iblk)
fhocn_ai (i,j,iblk) = fhocn (i,j,iblk)
fswthru_ai(i,j,iblk) = fswthru(i,j,iblk)
fzsal_ai (i,j,iblk) = fzsal (i,j,iblk)
fzsal_g_ai(i,j,iblk) = fzsal_g(i,j,iblk)

if (nbtrcr > 0) then
do k = 1, nbtrcr
Expand Down Expand Up @@ -555,7 +552,6 @@ subroutine coupling_prep (iblk)
faero_ocn(:,:,:,iblk), &
alvdr (:,:,iblk), alidr (:,:,iblk), &
alvdf (:,:,iblk), alidf (:,:,iblk), &
fzsal (:,:,iblk), fzsal_g (:,:,iblk), &
flux_bio(:,:,1:nbtrcr,iblk))

!echmod - comment this out for efficiency, if .not. calc_Tsfc
Expand Down
16 changes: 6 additions & 10 deletions cicecore/drivers/mct/cesm1/CICE_RunMod.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ subroutine ice_step
use ice_calendar, only: dt, dt_dyn, ndtd, diagfreq, write_restart, istep
use ice_calendar, only: idate, msec
use ice_diagnostics, only: init_mass_diags, runtime_diags, debug_model, debug_ice
use ice_diagnostics_bgc, only: hbrine_diags, zsal_diags, bgc_diags
use ice_diagnostics_bgc, only: hbrine_diags, bgc_diags
use ice_domain, only: halo_info, nblocks
use ice_dyn_eap, only: write_restart_eap
use ice_dyn_shared, only: kdyn, kridge
Expand Down Expand Up @@ -163,7 +163,7 @@ subroutine ice_step
logical (kind=log_kind) :: &
tr_iage, tr_FY, tr_lvl, tr_fsd, tr_snow, &
tr_pond_lvl, tr_pond_topo, tr_brine, tr_iso, tr_aero, &
calc_Tsfc, skl_bgc, solve_zsal, z_tracers, wave_spec
calc_Tsfc, skl_bgc, z_tracers, wave_spec

character(len=*), parameter :: subname = '(ice_step)'

Expand All @@ -177,7 +177,7 @@ subroutine ice_step
endif

call icepack_query_parameters(calc_Tsfc_out=calc_Tsfc, skl_bgc_out=skl_bgc, &
solve_zsal_out=solve_zsal, z_tracers_out=z_tracers, ktherm_out=ktherm, &
z_tracers_out=z_tracers, ktherm_out=ktherm, &
wave_spec_out=wave_spec)
call icepack_query_tracer_flags(tr_iage_out=tr_iage, tr_FY_out=tr_FY, &
tr_lvl_out=tr_lvl, tr_pond_lvl_out=tr_pond_lvl, &
Expand Down Expand Up @@ -374,7 +374,6 @@ subroutine ice_step
call ice_timer_start(timer_diags) ! diagnostics
if (mod(istep,diagfreq) == 0) then
call runtime_diags(dt) ! log file
if (solve_zsal) call zsal_diags
if (skl_bgc .or. z_tracers) call bgc_diags
if (tr_brine) call hbrine_diags
if (my_task == master_task) then
Expand All @@ -399,7 +398,7 @@ subroutine ice_step
if (tr_fsd) call write_restart_fsd
if (tr_iso) call write_restart_iso
if (tr_aero) call write_restart_aero
if (solve_zsal .or. skl_bgc .or. z_tracers) &
if (skl_bgc .or. z_tracers) &
call write_restart_bgc
if (tr_brine) call write_restart_hbrine
if (kdyn == 2) call write_restart_eap
Expand All @@ -418,7 +417,7 @@ end subroutine ice_step
subroutine coupling_prep (iblk)

use ice_arrays_column, only: alvdfn, alidfn, alvdrn, alidrn, &
albicen, albsnon, albpndn, apeffn, fzsal_g, fzsal, snowfracn
albicen, albsnon, albpndn, apeffn, snowfracn
use ice_blocks, only: nx_block, ny_block, get_block, block
use ice_domain, only: blocks_ice
use ice_calendar, only: dt, nstreams
Expand All @@ -433,7 +432,7 @@ subroutine coupling_prep (iblk)
fsens, flat, fswabs, flwout, evap, Tref, Qref, &
scale_fluxes, frzmlt_init, frzmlt, Uref, wind
use ice_flux_bgc, only: faero_ocn, fiso_ocn, Qref_iso, fiso_evap, &
fzsal_ai, fzsal_g_ai, flux_bio, flux_bio_ai, &
flux_bio, flux_bio_ai, &
fnit, fsil, famm, fdmsp, fdms, fhum, fdust, falgalN, &
fdoc, fdic, fdon, ffep, ffed, bgcflux_ice_to_ocn
use ice_grid, only: tmask
Expand Down Expand Up @@ -586,8 +585,6 @@ subroutine coupling_prep (iblk)
fsalt_ai (i,j,iblk) = fsalt (i,j,iblk)
fhocn_ai (i,j,iblk) = fhocn (i,j,iblk)
fswthru_ai(i,j,iblk) = fswthru(i,j,iblk)
fzsal_ai (i,j,iblk) = fzsal (i,j,iblk)
fzsal_g_ai(i,j,iblk) = fzsal_g(i,j,iblk)

if (nbtrcr > 0) then
do k = 1, nbtrcr
Expand Down Expand Up @@ -633,7 +630,6 @@ subroutine coupling_prep (iblk)
faero_ocn(:,:,:,iblk), &
alvdr (:,:,iblk), alidr (:,:,iblk), &
alvdf (:,:,iblk), alidf (:,:,iblk), &
fzsal (:,:,iblk), fzsal_g (:,:,iblk), &
flux_bio (:,:,1:nbtrcr,iblk), &
Qref_iso =Qref_iso (:,:,:,iblk), &
fiso_evap=fiso_evap(:,:,:,iblk), &
Expand Down
Loading