Update CICE to latest Consortium master

.github/workflows/test-cice.yml

@@ -17,7 +17,7 @@ on:
 
 defaults:
   run:
-    shell: /bin/csh {0}
+    shell: /bin/csh -e {0}
 
 jobs:
   build:
@@ -104,9 +104,9 @@ jobs:
       - name: download input data
         run: |
           cd $HOME/cice-dirs/input
-          wget 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 https://zenodo.org/record/3728362/files/CICE_data_gx3_forcing_NCAR_bulk-20200320.tar.gz && tar xvfz CICE_data_gx3_forcing_NCAR_bulk-20200320.tar.gz
-          wget 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/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/3728362/files/CICE_data_gx3_forcing_NCAR_bulk-20200320.tar.gz && tar xvfz CICE_data_gx3_forcing_NCAR_bulk-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
           pwd
           ls -alR
 #      - name: run case

.gitmodules

@@ -1,3 +1,5 @@
 [submodule "icepack"]
 	path = icepack
-	url = https://github.com/NOAA-EMC/Icepack
+	#url = https://github.com/NOAA-EMC/Icepack
+	url = https://github.com/DeniseWorthen/Icepack
+        branch = feature/icepack_noabort

cice.setup

@@ -390,6 +390,18 @@ if ((${dosuite} == 1 || ${dotest} == 1) && ${testid} == ${spval}) then
   exit -1
 endif
 
+# This creates a new sandbox and modifies the source code for "improved" lcov analysis
+# Turn this if block off if you don't want coverage to do that
+if ($coverage == 1) then
+  set sandbox_lcov = ${ICE_SANDBOX}/../cice_lcov_${sdate}-${stime}
+  cp -p -r ${ICE_SANDBOX} ${sandbox_lcov}
+  echo "shifting to sandbox = ${sandbox_lcov}"
+  set ICE_SANDBOX = ${sandbox_lcov}
+  set ICE_SCRIPTS = "${ICE_SANDBOX}/configuration/scripts"
+  cd ${ICE_SANDBOX}
+  ${ICE_SCRIPTS}/tests/lcov_modify_source.sh
+endif
+
 #---------------------------------------------------------------------
 # Setup tsfile and test suite support stuff
 
@@ -1094,7 +1106,7 @@ cd ${testname_base}
 source ./cice.settings
 if (\${dobuild} == true) then
    if (\${doreuse} == true) then
-     set ciceexe = "../ciceexe.\${ICE_ENVNAME}.\${ICE_COMMDIR}.\${ICE_BLDDEBUG}.\${ICE_THREADED}.\${ICE_IOTYPE}"
+     set ciceexe = "../ciceexe.\${ICE_TARGET}.\${ICE_ENVNAME}.\${ICE_COMMDIR}.\${ICE_BLDDEBUG}.\${ICE_THREADED}.\${ICE_IOTYPE}"
      ./cice.build --exe \${ciceexe}
      if !(-e \${ciceexe}) cp -p \${ICE_RUNDIR}/cice \${ciceexe}
    else

cicecore/cicedynB/analysis/ice_diagnostics.F90

@@ -25,19 +25,22 @@ module ice_diagnostics
 
       implicit none
       private
-      public :: runtime_diags, init_mass_diags, init_diags, &
-                print_state, print_points_state, diagnostic_abort
-
+      public :: runtime_diags, init_mass_diags, init_diags, debug_ice, &
+                print_state, diagnostic_abort
 
       ! diagnostic output file
       character (len=char_len), public :: diag_file
 
       ! point print data
 
       logical (kind=log_kind), public :: &
+         debug_model      , & ! if true, debug model at high level
          print_points     , & ! if true, print point data
          print_global         ! if true, print global data
 
+      integer (kind=int_kind), public :: &
+         debug_model_step = 999999999  ! begin printing at istep1=debug_model_step
+
       integer (kind=int_kind), parameter, public :: &
          npnt = 2             ! total number of points to be printed
 
@@ -87,16 +90,6 @@ module ice_diagnostics
          totaeron         , & ! total aerosol mass
          totaeros             ! total aerosol mass
 
-      ! printing info for routine print_state
-      ! iblkp, ip, jp, mtask identify the grid cell to print
-!     character (char_len) :: plabel
-      integer (kind=int_kind), parameter, public :: &
-         check_step = 999999999, & ! begin printing at istep1=check_step
-         iblkp = 1, &      ! block number 
-         ip = 72, &        ! i index
-         jp = 11, &        ! j index
-         mtask = 0         ! my_task
-
 !=======================================================================
 
       contains
@@ -1525,20 +1518,39 @@ end subroutine init_diags
 
 !=======================================================================
 
