diff --git a/.github/workflows/test-cice.yml b/.github/workflows/test-cice.yml
index 160485d04..a91432971 100644
--- a/.github/workflows/test-cice.yml
+++ b/.github/workflows/test-cice.yml
@@ -147,7 +147,8 @@ jobs:
         run: |
           cd $HOME/cice-dirs/input
           wget --progress=dot:giga https://zenodo.org/record/3728358/files/CICE_data_gx3_grid_ic-20200320.tar.gz && tar xvfz CICE_data_gx3_grid_ic-20200320.tar.gz
-          wget --progress=dot:giga https://zenodo.org/record/3728364/files/CICE_data_gx3_forcing_JRA55-20200320.tar.gz && tar xvfz CICE_data_gx3_forcing_JRA55-20200320.tar.gz
+#          wget --progress=dot:giga https://zenodo.org/record/3728364/files/CICE_data_gx3_forcing_JRA55-20200320.tar.gz && tar xvfz CICE_data_gx3_forcing_JRA55-20200320.tar.gz
+          wget --progress=dot:giga https://zenodo.org/records/10419929/files/CICE_data_gx3_forcing_JRA55_200501_20231220.tar.gz && tar xvfz CICE_data_gx3_forcing_JRA55_200501_20231220.tar.gz
           pwd
           ls -alR
 #      - name: run case
diff --git a/cicecore/cicedyn/infrastructure/ice_blocks.F90 b/cicecore/cicedyn/infrastructure/ice_blocks.F90
index fb7483914..ccaf23999 100644
--- a/cicecore/cicedyn/infrastructure/ice_blocks.F90
+++ b/cicecore/cicedyn/infrastructure/ice_blocks.F90
@@ -173,7 +173,7 @@ subroutine create_blocks(nx_global, ny_global, ew_boundary_type, &
    do jblock=1,nblocks_y
       js = (jblock-1)*block_size_y + 1
       if (js > ny_global) call abort_ice(subname// &
-            'ERROR: Bad block decomp: ny_block too large?')
+            ' ERROR: Bad block decomp: ny_block too large?')
       je = js + block_size_y - 1
       if (je > ny_global) je = ny_global ! pad array
 
@@ -182,7 +182,7 @@ subroutine create_blocks(nx_global, ny_global, ew_boundary_type, &
 
          is = (iblock-1)*block_size_x + 1
          if (is > nx_global) call abort_ice(subname// &
-            'ERROR: Bad block decomp: nx_block too large?')
+            ' ERROR: Bad block decomp: nx_block too large?')
          ie = is + block_size_x - 1
          if (ie > nx_global) ie = nx_global
 
