Update to CMIP7 diagnostics

drivers/access/CICE_RunMod.F90

@@ -572,6 +572,15 @@ subroutine coupling_prep (iblk)
             fsalt_ai  (i,j,iblk) = fsalt  (i,j,iblk)
             fhocn_ai  (i,j,iblk) = fhocn  (i,j,iblk)
             fswthru_ai(i,j,iblk) = fswthru(i,j,iblk)
+            fsens_ai  (i,j,iblk) = fsens(i,j,iblk)
+            flat_ai   (i,j,iblk) = flat(i,j,iblk)
+            fswabs_ai (i,j,iblk) = fswabs(i,j,iblk)
+            flwout_ai (i,j,iblk) = flwout(i,j,iblk)
+            evap_ai   (i,j,iblk) = evap(i,j,iblk) 
+            evap_ice_ai(i,j,iblk) = evap_ice(i,j,iblk) 
+            evap_snow_ai(i,j,iblk) = evap_snow(i,j,iblk) 
+            fcondtop_ai(i,j,iblk) = fcondtop(i,j,iblk) 
+            fsurf_ai(i,j,iblk) = fsurf(i,j,iblk) 
 
             if (nbtrcr > 0) then
             do k = 1, nbtrcr

io_netcdf/ice_history_write.F90

@@ -1140,6 +1140,7 @@ subroutine ice_hist_create(ns, ncfile, ncid, var, coord_var, var_nverts, var_nz)
         call check(nf90_put_att(ncid,nf90_global,'comment2',title), &
                    'global attribute comment2')
 
+        ! TO-DO: Update output for CF compliance !
         ! title = 'CF-1.0'
         ! call check(nf90_put_att(ncid,nf90_global,'conventions',title), &
         !            'global attribute conventions')

source/ice_fileunits.F90

@@ -293,7 +293,7 @@ subroutine flush_fileunit(iunit)
       end subroutine flush_fileunit
 
 !=======================================================================
-
+! Namelist error handling ported from https://github.com/CICE-Consortium/CICE/blob/8e3ef7c4cb657705ceff5bfec3e12b49dec4973e/cicecore/shared/ice_fileunits.F90#L328
       subroutine goto_nml(iunit, nml, status)
         ! Search to namelist group within ice_in file.
         ! for compilers that do not allow optional namelists
@@ -306,7 +306,7 @@ subroutine goto_nml(iunit, nml, status)
              nml ! namelist to search for
 
         integer(kind=int_kind), intent(out) :: &
-             status ! status of subrouine
+             status ! status of subroutine
 
         ! local variables
         character(len=char_len) :: &

source/ice_flux.F90

@@ -308,12 +308,21 @@ module ice_flux
       ! ice diagnostics and history files as these are more accurate. 
       ! (The others suffer from problem of incorrect values at grid boxes
       !  that change from an ice free state to an icy state.)
-    
+
       real (kind=dbl_kind), dimension (nx_block,ny_block,max_blocks), public :: &
          fresh_ai, & ! fresh water flux to ocean (kg/m^2/s)
          fsalt_ai, & ! salt flux to ocean (kg/m^2/s)
          fhocn_ai, & ! net heat flux to ocean (W/m^2)
-         fswthru_ai  ! shortwave penetrating to ocean (W/m^2)
+         fswthru_ai, &  ! shortwave penetrating to ocean (W/m^2)
+         fsens_ai, & ! sensible heat flux (W/m^2)
+         flat_ai, &  ! latent heat flux (W/m^2)
+         fswabs_ai, & ! shortwave absorbed heat flx     (W/m^2)
+         flwout_ai, & ! upwd lw emitted heat flx 
+         evap_ai, &  ! & evaporation                     (kg/m2/s)
+         evap_ice_ai, & ! & evaporation                     (kg/m2/s)
+         evap_snow_ai, & ! & evaporation                     (kg/m2/s)
+         fcondtop_ai, &  ! downward cond flux at top surface (W m-2)
+         fsurf_ai     ! net flux to top surface, excluding fcondtop
 
       ! Used with data assimilation in hadgem drivers
       real (kind=dbl_kind), dimension (nx_block,ny_block,max_blocks) :: &
@@ -613,11 +622,20 @@ subroutine init_history_therm
       fsalt_ai  (:,:,:) = c0
       fhocn_ai  (:,:,:) = c0
       fswthru_ai(:,:,:) = c0
-      albice (:,:,:) = c0
-      albsno (:,:,:) = c0
-      albpnd (:,:,:) = c0
+      fsens_ai  (:,:,:) = c0
+      flat_ai   (:,:,:) = c0
+      fswabs_ai (:,:,:) = c0
+      flwout_ai (:,:,:) = c0
+      evap_ai   (:,:,:) = c0
+      evap_ice_ai(:,:,:) = c0
+      evap_snow_ai(:,:,:) = c0
+      fcondtop_ai(:,:,:) = c0
+      fsurf_ai  (:,:,:) = c0
+      albice    (:,:,:) = c0
+      albsno    (:,:,:) = c0
+      albpnd    (:,:,:) = c0
       snowfracn (:,:,:,:) = c0
-      snowfrac (:,:,:) = c0
+      snowfrac  (:,:,:) = c0
 
       ! drag coefficients are computed prior to the atmo_boundary call, 
       ! during the thermodynamics section 

source/ice_history_shared.F90

@@ -200,7 +200,7 @@ module ice_history_shared
            f_hs        = 'm', &
            f_snowfrac  = 'x', f_snowfracn  = 'x', &
            f_Tsfc      = 'm', & 
