Deprecate zsalinity, mostly with ifdef and comments first for testing

cicecore/cicedyn/analysis/ice_diagnostics_bgc.F90

@@ -24,7 +24,7 @@ module ice_diagnostics_bgc
 
       implicit none
       private
-      public :: hbrine_diags, bgc_diags, zsal_diags
+      public :: hbrine_diags, bgc_diags
 
 !=======================================================================
 
@@ -715,7 +715,7 @@ subroutine bgc_diags
       endif
       if (tr_bgc_N) then
          write(nu_diag,*) '---------------------------------------------------'
-         write(nu_diag,900) 'tot algal growth (1/d) = ',pgrow_net(1),pgrow_net(2)
+         write(nu_diag,901) 'tot algal growth (1/d) = ',pgrow_net(1),pgrow_net(2)
        do kk = 1,n_algae
          write(nu_diag,*) '  algal conc. (mmol N/m^3) or flux (mmol N/m^2/d)'
          write(nu_diag,1020) '  type:', kk
@@ -846,11 +846,13 @@ subroutine bgc_diags
   802 format (f24.17,2x,f24.17)
   803 format (a25,2x,a25)
   900 format (a25,2x,f24.17,2x,f24.17)
+  901 format (a25,2x,g24.17,2x,g24.17)
  1020 format (a30,2x,i6)    ! integer
 
       end subroutine bgc_diags
 
 !=======================================================================
+#ifdef tcxzsal
 !
 ! Writes diagnostic info (max, min, global sums, etc) to standard out
 !
@@ -894,13 +896,12 @@ subroutine zsal_diags
 
       logical (kind=log_kind) :: tr_brine
 
-      integer (kind=int_kind) :: nt_fbri, nt_bgc_S, nt_sice
+      integer (kind=int_kind) :: nt_fbri, nt_sice
       character(len=*), parameter :: subname = '(zsal_diags)'
 
       call icepack_query_parameters(rhosi_out=rhosi, rhow_out=rhow, rhos_out=rhos)
       call icepack_query_tracer_flags(tr_brine_out=tr_brine)
-      call icepack_query_tracer_indices(nt_fbri_out=nt_fbri, nt_bgc_S_out=nt_bgc_S, &
-           nt_sice_out=nt_sice)
+      call icepack_query_tracer_indices(nt_fbri_out=nt_fbri, nt_sice_out=nt_sice)
       call icepack_warnings_flush(nu_diag)
       if (icepack_warnings_aborted()) call abort_ice(error_message=subname, &
          file=__FILE__, line=__LINE__)
@@ -1069,7 +1070,7 @@ subroutine zsal_diags
   902 format (a25,10x,f6.1,1x,f6.1,9x,f6.1,1x,f6.1)
 
       end subroutine zsal_diags
-
+#endif
 !=======================================================================
 
       end module ice_diagnostics_bgc

cicecore/cicedyn/analysis/ice_history.F90

@@ -92,7 +92,7 @@ subroutine init_hist (dt)
       logical (kind=log_kind) :: formdrag
       logical (kind=log_kind) :: tr_iage, tr_FY, tr_lvl, tr_pond, tr_aero, tr_brine
       logical (kind=log_kind) :: tr_fsd, tr_snow
-      logical (kind=log_kind) :: skl_bgc, solve_zsal, solve_zbgc, z_tracers
+      logical (kind=log_kind) :: skl_bgc, solve_zbgc, z_tracers
       integer (kind=int_kind) :: n, ns, ns1, ns2
       integer (kind=int_kind), dimension(max_nstrm) :: &
          ntmp
@@ -222,7 +222,7 @@ subroutine init_hist (dt)
       call icepack_query_parameters(rhofresh_out=rhofresh, Tffresh_out=Tffresh, &
          secday_out=secday, rad_to_deg_out=rad_to_deg)
       call icepack_query_parameters(formdrag_out=formdrag, skl_bgc_out=skl_bgc, &
-         solve_zsal_out=solve_zsal, solve_zbgc_out=solve_zbgc, z_tracers_out=z_tracers)
+         solve_zbgc_out=solve_zbgc, 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_out=tr_pond, tr_aero_out=tr_aero, &
          tr_brine_out=tr_brine, tr_fsd_out=tr_fsd, tr_snow_out=tr_snow)