Correcting use statements for restarts in trunk hadgem3 driver

Author: eclare108213

drivers/hadgem3/CICE_InitMod.F90

@@ -168,29 +168,26 @@ end subroutine cice_init
       subroutine init_restart
 
       use ice_aerosol, only: init_aerosol
-      use ice_age, only: init_age
+      use ice_age, only: init_age, restart_age, read_restart_age
       use ice_blocks, only: nx_block, ny_block
       use ice_brine, only: init_hbrine
       use ice_calendar, only: time, calendar
       use ice_domain, only: nblocks
       use ice_domain_size, only: ncat
       use ice_dyn_eap, only: read_restart_eap
       use ice_dyn_shared, only: kdyn
-      use ice_firstyear, only: init_fy
+      use ice_firstyear, only: init_fy, restart_FY, read_restart_FY
       use ice_flux, only: sss
       use ice_init, only: ice_ic
-      use ice_lvl, only: init_lvl
-      use ice_meltpond_cesm, only: init_meltponds_cesm
-      use ice_meltpond_lvl, only: init_meltponds_lvl
-      use ice_meltpond_topo, only: init_meltponds_topo
+      use ice_lvl, only: init_lvl, restart_lvl, read_restart_lvl
+      use ice_meltpond_cesm, only: init_meltponds_cesm, &
+          restart_pond_cesm, read_restart_pond_cesm
+      use ice_meltpond_lvl, only: init_meltponds_lvl, &
+          restart_pond_lvl, read_restart_pond_lvl, dhsn
+      use ice_meltpond_topo, only: init_meltponds_topo, &
+          restart_pond_topo, read_restart_pond_topo
       use ice_restart_shared, only: runtype, restart
       use ice_restart_driver, only: restartfile, restartfile_v4
-      use ice_restart_age, only: restart_age, read_restart_age
-      use ice_restart_firstyear, only: restart_FY, read_restart_FY
-      use ice_restart_lvl, only: restart_lvl, read_restart_lvl
-      use ice_restart_meltpond_cesm, only: restart_pond_cesm, read_restart_pond_cesm
-      use ice_restart_meltpond_lvl, only: restart_pond_lvl, read_restart_pond_lvl, dhsn
-      use ice_restart_meltpond_topo, only: restart_pond_topo, read_restart_pond_topo
       use ice_state, only: tr_iage, tr_FY, tr_lvl, tr_pond_cesm, &
           tr_pond_lvl, tr_pond_topo, tr_aero, trcrn, &
           nt_iage, nt_FY, nt_alvl, nt_vlvl, nt_apnd, nt_hpnd, nt_ipnd, tr_brine

drivers/hadgem3/CICE_RunMod.F90

@@ -100,6 +100,7 @@ end subroutine CICE_Run
 
       subroutine ice_step
 
+      use ice_age, only: write_restart_age
       use ice_aerosol, only: write_restart_aero
       use ice_boundary, only: ice_HaloUpdate
       use ice_brine, only: hbrine_diags, write_restart_hbrine
@@ -110,16 +111,15 @@ subroutine ice_step
       use ice_domain_size, only: nslyr
       use ice_dyn_eap, only: write_restart_eap
       use ice_dyn_shared, only: kdyn
+      use ice_firstyear, only: write_restart_FY
       use ice_flux, only: scale_factor, init_history_therm
       use ice_history, only: accum_hist
+      use ice_lvl, only: write_restart_lvl
       use ice_restart, only: final_restart
       use ice_restart_driver, only: dumpfile
-      use ice_restart_age, only: write_restart_age
-      use ice_restart_firstyear, only: write_restart_FY
-      use ice_restart_lvl, only: write_restart_lvl
-      use ice_restart_meltpond_cesm, only: write_restart_pond_cesm
-      use ice_restart_meltpond_lvl, only: write_restart_pond_lvl
-      use ice_restart_meltpond_topo, only: write_restart_pond_topo
+      use ice_meltpond_cesm, only: write_restart_pond_cesm
+      use ice_meltpond_lvl, only: write_restart_pond_lvl
+      use ice_meltpond_topo, only: write_restart_pond_topo
       use ice_restoring, only: restore_ice, ice_HaloRestore
       use ice_state, only: nt_qsno, trcrn, tr_iage, tr_FY, tr_lvl, &
           tr_pond_cesm, tr_pond_lvl, tr_pond_topo, tr_brine, tr_aero