-           f_aice      = 'm', f_siconc    = 'x' , & !same var, two names, 
+           f_aice      = 'm', f_siconc    = 'x' , &
            f_uvel      = 'm', f_vvel       = 'm', &
            f_uatm      = 'm', f_vatm       = 'm', &
            f_fswdn     = 'm', f_flwdn      = 'm', &
@@ -269,24 +269,24 @@ module ice_history_shared
            f_sidmassth = 'x', f_sidmassdyn = 'x', &
            f_sidmassgrowthwat = 'x', &
            f_sidmassgrowthbot = 'x', &
-           f_sidmasssi = 'x', f_sidmassgrowthsi = 'x', & !same var, two names
+           f_sidmasssi = 'x', f_sidmassgrowthsi = 'x', &
            f_sidmassevapsubl = 'x', &
            f_sidmassmelttop = 'x', &
            f_sidmassmeltbot = 'x', &
-           f_sidmasslat = 'x', f_sidmassmeltlat = 'x', & !same var, two names
-           f_sndmasssnf = 'x', f_sisndmasssnf   = 'x', & !same var, two names
-           f_sndmassmelt = 'x', f_sisndmassmelt = 'x', & !same var, two names
-           f_sndmassdyn = 'x', f_sisndmassdyn = 'x', &   !same var, two names
+           f_sidmasslat = 'x', f_sidmassmeltlat = 'x', &
+           f_sndmasssnf = 'x', f_sisndmasssnf   = 'x', &
+           f_sndmassmelt = 'x', f_sisndmassmelt = 'x', &
+           f_sndmassdyn = 'x', f_sisndmassdyn = 'x', &
            f_sisndmasssi = 'x', &
-           f_sndmasssubl = 'x', f_sisndmasssubl = 'x', & !same var, two names
+           f_sndmasssubl = 'x', f_sisndmasssubl = 'x', &
            f_sidivvel = 'x', &
            f_siflswdtop = 'x', &
            f_siflswutop = 'x', &
            f_siflswdbot = 'x', &
            f_sifllwdtop = 'x', &
            f_sifllwutop = 'x', &
            f_siflsenstop = 'x', &
-           f_siflsensupbot = 'x', f_siflsensbot = 'x', & !same var, two names
+           f_siflsensupbot = 'x', f_siflsensbot = 'x', &
            f_sifllatstop = 'x', &
            f_siflcondtop = 'x', &
            f_siflcondbot = 'x', &
@@ -295,7 +295,7 @@ module ice_history_shared
            f_siflfwbot = 'x', &
            f_siflfwdrain = 'x', &
            f_sisaltmass = 'x', &
-           f_aicen     = 'x' , f_siitdconc = 'x', & !same var, two names
+           f_aicen     = 'x' , f_siitdconc = 'x', &
            f_vicen      = 'x', &
            f_vsnon     = 'x',  &
            f_trsig     = 'm', &

source/ice_read_write.F90

@@ -1563,7 +1563,7 @@ subroutine ice_read_nc_z(fid,  nrec,  varname, work,  diag, &
 
           if (status /= nf90_noerr) then
            call abort_ice ( & 
-               'ice_read_nc: Cannot get variable '//trim(varname) )
+               'ice_read_nc_z: Cannot get variable '//trim(varname) )
          endif
 
       endif                     ! my_task = master_task
@@ -1797,7 +1797,7 @@ subroutine ice_write_nc_xyz(fid,  nrec,  varid, work,  diag, &
 
          if (status /= nf90_noerr) then
            call abort_ice ( & 
-               'ice_write_nc_xy: Cannot put variable '//trim(nf90_strerror(status)) )
+               'ice_write_nc_xyz: Cannot put variable '//trim(nf90_strerror(status)) )
          endif
 
       endif                     ! my_task = master_task

source/ice_therm_vertical.F90

@@ -480,18 +480,18 @@ subroutine thermo_vertical (nx_block,    ny_block,  &
          ! Tsnice from https://github.com/CICE-Consortium/Icepack/blob/e9d626f0e5b743e143a2e87248a1aa22ee4f3751/columnphysics/icepack_therm_vertical.F90#L378C1-L385C12
          ! Tsnice is :
                ! - the average of temperature of bottom snow layer and top ice layer,
-               ! - weighted by aicen across all thicknii categories
-         if ((hslyr(ij)+hilyr(ij)) > puny) then
-            if (hslyr(ij) > puny) then
-               Tsnice(ij) = Tsnice(ij) + aicen(i,j)*(&
-                  (hslyr(ij)*zTsn(ij,nslyr) + hilyr(ij)*zTin(ij,1)) &
-                  / (hslyr(ij)+hilyr(ij)) &
-                  )
-            else
-               Tsnice(ij) = Tsnice(ij) + aicen(i,j)*Tsf(ij)
-            endif
-         endif
-      enddo
+               ! - weighted by aicen across all thickness categories
+          if (hslyr(ij) > puny) then
+            ! interface temperature is average of top ice layer & bottom snow layer temperatures,
+            ! weighted by the thickness of each layer (https://github.com/CICE-Consortium/Icepack/pull/542#issuecomment-3464152061) 
+             Tsnice(ij) = Tsnice(ij) + aicen(i,j)*(&
+                (hilyr(ij)*zTsn(ij,nslyr) + hslyr(ij)*zTin(ij,1)) &
+                / (hslyr(ij)+hilyr(ij)) &
+                )
+          else
+             Tsnice(ij) = Tsnice(ij) + aicen(i,j)*Tsf(ij)
+          endif
+       enddo
 
       if (l_stop) return