Merge branch 'concepts/write-ic-at-init-date' into 'concepts/main' (!15)

cicecore: correct initial condition metadata (CICE-Consortium#818)

Closes #19

cicecore/cicedyn/infrastructure/io/io_binary/ice_history_write.F90

@@ -158,6 +158,7 @@ subroutine ice_write_hist(ns)
                trim(avail_hist_fields(n)%vcomment)
 
             if (histfreq(ns) == '1' .or. .not. hist_avg         &
+                .or. write_ic                                   &
                 .or. n==n_divu(ns)      .or. n==n_shear(ns)     &  ! snapshots
                 .or. n==n_sig1(ns)      .or. n==n_sig2(ns)      &
                 .or. n==n_sigP(ns)      .or. n==n_trsig(ns)     &
@@ -186,7 +187,7 @@ subroutine ice_write_hist(ns)
             write (nu_hdr, 994) nrec,trim(avail_hist_fields(n)%vname), &
                trim(avail_hist_fields(n)%vdesc),trim(avail_hist_fields(n)%vunit),nn
 
-            if (histfreq(ns) == '1' .or. .not. hist_avg) then
+            if (histfreq(ns) == '1' .or. .not. hist_avg .or. write_ic) then
                write (nu_hdr, 996) nrec,trim(avail_hist_fields(n)%vname), &
                   'time_rep','instantaneous'
             else
@@ -210,7 +211,7 @@ subroutine ice_write_hist(ns)
             write (nu_hdr, 993) nrec,trim(avail_hist_fields(n)%vname), &
                trim(avail_hist_fields(n)%vdesc),trim(avail_hist_fields(n)%vunit),k
 
-            if (histfreq(ns) == '1' .or. .not. hist_avg) then
+            if (histfreq(ns) == '1' .or. .not. hist_avg .or. write_ic) then
                write (nu_hdr, 996) nrec,trim(avail_hist_fields(n)%vname), &
                   'time_rep','instantaneous'
             else
@@ -234,7 +235,7 @@ subroutine ice_write_hist(ns)
             write (nu_hdr, 993) nrec,trim(avail_hist_fields(n)%vname), &
                trim(avail_hist_fields(n)%vdesc),trim(avail_hist_fields(n)%vunit),nn,k
 
-            if (histfreq(ns) == '1' .or. .not. hist_avg) then
+            if (histfreq(ns) == '1' .or. .not. hist_avg .or. write_ic) then
                write (nu_hdr, 996) nrec,trim(avail_hist_fields(n)%vname), &
                   'time_rep','instantaneous'
             else
@@ -258,7 +259,7 @@ subroutine ice_write_hist(ns)
             write (nu_hdr, 993) nrec,trim(avail_hist_fields(n)%vname), &
                trim(avail_hist_fields(n)%vdesc),trim(avail_hist_fields(n)%vunit),nn,k
 
-            if (histfreq(ns) == '1' .or. .not. hist_avg) then
+            if (histfreq(ns) == '1' .or. .not. hist_avg .or. write_ic) then
                write (nu_hdr, 996) nrec,trim(avail_hist_fields(n)%vname), &
                   'time_rep','instantaneous'
             else
@@ -282,7 +283,7 @@ subroutine ice_write_hist(ns)
             write (nu_hdr, 993) nrec,trim(avail_hist_fields(n)%vname), &
                trim(avail_hist_fields(n)%vdesc),trim(avail_hist_fields(n)%vunit),nn,k
 
-            if (histfreq(ns) == '1' .or. .not. hist_avg) then
+            if (histfreq(ns) == '1' .or. .not. hist_avg .or. write_ic) then
                write (nu_hdr, 996) nrec,trim(avail_hist_fields(n)%vname), &
                   'time_rep','instantaneous'
             else
@@ -307,7 +308,7 @@ subroutine ice_write_hist(ns)
             write (nu_hdr, 993) nrec,trim(avail_hist_fields(n)%vname), &
                trim(avail_hist_fields(n)%vdesc),trim(avail_hist_fields(n)%vunit),nn,k
 
-            if (histfreq(ns) == '1' .or. .not. hist_avg) then
+            if (histfreq(ns) == '1' .or. .not. hist_avg .or. write_ic) then
                write (nu_hdr, 996) nrec,trim(avail_hist_fields(n)%vname), &
                   'time_rep','instantaneous'
             else
@@ -333,7 +334,7 @@ subroutine ice_write_hist(ns)
             write (nu_hdr, 993) nrec,trim(avail_hist_fields(n)%vname), &
                trim(avail_hist_fields(n)%vdesc),trim(avail_hist_fields(n)%vunit),nn,k
 
-            if (histfreq(ns) == '1' .or. .not. hist_avg) then
+            if (histfreq(ns) == '1' .or. .not. hist_avg .or. write_ic) then
                write (nu_hdr, 996) nrec,trim(avail_hist_fields(n)%vname), &
                   'time_rep','instantaneous'
             else
@@ -359,7 +360,7 @@ subroutine ice_write_hist(ns)
             write (nu_hdr, 993) nrec,trim(avail_hist_fields(n)%vname), &
                trim(avail_hist_fields(n)%vdesc),trim(avail_hist_fields(n)%vunit),nn,k
 
-            if (histfreq(ns) == '1' .or. .not. hist_avg) then
+            if (histfreq(ns) == '1' .or. .not. hist_avg .or. write_ic) then
                write (nu_hdr, 996) nrec,trim(avail_hist_fields(n)%vname), &
                   'time_rep','instantaneous'
             else

cicecore/cicedyn/infrastructure/io/io_netcdf/ice_history_write.F90

@@ -158,7 +158,7 @@ subroutine ice_write_hist (ns)
       ! define dimensions
       !-----------------------------------------------------------------
 
-        if (hist_avg) then
+        if (hist_avg .and. .not. write_ic) then
           status = nf90_def_dim(ncid,'d2',2,boundid)
           if (status /= nf90_noerr) call abort_ice(subname// &
              'ERROR: defining dim d2')
@@ -240,7 +240,7 @@ subroutine ice_write_hist (ns)
            call abort_ice(subname//'ERROR: invalid calendar settings')
         endif
 
-        if (hist_avg) then
+        if (hist_avg .and. .not. write_ic) then
           status = nf90_put_att(ncid,varid,'bounds','time_bounds')
           if (status /= nf90_noerr) call abort_ice(subname// &
                       'ERROR: time bounds')
@@ -250,7 +250,7 @@ subroutine ice_write_hist (ns)
       ! Define attributes for time bounds if hist_avg is true
       !-----------------------------------------------------------------
 
-        if (hist_avg) then
+        if (hist_avg .and. .not. write_ic) then
           dimid(1) = boundid
           dimid(2) = timid
           status = nf90_def_var(ncid,'time_bounds',lprecision,dimid(1:2),varid)
@@ -725,7 +725,7 @@ subroutine ice_write_hist (ns)
       ! write time_bounds info
       !-----------------------------------------------------------------
 
-        if (hist_avg) then
+        if (hist_avg .and. .not. write_ic) then
           status = nf90_inq_varid(ncid,'time_bounds',varid)
           if (status /= nf90_noerr) call abort_ice(subname// &
                         'ERROR: getting time_bounds id')
@@ -1216,7 +1216,7 @@ end subroutine ice_write_hist
       subroutine ice_write_hist_attrs(ncid, varid, hfield, ns)
 
       use ice_kinds_mod
-      use ice_calendar, only: histfreq, histfreq_n
+      use ice_calendar, only: histfreq, histfreq_n, write_ic
       use ice_history_shared, only: ice_hist_field, history_precision, &
           hist_avg
 #ifdef USE_NETCDF
@@ -1259,7 +1259,7 @@ subroutine ice_write_hist_attrs(ncid, varid, hfield, ns)
       call ice_write_hist_fill(ncid,varid,hfield%vname,history_precision)
 
       ! Add cell_methods attribute to variables if averaged
-      if (hist_avg) then
+      if (hist_avg .and. .not. write_ic) then
          if    (TRIM(hfield%vname(1:4))/='sig1' &
            .and.TRIM(hfield%vname(1:4))/='sig2' &
            .and.TRIM(hfield%vname(1:9))/='sistreave' &
@@ -1273,6 +1273,7 @@ subroutine ice_write_hist_attrs(ncid, varid, hfield, ns)
 
       if ((histfreq(ns) == '1' .and. histfreq_n(ns) == 1) &
           .or..not. hist_avg                              &
+          .or. write_ic                                   &
           .or.TRIM(hfield%vname(1:4))=='divu' &
           .or.TRIM(hfield%vname(1:5))=='shear' &
           .or.TRIM(hfield%vname(1:4))=='sig1' &

cicecore/cicedyn/infrastructure/io/io_pio2/ice_history_write.F90

@@ -194,7 +194,7 @@ subroutine ice_write_hist (ns)
       ! define dimensions
       !-----------------------------------------------------------------
 
-        if (hist_avg) then
+        if (hist_avg .and. .not. write_ic) then
           status = pio_def_dim(File,'d2',2,boundid)
         endif
 
@@ -232,12 +232,12 @@ subroutine ice_write_hist (ns)
            call abort_ice(subname//'ERROR: invalid calendar settings')
         endif
 
-        if (hist_avg) then
+        if (hist_avg .and. .not. write_ic) then
           status = pio_put_att(File,varid,'bounds','time_bounds')
         endif
 
         ! Define attributes for time_bounds if hist_avg is true
-        if (hist_avg) then
+        if (hist_avg .and. .not. write_ic) then
           dimid2(1) = boundid
           dimid2(2) = timid
           status = pio_def_var(File,'time_bounds',pio_double,dimid2,varid)
@@ -684,7 +684,7 @@ subroutine ice_write_hist (ns)
       ! write time_bounds info
       !-----------------------------------------------------------------
 
-        if (hist_avg) then
+        if (hist_avg .and. .not. write_ic) then
           status = pio_inq_varid(File,'time_bounds',varid)
           time_bounds=(/time_beg(ns),time_end(ns)/)
           bnd_start  = (/1,1/)
@@ -1201,7 +1201,7 @@ end subroutine ice_write_hist
       subroutine ice_write_hist_attrs(File, varid, hfield, ns)
 
       use ice_kinds_mod
-      use ice_calendar, only: histfreq, histfreq_n
+      use ice_calendar, only: histfreq, histfreq_n, write_ic
       use ice_history_shared, only: ice_hist_field, history_precision, &
           hist_avg
       use ice_pio
@@ -1232,7 +1232,7 @@ subroutine ice_write_hist_attrs(File, varid, hfield, ns)
       call ice_write_hist_fill(File,varid,hfield%vname,history_precision)
 
       ! Add cell_methods attribute to variables if averaged
-      if (hist_avg) then
+      if (hist_avg .and. .not. write_ic) then
          if    (TRIM(hfield%vname(1:4))/='sig1' &
            .and.TRIM(hfield%vname(1:4))/='sig2' &
            .and.TRIM(hfield%vname(1:9))/='sistreave' &
@@ -1244,6 +1244,7 @@ subroutine ice_write_hist_attrs(File, varid, hfield, ns)
 
       if ((histfreq(ns) == '1' .and. histfreq_n(ns) == 1) &
           .or..not. hist_avg                              &
+          .or. write_ic                                   &
           .or.TRIM(hfield%vname(1:4))=='divu' &
           .or.TRIM(hfield%vname(1:5))=='shear' &
           .or.TRIM(hfield%vname(1:4))=='sig1' &

cicecore/drivers/direct/nemo_concepts/CICE_InitMod.F90

@@ -185,6 +185,8 @@ subroutine cice_init
       if (trim(runtype) == 'continue' .or. restart) &
          call init_shortwave    ! initialize radiative transfer
 
+      if (write_ic) call accum_hist(dt) ! write initial conditions
+
       ! determine the time and date at the end of the first timestep
       call advance_timestep()
 
@@ -215,8 +217,6 @@ subroutine cice_init
       call init_flux_atm        ! initialize atmosphere fluxes sent to coupler
       call init_flux_ocn        ! initialize ocean fluxes sent to coupler
 
-      if (write_ic) call accum_hist(dt) ! write initial conditions
-
       end subroutine cice_init
 
 !=======================================================================

cicecore/drivers/standalone/cice/CICE_InitMod.F90

@@ -199,6 +199,8 @@ subroutine cice_init
       if (trim(runtype) == 'continue' .or. restart) &
          call init_shortwave    ! initialize radiative transfer
 
+      if (write_ic) call accum_hist(dt) ! write initial conditions
+
 ! tcraig, use advance_timestep here
 !      istep  = istep  + 1    ! update time step counters
 !      istep1 = istep1 + 1
@@ -243,8 +245,6 @@ subroutine cice_init
       call init_flux_atm        ! initialize atmosphere fluxes sent to coupler
       call init_flux_ocn        ! initialize ocean fluxes sent to coupler
 
-      if (write_ic) call accum_hist(dt) ! write initial conditions
-
       if (my_task == master_task) then
          call ice_memusage_print(nu_diag,subname//':end')
       endif