Revert "Update to CICE master"

This reverts commit 37e0b09, reversing
changes made to bbec5d1.

cicecore/cicedynB/general/ice_flux.F90

@@ -443,7 +443,7 @@ subroutine init_coupler_flux
       uocn  (:,:,:) = c0              ! surface ocean currents (m/s)
       vocn  (:,:,:) = c0
       frzmlt(:,:,:) = c0              ! freezing/melting potential (W/m^2)
-      frzmlt_init(:,:,:) = c0         ! freezing/melting potential (W/m^2)
+!     frzmlt_init(:,:,:) = c0         ! freezing/melting potential (W/m^2)
       sss   (:,:,:) = 34.0_dbl_kind   ! sea surface salinity (ppt)
 
       do iblk = 1, size(Tf,3)
@@ -650,6 +650,7 @@ subroutine init_history_therm
       fcondtopn (:,:,:,:) = c0
       flatn     (:,:,:,:) = c0
       fsensn    (:,:,:,:) = c0
+      fpond     (:,:,:) = c0
       fresh_ai  (:,:,:) = c0
       fsalt_ai  (:,:,:) = c0
       fhocn_ai  (:,:,:) = c0
@@ -670,6 +671,7 @@ subroutine init_history_therm
 
       if (formdrag) then
         Cdn_atm_rdg (:,:,:) = c0
+        Cdn_atm_ratio(:,:,:)= c0
         Cdn_atm_floe(:,:,:) = c0
         Cdn_atm_pond(:,:,:) = c0
         Cdn_atm_skin(:,:,:) = c0

cicecore/shared/ice_distribution.F90

@@ -375,24 +375,8 @@ subroutine ice_distributionDestroy(distribution)
 !----------------------------------------------------------------------
 
    deallocate(distribution%blockLocation, stat=istat)
-   if (istat > 0) then
-      call abort_ice( &
-         'ice_distributionDestroy: error deallocating blockLocation')
-      return
-   endif
-
    deallocate(distribution%blockLocalID , stat=istat)
-   if (istat > 0) then
-      call abort_ice( &
-         'ice_distributionDestroy: error deallocating blockLocalID')
-      return
-   endif
    deallocate(distribution%blockGlobalID, stat=istat)
-   if (istat > 0) then
-      call abort_ice( &
-         'ice_distributionDestroy: error deallocating blockGlobalID')
-      return
-   endif
 
 !-----------------------------------------------------------------------