Merging trunk r277:281 into release, including bug fix in ice_history.F90 for

allocatable arrays.

Author: eclare108213

drivers/cice4/CICE_RunMod.F90_debug

@@ -411,7 +411,7 @@
             enddo               ! i
             enddo               ! j
 
-            if (calc_Tsfc .or. calc_strair .and. icells > 0) then 
+            if ((calc_Tsfc .or. calc_strair) .and. icells > 0) then 
 
       !-----------------------------------------------------------------
       ! Atmosphere boundary layer calculation; compute coefficients

source/ice_history.F90

@@ -1344,11 +1344,11 @@ subroutine init_hist (dt)
       !-----------------------------------------------------------------
       ! initialize the history arrays
       !-----------------------------------------------------------------
-      a2D(:,:,:,:) = c0
-      a3Dc(:,:,:,:,:) = c0
-      a3Dz(:,:,:,:,:) = c0
-      a4Di(:,:,:,:,:,:) = c0
-      a4Ds(:,:,:,:,:,:) = c0
+      if (allocated(a2D))  a2D (:,:,:,:)     = c0
+      if (allocated(a3Dc)) a3Dc(:,:,:,:,:)   = c0
+      if (allocated(a3Dz)) a3Dz(:,:,:,:,:)   = c0
+      if (allocated(a4Di)) a4Di(:,:,:,:,:,:) = c0
+      if (allocated(a4Ds)) a4Ds(:,:,:,:,:,:) = c0
       avgct(:) = c0
       albcnt(:,:,:,:) = c0
 
@@ -1982,11 +1982,11 @@ subroutine ice_write_hist (dt)
       ! reset to zero
       !------------------------------------------------------------
         if (write_ic) then
-           a2D(:,:,:,:) = c0
-           a3Dc(:,:,:,:,:) = c0
-           a3Dz(:,:,:,:,:) = c0
-           a4Di(:,:,:,:,:,:) = c0
-           a4Ds(:,:,:,:,:,:) = c0
+           if (allocated(a2D))  a2D (:,:,:,:)     = c0
+           if (allocated(a3Dc)) a3Dc(:,:,:,:,:)   = c0
+           if (allocated(a3Dz)) a3Dz(:,:,:,:,:)   = c0
+           if (allocated(a4Di)) a4Di(:,:,:,:,:,:) = c0
+           if (allocated(a4Ds)) a4Ds(:,:,:,:,:,:) = c0
            avgct(:) = c0
            albcnt(:,:,:,:) = c0
            write_ic = .false.        ! write initial condition once at most