-! This routine is useful for debugging.
-! Calls to it should be inserted in the form (after thermo, for example)
-!      do iblk = 1, nblocks
-!      do j=jlo,jhi
-!      do i=ilo,ihi
-!         plabel = 'post thermo'
-!         if (istep1 >= check_step .and. iblk==iblkp .and i==ip &
-!             .and. j==jp .and. my_task == mtask) &
-!         call print_state(plabel,i,j,iblk)
-!      enddo
-!      enddo
+! This routine is useful for debugging
+! author Elizabeth C. Hunke, LANL
+
+      subroutine debug_ice(iblk, plabeld)
+
+      use ice_kinds_mod
+      use ice_calendar, only: istep1
+      use ice_communicate, only: my_task
+      use ice_blocks, only: nx_block, ny_block
+
+      character (char_len), intent(in) :: plabeld
+      integer (kind=int_kind), intent(in) :: iblk
+
+      ! local 
+      integer (kind=int_kind) :: i, j, m
+      character(len=*), parameter :: subname='(debug_ice)'
+
+!     tcraig, do this only on one point, the first point
+!      do m = 1, npnt
+      m = 1
+         if (istep1 >= debug_model_step .and. &
+             iblk == pbloc(m) .and. my_task == pmloc(m)) then
+            i = piloc(m)
+            j = pjloc(m)
+            call print_state(plabeld,i,j,iblk)
+         endif
 !      enddo
-!
-! 'use ice_diagnostics' may need to be inserted also
+
+      end subroutine debug_ice
+
+!=======================================================================
+
+! This routine is useful for debugging.
 ! author: Elizabeth C. Hunke, LANL
 
       subroutine print_state(plabel,i,j,iblk)
@@ -1587,7 +1599,7 @@ subroutine print_state(plabel,i,j,iblk)
 
       this_block = get_block(blocks_ice(iblk),iblk)         
 
-      write(nu_diag,*) plabel
+      write(nu_diag,*) subname,plabel
       write(nu_diag,*) 'istep1, my_task, i, j, iblk:', &
                         istep1, my_task, i, j, iblk
       write(nu_diag,*) 'Global i and j:', &
@@ -1699,16 +1711,14 @@ subroutine print_state(plabel,i,j,iblk)
       write(nu_diag,*) '            evap    = ',evap  (i,j,iblk)
       write(nu_diag,*) '            flwout  = ',flwout(i,j,iblk)
       write(nu_diag,*) ' '
+      call flush_fileunit(nu_diag)
 
       end subroutine print_state
 
 !=======================================================================
+#ifdef UNDEPRECATE_print_points_state
 
 ! This routine is useful for debugging.
-! Calls can be inserted anywhere and it will print info on print_points points
-!      call print_points_state(plabel)
-!
-! 'use ice_diagnostics' may need to be inserted also
 
       subroutine print_points_state(plabel,ilabel)
 
@@ -1764,6 +1774,7 @@ subroutine print_points_state(plabel,ilabel)
             write(llabel,'(a)') 'pps:'//trim(llabel)
          endif
 
+         write(nu_diag,*) subname
          write(nu_diag,*) trim(llabel),'istep1, my_task, i, j, iblk=', &
                            istep1, my_task, i, j, iblk
          write(nu_diag,*) trim(llabel),'Global i and j=', &
@@ -1842,12 +1853,13 @@ subroutine print_points_state(plabel,ilabel)
       write(nu_diag,*) '            evap    = ',evap  (i,j,iblk)
       write(nu_diag,*) '            flwout  = ',flwout(i,j,iblk)
       write(nu_diag,*) ' '
+      call flush_fileunit(nu_diag)
 
       endif   ! my_task
       enddo   ! ncnt
 
       end subroutine print_points_state
-
+#endif
 !=======================================================================
 
 ! prints error information prior to aborting

cicecore/cicedynB/analysis/ice_history.F90

@@ -1713,7 +1713,7 @@ subroutine accum_hist (dt)
       use ice_domain_size, only: nfsd
       use ice_grid, only: tmask, lmask_n, lmask_s, dxu, dyu
       use ice_calendar, only: new_year, write_history, &
-                              write_ic, time, histfreq, nstreams, month, &
+                              write_ic, timesecs, histfreq, nstreams, mmonth, &
                               new_month
       use ice_dyn_eap, only: a11, a12, e11, e12, e22, s11, s12, s22, &
           yieldstress11, yieldstress12, yieldstress22
@@ -1864,7 +1864,7 @@ subroutine accum_hist (dt)
            avgct(ns) = avgct(ns) + c1
 !           if (avgct(ns) == c1) time_beg(ns) = (time-dt)/int(secday)
            if (avgct(ns) == c1) then
-              time_beg(ns) = (time-dt)/int(secday)
+              time_beg(ns) = (timesecs-dt)/int(secday)
               time_beg(ns) = real(time_beg(ns),kind=real_kind)
            endif
          endif
@@ -3966,7 +3966,7 @@ subroutine accum_hist (dt)
         enddo                   ! iblk
         !$OMP END PARALLEL DO
 
