Update Icepack to #d024340f19676b July 6, 2023 (CICE-Consortium#841)

Remove deprecated COREII LYq forcing

Remove deprecated print_points_state

Update links in rst documentation to point to main, not master

cicecore/cicedyn/analysis/ice_diagnostics.F90

@@ -1943,162 +1943,6 @@ subroutine print_state(plabel,i,j,iblk)
       end subroutine print_state
 
 !=======================================================================
-#ifdef UNDEPRECATE_print_points_state
-
-! This routine is useful for debugging.
-
-      subroutine print_points_state(plabel,ilabel)
-
-      use ice_grid, only: grid_ice
-      use ice_blocks, only: block, get_block
-      use ice_domain, only: blocks_ice
-      use ice_domain_size, only: ncat, nilyr, nslyr
-      use ice_state, only: aice0, aicen, vicen, vsnon, uvel, vvel, &
-                           uvelE, vvelE, uvelE, vvelE, trcrn
-      use ice_flux, only: uatm, vatm, potT, Tair, Qa, flw, frain, fsnow, &
-          fsens, flat, evap, flwout, swvdr, swvdf, swidr, swidf, rhoa, &
-          frzmlt, sst, sss, Tf, Tref, Qref, Uref, uocn, vocn, strtltxU, strtltyU
-
-      character (len=*), intent(in),optional :: plabel
-      integer          , intent(in),optional :: ilabel
-
-      ! local variables
-
-      real (kind=dbl_kind) :: &
-           eidebug, esdebug, &
-           qi, qs, &
-           puny
-
-      integer (kind=int_kind) :: m, n, k, i, j, iblk, nt_Tsfc, nt_qice, nt_qsno
-      character(len=256) :: llabel
-
-      type (block) :: &
-         this_block           ! block information for current block
-
-      character(len=*), parameter :: subname = '(print_points_state)'
-      ! ----------------------
-
-      call icepack_query_tracer_indices(nt_Tsfc_out=nt_Tsfc, nt_qice_out=nt_qice, &
-           nt_qsno_out=nt_qsno)
-      call icepack_query_parameters(puny_out=puny)
-      call icepack_warnings_flush(nu_diag)
-      if (icepack_warnings_aborted()) call abort_ice(error_message=subname, &
-         file=__FILE__, line=__LINE__)
-
-      do m = 1, npnt
-      if (my_task == pmloc(m)) then
-         i = piloc(m)
-         j = pjloc(m)
-         iblk = pbloc(m)
-         this_block = get_block(blocks_ice(iblk),iblk)
-
-         if (present(ilabel)) then
-            write(llabel,'(i6,a1,i3,a1)') ilabel,':',m,':'
-         else
-            write(llabel,'(i3,a1)') m,':'
-         endif
-         if (present(plabel)) then
-            write(llabel,'(a)') 'pps:'//trim(plabel)//':'//trim(llabel)
-         else
-            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=', &
-                           this_block%i_glob(i), &
-                           this_block%j_glob(j)
-         write(nu_diag,*) trim(llabel),'aice0=', aice0(i,j,iblk)
-
-      do n = 1, ncat
-         write(nu_diag,*) trim(llabel),'aicen=', n,aicen(i,j,n,iblk)
-         write(nu_diag,*) trim(llabel),'vicen=', n,vicen(i,j,n,iblk)
-         write(nu_diag,*) trim(llabel),'vsnon=', n,vsnon(i,j,n,iblk)
-         if (aicen(i,j,n,iblk) > puny) then
-            write(nu_diag,*) trim(llabel),'hin=', n,vicen(i,j,n,iblk)/aicen(i,j,n,iblk)
-            write(nu_diag,*) trim(llabel),'hsn=', n,vsnon(i,j,n,iblk)/aicen(i,j,n,iblk)
-         endif
-         write(nu_diag,*) trim(llabel),'Tsfcn=',n,trcrn(i,j,nt_Tsfc,n,iblk)
-      enddo
-
-      eidebug = c0
-      do n = 1,ncat
-         do k = 1,nilyr
-            qi = trcrn(i,j,nt_qice+k-1,n,iblk)
-            write(nu_diag,*) trim(llabel),'qice= ',n,k, qi
-            eidebug = eidebug + qi
-         enddo
-      enddo
-      write(nu_diag,*) trim(llabel),'qice=',eidebug
-
-      esdebug = c0
-      do n = 1,ncat
-         if (vsnon(i,j,n,iblk) > puny) then
-            do k = 1,nslyr
-               qs = trcrn(i,j,nt_qsno+k-1,n,iblk)
-               write(nu_diag,*) trim(llabel),'qsnow=',n,k, qs
-               esdebug = esdebug + qs
-            enddo
-         endif
-      enddo
-      write(nu_diag,*) trim(llabel),'qsnow=',esdebug
-
-      write(nu_diag,*) trim(llabel),'uvel=',uvel(i,j,iblk)
-      write(nu_diag,*) trim(llabel),'vvel=',vvel(i,j,iblk)
-      if (grid_ice == 'C') then
-         write(nu_diag,*) trim(llabel),'uvelE=',uvelE(i,j,iblk)
-         write(nu_diag,*) trim(llabel),'vvelN=',vvelN(i,j,iblk)
-      elseif (grid_ice == 'CD') then
-         write(nu_diag,*) trim(llabel),'uvelE=',uvelE(i,j,iblk)
-         write(nu_diag,*) trim(llabel),'vvelE=',vvelE(i,j,iblk)
-         write(nu_diag,*) trim(llabel),'uvelN=',uvelN(i,j,iblk)
-         write(nu_diag,*) trim(llabel),'vvelN=',vvelN(i,j,iblk)
-      endif
-
-      write(nu_diag,*) ' '
-      write(nu_diag,*) 'atm states and fluxes'
-      write(nu_diag,*) '            uatm    = ',uatm (i,j,iblk)
-      write(nu_diag,*) '            vatm    = ',vatm (i,j,iblk)
-      write(nu_diag,*) '            potT    = ',potT (i,j,iblk)
-      write(nu_diag,*) '            Tair    = ',Tair (i,j,iblk)
-      write(nu_diag,*) '            Qa      = ',Qa   (i,j,iblk)
-      write(nu_diag,*) '            rhoa    = ',rhoa (i,j,iblk)
-      write(nu_diag,*) '            swvdr   = ',swvdr(i,j,iblk)
-      write(nu_diag,*) '            swvdf   = ',swvdf(i,j,iblk)
-      write(nu_diag,*) '            swidr   = ',swidr(i,j,iblk)
-      write(nu_diag,*) '            swidf   = ',swidf(i,j,iblk)
-      write(nu_diag,*) '            flw     = ',flw  (i,j,iblk)
-      write(nu_diag,*) '            frain   = ',frain(i,j,iblk)
-      write(nu_diag,*) '            fsnow   = ',fsnow(i,j,iblk)
-      write(nu_diag,*) ' '
-      write(nu_diag,*) 'ocn states and fluxes'
-      write(nu_diag,*) '            frzmlt  = ',frzmlt  (i,j,iblk)
-      write(nu_diag,*) '            sst     = ',sst     (i,j,iblk)
-      write(nu_diag,*) '            sss     = ',sss     (i,j,iblk)
-      write(nu_diag,*) '            Tf      = ',Tf      (i,j,iblk)
-      write(nu_diag,*) '            uocn    = ',uocn    (i,j,iblk)
-      write(nu_diag,*) '            vocn    = ',vocn    (i,j,iblk)
-      write(nu_diag,*) '            strtltxU= ',strtltxU(i,j,iblk)
-      write(nu_diag,*) '            strtltyU= ',strtltyU(i,j,iblk)
-      write(nu_diag,*) ' '
-      write(nu_diag,*) 'srf states and fluxes'
-      write(nu_diag,*) '            Tref    = ',Tref  (i,j,iblk)
-      write(nu_diag,*) '            Qref    = ',Qref  (i,j,iblk)
-      write(nu_diag,*) '            Uref    = ',Uref  (i,j,iblk)
-      write(nu_diag,*) '            fsens   = ',fsens (i,j,iblk)
-      write(nu_diag,*) '            flat    = ',flat  (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)
-
-      endif   ! my_task
-      enddo   ! ncnt
-
-      end subroutine print_points_state
-#endif
-!=======================================================================
 
 ! prints error information prior to aborting