Merge pull request #38 from ACCESS-NRI/esm1.6-dump-last

Implement dump last in ESM1.6 driver

Author: blimlim

drivers/access/CICE_RunMod.F90

@@ -48,7 +48,8 @@ subroutine CICE_Run
       use ice_calendar, only: istep, istep1, time, dt, stop_now, calendar
       use ice_forcing, only: get_forcing_atmo, get_forcing_ocn
 #ifdef ACCESS
-      use ice_calendar, only: month, mday, istep, istep1, time, dt, stop_now, calendar
+      use ice_calendar, only: month, mday, istep, istep1, time, dt, stop_now, calendar, &
+          write_restart, dump_last
       use ice_restart_driver, only: dumpfile     !temporary debug
 #endif
       use ice_flux, only: init_flux_atm, init_flux_ocn
@@ -135,6 +136,11 @@ subroutine CICE_Run
           !      ' calling dumpfile at icpl_ai, itap, time_sec, idate = ', icpl_ai, itap, time_sec, idate
           !  call dumpfile
           !endif
+
+          ! Write restart on final timestep
+          if (dump_last .and. (itap == num_ice_ai) .and. (icpl_ai == num_cpl_ai)) then
+            write_restart = 1
+          endif
 
           !*** ice "update" ***!
           call ice_step

source/ice_calendar.F90

@@ -296,7 +296,9 @@ subroutine calendar(ttime)
       write(il_out,*) '(calendar)  idate = ', idate
 #endif
       if (istep >= npt+1)  stop_now = 1
+#ifndef ACCESS
       if (istep == npt .and. dump_last) write_restart = 1 ! last timestep
+#endif
       if (nyr   /= nyrp)   new_year = .true.
       if (month /= monthp) new_month = .true.
       if (mday  /= mdayp)  new_day = .true.