Update Icepack tracer calls for recent refactor

cicecore/cicedynB/dynamics/ice_transport_driver.F90

@@ -23,7 +23,7 @@ module ice_transport_driver
       use icepack_intfc, only: icepack_warnings_flush, icepack_warnings_aborted
       use icepack_intfc, only: icepack_compute_tracers
       use icepack_intfc, only: icepack_query_tracer_flags, &
-          icepack_query_tracer_numbers, icepack_query_tracer_indices, &
+          icepack_query_tracer_sizes, icepack_query_tracer_indices, &
           icepack_query_parameters
 
       implicit none
@@ -88,7 +88,7 @@ subroutine init_transport
 
       call ice_timer_start(timer_advect)  ! advection 
 
-      call icepack_query_tracer_numbers(ntrcr_out=ntrcr)
+      call icepack_query_tracer_sizes(ntrcr_out=ntrcr)
       call icepack_query_tracer_indices(nt_Tsfc_out=nt_Tsfc, nt_qice_out=nt_qice, &
           nt_qsno_out=nt_qsno, nt_sice_out=nt_sice, nt_fbri_out=nt_fbri, &
           nt_iage_out=nt_iage, nt_FY_out=nt_FY, nt_alvl_out=nt_alvl, nt_fsd_out=nt_fsd, &
@@ -304,7 +304,7 @@ subroutine transport_remap (dt)
       character(len=*), parameter :: subname = '(transport_remap)'
 
       call ice_timer_start(timer_advect)  ! advection 
-      call icepack_query_tracer_numbers(ntrcr_out=ntrcr)
+      call icepack_query_tracer_sizes(ntrcr_out=ntrcr)
       call icepack_warnings_flush(nu_diag)
       if (icepack_warnings_aborted()) call abort_ice(error_message=subname, &
          file=__FILE__, line=__LINE__)
@@ -709,7 +709,7 @@ subroutine transport_upwind (dt)
 
       call ice_timer_start(timer_advect)  ! advection 
 
-      call icepack_query_tracer_numbers(ntrcr_out=ntrcr)
+      call icepack_query_tracer_sizes(ntrcr_out=ntrcr)
       call icepack_warnings_flush(nu_diag)
       if (icepack_warnings_aborted()) call abort_ice(error_message=subname, &
          file=__FILE__, line=__LINE__)

cicecore/cicedynB/general/ice_init.F90

@@ -27,9 +27,9 @@ module ice_init
       use icepack_intfc, only: icepack_init_trcr
       use icepack_intfc, only: icepack_init_parameters
       use icepack_intfc, only: icepack_init_tracer_flags
-      use icepack_intfc, only: icepack_init_tracer_indices
+      use icepack_intfc, only: icepack_init_tracer_sizes
       use icepack_intfc, only: icepack_query_tracer_flags
-      use icepack_intfc, only: icepack_query_tracer_numbers
+      use icepack_intfc, only: icepack_query_tracer_sizes
       use icepack_intfc, only: icepack_query_tracer_indices
       use icepack_intfc, only: icepack_query_parameters
 
@@ -1261,7 +1261,9 @@ subroutine input_data
       call icepack_init_tracer_flags(tr_iage_in=tr_iage, tr_FY_in=tr_FY, &
          tr_lvl_in=tr_lvl, tr_aero_in=tr_aero, tr_fsd_in=tr_fsd, tr_pond_in=tr_pond, &
          tr_pond_cesm_in=tr_pond_cesm, tr_pond_lvl_in=tr_pond_lvl, tr_pond_topo_in=tr_pond_topo)
-      call icepack_init_tracer_indices(ncat_in=ncat, nilyr_in=nilyr, nslyr_in=nslyr, nblyr_in=nblyr)
+      call icepack_init_tracer_sizes(ncat_in=ncat, nilyr_in=nilyr, nslyr_in=nslyr, nblyr_in=nblyr, &
+         nfsd_in=nfsd, n_algae_in=n_algae, n_aero_in=n_aero, n_DOC_in=n_DOC, n_DON_in=n_DON, &
+         n_DIC_in=n_DIC, n_fed_in=n_fed, n_fep_in=n_fep, n_zaero_in=n_zaero)
       call icepack_warnings_flush(nu_diag)
       if (icepack_warnings_aborted()) call abort_ice(error_message=subname, &
          file=__FILE__, line=__LINE__)
@@ -1323,7 +1325,7 @@ subroutine init_state
       !-----------------------------------------------------------------
 
       call icepack_query_parameters(heat_capacity_out=heat_capacity)
-      call icepack_query_tracer_numbers(ntrcr_out=ntrcr)
+      call icepack_query_tracer_sizes(ntrcr_out=ntrcr)
       call icepack_query_tracer_flags(tr_iage_out=tr_iage, tr_FY_out=tr_FY, &
         tr_lvl_out=tr_lvl, tr_aero_out=tr_aero, tr_fsd_out=tr_fsd, &
         tr_pond_cesm_out=tr_pond_cesm, tr_pond_lvl_out=tr_pond_lvl, tr_pond_topo_out=tr_pond_topo)
@@ -1654,7 +1656,7 @@ subroutine set_state_var (nx_block, ny_block, &
 
       !-----------------------------------------------------------------
 
-      call icepack_query_tracer_numbers(ntrcr_out=ntrcr)
+      call icepack_query_tracer_sizes(ntrcr_out=ntrcr)
       call icepack_query_tracer_flags(tr_brine_out=tr_brine, tr_lvl_out=tr_lvl)
       call icepack_query_tracer_indices( nt_Tsfc_out=nt_Tsfc, nt_qice_out=nt_qice, &
         nt_qsno_out=nt_qsno, nt_sice_out=nt_sice, &

cicecore/cicedynB/general/ice_state.F90

@@ -41,7 +41,7 @@ module ice_state
       use ice_blocks, only: nx_block, ny_block
       use ice_exit, only: abort_ice
       use ice_fileunits, only: nu_diag
-      use icepack_intfc, only: icepack_query_tracer_numbers
+      use icepack_intfc, only: icepack_query_tracer_sizes
       use icepack_intfc, only: icepack_warnings_flush, icepack_warnings_aborted
 
       implicit none
@@ -139,7 +139,7 @@ subroutine alloc_state
       integer (int_kind) :: ntrcr, ierr
       character(len=*),parameter :: subname='(alloc_state)'
 
-      call icepack_query_tracer_numbers(ntrcr_out=ntrcr)
+      call icepack_query_tracer_sizes(ntrcr_out=ntrcr)
       call icepack_warnings_flush(nu_diag)
       if (icepack_warnings_aborted()) call abort_ice(error_message=subname, &
           file=__FILE__, line=__LINE__)

cicecore/cicedynB/general/ice_step_mod.F90

@@ -29,7 +29,7 @@ module ice_step_mod
       use icepack_intfc, only: icepack_max_doc, icepack_max_dic, icepack_max_aero
       use icepack_intfc, only: icepack_max_fe
       use icepack_intfc, only: icepack_query_parameters
-      use icepack_intfc, only: icepack_query_tracer_flags, icepack_query_tracer_numbers
+      use icepack_intfc, only: icepack_query_tracer_flags, icepack_query_tracer_sizes
       use icepack_intfc, only: icepack_query_tracer_indices
 
       implicit none
@@ -217,7 +217,7 @@ subroutine step_therm1 (dt, iblk)
 
       call icepack_query_parameters(puny_out=puny)
       call icepack_query_parameters(calc_Tsfc_out=calc_Tsfc)
-      call icepack_query_tracer_numbers(ntrcr_out=ntrcr)
+      call icepack_query_tracer_sizes(ntrcr_out=ntrcr)
       call icepack_query_tracer_flags( &
          tr_iage_out=tr_iage, tr_FY_out=tr_FY, &
          tr_aero_out=tr_aero, tr_pond_out=tr_pond, tr_pond_cesm_out=tr_pond_cesm, &
@@ -483,7 +483,7 @@ subroutine step_therm2 (dt, iblk)
       character(len=*), parameter :: subname = '(step_therm2)'
 
       call icepack_query_parameters(z_tracers_out=z_tracers)
-      call icepack_query_tracer_numbers(ntrcr_out=ntrcr, nbtrcr_out=nbtrcr)
+      call icepack_query_tracer_sizes(ntrcr_out=ntrcr, nbtrcr_out=nbtrcr)
       call icepack_query_tracer_flags(tr_fsd_out=tr_fsd)
       call icepack_warnings_flush(nu_diag)
       if (icepack_warnings_aborted()) call abort_ice(error_message=subname, &
@@ -610,7 +610,7 @@ subroutine update_state (dt, daidt, dvidt, dagedt, offset)
       character(len=*), parameter :: subname='(update_state)'
 
       call icepack_query_tracer_flags(tr_iage_out=tr_iage)
-      call icepack_query_tracer_numbers(ntrcr_out=ntrcr)
+      call icepack_query_tracer_sizes(ntrcr_out=ntrcr)
       call icepack_query_tracer_indices(nt_iage_out=nt_iage)
       call icepack_warnings_flush(nu_diag)
       if (icepack_warnings_aborted()) call abort_ice(error_message=subname, &
@@ -855,7 +855,7 @@ subroutine step_dyn_ridge (dt, ndtd, iblk)
       call ice_timer_start(timer_column)
       call ice_timer_start(timer_ridge)
 
-      call icepack_query_tracer_numbers(ntrcr_out=ntrcr, nbtrcr_out=nbtrcr)
+      call icepack_query_tracer_sizes(ntrcr_out=ntrcr, nbtrcr_out=nbtrcr)
       call icepack_warnings_flush(nu_diag)
       if (icepack_warnings_aborted()) call abort_ice(error_message=subname, &
          file=__FILE__, line=__LINE__)
@@ -997,7 +997,7 @@ subroutine step_radiation (dt, iblk)
 
       call ice_timer_start(timer_sw)      ! shortwave
 
-      call icepack_query_tracer_numbers(ntrcr_out=ntrcr, &
+      call icepack_query_tracer_sizes(ntrcr_out=ntrcr, &
          nbtrcr_out=nbtrcr, nbtrcr_sw_out=nbtrcr_sw)
       call icepack_query_tracer_flags( &
          tr_brine_out=tr_brine, tr_bgc_N_out=tr_bgc_N, tr_zaero_out=tr_zaero)
@@ -1322,7 +1322,7 @@ subroutine biogeochemistry (dt, iblk)
 
       call icepack_query_tracer_flags(tr_brine_out=tr_brine)
       call icepack_query_parameters(skl_bgc_out=skl_bgc)
-      call icepack_query_tracer_numbers(ntrcr_out=ntrcr, nbtrcr_out=nbtrcr)
+      call icepack_query_tracer_sizes(ntrcr_out=ntrcr, nbtrcr_out=nbtrcr)
       call icepack_query_tracer_flags(tr_zaero_out=tr_zaero)
       call icepack_query_tracer_indices(nlt_zaero_out=nlt_zaero)
       call icepack_query_tracer_indices(bio_index_o_out=bio_index_o)

cicecore/cicedynB/infrastructure/ice_restart_driver.F90

@@ -29,7 +29,7 @@ module ice_restart_driver
       use ice_fileunits, only: nu_diag, nu_rst_pointer, nu_restart, nu_dump
       use icepack_intfc, only: icepack_warnings_flush, icepack_warnings_aborted
       use icepack_intfc, only: icepack_aggregate
-      use icepack_intfc, only: icepack_query_tracer_indices, icepack_query_tracer_numbers
+      use icepack_intfc, only: icepack_query_tracer_indices, icepack_query_tracer_sizes
 
       implicit none
       private
@@ -236,7 +236,7 @@ subroutine restartfile (ice_ic)
 
       character(len=*), parameter :: subname = '(restartfile)'
 
-      call icepack_query_tracer_numbers(ntrcr_out=ntrcr)
+      call icepack_query_tracer_sizes(ntrcr_out=ntrcr)
       call icepack_warnings_flush(nu_diag)
       if (icepack_warnings_aborted()) call abort_ice(error_message=subname, &
           file=__FILE__, line=__LINE__)
@@ -580,7 +580,7 @@ subroutine restartfile_v4 (ice_ic)
 
       character(len=*), parameter :: subname = '(restartfile_v4)'
 
-      call icepack_query_tracer_numbers(ntrcr_out=ntrcr)
+      call icepack_query_tracer_sizes(ntrcr_out=ntrcr)
       call icepack_warnings_flush(nu_diag)
       if (icepack_warnings_aborted()) call abort_ice(error_message=subname, &
           file=__FILE__, line=__LINE__)

cicecore/cicedynB/infrastructure/ice_restoring.F90

@@ -18,7 +18,7 @@ module ice_restoring
       use icepack_intfc, only: icepack_warnings_flush, icepack_warnings_aborted
       use icepack_intfc, only: icepack_init_trcr
       use icepack_intfc, only: icepack_query_parameters, &
-          icepack_query_tracer_numbers, icepack_query_tracer_flags, &
+          icepack_query_tracer_sizes, icepack_query_tracer_flags, &
           icepack_query_tracer_indices
 
       implicit none
@@ -81,7 +81,7 @@ subroutine ice_HaloRestore_init
 
    if (.not. restore_ice) return
 
-   call icepack_query_tracer_numbers(ntrcr_out=ntrcr)
+   call icepack_query_tracer_sizes(ntrcr_out=ntrcr)
    call icepack_warnings_flush(nu_diag)
    if (icepack_warnings_aborted()) call abort_ice(error_message=subname, &
       file=__FILE__, line=__LINE__)
@@ -577,7 +577,7 @@ subroutine ice_HaloRestore
 
    call ice_timer_start(timer_bound)
    call icepack_query_parameters(secday_out=secday)
-   call icepack_query_tracer_numbers(ntrcr_out=ntrcr)
+   call icepack_query_tracer_sizes(ntrcr_out=ntrcr)
    call icepack_warnings_flush(nu_diag)
    if (icepack_warnings_aborted()) call abort_ice(error_message=subname, &
       file=__FILE__, line=__LINE__)

cicecore/cicedynB/infrastructure/io/io_binary/ice_restart.F90

@@ -21,7 +21,7 @@ module ice_restart
       use ice_fileunits, only: nu_restart_bgc, nu_restart_aero, nu_restart_fsd
       use ice_exit, only: abort_ice
       use icepack_intfc, only: icepack_query_parameters
-      use icepack_intfc, only: icepack_query_tracer_numbers
+      use icepack_intfc, only: icepack_query_tracer_sizes
       use icepack_intfc, only: icepack_query_tracer_flags
       use icepack_intfc, only: icepack_warnings_flush, icepack_warnings_aborted
 
@@ -73,7 +73,7 @@ subroutine init_restart_read(ice_ic)
 
       call icepack_query_parameters( &
          solve_zsal_out=solve_zsal)
-      call icepack_query_tracer_numbers( &
+      call icepack_query_tracer_sizes( &
          nbtrcr_out=nbtrcr)
       call icepack_query_tracer_flags( &
          tr_iage_out=tr_iage, tr_FY_out=tr_FY, tr_lvl_out=tr_lvl, tr_fsd_out=tr_fsd, &
@@ -379,7 +379,7 @@ subroutine init_restart_write(filename_spec)
 
       call icepack_query_parameters( &
          solve_zsal_out=solve_zsal)
-      call icepack_query_tracer_numbers( &
+      call icepack_query_tracer_sizes( &
          nbtrcr_out=nbtrcr)
       call icepack_query_tracer_flags( &
          tr_iage_out=tr_iage, tr_FY_out=tr_FY, tr_lvl_out=tr_lvl, tr_fsd_out=tr_fsd, &
@@ -777,7 +777,7 @@ subroutine final_restart()
 
       call icepack_query_parameters( &
          solve_zsal_out=solve_zsal)
-      call icepack_query_tracer_numbers( &
+      call icepack_query_tracer_sizes( &
          nbtrcr_out=nbtrcr)
       call icepack_query_tracer_flags( &
          tr_iage_out=tr_iage, tr_FY_out=tr_FY, tr_lvl_out=tr_lvl, &

cicecore/cicedynB/infrastructure/io/io_netcdf/ice_restart.F90

@@ -15,7 +15,7 @@ module ice_restart
       use ice_fileunits, only: nu_diag, nu_rst_pointer
       use ice_exit, only: abort_ice
       use icepack_intfc, only: icepack_query_parameters
-      use icepack_intfc, only: icepack_query_tracer_numbers
+      use icepack_intfc, only: icepack_query_tracer_sizes
       use icepack_intfc, only: icepack_query_tracer_flags
       use icepack_intfc, only: icepack_warnings_flush, icepack_warnings_aborted
 
@@ -156,7 +156,7 @@ subroutine init_restart_write(filename_spec)
 
       call icepack_query_parameters( &
          solve_zsal_out=solve_zsal, skl_bgc_out=skl_bgc, z_tracers_out=z_tracers)
-      call icepack_query_tracer_numbers( &
+      call icepack_query_tracer_sizes( &
          nbtrcr_out=nbtrcr)
       call icepack_query_tracer_flags( &
          tr_iage_out=tr_iage, tr_FY_out=tr_FY, tr_lvl_out=tr_lvl, tr_fsd_out=tr_fsd, &

cicecore/cicedynB/infrastructure/io/io_pio/ice_restart.F90

@@ -16,7 +16,7 @@ module ice_restart
       use pio
       use icepack_intfc, only: icepack_warnings_flush, icepack_warnings_aborted
       use icepack_intfc, only: icepack_query_tracer_flags, icepack_query_tracer_indices
-      use icepack_intfc, only: icepack_query_parameters, icepack_query_tracer_numbers
+      use icepack_intfc, only: icepack_query_parameters, icepack_query_tracer_sizes
 
       implicit none
       private
@@ -168,7 +168,7 @@ subroutine init_restart_write(filename_spec)
 
       character(len=*), parameter :: subname = '(init_restart_write)'
 
-      call icepack_query_tracer_numbers(nbtrcr_out=nbtrcr)
+      call icepack_query_tracer_sizes(nbtrcr_out=nbtrcr)
       call icepack_query_tracer_flags( &
           tr_iage_out=tr_iage, tr_FY_out=tr_FY, tr_lvl_out=tr_lvl, &
           tr_aero_out=tr_aero, tr_pond_cesm_out=tr_pond_cesm, &

cicecore/cicedynB/infrastructure/io/io_pio2/ice_restart.F90

@@ -16,7 +16,7 @@ module ice_restart
       use pio
       use icepack_intfc, only: icepack_warnings_flush, icepack_warnings_aborted
       use icepack_intfc, only: icepack_query_tracer_flags, icepack_query_tracer_indices
-      use icepack_intfc, only: icepack_query_parameters, icepack_query_tracer_numbers
+      use icepack_intfc, only: icepack_query_parameters, icepack_query_tracer_sizes
 
       implicit none
       private
@@ -168,7 +168,7 @@ subroutine init_restart_write(filename_spec)
 
       character(len=*), parameter :: subname = '(init_restart_write)'
 
-      call icepack_query_tracer_numbers(nbtrcr_out=nbtrcr)
+      call icepack_query_tracer_sizes(nbtrcr_out=nbtrcr)
       call icepack_query_tracer_flags( &
           tr_iage_out=tr_iage, tr_FY_out=tr_FY, tr_lvl_out=tr_lvl, &
           tr_aero_out=tr_aero, tr_pond_cesm_out=tr_pond_cesm, &

cicecore/drivers/direct/hadgem3/CICE_InitMod.F90

@@ -21,7 +21,7 @@ module CICE_InitMod
       use icepack_intfc, only: icepack_configure
       use icepack_intfc, only: icepack_warnings_flush, icepack_warnings_aborted
       use icepack_intfc, only: icepack_query_parameters, icepack_query_tracer_flags, &
-          icepack_query_tracer_indices, icepack_query_tracer_numbers
+          icepack_query_tracer_indices, icepack_query_tracer_sizes
 
       implicit none
       private
@@ -270,7 +270,7 @@ subroutine init_restart
           nt_alvl, nt_vlvl, nt_apnd, nt_hpnd, nt_ipnd, &
           nt_iage, nt_FY, nt_aero, nt_fsd
 
-      call icepack_query_tracer_numbers(ntrcr_out=ntrcr)
+      call icepack_query_tracer_sizes(ntrcr_out=ntrcr)
       call icepack_warnings_flush(nu_diag)
       if (icepack_warnings_aborted()) call abort_ice(error_message=subname, &
           file=__FILE__, line=__LINE__)

cicecore/drivers/direct/hadgem3/CICE_RunMod.F90

@@ -23,7 +23,7 @@ module CICE_RunMod
       use icepack_intfc, only: icepack_warnings_flush, icepack_warnings_aborted
       use icepack_intfc, only: icepack_max_aero
       use icepack_intfc, only: icepack_query_parameters
-      use icepack_intfc, only: icepack_query_tracer_flags, icepack_query_tracer_numbers
+      use icepack_intfc, only: icepack_query_tracer_flags, icepack_query_tracer_sizes
 
       implicit none
       private
@@ -385,7 +385,7 @@ subroutine coupling_prep (iblk)
          netsw           ! flag for shortwave radiation presence
 
          call icepack_query_parameters(puny_out=puny, rhofresh_out=rhofresh)
-         call icepack_query_tracer_numbers(nbtrcr_out=nbtrcr)
+         call icepack_query_tracer_sizes(nbtrcr_out=nbtrcr)
          call icepack_query_parameters(calc_Tsfc_out=calc_Tsfc)
          call icepack_warnings_flush(nu_diag)
          if (icepack_warnings_aborted()) call abort_ice(error_message="subname", &

cicecore/drivers/mct/cesm1/CICE_InitMod.F90

@@ -21,7 +21,7 @@ module CICE_InitMod
       use icepack_intfc, only: icepack_configure
       use icepack_intfc, only: icepack_warnings_flush, icepack_warnings_aborted
       use icepack_intfc, only: icepack_query_parameters, icepack_query_tracer_flags, &
-          icepack_query_tracer_indices, icepack_query_tracer_numbers
+          icepack_query_tracer_indices, icepack_query_tracer_sizes
 
       implicit none
       private
@@ -193,10 +193,10 @@ subroutine cice_init(mpicom_ice)
       if (trim(runtype) == 'continue' .or. restart) &
          call init_shortwave    ! initialize radiative transfer
 
-      istep  = istep  + 1    ! update time step counters
-      istep1 = istep1 + 1
-      time = time + dt       ! determine the time and date
-      call calendar(time)    ! at the end of the first timestep
+!      istep  = istep  + 1    ! update time step counters
+!      istep1 = istep1 + 1
+!      time = time + dt       ! determine the time and date
+!      call calendar(time)    ! at the end of the first timestep
 
    !--------------------------------------------------------------------
    ! coupler communication or forcing data initialization
@@ -274,7 +274,7 @@ subroutine init_restart
 
       character(len=*), parameter :: subname = '(init_restart)'
 
-      call icepack_query_tracer_numbers(ntrcr_out=ntrcr)
+      call icepack_query_tracer_sizes(ntrcr_out=ntrcr)
       call icepack_warnings_flush(nu_diag)
       if (icepack_warnings_aborted()) call abort_ice(error_message=subname, &
           file=__FILE__, line=__LINE__)

cicecore/drivers/mct/cesm1/CICE_RunMod.F90

@@ -24,7 +24,7 @@ module CICE_RunMod
       use icepack_intfc, only: icepack_warnings_flush, icepack_warnings_aborted
       use icepack_intfc, only: icepack_max_aero
       use icepack_intfc, only: icepack_query_parameters
-      use icepack_intfc, only: icepack_query_tracer_flags, icepack_query_tracer_numbers
+      use icepack_intfc, only: icepack_query_tracer_flags, icepack_query_tracer_sizes
 
       implicit none
       private
@@ -136,6 +136,7 @@ subroutine ice_step
 
       use ice_boundary, only: ice_HaloUpdate
       use ice_calendar, only: dt, dt_dyn, ndtd, diagfreq, write_restart, istep
+      use ice_calendar, only: idate, sec
       use ice_diagnostics, only: init_mass_diags, runtime_diags
       use ice_diagnostics_bgc, only: hbrine_diags, zsal_diags, bgc_diags
       use ice_domain, only: halo_info, nblocks
@@ -409,7 +410,7 @@ subroutine coupling_prep (iblk)
 
          call icepack_query_parameters(puny_out=puny, rhofresh_out=rhofresh)
          call icepack_query_parameters(skl_bgc_out=skl_bgc)
-         call icepack_query_tracer_numbers(nbtrcr_out=nbtrcr)
+         call icepack_query_tracer_sizes(nbtrcr_out=nbtrcr)
          call icepack_query_parameters(calc_Tsfc_out=calc_Tsfc)
          call icepack_warnings_flush(nu_diag)
          if (icepack_warnings_aborted()) call abort_ice(error_message=subname, &