-        time_end(ns) = time/int(secday)
+        time_end(ns) = timesecs/int(secday)
         time_end(ns) = real(time_end(ns),kind=real_kind)
 
       !---------------------------------------------------------------
@@ -4057,7 +4057,7 @@ subroutine accum_hist (dt)
             enddo
          endif                  ! new_year
 
-         if ( (month .eq. 7) .and. new_month ) then 
+         if ( (mmonth .eq. 7) .and. new_month ) then 
             do j=jlo,jhi
             do i=ilo,ihi
                ! reset SH Jul 1

cicecore/cicedynB/analysis/ice_history_shared.F90

@@ -653,9 +653,9 @@ module ice_history_shared
 
       subroutine construct_filename(ncfile,suffix,ns)
 
-      use ice_calendar, only: sec, nyr, month, daymo,  &
+      use ice_calendar, only: msec, myear, mmonth, daymo,  &
                               mday, write_ic, histfreq, histfreq_n, &
-                              year_init, new_year, new_month, new_day, &
+                              new_year, new_month, new_day, &
                               dt
       use ice_restart_shared, only: lenstr
 
@@ -667,12 +667,12 @@ subroutine construct_filename(ncfile,suffix,ns)
       character (len=1) :: cstream
       character(len=*), parameter :: subname = '(construct_filename)'
 
-        iyear = nyr + year_init - 1 ! set year_init=1 in ice_in to get iyear=nyr
-        imonth = month
+        iyear = myear
+        imonth = mmonth
         iday = mday
-        isec = sec - dt
+        isec = msec - dt
 
-        if (write_ic) isec = sec
+        if (write_ic) isec = msec
         ! construct filename
         if (write_ic) then
            write(ncfile,'(a,a,i4.4,a,i2.2,a,i2.2,a,i5.5,a,a)')  &
@@ -688,7 +688,7 @@ subroutine construct_filename(ncfile,suffix,ns)
            imonth = 12
            iday = daymo(imonth)
           elseif (new_month) then
-           imonth = month - 1
+           imonth = mmonth - 1
            iday = daymo(imonth)
           elseif (new_day) then
            iday = iday - 1
@@ -703,7 +703,7 @@ subroutine construct_filename(ncfile,suffix,ns)
          if (histfreq(ns) == '1') then ! instantaneous, write every dt
            write(ncfile,'(a,a,i4.4,a,i2.2,a,i2.2,a,i5.5,a,a)')  &
             history_file(1:lenstr(history_file))//trim(cstream),'_inst.', &
-             iyear,'-',imonth,'-',iday,'-',sec,'.',suffix
+             iyear,'-',imonth,'-',iday,'-',msec,'.',suffix
 
          elseif (hist_avg) then    ! write averaged data
 
@@ -714,7 +714,7 @@ subroutine construct_filename(ncfile,suffix,ns)
           elseif (histfreq(ns) == 'h'.or.histfreq(ns) == 'H') then ! hourly
            write(ncfile,'(a,a,i2.2,a,i4.4,a,i2.2,a,i2.2,a,i5.5,a,a)')  &
             history_file(1:lenstr(history_file))//trim(cstream),'_', &
-             histfreq_n(ns),'h.',iyear,'-',imonth,'-',iday,'-',sec,'.',suffix
+             histfreq_n(ns),'h.',iyear,'-',imonth,'-',iday,'-',msec,'.',suffix
           elseif (histfreq(ns) == 'm'.or.histfreq(ns) == 'M') then ! monthly
            write(ncfile,'(a,a,i4.4,a,i2.2,a,a)')  &
             history_file(1:lenstr(history_file))//trim(cstream),'.', &
@@ -728,7 +728,7 @@ subroutine construct_filename(ncfile,suffix,ns)
          else                     ! instantaneous with histfreq > dt
            write(ncfile,'(a,a,i4.4,a,i2.2,a,i2.2,a,i5.5,a,a)')  &
             history_file(1:lenstr(history_file)),'_inst.', &
-             iyear,'-',imonth,'-',iday,'-',sec,'.',suffix
+             iyear,'-',imonth,'-',iday,'-',msec,'.',suffix
          endif
         endif
 

cicecore/cicedynB/dynamics/ice_dyn_evp.F90

@@ -361,8 +361,7 @@ subroutine evp (dt)
           first_time = .false.
         endif
         if (trim(grid_type) == 'tripole') then
-          call abort_ice(trim(subname)//' &
-             & Kernel not tested on tripole grid. Set kevp_kernel=0')
+          call abort_ice(trim(subname)//' Kernel not tested on tripole grid. Set kevp_kernel=0')
         endif
         call ice_dyn_evp_1d_copyin(                                                &
           nx_block,ny_block,nblocks,nx_global+2*nghost,ny_global+2*nghost, &