Bug fixes for multiple snow layers, from snow branch.

Author: eclare108213

source/ice_itd.F90

@@ -1880,7 +1880,7 @@ subroutine zap_small_areas (nx_block, ny_block,   &
         indxi       , & ! compressed indices for i/j directions
         indxj
 
-      real (kind=dbl_kind) :: xtmp, zspace      ! temporary variable
+      real (kind=dbl_kind) :: xtmp     ! temporary variable
 
       !-----------------------------------------------------------------
       ! Initialize
@@ -1890,8 +1890,6 @@ subroutine zap_small_areas (nx_block, ny_block,   &
       istop = 0
       jstop = 0
 
-      zspace = c1/max(c1,(real(nblyr,kind=dbl_kind)))
-      
       !-----------------------------------------------------------------
       ! I. Zap categories with very small areas.
       !-----------------------------------------------------------------
@@ -2377,13 +2375,13 @@ subroutine zap_snow_temperature(nx_block,   ny_block, &
 
             l_zap = .false.
 
-            ! check each snow layer - zap all if one is bad
-            do k = 1, nslyr
+            if (aicen(i,j,n) > puny) then
 
-               if (aicen(i,j,n) > puny) then
+            ! snow thickness
+            hsn = vsnon(i,j,n) / aicen(i,j,n)
 
-               ! snow thickness
-               hsn = vsnon(i,j,n) / aicen(i,j,n)
+            ! check each snow layer - zap all if one is bad
+            do k = 1, nslyr
 
                ! snow enthalpy and max temperature
                if (hsn > hs_min .and. heat_capacity) then
@@ -2410,10 +2408,10 @@ subroutine zap_snow_temperature(nx_block,   ny_block, &
                   write(nu_diag,*) "zqsn:", zqsn
                endif
 
-               endif ! aicen > puny
-
             enddo ! k
 
+            endif ! aicen > puny
+
             ! add cell to zap list
             if (l_zap) then
                icells = icells + 1

source/ice_mechred.F90

@@ -1739,7 +1739,8 @@ subroutine ridge_shift (nx_block,    ny_block,        &
                i = indxii(ij)
                j = indxjj(ij)
                m = indxij(ij)
-               esrdgn = vsrdgn(ij) * trcrn(i,j,nt_qsno+k-1,n)
+               esrdgn = vsrdgn(ij) * trcrn(i,j,nt_qsno+k-1,n) &
+                                   / real(nslyr,kind=dbl_kind)
                esnow_mlt(m) = esnow_mlt(m) + esrdgn*(c1-fsnowrdg)
            enddo
          enddo

source/ice_therm_mushy.F90

@@ -3294,8 +3294,8 @@ subroutine flood_ice(hsn,    hin,      &
          Sbr                   ! ice layer brine salinity (ppt)
 
     real(kind=dbl_kind), intent(inout) :: &
-         hslyr             , & ! ice layer thickness (m)
-         hilyr                 ! snow layer thickness (m)
+         hslyr             , & ! snow layer thickness (m)
+         hilyr                 ! ice layer thickness (m)
 
     real(kind=dbl_kind), intent(out) :: &
          snoice                ! snow ice formation
@@ -3350,7 +3350,7 @@ subroutine flood_ice(hsn,    hin,      &
           ! sea ice fraction of newly formed snow ice
           phi_snowice = (c1 - rhos / rhoi)
 
-          ! desnity of newly formed snowice
+          ! density of newly formed snowice
           rho_snowice = phi_snowice * rho_ocn + (c1 - phi_snowice) * rhoi
 
           ! calculate thickness of new ice added
@@ -3429,23 +3429,17 @@ subroutine enthalpy_snow_snowice(dh, hsn, zqsn, zqsn_snowice)
     ! snow depth and snow layers affected by snowice formation
     if (hsn > puny) then
        rnlyr = (dh / hsn) * nslyr
-       nlyr = min(floor(rnlyr),nslyr-1)
-       
-       zqsn_snowice = c0
-       
+       nlyr = min(floor(rnlyr),nslyr-1) ! nlyr=0 if nslyr=1
+
        ! loop over full snow layers affected
+       ! not executed if nlyr=0
        do k = nslyr, nslyr-nlyr+1, -1
-          
           zqsn_snowice = zqsn_snowice + zqsn(k) / rnlyr
-          
        enddo ! k
-       
+
        ! partially converted snow layer
        zqsn_snowice = zqsn_snowice + &
-                      ((rnlyr - real(nlyr,dbl_kind)) / rnlyr) * zqsn(nslyr)
-       
-       zqsn_snowice = zqsn_snowice
-
+            ((rnlyr - real(nlyr,dbl_kind)) / rnlyr) * zqsn(nslyr-nlyr)
     endif
 
   end subroutine enthalpy_snow_snowice