diff --git a/cicecore/cicedynB/dynamics/ice_transport_driver.F90 b/cicecore/cicedynB/dynamics/ice_transport_driver.F90 index 7ea944b8d..86c5a67c4 100644 --- a/cicecore/cicedynB/dynamics/ice_transport_driver.F90 +++ b/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__) diff --git a/cicecore/cicedynB/general/ice_init.F90 b/cicecore/cicedynB/general/ice_init.F90 index 2de66a872..c0cc1d6fe 100644 --- a/cicecore/cicedynB/general/ice_init.F90 +++ b/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, & diff --git a/cicecore/cicedynB/general/ice_state.F90 b/cicecore/cicedynB/general/ice_state.F90 index 112a853ff..362fd1413 100644 --- a/cicecore/cicedynB/general/ice_state.F90 +++ b/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__) diff --git a/cicecore/cicedynB/general/ice_step_mod.F90 b/cicecore/cicedynB/general/ice_step_mod.F90 index eba1d5120..b8d796710 100644 --- a/cicecore/cicedynB/general/ice_step_mod.F90 +++ b/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) diff --git a/cicecore/cicedynB/infrastructure/ice_restart_driver.F90 b/cicecore/cicedynB/infrastructure/ice_restart_driver.F90 index ca22c6abd..5bc945fa2 100644 --- a/cicecore/cicedynB/infrastructure/ice_restart_driver.F90 +++ b/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__) diff --git a/cicecore/cicedynB/infrastructure/ice_restoring.F90 b/cicecore/cicedynB/infrastructure/ice_restoring.F90 index af7959f3e..1ef7b9531 100644 --- a/cicecore/cicedynB/infrastructure/ice_restoring.F90 +++ b/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__) diff --git a/cicecore/cicedynB/infrastructure/io/io_binary/ice_restart.F90 b/cicecore/cicedynB/infrastructure/io/io_binary/ice_restart.F90 index f1b1b314d..9e9150b6c 100644 --- a/cicecore/cicedynB/infrastructure/io/io_binary/ice_restart.F90 +++ b/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, & diff --git a/cicecore/cicedynB/infrastructure/io/io_netcdf/ice_restart.F90 b/cicecore/cicedynB/infrastructure/io/io_netcdf/ice_restart.F90 index 2afc6dec9..ecabcc089 100644 --- a/cicecore/cicedynB/infrastructure/io/io_netcdf/ice_restart.F90 +++ b/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, & diff --git a/cicecore/cicedynB/infrastructure/io/io_pio/ice_restart.F90 b/cicecore/cicedynB/infrastructure/io/io_pio/ice_restart.F90 index f00501bfc..8dc9e94a9 100644 --- a/cicecore/cicedynB/infrastructure/io/io_pio/ice_restart.F90 +++ b/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, & diff --git a/cicecore/cicedynB/infrastructure/io/io_pio2/ice_restart.F90 b/cicecore/cicedynB/infrastructure/io/io_pio2/ice_restart.F90 index f00501bfc..8dc9e94a9 100644 --- a/cicecore/cicedynB/infrastructure/io/io_pio2/ice_restart.F90 +++ b/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, & diff --git a/cicecore/drivers/direct/hadgem3/CICE_InitMod.F90 b/cicecore/drivers/direct/hadgem3/CICE_InitMod.F90 index 2208d8aad..7ec28783f 100644 --- a/cicecore/drivers/direct/hadgem3/CICE_InitMod.F90 +++ b/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__) diff --git a/cicecore/drivers/direct/hadgem3/CICE_RunMod.F90 b/cicecore/drivers/direct/hadgem3/CICE_RunMod.F90 index 8b7ca3a37..90af92122 100644 --- a/cicecore/drivers/direct/hadgem3/CICE_RunMod.F90 +++ b/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", & diff --git a/cicecore/drivers/mct/cesm1/CICE_InitMod.F90 b/cicecore/drivers/mct/cesm1/CICE_InitMod.F90 index e3b86071a..7e325e191 100644 --- a/cicecore/drivers/mct/cesm1/CICE_InitMod.F90 +++ b/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__) diff --git a/cicecore/drivers/mct/cesm1/CICE_RunMod.F90 b/cicecore/drivers/mct/cesm1/CICE_RunMod.F90 index 8ffdd7c33..26d40a431 100644 --- a/cicecore/drivers/mct/cesm1/CICE_RunMod.F90 +++ b/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, & diff --git a/cicecore/drivers/mct/cesm1/CICE_RunMod.F90_debug b/cicecore/drivers/mct/cesm1/CICE_RunMod.F90_debug index ef505a353..4f8b0a352 100644 --- a/cicecore/drivers/mct/cesm1/CICE_RunMod.F90_debug +++ b/cicecore/drivers/mct/cesm1/CICE_RunMod.F90_debug @@ -125,7 +125,8 @@ subroutine ice_step use ice_boundary, only: ice_HaloUpdate - use ice_calendar, only: dt, dt_dyn, ndtd, diagfreq, write_restart, istep, idate, sec + 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 diff --git a/cicecore/drivers/mct/cesm1/ice_prescribed_mod.F90 b/cicecore/drivers/mct/cesm1/ice_prescribed_mod.F90 index 60616fef2..27bd98bfe 100644 --- a/cicecore/drivers/mct/cesm1/ice_prescribed_mod.F90 +++ b/cicecore/drivers/mct/cesm1/ice_prescribed_mod.F90 @@ -47,7 +47,7 @@ module ice_prescribed_mod use ice_read_write use ice_exit, only: abort_ice use icepack_intfc, only: icepack_warnings_flush, icepack_warnings_aborted - use icepack_intfc, only: icepack_query_tracer_indices, icepack_query_tracer_numbers + use icepack_intfc, only: icepack_query_tracer_indices, icepack_query_tracer_sizes use icepack_intfc, only: icepack_query_parameters implicit none @@ -422,7 +422,7 @@ subroutine ice_prescribed_phys call icepack_query_tracer_indices(nt_Tsfc_out=nt_Tsfc, nt_sice_out=nt_sice, & nt_qice_out=nt_qice, nt_qsno_out=nt_qsno) - call icepack_query_tracer_numbers(ntrcr_out=ntrcr) + call icepack_query_tracer_sizes(ntrcr_out=ntrcr) call icepack_query_parameters(rad_to_deg_out=rad_to_deg, pi_out=pi, & puny_out=puny, rhoi_out=rhoi, rhos_out=rhos, cp_ice_out=cp_ice, cp_ocn_out=cp_ocn, & lfresh_out=lfresh, depressT_out=depressT) diff --git a/cicecore/drivers/nuopc/cmeps/CICE_InitMod.F90 b/cicecore/drivers/nuopc/cmeps/CICE_InitMod.F90 index 5b04e571b..14db24c73 100644 --- a/cicecore/drivers/nuopc/cmeps/CICE_InitMod.F90 +++ b/cicecore/drivers/nuopc/cmeps/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 @@ -269,7 +269,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__) diff --git a/cicecore/drivers/nuopc/cmeps/CICE_RunMod.F90 b/cicecore/drivers/nuopc/cmeps/CICE_RunMod.F90 index 8ffdd7c33..26d40a431 100644 --- a/cicecore/drivers/nuopc/cmeps/CICE_RunMod.F90 +++ b/cicecore/drivers/nuopc/cmeps/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, & diff --git a/cicecore/drivers/nuopc/cmeps/ice_prescribed_mod.F90 b/cicecore/drivers/nuopc/cmeps/ice_prescribed_mod.F90 index bca8c7ab7..f597015f3 100644 --- a/cicecore/drivers/nuopc/cmeps/ice_prescribed_mod.F90 +++ b/cicecore/drivers/nuopc/cmeps/ice_prescribed_mod.F90 @@ -35,7 +35,7 @@ module ice_prescribed_mod use ice_read_write use ice_exit, only: abort_ice use icepack_intfc, only: icepack_warnings_flush, icepack_warnings_aborted - use icepack_intfc, only: icepack_query_tracer_indices, icepack_query_tracer_numbers + use icepack_intfc, only: icepack_query_tracer_indices, icepack_query_tracer_sizes use icepack_intfc, only: icepack_query_parameters implicit none @@ -372,7 +372,7 @@ subroutine ice_prescribed_phys call icepack_query_tracer_indices(nt_Tsfc_out=nt_Tsfc, nt_sice_out=nt_sice, & nt_qice_out=nt_qice, nt_qsno_out=nt_qsno) - call icepack_query_tracer_numbers(ntrcr_out=ntrcr) + call icepack_query_tracer_sizes(ntrcr_out=ntrcr) call icepack_query_parameters(rad_to_deg_out=rad_to_deg, pi_out=pi, & puny_out=puny, rhoi_out=rhoi, rhos_out=rhos, cp_ice_out=cp_ice, cp_ocn_out=cp_ocn, & lfresh_out=lfresh, depressT_out=depressT) diff --git a/cicecore/drivers/nuopc/dmi/CICE_InitMod.F90 b/cicecore/drivers/nuopc/dmi/CICE_InitMod.F90 index 2e9c6f709..bd434dd80 100644 --- a/cicecore/drivers/nuopc/dmi/CICE_InitMod.F90 +++ b/cicecore/drivers/nuopc/dmi/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 @@ -283,7 +283,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__) diff --git a/cicecore/drivers/nuopc/dmi/CICE_RunMod.F90 b/cicecore/drivers/nuopc/dmi/CICE_RunMod.F90 index 459a7b42e..11587cd83 100644 --- a/cicecore/drivers/nuopc/dmi/CICE_RunMod.F90 +++ b/cicecore/drivers/nuopc/dmi/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 @@ -397,7 +397,7 @@ subroutine coupling_prep (iblk) character(len=*), parameter :: subname = '(coupling_prep)' 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, & diff --git a/cicecore/drivers/standalone/cice/CICE_InitMod.F90 b/cicecore/drivers/standalone/cice/CICE_InitMod.F90 index 9b4f92c2f..cc075f564 100644 --- a/cicecore/drivers/standalone/cice/CICE_InitMod.F90 +++ b/cicecore/drivers/standalone/cice/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 @@ -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__) diff --git a/cicecore/drivers/standalone/cice/CICE_RunMod.F90 b/cicecore/drivers/standalone/cice/CICE_RunMod.F90 index 2ed51e4b7..ad974475b 100644 --- a/cicecore/drivers/standalone/cice/CICE_RunMod.F90 +++ b/cicecore/drivers/standalone/cice/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 @@ -393,7 +393,7 @@ subroutine coupling_prep (iblk) character(len=*), parameter :: subname = '(coupling_prep)' 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, & diff --git a/cicecore/shared/ice_arrays_column.F90 b/cicecore/shared/ice_arrays_column.F90 index 074a2a2eb..64c4de612 100644 --- a/cicecore/shared/ice_arrays_column.F90 +++ b/cicecore/shared/ice_arrays_column.F90 @@ -16,7 +16,7 @@ module ice_arrays_column use icepack_intfc, only: icepack_nspint use icepack_intfc, only: icepack_query_tracer_sizes, icepack_query_parameters, & icepack_query_tracer_flags, & - icepack_warnings_flush, icepack_warnings_aborted, icepack_query_tracer_numbers + icepack_warnings_flush, icepack_warnings_aborted, icepack_query_tracer_sizes implicit none private @@ -306,7 +306,7 @@ subroutine alloc_arrays_column character(len=*),parameter :: subname='(alloc_arrays_column)' - call icepack_query_tracer_numbers(ntrcr_out=ntrcr, nbtrcr_sw_out=nbtrcr_sw) + call icepack_query_tracer_sizes(ntrcr_out=ntrcr, nbtrcr_sw_out=nbtrcr_sw) call icepack_query_tracer_sizes( max_nbtrcr_out=max_nbtrcr, & max_algae_out=max_algae, max_aero_out=max_aero, & nmodal1_out=nmodal1, nmodal2_out=nmodal2, max_don_out=max_don) diff --git a/cicecore/shared/ice_init_column.F90 b/cicecore/shared/ice_init_column.F90 index 7ff674a4b..1c3dcfacd 100644 --- a/cicecore/shared/ice_init_column.F90 +++ b/cicecore/shared/ice_init_column.F90 @@ -22,13 +22,13 @@ module ice_init_column use icepack_intfc, only: icepack_max_algae, icepack_max_aero, icepack_max_fe use icepack_intfc, only: icepack_max_nbtrcr use icepack_intfc, only: icepack_warnings_flush, icepack_warnings_aborted - use icepack_intfc, only: icepack_init_tracer_numbers, icepack_init_tracer_flags + use icepack_intfc, only: icepack_init_tracer_sizes, icepack_init_tracer_flags use icepack_intfc, only: icepack_init_tracer_indices use icepack_intfc, only: icepack_init_parameters - use icepack_intfc, only: icepack_query_tracer_numbers, icepack_query_tracer_flags + use icepack_intfc, only: icepack_query_tracer_sizes, icepack_query_tracer_flags use icepack_intfc, only: icepack_query_tracer_indices, icepack_query_tracer_sizes use icepack_intfc, only: icepack_query_parameters - use icepack_intfc, only: icepack_write_tracer_numbers, icepack_write_tracer_flags + use icepack_intfc, only: icepack_write_tracer_sizes, icepack_write_tracer_flags use icepack_intfc, only: icepack_write_tracer_indices, icepack_write_tracer_sizes use icepack_intfc, only: icepack_init_fsd, icepack_cleanup_fsd use icepack_intfc, only: icepack_init_zbgc @@ -242,7 +242,7 @@ subroutine init_shortwave call icepack_query_parameters(shortwave_out=shortwave) call icepack_query_parameters(dEdd_algae_out=dEdd_algae) call icepack_query_parameters(modal_aero_out=modal_aero) - call icepack_query_tracer_numbers(ntrcr_out=ntrcr, nbtrcr_out=nbtrcr, nbtrcr_sw_out=nbtrcr_sw) + 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_zaero_out=tr_zaero, & tr_bgc_n_out=tr_bgc_n) call icepack_query_tracer_indices(nt_alvl_out=nt_alvl, nt_apnd_out=nt_apnd, nt_hpnd_out=nt_hpnd, & @@ -730,7 +730,7 @@ subroutine init_bgc() ! Initialize call icepack_query_parameters(solve_zsal_out=solve_zsal) - call icepack_query_tracer_numbers(nbtrcr_out=nbtrcr, ntrcr_out=ntrcr, ntrcr_o_out=ntrcr_o) + call icepack_query_tracer_sizes(nbtrcr_out=nbtrcr, ntrcr_out=ntrcr, ntrcr_o_out=ntrcr_o) call icepack_query_tracer_indices(nt_sice_out=nt_sice, nt_bgc_S_out=nt_bgc_S) call icepack_query_tracer_sizes(max_nbtrcr_out=max_nbtrcr, & max_algae_out=max_algae, max_don_out=max_don, max_doc_out=max_doc, & @@ -2186,7 +2186,7 @@ subroutine count_tracers 1020 format (a30,2x,i6) ! integer call flush_fileunit(nu_diag) endif ! my_task = master_task - call icepack_init_tracer_numbers(ntrcr_in=ntrcr, & + call icepack_init_tracer_sizes(ntrcr_in=ntrcr, & ntrcr_o_in=ntrcr_o, nbtrcr_in=nbtrcr, nbtrcr_sw_in=nbtrcr_sw) call icepack_init_tracer_indices(nt_Tsfc_in=nt_Tsfc, nt_sice_in=nt_sice, & nt_qice_in=nt_qice, nt_qsno_in=nt_qsno, nt_iage_in=nt_iage, nt_fy_in=nt_fy, & @@ -2205,17 +2205,14 @@ subroutine count_tracers nlt_zaero_in=nlt_zaero, nlt_bgc_chl_in=nlt_bgc_chl, & nlt_bgc_DIC_in=nlt_bgc_DIC, nlt_bgc_DOC_in=nlt_bgc_DOC, nlt_bgc_PON_in=nlt_bgc_PON, & nlt_bgc_DON_in=nlt_bgc_DON, nlt_bgc_Fed_in=nlt_bgc_Fed, nlt_bgc_Fep_in=nlt_bgc_Fep, & - nt_bgc_hum_in=nt_bgc_hum, nlt_bgc_hum_in=nlt_bgc_hum, & - 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) + nt_bgc_hum_in=nt_bgc_hum, nlt_bgc_hum_in=nlt_bgc_hum) call icepack_warnings_flush(nu_diag) if (icepack_warnings_aborted()) call abort_ice(error_message=subname//' Icepack Abort2', & file=__FILE__, line=__LINE__) if (my_task == master_task) then call icepack_write_tracer_flags(nu_diag) - call icepack_write_tracer_numbers(nu_diag) + call icepack_write_tracer_sizes(nu_diag) call icepack_write_tracer_indices(nu_diag) endif call icepack_warnings_flush(nu_diag) @@ -2402,7 +2399,7 @@ subroutine init_zbgc if (icepack_warnings_aborted()) call abort_ice(error_message=subname, & file=__FILE__, line=__LINE__) - call icepack_query_tracer_numbers( & + call icepack_query_tracer_sizes( & nbtrcr_out=nbtrcr, nbtrcr_sw_out=nbtrcr_sw) call icepack_warnings_flush(nu_diag) if (icepack_warnings_aborted()) call abort_ice(error_message=subname, & diff --git a/cicecore/shared/ice_restart_column.F90 b/cicecore/shared/ice_restart_column.F90 index 1797fb804..34055a751 100644 --- a/cicecore/shared/ice_restart_column.F90 +++ b/cicecore/shared/ice_restart_column.F90 @@ -20,7 +20,7 @@ module ice_restart_column use icepack_intfc, only: icepack_max_algae, icepack_max_doc, & icepack_max_don, icepack_max_dic, icepack_max_fe, icepack_max_aero 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 @@ -861,7 +861,7 @@ subroutine write_restart_bgc() character(len=*),parameter :: subname='(write_restart_bgc)' call icepack_query_parameters(skl_bgc_out=skl_bgc, solve_zsal_out=solve_zsal) - call icepack_query_tracer_numbers(nbtrcr_out=nbtrcr) + call icepack_query_tracer_sizes(nbtrcr_out=nbtrcr) call icepack_query_tracer_flags(tr_bgc_Nit_out=tr_bgc_Nit, & tr_bgc_Am_out=tr_bgc_Am, tr_bgc_Sil_out=tr_bgc_Sil, & tr_bgc_DMS_out=tr_bgc_DMS, tr_bgc_PON_out=tr_bgc_PON, & @@ -1271,7 +1271,7 @@ subroutine read_restart_bgc() character(len=*),parameter :: subname='(read_restart_bgc)' call icepack_query_parameters(skl_bgc_out=skl_bgc, solve_zsal_out=solve_zsal) - call icepack_query_tracer_numbers(nbtrcr_out=nbtrcr) + call icepack_query_tracer_sizes(nbtrcr_out=nbtrcr) call icepack_query_tracer_flags(tr_bgc_Nit_out=tr_bgc_Nit, & tr_bgc_Am_out=tr_bgc_Am, tr_bgc_Sil_out=tr_bgc_Sil, & tr_bgc_DMS_out=tr_bgc_DMS, tr_bgc_PON_out=tr_bgc_PON, & diff --git a/cicecore/ww3.20100101_efreq_remapgx3.nc b/cicecore/ww3.20100101_efreq_remapgx3.nc deleted file mode 100644 index 466b9a505..000000000 Binary files a/cicecore/ww3.20100101_efreq_remapgx3.nc and /dev/null differ diff --git a/configuration/scripts/tests/nothread_suite.ts b/configuration/scripts/tests/nothread_suite.ts index 51f9e481d..dc14c2bf6 100644 --- a/configuration/scripts/tests/nothread_suite.ts +++ b/configuration/scripts/tests/nothread_suite.ts @@ -9,9 +9,8 @@ smoke gx3 4x1 debug,diag1,run5day,thread restart gx3 16x1 thread smoke gx3 16x1 diag24,run1year,medium -restart gx1 160x1 droundrobin,medium - #tcraig, hangs nodes intermittently on izumi with pgi +#restart gx1 160x1 droundrobin,medium #restart tx1 160x1 dsectrobin,medium restart gx3 16x1 none diff --git a/doc/source/developer_guide/dg_icepack.rst b/doc/source/developer_guide/dg_icepack.rst index 515c6a839..de6c230e6 100755 --- a/doc/source/developer_guide/dg_icepack.rst +++ b/doc/source/developer_guide/dg_icepack.rst @@ -10,9 +10,9 @@ separately, see https://github.com/CICE-Consortium/Icepack. More specifically, the CICE model uses methods defined in **icepack_intfc.F90**. It uses the init, query, and write methods to set, get, and document Icepack values. And it follows -the icepack_warnings methodology where icepack_warnings_aborted is checked and -icepack_warnings_print is called after every call to an Icepack method. It does not directly -"use" Icepack data and access Icepack data only thru interfaces. +the icepack_warnings methodology where **icepack_warnings_aborted** is checked and +**icepack_warnings_flush** is called after every call to an Icepack method. +It does not directly "use" Icepack data, accessing Icepack data only thru interfaces. diff --git a/icepack b/icepack index 4a58d16b7..51a93857d 160000 --- a/icepack +++ b/icepack @@ -1 +1 @@ -Subproject commit 4a58d16b742caaa7f2206fb4cfc0ec63d96ec9b6 +Subproject commit 51a93857d155fc2ceeda30eb22cd6b4f773c8beb