@@ -223,7 +223,7 @@ subroutine create_blocks(nx_global, ny_global, ew_boundary_type, &
                case ('tripoleT')
                   j_global(j,n) = -j_global(j,n) + 1 ! open
                case default
-                  call abort_ice(subname//'ERROR: unknown n-s bndy type')
+                  call abort_ice(subname//' ERROR: unknown n-s bndy type')
                end select
             endif
 
@@ -247,7 +247,7 @@ subroutine create_blocks(nx_global, ny_global, ew_boundary_type, &
                case ('tripoleT')
                   j_global(j,n) = -j_global(j,n)
                case default
-                  call abort_ice(subname//'ERROR: unknown n-s bndy type')
+                  call abort_ice(subname//' ERROR: unknown n-s bndy type')
                end select
 
             !*** set last physical point if padded domain
@@ -275,7 +275,7 @@ subroutine create_blocks(nx_global, ny_global, ew_boundary_type, &
                case ('closed')
                   i_global(i,n) = 0
                case default
-                  call abort_ice(subname//'ERROR: unknown e-w bndy type')
+                  call abort_ice(subname//' ERROR: unknown e-w bndy type')
                end select
             endif
 
@@ -295,7 +295,7 @@ subroutine create_blocks(nx_global, ny_global, ew_boundary_type, &
                case ('closed')
                   i_global(i,n) = 0
                case default
-                  call abort_ice(subname//'ERROR: unknown e-w bndy type')
+                  call abort_ice(subname//' ERROR: unknown e-w bndy type')
                end select
 
             !*** last physical point in padded domain
@@ -427,7 +427,7 @@ function ice_blocksGetNbrID(blockID, direction, iBoundary, jBoundary) &
             inbr =  nblocks_x - iBlock + 1
             jnbr = -jBlock
          case default
-            call abort_ice(subname//'ERROR: unknown north boundary')
+            call abort_ice(subname//' ERROR: unknown north boundary')
          end select
       endif
 
@@ -448,7 +448,7 @@ function ice_blocksGetNbrID(blockID, direction, iBoundary, jBoundary) &
          case ('tripoleT')
             jnbr = 0 ! do not write into the neighbor's ghost cells
          case default
-            call abort_ice(subname//'ERROR: unknown south boundary')
+            call abort_ice(subname//' ERROR: unknown south boundary')
          end select
       endif
 
@@ -465,7 +465,7 @@ function ice_blocksGetNbrID(blockID, direction, iBoundary, jBoundary) &
          case ('cyclic')
             inbr = 1
          case default
-            call abort_ice(subname//'ERROR: unknown east boundary')
+            call abort_ice(subname//' ERROR: unknown east boundary')
          end select
       endif
 
@@ -482,7 +482,7 @@ function ice_blocksGetNbrID(blockID, direction, iBoundary, jBoundary) &
          case ('cyclic')
             inbr = nblocks_x
          case default
-            call abort_ice(subname//'ERROR: unknown west boundary')
+            call abort_ice(subname//' ERROR: unknown west boundary')
          end select
       endif
 
@@ -499,7 +499,7 @@ function ice_blocksGetNbrID(blockID, direction, iBoundary, jBoundary) &
          case ('cyclic')
             inbr = 1
          case default
-            call abort_ice(subname//'ERROR: unknown east boundary')
+            call abort_ice(subname//' ERROR: unknown east boundary')
          end select
       endif
       if (jnbr > nblocks_y) then
@@ -521,7 +521,7 @@ function ice_blocksGetNbrID(blockID, direction, iBoundary, jBoundary) &
             if (inbr == 0) inbr = nblocks_x
             jnbr = -jBlock
          case default
-            call abort_ice(subname//'ERROR: unknown north boundary')
+            call abort_ice(subname//' ERROR: unknown north boundary')
          end select
       endif
 
@@ -538,7 +538,7 @@ function ice_blocksGetNbrID(blockID, direction, iBoundary, jBoundary) &
          case ('cyclic')
             inbr = nblocks_x
          case default
-            call abort_ice(subname//'ERROR: unknown west boundary')
+            call abort_ice(subname//' ERROR: unknown west boundary')
          end select
       endif
       if (jnbr > nblocks_y) then
@@ -560,7 +560,7 @@ function ice_blocksGetNbrID(blockID, direction, iBoundary, jBoundary) &
             if (inbr > nblocks_x) inbr = 1
             jnbr = -jBlock
          case default
-            call abort_ice(subname//'ERROR: unknown north boundary')
+            call abort_ice(subname//' ERROR: unknown north boundary')
          end select
       endif
 
@@ -577,7 +577,7 @@ function ice_blocksGetNbrID(blockID, direction, iBoundary, jBoundary) &
          case ('cyclic')
             inbr = 1
          case default
-            call abort_ice(subname//'ERROR: unknown east boundary')
+            call abort_ice(subname//' ERROR: unknown east boundary')
          end select
       endif
       if (jnbr < 1) then
@@ -593,7 +593,7 @@ function ice_blocksGetNbrID(blockID, direction, iBoundary, jBoundary) &
          case ('tripoleT')
             jnbr = 0 ! do not write into the neighbor's ghost cells
          case default
-            call abort_ice(subname//'ERROR: unknown south boundary')
+            call abort_ice(subname//' ERROR: unknown south boundary')
          end select
       endif
 
@@ -609,7 +609,7 @@ function ice_blocksGetNbrID(blockID, direction, iBoundary, jBoundary) &
          case ('cyclic')
             inbr = nblocks_x
          case default
-            call abort_ice(subname//'ERROR: unknown west boundary')
+            call abort_ice(subname//' ERROR: unknown west boundary')
          end select
       endif
       if (jnbr < 1) then
@@ -625,7 +625,7 @@ function ice_blocksGetNbrID(blockID, direction, iBoundary, jBoundary) &
          case ('tripoleT')
             jnbr = 0 ! do not write into the neighbor's ghost cells
          case default
-            call abort_ice(subname//'ERROR: unknown south boundary')
+            call abort_ice(subname//' ERROR: unknown south boundary')
          end select
       endif
 
@@ -642,7 +642,7 @@ function ice_blocksGetNbrID(blockID, direction, iBoundary, jBoundary) &
          case ('cyclic')
             inbr = inbr - nblocks_x
          case default
-            call abort_ice(subname//'ERROR: unknown east boundary')
+            call abort_ice(subname//' ERROR: unknown east boundary')
          end select
       endif
 
@@ -658,7 +658,7 @@ function ice_blocksGetNbrID(blockID, direction, iBoundary, jBoundary) &
          case ('cyclic')
             inbr = nblocks_x + inbr
          case default
-            call abort_ice(subname//'ERROR: unknown west boundary')
+            call abort_ice(subname//' ERROR: unknown west boundary')
          end select
       endif
 
@@ -675,7 +675,7 @@ function ice_blocksGetNbrID(blockID, direction, iBoundary, jBoundary) &
          case ('cyclic')
             inbr = inbr - nblocks_x
          case default
-            call abort_ice(subname//'ERROR: unknown east boundary')
+            call abort_ice(subname//' ERROR: unknown east boundary')
          end select
       endif
       if (jnbr > nblocks_y) then
@@ -697,7 +697,7 @@ function ice_blocksGetNbrID(blockID, direction, iBoundary, jBoundary) &
             if (inbr <= 0) inbr = inbr + nblocks_x
             jnbr = -jBlock
          case default
-            call abort_ice(subname//'ERROR: unknown north boundary')
+            call abort_ice(subname//' ERROR: unknown north boundary')
          end select
       endif
 
@@ -714,7 +714,7 @@ function ice_blocksGetNbrID(blockID, direction, iBoundary, jBoundary) &
          case ('cyclic')
             inbr = nblocks_x + inbr
          case default
-            call abort_ice(subname//'ERROR: unknown west boundary')
+            call abort_ice(subname//' ERROR: unknown west boundary')
          end select
       endif
       if (jnbr > nblocks_y) then
@@ -736,13 +736,13 @@ function ice_blocksGetNbrID(blockID, direction, iBoundary, jBoundary) &
             if (inbr > nblocks_x) inbr = inbr - nblocks_x
             jnbr = -jBlock
          case default
-            call abort_ice(subname//'ERROR: unknown north boundary')
+            call abort_ice(subname//' ERROR: unknown north boundary')
          end select
       endif
 
    case default
 
-      call abort_ice(subname//'ERROR: unknown direction')
+      call abort_ice(subname//' ERROR: unknown direction')
       return
 
    end select
@@ -789,7 +789,7 @@ function get_block(block_id,local_id)
 !----------------------------------------------------------------------
 
    if (block_id < 1 .or. block_id > nblocks_tot) then
-      call abort_ice(subname//'ERROR: invalid block_id')
+      call abort_ice(subname//' ERROR: invalid block_id')
    endif
 
    get_block = all_blocks(block_id)
@@ -834,7 +834,7 @@ subroutine get_block_parameter(block_id, local_id,           &
 !----------------------------------------------------------------------
 
    if (block_id < 1 .or. block_id > nblocks_tot) then
-      call abort_ice(subname//'ERROR: invalid block_id')
+      call abort_ice(subname//' ERROR: invalid block_id')
    endif
 
    if (present(local_id)) local_id = all_blocks(block_id)%local_id
diff --git a/cicecore/cicedyn/infrastructure/ice_domain.F90 b/cicecore/cicedyn/infrastructure/ice_domain.F90
index 12b7d93aa..8b680f2d4 100644
--- a/cicecore/cicedyn/infrastructure/ice_domain.F90
+++ b/cicecore/cicedyn/infrastructure/ice_domain.F90
@@ -176,13 +176,13 @@ subroutine init_domain_blocks
       call get_fileunit(nu_nml)
       open (nu_nml, file=trim(nml_filename), status='old',iostat=nml_error)
       if (nml_error /= 0) then
-         call abort_ice(subname//'ERROR: domain_nml open file '// &
+         call abort_ice(subname//' ERROR: domain_nml open file '// &
               trim(nml_filename), file=__FILE__, line=__LINE__)
       endif
 
       call goto_nml(nu_nml,trim(nml_name),nml_error)
       if (nml_error /= 0) then
-         call abort_ice(subname//'ERROR: searching for '// trim(nml_name), &
+         call abort_ice(subname//' ERROR: searching for '// trim(nml_name), &
               file=__FILE__, line=__LINE__)
       endif
 
@@ -194,7 +194,7 @@ subroutine init_domain_blocks
             ! backspace and re-read erroneous line
             backspace(nu_nml)
             read(nu_nml,fmt='(A)') tmpstr2
-            call abort_ice(subname//'ERROR: ' // trim(nml_name) // ' reading ' // &
+            call abort_ice(subname//' ERROR: ' // trim(nml_name) // ' reading ' // &
                  trim(tmpstr2), file=__FILE__, line=__LINE__)
          endif
       end do
@@ -241,7 +241,7 @@ subroutine init_domain_blocks
       !***
       !*** domain size zero or negative
       !***
-      call abort_ice(subname//'ERROR: Invalid domain: size < 1', file=__FILE__, line=__LINE__) ! no domain
+      call abort_ice(subname//' ERROR: Invalid domain: size < 1', file=__FILE__, line=__LINE__) ! no domain
    else if (nprocs /= get_num_procs()) then
       !***
       !*** input nprocs does not match system (eg MPI) request
@@ -249,14 +249,14 @@ subroutine init_domain_blocks
 #if (defined CESMCOUPLED)
       nprocs = get_num_procs()
 #else
-      write(nu_diag,*) subname,'ERROR: nprocs, get_num_procs = ',nprocs,get_num_procs()
-      call abort_ice(subname//'ERROR: Input nprocs not same as system request', file=__FILE__, line=__LINE__)
+      write(nu_diag,*) subname,' ERROR: nprocs, get_num_procs = ',nprocs,get_num_procs()
+      call abort_ice(subname//' ERROR: Input nprocs not same as system request', file=__FILE__, line=__LINE__)
 #endif
    else if (nghost < 1) then
       !***
       !*** must have at least 1 layer of ghost cells
       !***
-      call abort_ice(subname//'ERROR: Not enough ghost cells allocated', file=__FILE__, line=__LINE__)
+      call abort_ice(subname//' ERROR: Not enough ghost cells allocated', file=__FILE__, line=__LINE__)
    endif
 
 !----------------------------------------------------------------------
@@ -384,7 +384,7 @@ subroutine init_domain_distribution(KMTG,ULATG,grid_ice)
       file=__FILE__, line=__LINE__)
 
    if (trim(ns_boundary_type) == 'closed') then
-      call abort_ice(subname//'ERROR: ns_boundary_type = closed not supported', file=__FILE__, line=__LINE__)
+      call abort_ice(subname//' ERROR: ns_boundary_type = closed not supported', file=__FILE__, line=__LINE__)
       allocate(nocn(nblocks_tot))
       nocn = 0
       do n=1,nblocks_tot
@@ -417,13 +417,14 @@ subroutine init_domain_distribution(KMTG,ULATG,grid_ice)
          endif
          if (nocn(n) > 0) then
             write(nu_diag,*) subname,'ns closed, Not enough land cells along ns edge'
-            call abort_ice(subname//'ERROR: Not enough land cells along ns edge for ns closed', file=__FILE__, line=__LINE__)
+            call abort_ice(subname//' ERROR: Not enough land cells along ns edge for ns closed', &
+                           file=__FILE__, line=__LINE__)
          endif
       enddo
       deallocate(nocn)
    endif
    if (trim(ew_boundary_type) == 'closed') then
-      call abort_ice(subname//'ERROR: ew_boundary_type = closed not supported', file=__FILE__, line=__LINE__)
+      call abort_ice(subname//' ERROR: ew_boundary_type = closed not supported', file=__FILE__, line=__LINE__)
       allocate(nocn(nblocks_tot))
       nocn = 0
       do n=1,nblocks_tot
@@ -456,7 +457,8 @@ subroutine init_domain_distribution(KMTG,ULATG,grid_ice)
          endif
          if (nocn(n) > 0) then
             write(nu_diag,*) subname,'ew closed, Not enough land cells along ew edge'
-            call abort_ice(subname//'ERROR: Not enough land cells along ew edge for ew closed', file=__FILE__, line=__LINE__)
+            call abort_ice(subname//' ERROR: Not enough land cells along ew edge for ew closed', &
+                           file=__FILE__, line=__LINE__)
          endif
       enddo
       deallocate(nocn)
@@ -486,23 +488,27 @@ subroutine init_domain_distribution(KMTG,ULATG,grid_ice)
 #ifdef USE_NETCDF
          status = nf90_open(distribution_wght_file, NF90_NOWRITE, fid)
          if (status /= nf90_noerr) then
-            call abort_ice(subname//'ERROR: Cannot open '//trim(distribution_wght_file), file=__FILE__, line=__LINE__)
+            call abort_ice(subname//' ERROR: Cannot open '//trim(distribution_wght_file), &
+                           file=__FILE__, line=__LINE__)
          endif
          status = nf90_inq_varid(fid, 'wght', varid)
          if (status /= nf90_noerr) then
-            call abort_ice(subname//'ERROR: Cannot find wght '//trim(distribution_wght_file), file=__FILE__, line=__LINE__)
+            call abort_ice(subname//' ERROR: Cannot find wght '//trim(distribution_wght_file), &
+                           file=__FILE__, line=__LINE__)
          endif
          status = nf90_get_var(fid, varid, wght)
          if (status /= nf90_noerr) then
-            call abort_ice(subname//'ERROR: Cannot get wght '//trim(distribution_wght_file), file=__FILE__, line=__LINE__)
+            call abort_ice(subname//' ERROR: Cannot get wght '//trim(distribution_wght_file), &
+                           file=__FILE__, line=__LINE__)
          endif
          status = nf90_close(fid)
          if (status /= nf90_noerr) then
-            call abort_ice(subname//'ERROR: Cannot close '//trim(distribution_wght_file), file=__FILE__, line=__LINE__)
+            call abort_ice(subname//' ERROR: Cannot close '//trim(distribution_wght_file), &
+                           file=__FILE__, line=__LINE__)
          endif
          write(nu_diag,*) 'read ',trim(distribution_wght_file),minval(wght),maxval(wght)
 #else
-         call abort_ice(subname//'ERROR: USE_NETCDF cpp not defined', &
+         call abort_ice(subname//' ERROR: USE_NETCDF cpp not defined', &
              file=__FILE__, line=__LINE__)
 #endif
       endif
@@ -721,7 +727,7 @@ subroutine init_domain_distribution(KMTG,ULATG,grid_ice)
    endif
 
    if (nblocks_max > max_blocks) then
-      write(outstring,*) 'ERROR: num blocks exceed max: increase max to', nblocks_max
+      write(outstring,*) ' ERROR: num blocks exceed max: increase max to', nblocks_max
       call abort_ice(subname//trim(outstring), file=__FILE__, line=__LINE__)
    else if (nblocks_max < max_blocks) then
       write(outstring,*) 'WARNING: ice no. blocks too large: decrease max to', nblocks_max
diff --git a/cicecore/cicedyn/infrastructure/ice_grid.F90 b/cicecore/cicedyn/infrastructure/ice_grid.F90
index 815821c10..da4388d78 100644
--- a/cicecore/cicedyn/infrastructure/ice_grid.F90
+++ b/cicecore/cicedyn/infrastructure/ice_grid.F90
@@ -224,7 +224,7 @@ subroutine alloc_grid
          ocn_gridcell_frac(nx_block,ny_block,max_blocks),& ! only relevant for lat-lon grids
          hm       (nx_block,ny_block,max_blocks), & ! land/boundary mask, thickness (T-cell)
          bm       (nx_block,ny_block,max_blocks), & ! task/block id
-         uvm      (nx_block,ny_block,max_blocks), & ! land/boundary mask, velocity (U-cell) - water in case of all water point
+         uvm      (nx_block,ny_block,max_blocks), & ! land/boundary mask, velocity (U-cell) - all water point
          npm      (nx_block,ny_block,max_blocks), & ! land/boundary mask (N-cell)
          epm      (nx_block,ny_block,max_blocks), & ! land/boundary mask (E-cell)
          kmt      (nx_block,ny_block,max_blocks), & ! ocean topography mask for bathymetry (T-cell)
@@ -245,7 +245,7 @@ subroutine alloc_grid
          lone_bounds(4,nx_block,ny_block,max_blocks), & ! longitude of gridbox corners for E point
          late_bounds(4,nx_block,ny_block,max_blocks), & ! latitude of gridbox corners for E point
          stat=ierr)
-      if (ierr/=0) call abort_ice(subname//'ERROR: Out of memory1', file=__FILE__, line=__LINE__)
+      if (ierr/=0) call abort_ice(subname//' ERROR: Out of memory1', file=__FILE__, line=__LINE__)
 
       if (save_ghte_ghtn) then
          if (my_task == master_task) then
@@ -259,7 +259,7 @@ subroutine alloc_grid
                G_HTN(1,1), & ! never used in code
                stat=ierr)
          endif
-         if (ierr/=0) call abort_ice(subname//'ERROR: Out of memory3', file=__FILE__, line=__LINE__)
+         if (ierr/=0) call abort_ice(subname//' ERROR: Out of memory3', file=__FILE__, line=__LINE__)
       endif
 
       end subroutine alloc_grid
@@ -277,7 +277,7 @@ subroutine dealloc_grid
 
       if (save_ghte_ghtn) then
          deallocate(G_HTE, G_HTN, stat=ierr)
-         if (ierr/=0) call abort_ice(subname//'ERROR: Dealloc error1', file=__FILE__, line=__LINE__)
+         if (ierr/=0) call abort_ice(subname//' ERROR: Dealloc error1', file=__FILE__, line=__LINE__)
       endif
 
       end subroutine dealloc_grid
@@ -324,12 +324,12 @@ subroutine init_grid1
 
       if (grid_type == 'tripole' .and. ns_boundary_type /= 'tripole' .and. &
           ns_boundary_type /= 'tripoleT') then
-         call abort_ice(subname//'ERROR: grid_type tripole needs tripole ns_boundary_type', &
+         call abort_ice(subname//' ERROR: grid_type tripole needs tripole ns_boundary_type', &
                         file=__FILE__, line=__LINE__)
       endif
 
       if (grid_type == 'tripole' .and. (mod(nx_global,2)/=0)) then
-         call abort_ice(subname//'ERROR: grid_type tripole requires even nx_global number', &
+         call abort_ice(subname//' ERROR: grid_type tripole requires even nx_global number', &
                         file=__FILE__, line=__LINE__)
       endif
 
@@ -676,7 +676,7 @@ subroutine init_grid2
       elseif (trim(bathymetry_format) == 'pop') then
          call get_bathymetry_popfile
       else
-         call abort_ice(subname//'ERROR: bathymetry_format value must be default or pop', &
+         call abort_ice(subname//' ERROR: bathymetry_format value must be default or pop', &
             file=__FILE__, line=__LINE__)
       endif
 
@@ -991,7 +991,7 @@ subroutine popgrid_nc
          call ice_close_nc(fid_kmt)
       endif
 #else
-      call abort_ice(subname//'ERROR: USE_NETCDF cpp not defined', &
+      call abort_ice(subname//' ERROR: USE_NETCDF cpp not defined', &
           file=__FILE__, line=__LINE__)
 #endif
 
@@ -1090,7 +1090,7 @@ subroutine latlongrid
                write(nu_diag,*) 'Because you have selected the column model flag'
                write(nu_diag,*) 'Please set nx_global=ny_global=1 in file'
                write(nu_diag,*) 'ice_domain_size.F and recompile'
-               call abort_ice (subname//'ERROR: check nx_global, ny_global', file=__FILE__, line=__LINE__)
+               call abort_ice (subname//' ERROR: check nx_global, ny_global', file=__FILE__, line=__LINE__)
             endif
          end if
 
@@ -1162,7 +1162,8 @@ subroutine latlongrid
             if (nx_global /= ni .and. ny_global /= nj) then
               write(nu_diag,*) 'latlongrid: ni,nj = ',ni,nj
               write(nu_diag,*) 'latlongrid: nx_g,ny_g = ',nx_global, ny_global
-              call abort_ice (subname//'ERROR: ni,nj not equal to nx_global,ny_global', file=__FILE__, line=__LINE__)
+              call abort_ice (subname//' ERROR: ni,nj not equal to nx_global,ny_global', &
+                              file=__FILE__, line=__LINE__)
             end if
          end if
 
@@ -1271,7 +1272,7 @@ subroutine latlongrid
 
       call makemask
 #else
-      call abort_ice(subname//'ERROR: USE_NETCDF cpp not defined', &
+      call abort_ice(subname//' ERROR: USE_NETCDF cpp not defined', &
           file=__FILE__, line=__LINE__)
 #endif
 
@@ -1454,7 +1455,7 @@ subroutine rectgrid
 
          else
 
-            call abort_ice(subname//'ERROR: unknown kmt_type '//trim(kmt_type), &
+            call abort_ice(subname//' ERROR: unknown kmt_type '//trim(kmt_type), &
                  file=__FILE__, line=__LINE__)
 
          endif ! kmt_type
@@ -1657,7 +1658,7 @@ subroutine grid_boxislands_kmt (work)
       nyb = int(real(ny_global, dbl_kind) / c20, int_kind)
 
       if (nxb < 1 .or. nyb < 1) &
-         call abort_ice(subname//'ERROR: requires larger grid size', &
+         call abort_ice(subname//' ERROR: requires larger grid size', &
               file=__FILE__, line=__LINE__)
 
       ! initialize work area as all ocean (c1).
@@ -2723,7 +2724,7 @@ subroutine grid_average_X2Y_NEversion(type,work1a,grid1a,work1b,grid1b,work2,gri
             call grid_average_X2Y_2('NE2TA',work1b,narea,npm,work1a,earea,epm,work2)
 
          case default
-            call abort_ice(subname//'ERROR: unknown X2Y '//trim(X2Y), file=__FILE__, line=__LINE__)
+            call abort_ice(subname//' ERROR: unknown X2Y '//trim(X2Y), file=__FILE__, line=__LINE__)
       end select
 
       end subroutine grid_average_X2Y_NEversion
@@ -2832,7 +2833,7 @@ subroutine grid_average_X2Y_1(X2Y,work1,work2)
             call grid_average_X2YA('SE',work1,narea,work2)
 
          case default
-            call abort_ice(subname//'ERROR: unknown X2Y '//trim(X2Y), file=__FILE__, line=__LINE__)
+            call abort_ice(subname//' ERROR: unknown X2Y '//trim(X2Y), file=__FILE__, line=__LINE__)
       end select
 
       end subroutine grid_average_X2Y_1
@@ -2944,7 +2945,7 @@ subroutine grid_average_X2Y_1f(X2Y,work1,wght1,mask1,work2)
             call grid_average_X2YA('SE',work1,wght1,work2)
 
          case default
-            call abort_ice(subname//'ERROR: unknown X2Y '//trim(X2Y), file=__FILE__, line=__LINE__)
+            call abort_ice(subname//' ERROR: unknown X2Y '//trim(X2Y), file=__FILE__, line=__LINE__)
       end select
 
       end subroutine grid_average_X2Y_1f
@@ -3173,7 +3174,7 @@ subroutine grid_average_X2YS(dir,work1,wght1,mask1,work2)
             !$OMP END PARALLEL DO
 
          case default
-            call abort_ice(subname//'ERROR: unknown option '//trim(dir), file=__FILE__, line=__LINE__)
+            call abort_ice(subname//' ERROR: unknown option '//trim(dir), file=__FILE__, line=__LINE__)
          end select
 
       end subroutine grid_average_X2YS
@@ -3401,7 +3402,7 @@ subroutine grid_average_X2YA(dir,work1,wght1,work2)
             !$OMP END PARALLEL DO
 
          case default
-            call abort_ice(subname//'ERROR: unknown option '//trim(dir), file=__FILE__, line=__LINE__)
+            call abort_ice(subname//' ERROR: unknown option '//trim(dir), file=__FILE__, line=__LINE__)
          end select
 
       end subroutine grid_average_X2YA
@@ -3603,7 +3604,7 @@ subroutine grid_average_X2YF(dir,work1,wght1,work2,wght2)
             !$OMP END PARALLEL DO
 
          case default
-            call abort_ice(subname//'ERROR: unknown option '//trim(dir), file=__FILE__, line=__LINE__)
+            call abort_ice(subname//' ERROR: unknown option '//trim(dir), file=__FILE__, line=__LINE__)
          end select
 
       end subroutine grid_average_X2YF
@@ -3748,7 +3749,7 @@ subroutine grid_average_X2Y_2(dir,work1a,wght1a,mask1a,work1b,wght1b,mask1b,work
             !$OMP END PARALLEL DO
 
          case default
-            call abort_ice(subname//'ERROR: unknown option '//trim(dir), file=__FILE__, line=__LINE__)
+            call abort_ice(subname//' ERROR: unknown option '//trim(dir), file=__FILE__, line=__LINE__)
          end select
 
       end subroutine grid_average_X2Y_2
diff --git a/cicecore/cicedyn/infrastructure/ice_memusage.F90 b/cicecore/cicedyn/infrastructure/ice_memusage.F90
index 8dca4e621..323a9074e 100644
--- a/cicecore/cicedyn/infrastructure/ice_memusage.F90
+++ b/cicecore/cicedyn/infrastructure/ice_memusage.F90
@@ -74,7 +74,8 @@ subroutine ice_memusage_init(iunit)
       write(iunit,'(A,l4)')    subname//' Initset conversion flag is ',initset
       write(iunit,'(A,f16.2)') subname//' 8 MB memory   alloc in MB is ',(mrss1-mrss0)*mb_blk
       write(iunit,'(A,f16.2)') subname//' 8 MB memory dealloc in MB is ',(mrss1-mrss2)*mb_blk
-      write(iunit,'(A,f16.2)') subname//' Memory block size conversion in bytes is ',mb_blk*1024_dbl_kind*1024.0_dbl_kind
+      write(iunit,'(A,f16.2)') subname//' Memory block size conversion in bytes is ', &
+                               mb_blk*1024_dbl_kind*1024.0_dbl_kind
    endif
 
 end subroutine ice_memusage_init
diff --git a/cicecore/cicedyn/infrastructure/ice_read_write.F90 b/cicecore/cicedyn/infrastructure/ice_read_write.F90
index 3d0e9dc25..f4c61e3cb 100644
--- a/cicecore/cicedyn/infrastructure/ice_read_write.F90
+++ b/cicecore/cicedyn/infrastructure/ice_read_write.F90
@@ -1197,7 +1197,7 @@ subroutine ice_read_nc_xy(fid,  nrec,  varname, work,  diag, &
             call ice_check_nc(status, subname//' ERROR: inquire dimension size 3 '//trim(varname), &
                               file=__FILE__, line=__LINE__)
             if (lnrec > dimlen) then
-               write(nu_diag,*) subname,' ERROR not enough records, ',trim(varname),lnrec,dimlen
+               write(nu_diag,*) subname,' ERROR: not enough records, ',trim(varname),lnrec,dimlen
                call abort_ice(subname//' ERROR: not enough records '//trim(varname), &
                               file=__FILE__, line=__LINE__)
             endif
@@ -1398,7 +1398,7 @@ subroutine ice_read_nc_xyz(fid,  nrec,  varname, work,  diag, &
             call ice_check_nc(status, subname//' ERROR: inquire dimension size 4 '//trim(varname), &
                               file=__FILE__, line=__LINE__)
             if (lnrec > dimlen) then
-               write(nu_diag,*) subname,' ERROR not enough records, ',trim(varname),lnrec,dimlen
+               write(nu_diag,*) subname,' ERROR: not enough records, ',trim(varname),lnrec,dimlen
                call abort_ice(subname//' ERROR: not enough records '//trim(varname), &
                               file=__FILE__, line=__LINE__)
             endif
@@ -1610,7 +1610,7 @@ subroutine ice_read_nc_xyf(fid,  nrec,  varname, work,  diag, &
             call ice_check_nc(status, subname//' ERROR: inquire dimension size 4 '//trim(varname), &
                               file=__FILE__, line=__LINE__)
             if (lnrec > dimlen) then
-               write(nu_diag,*) subname,' ERROR not enough records, ',trim(varname),lnrec,dimlen
+               write(nu_diag,*) subname,' ERROR: not enough records, ',trim(varname),lnrec,dimlen
                call abort_ice(subname//' ERROR: not enough records '//trim(varname), &
                               file=__FILE__, line=__LINE__)
             endif
@@ -1777,7 +1777,7 @@ subroutine ice_read_nc_point(fid,  nrec,  varname, work, diag, &
             call ice_check_nc(status, subname//' ERROR: inquire dimension size 1 '//trim(varname), &
                               file=__FILE__, line=__LINE__)
             if (lnrec > dimlen) then
-               write(nu_diag,*) subname,' ERROR not enough records, ',trim(varname),lnrec,dimlen
+               write(nu_diag,*) subname,' ERROR: not enough records, ',trim(varname),lnrec,dimlen
                call abort_ice(subname//' ERROR: not enough records '//trim(varname), &
                               file=__FILE__, line=__LINE__)
             endif
@@ -1895,7 +1895,7 @@ subroutine ice_read_nc_1D(fid,  varname, work, diag, &
          endif
       endif
 #else
-      call abort_ice(subname//'ERROR: USE_NETCDF cpp not defined', &
+      call abort_ice(subname//' ERROR: USE_NETCDF cpp not defined', &
                      file=__FILE__, line=__LINE__)
       work = c0 ! to satisfy intent(out) attribute
 #endif
@@ -1981,7 +1981,7 @@ subroutine ice_read_nc_2D(fid,  varname, work, diag, &
          endif
       endif
 #else
-      call abort_ice(subname//'ERROR: USE_NETCDF cpp not defined', &
+      call abort_ice(subname//' ERROR: USE_NETCDF cpp not defined', &
                      file=__FILE__, line=__LINE__)
       work = c0 ! to satisfy intent(out) attribute
 #endif
@@ -2069,7 +2069,7 @@ subroutine ice_read_nc_3D(fid,  varname, work, diag, &
          endif
       endif
 #else
-      call abort_ice(subname//'ERROR: USE_NETCDF cpp not defined', &
+      call abort_ice(subname//' ERROR: USE_NETCDF cpp not defined', &
                      file=__FILE__, line=__LINE__)
       work = c0 ! to satisfy intent(out) attribute
 #endif
@@ -2157,7 +2157,7 @@ subroutine ice_read_nc_z(fid,  nrec,  varname, work,  diag, &
             call ice_check_nc(status, subname//' ERROR: inquire dimension size 2 '//trim(varname), &
                               file=__FILE__, line=__LINE__)
             if (lnrec > dimlen) then
-               write(nu_diag,*) subname,' ERROR not enough records, ',trim(varname),lnrec,dimlen
+               write(nu_diag,*) subname,' ERROR: not enough records, ',trim(varname),lnrec,dimlen
                call abort_ice(subname//' ERROR: not enough records '//trim(varname), &
                               file=__FILE__, line=__LINE__)
             endif
@@ -2589,13 +2589,13 @@ subroutine ice_check_nc(status, abort_msg, file, line)
 #ifdef USE_NETCDF
       if (status /= nf90_noerr) then
          if (present(file) .and. present(line)) then
-            call abort_ice(subname//trim(nf90_strerror(status))//':'//trim(abort_msg), &
+            call abort_ice(subname//trim(nf90_strerror(status))//', '//trim(abort_msg), &
                            file=file, line=line)
          elseif (present(file)) then
-            call abort_ice(subname//trim(nf90_strerror(status))//':'//trim(abort_msg), &
+            call abort_ice(subname//trim(nf90_strerror(status))//', '//trim(abort_msg), &
                            file=file)
          else
-            call abort_ice(subname//trim(nf90_strerror(status))//':'//trim(abort_msg))
+            call abort_ice(subname//trim(nf90_strerror(status))//', '//trim(abort_msg))
          endif
       endif
 #else
diff --git a/cicecore/cicedyn/infrastructure/ice_restoring.F90 b/cicecore/cicedyn/infrastructure/ice_restoring.F90
index 221d066df..27328d9dd 100644
--- a/cicecore/cicedyn/infrastructure/ice_restoring.F90
+++ b/cicecore/cicedyn/infrastructure/ice_restoring.F90
@@ -88,7 +88,7 @@ subroutine ice_HaloRestore_init
 
    if ((ew_boundary_type == 'open' .or. &
         ns_boundary_type == 'open') .and. .not.(restart_ext)) then
-      if (my_task == master_task) write (nu_diag,*) 'ERROR: restart_ext=F and open boundaries'
+      if (my_task == master_task) write (nu_diag,*) ' ERROR: restart_ext=F and open boundaries'
       call abort_ice(error_message=subname//'open boundary and restart_ext=F', &
          file=__FILE__, line=__LINE__)
    endif
diff --git a/cicecore/cicedyn/infrastructure/io/io_binary/ice_restart.F90 b/cicecore/cicedyn/infrastructure/io/io_binary/ice_restart.F90
index cc158fccc..606f0d46b 100644
--- a/cicecore/cicedyn/infrastructure/io/io_binary/ice_restart.F90
+++ b/cicecore/cicedyn/infrastructure/io/io_binary/ice_restart.F90
@@ -128,7 +128,7 @@ subroutine init_restart_read(ice_ic)
       if (kdyn == 2) then
          if (my_task == master_task) then
             n = index(filename0,trim(restart_file))
-            if (n == 0) call abort_ice(subname//'ERROR: eap restart: filename discrepancy')
+            if (n == 0) call abort_ice(subname//' ERROR: eap restart: filename discrepancy')
             string1 = trim(filename0(1:n-1))
             string2 = trim(filename0(n+lenstr(restart_file):lenstr(filename0)))
             write(filename,'(a,a,a,a)') &
@@ -148,7 +148,7 @@ subroutine init_restart_read(ice_ic)
       if (tr_fsd) then
          if (my_task == master_task) then
             n = index(filename0,trim(restart_file))
-            if (n == 0) call abort_ice(subname//'ERROR: fsd restart: filename discrepancy')
+            if (n == 0) call abort_ice(subname//' ERROR: fsd restart: filename discrepancy')
             string1 = trim(filename0(1:n-1))
             string2 = trim(filename0(n+lenstr(restart_file):lenstr(filename0)))
             write(filename,'(a,a,a,a)') &
@@ -168,7 +168,7 @@ subroutine init_restart_read(ice_ic)
       if (tr_iage) then
          if (my_task == master_task) then
             n = index(filename0,trim(restart_file))
-            if (n == 0) call abort_ice(subname//'ERROR: iage restart: filename discrepancy')
+            if (n == 0) call abort_ice(subname//' ERROR: iage restart: filename discrepancy')
             string1 = trim(filename0(1:n-1))
             string2 = trim(filename0(n+lenstr(restart_file):lenstr(filename0)))
             write(filename,'(a,a,a,a)') &
@@ -188,7 +188,7 @@ subroutine init_restart_read(ice_ic)
       if (tr_FY) then
          if (my_task == master_task) then
             n = index(filename0,trim(restart_file))
-            if (n == 0) call abort_ice(subname//'ERROR: FY restart: filename discrepancy')
+            if (n == 0) call abort_ice(subname//' ERROR: FY restart: filename discrepancy')
             string1 = trim(filename0(1:n-1))
             string2 = trim(filename0(n+lenstr(restart_file):lenstr(filename0)))
             write(filename,'(a,a,a,a)') &
@@ -208,7 +208,7 @@ subroutine init_restart_read(ice_ic)
       if (tr_lvl) then
          if (my_task == master_task) then
             n = index(filename0,trim(restart_file))
-            if (n == 0) call abort_ice(subname//'ERROR: lvl restart: filename discrepancy')
+            if (n == 0) call abort_ice(subname//' ERROR: lvl restart: filename discrepancy')
             string1 = trim(filename0(1:n-1))
             string2 = trim(filename0(n+lenstr(restart_file):lenstr(filename0)))
             write(filename,'(a,a,a,a)') &
@@ -228,7 +228,7 @@ subroutine init_restart_read(ice_ic)
       if (tr_pond_lvl) then
          if (my_task == master_task) then
             n = index(filename0,trim(restart_file))
-            if (n == 0) call abort_ice(subname//'ERROR:pond_lvl restart: filename discrepancy')
+            if (n == 0) call abort_ice(subname//' ERROR:pond_lvl restart: filename discrepancy')
             string1 = trim(filename0(1:n-1))
             string2 = trim(filename0(n+lenstr(restart_file):lenstr(filename0)))
             write(filename,'(a,a,a,a)') &
@@ -248,7 +248,7 @@ subroutine init_restart_read(ice_ic)
       if (tr_pond_topo) then
          if (my_task == master_task) then
             n = index(filename0,trim(restart_file))
-            if (n == 0) call abort_ice(subname//'ERROR: pond_topo restart: filename discrepancy')
+            if (n == 0) call abort_ice(subname//' ERROR: pond_topo restart: filename discrepancy')
             string1 = trim(filename0(1:n-1))
             string2 = trim(filename0(n+lenstr(restart_file):lenstr(filename0)))
             write(filename,'(a,a,a,a)') &
@@ -268,7 +268,7 @@ subroutine init_restart_read(ice_ic)
       if (tr_snow) then
          if (my_task == master_task) then
             n = index(filename0,trim(restart_file))
-            if (n == 0) call abort_ice(subname//'ERROR: snow restart: filename discrepancy')
+            if (n == 0) call abort_ice(subname//' ERROR: snow restart: filename discrepancy')
             string1 = trim(filename0(1:n-1))
             string2 = trim(filename0(n+lenstr(restart_file):lenstr(filename0)))
             write(filename,'(a,a,a,a)') &
@@ -288,7 +288,7 @@ subroutine init_restart_read(ice_ic)
       if (tr_brine) then
          if (my_task == master_task) then
             n = index(filename0,trim(restart_file))
-            if (n == 0) call abort_ice(subname//'ERROR: brine restart: filename discrepancy')
+            if (n == 0) call abort_ice(subname//' ERROR: brine restart: filename discrepancy')
             string1 = trim(filename0(1:n-1))
             string2 = trim(filename0(n+lenstr(restart_file):lenstr(filename0)))
             write(filename,'(a,a,a,a)') &
@@ -308,7 +308,7 @@ subroutine init_restart_read(ice_ic)
       if (nbtrcr > 0) then
          if (my_task == master_task) then
             n = index(filename0,trim(restart_file))
-            if (n == 0) call abort_ice(subname//'ERROR: bgc restart: filename discrepancy')
+            if (n == 0) call abort_ice(subname//' ERROR: bgc restart: filename discrepancy')
             string1 = trim(filename0(1:n-1))
             string2 = trim(filename0(n+lenstr(restart_file):lenstr(filename0)))
             write(filename,'(a,a,a,a)') &
@@ -328,7 +328,7 @@ subroutine init_restart_read(ice_ic)
       if (tr_iso) then
          if (my_task == master_task) then
             n = index(filename0,trim(restart_file))
-            if (n == 0) call abort_ice(subname//'ERROR: iso restart: filename discrepancy')
+            if (n == 0) call abort_ice(subname//' ERROR: iso restart: filename discrepancy')
             string1 = trim(filename0(1:n-1))
             string2 = trim(filename0(n+lenstr(restart_file):lenstr(filename0)))
             write(filename,'(a,a,a,a)') &
@@ -348,7 +348,7 @@ subroutine init_restart_read(ice_ic)
       if (tr_aero) then
          if (my_task == master_task) then
             n = index(filename0,trim(restart_file))
-            if (n == 0) call abort_ice(subname//'ERROR: aero restart: filename discrepancy')
+            if (n == 0) call abort_ice(subname//' ERROR: aero restart: filename discrepancy')
             string1 = trim(filename0(1:n-1))
             string2 = trim(filename0(n+lenstr(restart_file):lenstr(filename0)))
             write(filename,'(a,a,a,a)') &
diff --git a/cicecore/cicedyn/infrastructure/io/io_netcdf/ice_history_write.F90 b/cicecore/cicedyn/infrastructure/io/io_netcdf/ice_history_write.F90
index cba629a64..78eec1d75 100644
--- a/cicecore/cicedyn/infrastructure/io/io_netcdf/ice_history_write.F90
+++ b/cicecore/cicedyn/infrastructure/io/io_netcdf/ice_history_write.F90
@@ -177,19 +177,19 @@ subroutine ice_write_hist (ns)
                            file=__FILE__, line=__LINE__)
 
          status = nf90_def_dim(ncid,'nkice',nzilyr,kmtidi)
-         call ice_check_nc(status, subname// ' ERROR: defining dim nki', &
+         call ice_check_nc(status, subname// ' ERROR: defining dim nkice', &
                            file=__FILE__, line=__LINE__)
 
          status = nf90_def_dim(ncid,'nksnow',nzslyr,kmtids)
-         call ice_check_nc(status, subname// ' ERROR: defining dim nks', &
+         call ice_check_nc(status, subname// ' ERROR: defining dim nksnow', &
                            file=__FILE__, line=__LINE__)
 
          status = nf90_def_dim(ncid,'nkbio',nzblyr,kmtidb)
-         call ice_check_nc(status, subname// ' ERROR: defining dim nkb', &
+         call ice_check_nc(status, subname// ' ERROR: defining dim nkbio', &
                            file=__FILE__, line=__LINE__)
 
          status = nf90_def_dim(ncid,'nkaer',nzalyr,kmtida)
-         call ice_check_nc(status, subname// ' ERROR: defining dim nka', &
+         call ice_check_nc(status, subname// ' ERROR: defining dim nkaer', &
                            file=__FILE__, line=__LINE__)
 
          status = nf90_def_dim(ncid,'time',NF90_UNLIMITED,timid)
@@ -197,7 +197,7 @@ subroutine ice_write_hist (ns)
                            file=__FILE__, line=__LINE__)
 
          status = nf90_def_dim(ncid,'nvertices',nverts,nvertexid)
-         call ice_check_nc(status, subname// ' ERROR: defining dim nverts', &
+         call ice_check_nc(status, subname// ' ERROR: defining dim nvertices', &
                            file=__FILE__, line=__LINE__)
 
          status = nf90_def_dim(ncid,'nf',nfsd_hist,fmtid)
@@ -723,8 +723,7 @@ subroutine ice_write_hist (ns)
          endif
 
          title = 'CF-1.0'
-         status =  &
-              nf90_put_att(ncid,nf90_global,'conventions',title)
+         status =  nf90_put_att(ncid,nf90_global,'conventions',title)
          call ice_check_nc(status, subname// ' ERROR: in global attribute conventions', &
                            file=__FILE__, line=__LINE__)
 
@@ -748,7 +747,7 @@ subroutine ice_write_hist (ns)
          !-----------------------------------------------------------------
 
          status = nf90_enddef(ncid)
-         call ice_check_nc(status, subname// ' ERROR in nf90_enddef', &
+         call ice_check_nc(status, subname// ' ERROR: in nf90_enddef', &
                            file=__FILE__, line=__LINE__)
 
          !-----------------------------------------------------------------
diff --git a/cicecore/cicedyn/infrastructure/io/io_netcdf/ice_restart.F90 b/cicecore/cicedyn/infrastructure/io/io_netcdf/ice_restart.F90
index 994ef9665..c670bf016 100644
--- a/cicecore/cicedyn/infrastructure/io/io_netcdf/ice_restart.F90
+++ b/cicecore/cicedyn/infrastructure/io/io_netcdf/ice_restart.F90
@@ -55,7 +55,7 @@ subroutine init_restart_read(ice_ic)
       character(len=char_len_long) :: &
          filename, filename0
 
-      integer (kind=int_kind) :: status, status1
+      integer (kind=int_kind) :: status
 
       character(len=*), parameter :: subname = '(init_restart_read)'
 
@@ -80,24 +80,31 @@ subroutine init_restart_read(ice_ic)
          call ice_check_nc(status, subname//' ERROR: open '//trim(filename), file=__FILE__, line=__LINE__)
 
          if (use_restart_time) then
-            status1 = nf90_noerr
+            ! for backwards compatibility, check nyr, month, and sec as well
             status = nf90_get_att(ncid, nf90_global, 'istep1', istep0)
-            if (status /= nf90_noerr) status1 = status
-!            status = nf90_get_att(ncid, nf90_global, 'time', time)
-!            status = nf90_get_att(ncid, nf90_global, 'time_forc', time_forc)
+            call ice_check_nc(status, subname//" ERROR: reading restart step ",file=__FILE__,line=__LINE__)
+
             status = nf90_get_att(ncid, nf90_global, 'myear', myear)
-            if (status /= nf90_noerr) status = nf90_get_att(ncid, nf90_global, 'nyr', myear)
-            if (status /= nf90_noerr) status1 = status
+            if (status /= nf90_noerr) then
+               status = nf90_get_att(ncid, nf90_global, 'nyr', myear)
+               call ice_check_nc(status, subname//" ERROR: reading restart year ",file=__FILE__,line=__LINE__)
+            endif
+
             status = nf90_get_att(ncid, nf90_global, 'mmonth', mmonth)
-            if (status /= nf90_noerr) status = nf90_get_att(ncid, nf90_global, 'month', mmonth)
-            if (status /= nf90_noerr) status1 = status
+            if (status /= nf90_noerr) then
+               status = nf90_get_att(ncid, nf90_global, 'month', mmonth)
+               call ice_check_nc(status, subname//" ERROR: reading restart month ",file=__FILE__,line=__LINE__)
+            endif
+
             status = nf90_get_att(ncid, nf90_global, 'mday', mday)
-            if (status /= nf90_noerr) status1 = status
+            call ice_check_nc(status, subname//" ERROR: reading restart day ",file=__FILE__,line=__LINE__)
+
             status = nf90_get_att(ncid, nf90_global, 'msec', msec)
-            if (status /= nf90_noerr) status = nf90_get_att(ncid, nf90_global, 'sec', msec)
-            if (status /= nf90_noerr) status1 = status
-            if (status1 /= nf90_noerr) call abort_ice(subname// &
-               'ERROR: reading restart time '//trim(filename), file=__FILE__, line=__LINE__)
+            if (status /= nf90_noerr) then
+               status = nf90_get_att(ncid, nf90_global, 'sec', msec)
+               call ice_check_nc(status, subname//" ERROR: reading restart sec ",file=__FILE__,line=__LINE__)
+            endif
+
          endif ! use namelist values if use_restart_time = F
 
       endif
@@ -115,7 +122,7 @@ subroutine init_restart_read(ice_ic)
          npt = npt - istep0
       endif
 #else
-      call abort_ice(subname//'ERROR: USE_NETCDF cpp not defined for '//trim(ice_ic), &
+      call abort_ice(subname//' ERROR: USE_NETCDF cpp not defined for '//trim(ice_ic), &
           file=__FILE__, line=__LINE__)
 #endif
 
@@ -663,7 +670,7 @@ subroutine init_restart_write(filename_spec)
       endif ! master_task
 
 #else
-      call abort_ice(subname//'ERROR: USE_NETCDF cpp not defined for '//trim(filename_spec), &
+      call abort_ice(subname//' ERROR: USE_NETCDF cpp not defined for '//trim(filename_spec), &
           file=__FILE__, line=__LINE__)
 #endif
 
@@ -749,7 +756,7 @@ subroutine read_restart_field(nu,nrec,work,atype,vname,ndim3, &
       endif
 
 #else
-      call abort_ice(subname//'ERROR: USE_NETCDF cpp not defined', &
+      call abort_ice(subname//' ERROR: USE_NETCDF cpp not defined', &
           file=__FILE__, line=__LINE__)
 #endif
 
@@ -819,7 +826,7 @@ subroutine write_restart_field(nu,nrec,work,atype,vname,ndim3,diag)
       endif
 
 #else
-      call abort_ice(subname//'ERROR: USE_NETCDF cpp not defined', &
+      call abort_ice(subname//' ERROR: USE_NETCDF cpp not defined', &
           file=__FILE__, line=__LINE__)
 #endif
 
@@ -843,10 +850,11 @@ subroutine final_restart()
          ! ncid is only valid on master
          status = nf90_close(ncid)
          call ice_check_nc(status, subname//' ERROR: closing', file=__FILE__, line=__LINE__)
-         write(nu_diag,'(a,i8,4x,i4.4,a,i2.2,a,i2.2,a,i5.5)') 'Restart read/written ',istep1,myear,'-',mmonth,'-',mday,'-',msec
+         write(nu_diag,'(a,i8,4x,i4.4,a,i2.2,a,i2.2,a,i5.5)') &
+            'Restart read/written ',istep1,myear,'-',mmonth,'-',mday,'-',msec
       endif
 #else
-      call abort_ice(subname//'ERROR: USE_NETCDF cpp not defined', &
+      call abort_ice(subname//' ERROR: USE_NETCDF cpp not defined', &
           file=__FILE__, line=__LINE__)
 #endif
 
@@ -874,7 +882,7 @@ subroutine define_rest_field(ncid, vname, dims)
       status = nf90_def_var(ncid,trim(vname),nf90_double,dims,varid)
       call ice_check_nc(status, subname//' ERROR: def var '//trim(vname), file=__FILE__, line=__LINE__)
 #else
-      call abort_ice(subname//'ERROR: USE_NETCDF cpp not defined', &
+      call abort_ice(subname//' ERROR: USE_NETCDF cpp not defined', &
           file=__FILE__, line=__LINE__)
 #endif
 
@@ -903,7 +911,7 @@ logical function query_field(nu,vname)
       endif
       call broadcast_scalar(query_field,master_task)
 #else
-      call abort_ice(subname//'ERROR: USE_NETCDF cpp not defined for '//trim(ice_ic), &
+      call abort_ice(subname//' ERROR: USE_NETCDF cpp not defined for '//trim(ice_ic), &
           file=__FILE__, line=__LINE__)
 #endif
 
diff --git a/cicecore/cicedyn/infrastructure/io/io_pio2/ice_history_write.F90 b/cicecore/cicedyn/infrastructure/io/io_pio2/ice_history_write.F90
index 5c06f2a88..0260815b5 100644
--- a/cicecore/cicedyn/infrastructure/io/io_pio2/ice_history_write.F90
+++ b/cicecore/cicedyn/infrastructure/io/io_pio2/ice_history_write.F90
@@ -826,7 +826,8 @@ subroutine ice_write_hist (ns)
                  workr2, status, fillval=spval)
          endif
 
-         call ice_pio_check(status,subname//' ERROR writing '//avail_hist_fields(n)%vname,file=__FILE__,line=__LINE__)
+         call ice_pio_check(status,subname//' ERROR: writing '//avail_hist_fields(n)%vname, &
+                            file=__FILE__,line=__LINE__)
       enddo
 
       ! Extra dimensions (NCAT, NFSD, VGRD*)
@@ -919,7 +920,8 @@ subroutine ice_write_hist (ns)
                     workr2, status, fillval=spval)
             endif
 
-            call ice_pio_check(status,subname//' ERROR writing '//avail_hist_fields(n)%vname,file=__FILE__,line=__LINE__)
+            call ice_pio_check(status,subname//' ERROR: writing '//avail_hist_fields(n)%vname, &
+                               file=__FILE__,line=__LINE__)
          endif
       enddo
 
@@ -978,7 +980,8 @@ subroutine ice_write_hist (ns)
                                      workr3v, status, fillval=spval)
             endif
 
-            call ice_pio_check(status,subname//' ERROR writing '//avail_hist_fields(n)%vname,file=__FILE__,line=__LINE__)
+            call ice_pio_check(status,subname//' ERROR: writing '//avail_hist_fields(n)%vname, &
+                               file=__FILE__,line=__LINE__)
          enddo
          deallocate(workd3v)
          deallocate(workr3v)
@@ -992,7 +995,7 @@ subroutine ice_write_hist (ns)
       do n=1,num_avail_hist_fields_2D
          if (avail_hist_fields(n)%vhistfreq == histfreq(ns) .or. write_ic) then
             call ice_pio_check(pio_inq_varid(File,avail_hist_fields(n)%vname,varid), &
-                 subname//' ERROR getting varid for '//avail_hist_fields(n)%vname,file=__FILE__,line=__LINE__)
+                 subname//' ERROR: getting varid for '//avail_hist_fields(n)%vname,file=__FILE__,line=__LINE__)
             workd2(:,:,:) = a2D(:,:,n,1:nblocks)
             call pio_seterrorhandling(File, PIO_INTERNAL_ERROR)
 #ifdef CESM1_PIO
@@ -1010,7 +1013,8 @@ subroutine ice_write_hist (ns)
                                      workr2, status, fillval=spval)
             endif
 
-            call ice_pio_check(status,subname//' ERROR writing '//avail_hist_fields(n)%vname,file=__FILE__,line=__LINE__)
+            call ice_pio_check(status,subname//' ERROR: writing '//avail_hist_fields(n)%vname, &
+                               file=__FILE__,line=__LINE__)
          endif
       enddo ! num_avail_hist_fields_2D
 
@@ -1046,7 +1050,8 @@ subroutine ice_write_hist (ns)
                                      workr3, status, fillval=spval)
             endif
 
-            call ice_pio_check(status,subname//' ERROR writing '//avail_hist_fields(n)%vname,file=__FILE__,line=__LINE__)
+            call ice_pio_check(status,subname//' ERROR: writing '//avail_hist_fields(n)%vname, &
+                               file=__FILE__,line=__LINE__)
          endif
       enddo ! num_avail_hist_fields_3Dc
       deallocate(workd3)
@@ -1081,7 +1086,8 @@ subroutine ice_write_hist (ns)
                                      workr3, status, fillval=spval)
             endif
 
-            call ice_pio_check(status,subname//' ERROR writing '//avail_hist_fields(n)%vname,file=__FILE__,line=__LINE__)
+            call ice_pio_check(status,subname//' ERROR: writing '//avail_hist_fields(n)%vname, &
+                               file=__FILE__,line=__LINE__)
          endif
       enddo ! num_avail_hist_fields_3Dz
       deallocate(workd3)
@@ -1116,7 +1122,8 @@ subroutine ice_write_hist (ns)
                                      workr3, status, fillval=spval)
             endif
 
-            call ice_pio_check(status,subname//' ERROR writing '//avail_hist_fields(n)%vname,file=__FILE__,line=__LINE__)
+            call ice_pio_check(status,subname//' ERROR: writing '//avail_hist_fields(n)%vname, &
+                               file=__FILE__,line=__LINE__)
          endif
       enddo ! num_avail_hist_fields_3Db
       deallocate(workd3)
@@ -1151,7 +1158,8 @@ subroutine ice_write_hist (ns)
                                      workr3, status, fillval=spval)
             endif
 
-            call ice_pio_check(status,subname//' ERROR writing '//avail_hist_fields(n)%vname,file=__FILE__,line=__LINE__)
+            call ice_pio_check(status,subname//' ERROR: writing '//avail_hist_fields(n)%vname, &
+                               file=__FILE__,line=__LINE__)
          endif
       enddo ! num_avail_hist_fields_3Db
       deallocate(workd3)
@@ -1186,7 +1194,8 @@ subroutine ice_write_hist (ns)
                                      workr3, status, fillval=spval)
             endif
 
-            call ice_pio_check(status,subname//' ERROR writing '//avail_hist_fields(n)%vname,file=__FILE__,line=__LINE__)
+            call ice_pio_check(status,subname//' ERROR: writing '//avail_hist_fields(n)%vname, &
+                               file=__FILE__,line=__LINE__)
          endif
       enddo ! num_avail_hist_fields_3Df
       deallocate(workd3)
@@ -1222,7 +1231,8 @@ subroutine ice_write_hist (ns)
                call pio_write_darray(File, varid, iodesc4di,&
                                      workr4, status, fillval=spval)
             endif
-            call ice_pio_check(status,subname//' ERROR writing '//avail_hist_fields(n)%vname,file=__FILE__,line=__LINE__)
+            call ice_pio_check(status,subname//' ERROR: writing '//avail_hist_fields(n)%vname, &
+                               file=__FILE__,line=__LINE__)
          endif
       enddo ! num_avail_hist_fields_4Di
       deallocate(workd4)
@@ -1259,7 +1269,8 @@ subroutine ice_write_hist (ns)
                                      workr4, status, fillval=spval)
             endif
 
-            call ice_pio_check(status,subname//' ERROR writing '//avail_hist_fields(n)%vname,file=__FILE__,line=__LINE__)
+            call ice_pio_check(status,subname//' ERROR: writing '//avail_hist_fields(n)%vname, &
+                               file=__FILE__,line=__LINE__)
          endif
       enddo ! num_avail_hist_fields_4Ds
       deallocate(workd4)
@@ -1295,7 +1306,8 @@ subroutine ice_write_hist (ns)
                call pio_write_darray(File, varid, iodesc4df,&
                                      workr4, status, fillval=spval)
             endif
-            call ice_pio_check(status,subname//' ERROR writing '//avail_hist_fields(n)%vname,file=__FILE__,line=__LINE__)
+            call ice_pio_check(status,subname//' ERROR: writing '//avail_hist_fields(n)%vname, &
+                               file=__FILE__,line=__LINE__)
          endif
       enddo ! num_avail_hist_fields_4Df
       deallocate(workd4)
diff --git a/cicecore/cicedyn/infrastructure/io/io_pio2/ice_pio.F90 b/cicecore/cicedyn/infrastructure/io/io_pio2/ice_pio.F90
index 47ebf36d1..a62e77139 100644
--- a/cicecore/cicedyn/infrastructure/io/io_pio2/ice_pio.F90
+++ b/cicecore/cicedyn/infrastructure/io/io_pio2/ice_pio.F90
@@ -113,7 +113,7 @@ subroutine ice_pio_init(mode, filename, File, clobber, cdf64, iotype)
    call pio_init(my_task, MPI_COMM_ICE, numiotasks, master_task, istride, &
                  rearranger, ice_pio_subsystem, base=basetask)
 
-   call pio_seterrorhandling(ice_pio_subsystem, PIO_BCAST_ERROR)
+   call pio_seterrorhandling(ice_pio_subsystem, PIO_RETURN_ERROR)
 
    !--- initialize rearranger options
    !pio_rearr_opt_comm_type = integer (PIO_REARR_COMM_[P2P,COLL])
@@ -185,16 +185,16 @@ subroutine ice_pio_init(mode, filename, File, clobber, cdf64, iotype)
          inquire(file=trim(filename),exist=exists)
          if (exists) then
             if (my_task == master_task) then
-               write(nu_diag,*) subname,' opening file for reading'
+               write(nu_diag,*) subname//' opening file for reading '//trim(filename)
             endif
             status = pio_openfile(ice_pio_subsystem, File, pio_iotype, trim(filename), pio_nowrite)
             call ice_pio_check( status, subname//' ERROR: Failed to open file '//trim(filename), &
              file=__FILE__,line=__LINE__)
          else
             if(my_task==master_task) then
-               write(nu_diag,*) 'ice_pio_ropen ERROR: file invalid ',trim(filename)
+               write(nu_diag,*) subname//' ERROR: file not found '//trim(filename)
             end if
-            call abort_ice(subname//'ERROR: aborting with invalid file')
+            call abort_ice(subname//' ERROR: aborting with invalid file '//trim(filename))
          endif
       end if
 
@@ -499,11 +499,11 @@ subroutine ice_pio_check(status, abort_msg, file, line)
          strerror_status = pio_strerror(status, err_msg)
 #endif
          if (present(file) .and. present(line)) then
-            call abort_ice(subname//trim(err_msg)//':'//trim(abort_msg), file=file, line=line)
+            call abort_ice(subname//trim(err_msg)//', '//trim(abort_msg), file=file, line=line)
          elseif (present(file)) then
-            call abort_ice(subname//trim(err_msg)//':'//trim(abort_msg), file=file)
+            call abort_ice(subname//trim(err_msg)//', '//trim(abort_msg), file=file)
          else
-            call abort_ice(subname//trim(err_msg)//':'//trim(abort_msg))
+            call abort_ice(subname//trim(err_msg)//', '//trim(abort_msg))
          endif
       endif
    end subroutine ice_pio_check
diff --git a/cicecore/cicedyn/infrastructure/io/io_pio2/ice_restart.F90 b/cicecore/cicedyn/infrastructure/io/io_pio2/ice_restart.F90
index d4ee7eda5..e55acc434 100644
--- a/cicecore/cicedyn/infrastructure/io/io_pio2/ice_restart.F90
+++ b/cicecore/cicedyn/infrastructure/io/io_pio2/ice_restart.F90
@@ -116,7 +116,8 @@ subroutine init_restart_read(ice_ic)
       call pio_seterrorhandling(File, PIO_INTERNAL_ERROR)
 
       if (my_task == master_task) then
-         write(nu_diag,'(a,i8,4x,i4.4,a,i2.2,a,i2.2,a,i5.5)') 'Restart read at istep=',istep0,myear,'-',mmonth,'-',mday,'-',msec
+         write(nu_diag,'(a,i8,4x,i4.4,a,i2.2,a,i2.2,a,i5.5)') &
+            'Restart read at istep=',istep0,myear,'-',mmonth,'-',mday,'-',msec
       endif
 
       call broadcast_scalar(istep0,master_task)
@@ -230,22 +231,22 @@ subroutine init_restart_write(filename_spec)
       call pio_seterrorhandling(File, PIO_RETURN_ERROR)
 
       call ice_pio_check(pio_put_att(File,pio_global,'istep1',istep1), &
-           subname//' ERROR writing restart step',file=__FILE__,line=__LINE__)
+           subname//' ERROR: writing restart step',file=__FILE__,line=__LINE__)
       call ice_pio_check(pio_put_att(File,pio_global,'myear',myear), &
-           subname//' ERROR writing restart year',file=__FILE__,line=__LINE__)
+           subname//' ERROR: writing restart year',file=__FILE__,line=__LINE__)
       call ice_pio_check(pio_put_att(File,pio_global,'mmonth',mmonth), &
-           subname//' ERROR writing restart month',file=__FILE__,line=__LINE__)
+           subname//' ERROR: writing restart month',file=__FILE__,line=__LINE__)
       call ice_pio_check(pio_put_att(File,pio_global,'mday',mday), &
-           subname//' ERROR writing restart day',file=__FILE__,line=__LINE__)
+           subname//' ERROR: writing restart day',file=__FILE__,line=__LINE__)
       call ice_pio_check(pio_put_att(File,pio_global,'msec',msec), &
-           subname//' ERROR writing restart sec',file=__FILE__,line=__LINE__)
+           subname//' ERROR: writing restart sec',file=__FILE__,line=__LINE__)
 
       call ice_pio_check(pio_def_dim(File,'ni',nx_global,dimid_ni), &
-           subname//' ERROR defining restart dim ni',file=__FILE__,line=__LINE__)
+           subname//' ERROR: defining restart dim ni',file=__FILE__,line=__LINE__)
       call ice_pio_check(pio_def_dim(File,'nj',ny_global,dimid_nj), &
-           subname//' ERROR defining restart dim nj',file=__FILE__,line=__LINE__)
+           subname//' ERROR: defining restart dim nj',file=__FILE__,line=__LINE__)
       call ice_pio_check(pio_def_dim(File,'ncat',ncat,dimid_ncat), &
-           subname//' ERROR defining restart dim ncat',file=__FILE__,line=__LINE__)
+           subname//' ERROR: defining restart dim ncat',file=__FILE__,line=__LINE__)
 
       !-----------------------------------------------------------------
       ! 2D restart fields
@@ -662,7 +663,7 @@ subroutine init_restart_write(filename_spec)
       endif   !z_tracers
 
       deallocate(dims)
-      call ice_pio_check(pio_enddef(File), subname//' ERROR enddef',file=__FILE__,line=__LINE__)
+      call ice_pio_check(pio_enddef(File), subname//' ERROR: enddef',file=__FILE__,line=__LINE__)
 
       call pio_seterrorhandling(File, PIO_INTERNAL_ERROR)
 
@@ -730,10 +731,10 @@ subroutine read_restart_field(nu,nrec,work,atype,vname,ndim3,diag, &
       endif
 
       call ice_pio_check(pio_inq_varid(File,trim(vname),vardesc), &
-           subname// "ERROR: missing varid "//trim(vname),file=__FILE__,line=__LINE__)
+           subname// " ERROR: missing varid "//trim(vname),file=__FILE__,line=__LINE__)
 
       call ice_pio_check(pio_inq_varndims(File, vardesc, ndims), &
-           subname// "ERROR missing varndims "//trim(vname),file=__FILE__,line=__LINE__)
+           subname// " ERROR: missing varndims "//trim(vname),file=__FILE__,line=__LINE__)
 
       if (ndim3 == ncat .and. ndims == 3) then
          call pio_read_darray(File, vardesc, iodesc3d_ncat, work, status)
@@ -760,7 +761,7 @@ subroutine read_restart_field(nu,nrec,work,atype,vname,ndim3,diag, &
       endif
 
       call ice_pio_check(status, &
-           subname//" ERROR reading var "//trim(vname),file=__FILE__,line=__LINE__)
+           subname//" ERROR: reading var "//trim(vname),file=__FILE__,line=__LINE__)
 
       call pio_seterrorhandling(File, PIO_INTERNAL_ERROR)
 
@@ -835,10 +836,10 @@ subroutine write_restart_field(nu,nrec,work,atype,vname,ndim3,diag)
       endif
 
       call ice_pio_check(pio_inq_varid(File,trim(vname),vardesc), &
-           subname// "ERROR missing varid "//trim(vname),file=__FILE__,line=__LINE__)
+           subname// " ERROR: missing varid "//trim(vname),file=__FILE__,line=__LINE__)
 
       call ice_pio_check(pio_inq_varndims(File, vardesc, ndims), &
-           subname// "ERROR missing varndims "//trim(vname),file=__FILE__,line=__LINE__)
+           subname// " ERROR: missing varndims "//trim(vname),file=__FILE__,line=__LINE__)
 
       if (ndims==3) then
          call pio_write_darray(File, vardesc, iodesc3d_ncat,work(:,:,:,1:nblocks), &
@@ -851,7 +852,7 @@ subroutine write_restart_field(nu,nrec,work,atype,vname,ndim3,diag)
       endif
 
       call ice_pio_check(status, &
-           subname//" ERROR writing "//trim(vname),file=__FILE__,line=__LINE__)
+           subname//" ERROR: writing "//trim(vname),file=__FILE__,line=__LINE__)
 
       call pio_seterrorhandling(File, PIO_INTERNAL_ERROR)
 
@@ -893,7 +894,8 @@ subroutine final_restart()
       call pio_closefile(File)
 
       if (my_task == master_task) then
-         write(nu_diag,'(a,i8,4x,i4.4,a,i2.2,a,i2.2,a,i5.5)') 'Restart read/written ',istep1,myear,'-',mmonth,'-',mday,'-',msec
+         write(nu_diag,'(a,i8,4x,i4.4,a,i2.2,a,i2.2,a,i5.5)') &
+            'Restart read/written ',istep1,myear,'-',mmonth,'-',mday,'-',msec
       endif
 
       end subroutine final_restart
@@ -912,7 +914,7 @@ subroutine define_rest_field(File, vname, dims)
       character(len=*), parameter :: subname = '(define_rest_field)'
 
       call ice_pio_check(pio_def_var(File,trim(vname),pio_double,dims,vardesc), &
-           subname//' ERROR def_var '//trim(vname),file=__FILE__,line=__LINE__)
+           subname//' ERROR: def_var '//trim(vname),file=__FILE__,line=__LINE__)
 
       end subroutine define_rest_field
 
diff --git a/doc/source/user_guide/ug_case_settings.rst b/doc/source/user_guide/ug_case_settings.rst
index fd808fd8f..7ba3f35ad 100644
--- a/doc/source/user_guide/ug_case_settings.rst
+++ b/doc/source/user_guide/ug_case_settings.rst
@@ -37,7 +37,8 @@ can be found in :ref:`cicecpps`.  The following CPPs are available.
    "NO_I8", "Converts integer*8 to integer*4.  This could have adverse affects for certain algorithms including the ddpdd implementation associated with the ``bfbflag``"
    "NO_R16", "Converts real*16 to real*8.  This could have adverse affects for certain algorithms including the lsum16 implementation associated with the ``bfbflag``"
    "NO_SNICARHC", "Does not compile hardcoded (HC) 5 band snicar tables tables needed by ``shortwave=dEdd_snicar_ad``. May reduce compile time."
-   "USE_NETCDF", "Turns on netcdf code.  This is normally on and is needed for released configurations.  An older value, ncdf, is still supported"
+   "USE_NETCDF", "Turns on netCDF code.  This is normally on and is needed for released configurations.  An older value, ncdf, is still supported."
+   "USE_PIO1", "Modifies pio code to be compatible with PIO1.  By default, code is compatible with PIO2"
    "",""
    "**Application Macros**", ""
    "CESMCOUPLED", "Turns on code changes for the CESM coupled application                          "
@@ -80,10 +81,10 @@ can be modified as needed.
    "ICE_LOGDIR", "string", "log directory", "${ICE_CASEDIR}/logs"
    "ICE_DRVOPT", "string", "unused", "standalone/cice"
    "ICE_TARGET", "string", "build target", "set by cice.setup"
-   "ICE_IOTYPE", "string", "I/O format", "set by cice.setup"
-   " ", "netcdf", "serial netCDF"
-   " ", "none", "netCDF library is not available"
-   " ", "pio", "parallel netCDF"
+   "ICE_IOTYPE", "string", "I/O source code", "set by cice.setup"
+   " ", "binary", "uses io_binary directory, no support for netCDF files"
+   " ", "netcdf", "uses io_netCDF directory, supports netCDF files"
+   " ", "pio", "uses io_pio directory, supports netCDF and parallel netCDF thru PIO interfaces"
    "ICE_CLEANBUILD", "true, false", "automatically clean before building", "true"
    "ICE_CPPDEFS", "user defined preprocessor macros for build", "null"
    "ICE_QUIETMODE", "true, false", "reduce build output to the screen", "false"
@@ -208,7 +209,7 @@ setup_nml
    "``incond_file``", "string", "output file prefix for initial condition", "‘iceh_ic’"
    "``istep0``", "integer", "initial time step number", "0"
    "``latpnt``", "real", "latitude of (2) diagnostic points", "90.0,-65.0"
-   "``lcdf64``", "logical", "use 64-bit netcdf format", "``.false.``"
+   "``lcdf64``", "logical", "use 64-bit netCDF format", "``.false.``"
    "``lonpnt``", "real", "longitude of (2) diagnostic points", "0.0,-45.0"
    "``memory_stats``", "logical", "turns on memory use diagnostics", "``.false.``"
    "``month_init``", "integer", "the initial month if not using restart", "1"
@@ -616,7 +617,7 @@ forcing_nml
    "", "``nc``", "read netcdf atmo forcing files", ""
    "``atm_data_type``", "``box2001``", "forcing data for :cite:`Hunke01` box problem", "``default``"
    "", "``default``", "constant values defined in the code", ""
-   "", "``hycom``", "HYCOM atm forcing data in netcdf format", ""
+   "", "``hycom``", "HYCOM atm forcing data in netCDF format", ""
    "", "``JRA55``", "JRA55 forcing data :cite:`Tsujino18`", ""
    "", "``JRA55do``", "JRA55do forcing data :cite:`Tsujino18`", ""
    "", "``monthly``", "monthly forcing data", ""
@@ -626,7 +627,7 @@ forcing_nml
    "``bgc_data_dir``", "string", "path to oceanic forcing data directory", "'unknown_bgc_data_dir'"
    "``bgc_data_type``", "``clim``", "bgc climatological data", "``default``"
    "", "``default``", "constant values defined in the code", ""
-   "", "``hycom``", "HYCOM ocean forcing data in netcdf format", ""
+   "", "``hycom``", "HYCOM ocean forcing data in netCDF format", ""
    "", "``ncar``", "POP ocean forcing data", ""
    "``calc_strair``", "``.false.``", "read wind stress and speed from files", "``.true.``"
    "", "``.true.``", "calculate wind stress and speed", ""
@@ -673,10 +674,10 @@ forcing_nml
    "``oceanmixed_ice``", "logical", "active ocean mixed layer calculation", "``.false.``"
    "``ocn_data_dir``", "string", "path to oceanic forcing data directory", "'unknown_ocn_data_dir'"
    "``ocn_data_format``", "``bin``", "read direct access binary ocean forcing files", "``bin``"
-   "", "``nc``", "read netcdf ocean forcing files", ""
+   "", "``nc``", "read netCDF ocean forcing files", ""
    "``ocn_data_type``", "``clim``", "ocean climatological data formulation", "``default``"
    "", "``default``", "constant values defined in the code", ""
-   "", "``hycom``", "HYCOM ocean forcing data in netcdf format", ""
+   "", "``hycom``", "HYCOM ocean forcing data in netCDF format", ""
    "", "``ncar``", "POP ocean forcing data", ""
    "``precip_units``", "``mks``", "liquid precipitation data units", "``mks``"
    "", "``mm_per_month``", "", ""
diff --git a/doc/source/user_guide/ug_running.rst b/doc/source/user_guide/ug_running.rst
index 3f3cd3495..065682d13 100644
--- a/doc/source/user_guide/ug_running.rst
+++ b/doc/source/user_guide/ug_running.rst
@@ -16,42 +16,61 @@ To run stand-alone, CICE requires
 
 - bash and csh
 - gmake (GNU Make)
-- Fortran and C	compilers (Intel, PGI, GNU, Cray, and NAG have been tested)
-- NetCDF (this is actually optional but required to test out of the box configurations)
-- MPI (this is actually	optional but without it	you can	only run on 1 processor)
+- Fortran and C	compilers (Intel, PGI, GNU, Cray, NVHPC, AOCC, and NAG have been tested)
+- NetCDF (optional, but required to test standard configurations that have netcdf grid, input, and forcing files)
+- MPI (optional, but required for running on more than 1 processor)
+- PIO (optional, but required for running with PIO I/O interfaces)
 
 Below are lists of software versions that the Consortium has tested at some point.  There is no
 guarantee that all compiler versions work with all CICE model versions.  At any given
 point, the Consortium is regularly testing on several different compilers, but not 
-necessarily on all possible versions or combinations.  A CICE goal is to be relatively portable
+necessarily on all possible versions or combinations.  CICE supports both PIO1 and PIO2.  To
+use PIO1, the cpp USE_PIO1 should also be set.  A CICE goal is to be relatively portable
 across different hardware, compilers, and other software.  As a result, the coding
 implementation tends to be on the conservative side at times.  If there are problems 
 porting to a particular system, please let the Consortium know.
 
 The Consortium has tested the following compilers at some point,
 
-- Intel 15.0.3.187
-- Intel 16.0.1.150
-- Intel 17.0.1.132
-- Intel 17.0.2.174
-- Intel 17.0.5.239
-- Intel 18.0.1.163
-- Intel 18.0.5
-- Intel 19.0.2
-- Intel 19.0.3.199
-- Intel 19.1.0.166
-- Intel 19.1.1.217
+- AOCC 3.0.0
+- Intel ifort 15.0.3.187
+- Intel ifort 16.0.1.150
+- Intel ifort 17.0.1.132
+- Intel ifort 17.0.2.174
+- Intel ifort 17.0.5.239
+- Intel ifort 18.0.1.163
+- Intel ifort 18.0.5
+- Intel ifort 19.0.2
+- Intel ifort 19.0.3.199
+- Intel ifort 19.1.0.166
+- Intel ifort 19.1.1.217
+- Intel ifort 19.1.2.254
+- Intel ifort 2021.4.0
+- Intel ifort 2021.6.0
+- Intel ifort 2021.8.0
+- Intel ifort 2021.9.0
+- Intel ifort 2022.2.1
 - PGI 16.10.0
 - PGI 19.9-0
 - PGI 20.1-0
+- PGI 20.4-0
 - GNU 6.3.0
 - GNU 7.2.0
 - GNU 7.3.0
+- GNU 7.7.0
 - GNU 8.3.0
 - GNU 9.3.0
-- Cray 8.5.8
-- Cray 8.6.4
+- GNU 10.1.0
+- GNU 11.2.0
+- GNU 12.1.0
+- GNU 12.2.0
+- Cray CCE 8.5.8
+- Cray CCE 8.6.4
+- Cray CCE 13.0.2
+- Cray CCE 14.0.3
+- Cray CCE 15.0.1
 - NAG 6.2
+- NVC 23.5-0
 
 The Consortium has tested the following mpi versions,
 
@@ -59,16 +78,26 @@ The Consortium has tested the following mpi versions,
 - MPICH 7.5.3
 - MPICH 7.6.2
 - MPICH 7.6.3
+- MPICH 7.7.0
 - MPICH 7.7.6
+- MPICH 7.7.7
+- MPICH 7.7.19
+- MPICH 7.7.20
+- MPICH 8.1.14
+- MPICH 8.1.21
+- MPICH 8.1.25
 - Intel MPI 18.0.1
 - Intel MPI 18.0.4
 - Intel MPI 2019 Update 6
+- Intel MPI 2019 Update 8
 - MPT 2.14
 - MPT 2.17
 - MPT 2.18
 - MPT 2.19
 - MPT 2.20
 - MPT 2.21
+- MPT 2.22
+- MPT 2.25
 - mvapich2-2.3.3
 - OpenMPI 1.6.5
 - OpenMPI 4.0.2
@@ -79,6 +108,7 @@ The NetCDF implementation is relatively general and should work with any version
 - NetCDF 4.3.2
 - NetCDF 4.4.0
 - NetCDF 4.4.1.1.3
+- NetCDF 4.4.1.1.6
 - NetCDF 4.4.1.1
 - NetCDF 4.4.2
 - NetCDF 4.5.0
@@ -88,6 +118,23 @@ The NetCDF implementation is relatively general and should work with any version
 - NetCDF 4.6.3.2
 - NetCDF 4.7.2
 - NetCDF 4.7.4
+- NetCDF 4.8.1
+- NetCDF 4.8.1.1
+- NetCDF 4.8.1.3
+- NetCDF 4.9.0.1
+- NetCDF 4.9.0.3
+- NetCDF 4.9.2
+
+CICE has been tested with
+
+- PIO 1.10.1
+- PIO 2.5.4
+- PIO 2.5.9
+- PIO 2.6.0
+- PIO 2.6.1
+- PnetCDF 2.6.2
+- PnetCDF 1.12.2
+- PnetCDF 1.12.3
 
 Please email the Consortium if this list can be extended.