Bug fix for padded domains. Other changes are cosmetic.

CICE-Consortium · Jul 27, 2015 · ec741d7 · ec741d7
1 parent 416af92
commit ec741d7
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 11 deletions.
diff --git a/cice/drivers/hadgem3/CICE_InitMod.F90 b/cice/drivers/hadgem3/CICE_InitMod.F90
@@ -132,10 +132,10 @@ subroutine cice_init
       if (trim(runtype) == 'continue' .or. restart) &
          call init_shortwave    ! initialize radiative transfer
 
-         istep  = istep  + 1    ! update time step counters
-         istep1 = istep1 + 1
-         time = time + dt       ! determine the time and date
-         call calendar(time)    ! at the end of the first timestep
+      istep  = istep  + 1    ! update time step counters
+      istep1 = istep1 + 1
+      time = time + dt       ! determine the time and date
+      call calendar(time)    ! at the end of the first timestep
 
    !--------------------------------------------------------------------
    ! coupler communication or forcing data initialization

diff --git a/cice/source/ice_blocks.F90 b/cice/source/ice_blocks.F90
@@ -249,11 +249,11 @@ subroutine create_blocks(nx_global, ny_global, ew_boundary_type, &
                            'ice: create_blocks: unknown n-s bndy type')
                end select
 
-            !*** set last physical point if padded domain
+            !*** set last physical point in padded domain
 
             else if (j_global(j,n) == ny_global .and. &
-                     j > all_blocks(n)%jlo      .and. &
-                     j < all_blocks(n)%jhi) then
+                     j >= all_blocks(n)%jlo      .and. &
+                     j <= all_blocks(n)%jhi) then
                all_blocks(n)%jhi = j   ! last physical point in padded domain
             endif
          end do
@@ -302,8 +302,8 @@ subroutine create_blocks(nx_global, ny_global, ew_boundary_type, &
             !*** last physical point in padded domain
 
             else if (i_global(i,n) == nx_global .and. &
-                     i > all_blocks(n)%ilo      .and. &
-                     i < all_blocks(n)%ihi) then
+                     i >= all_blocks(n)%ilo      .and. &
+                     i <= all_blocks(n)%ihi) then
                all_blocks(n)%ihi = i
             endif
          end do

diff --git a/cice/source/ice_diagnostics.F90 b/cice/source/ice_diagnostics.F90
@@ -471,7 +471,7 @@ subroutine runtime_diags (dt)
                   work1(i,j,iblk) = &
                      (fswabs(i,j,iblk) - fswthru(i,j,iblk) &
                     + fsens (i,j,iblk) + flwout (i,j,iblk)) &
-                                                  * aice      (i,j,iblk) &
+                                       * aice      (i,j,iblk) &
                     + flw   (i,j,iblk) * aice_init (i,j,iblk)
                enddo
                enddo
@@ -486,7 +486,7 @@ subroutine runtime_diags (dt)
                do i = 1, nx_block
                   work1(i,j,iblk) = &
                              (fsurf(i,j,iblk) - flat(i,j,iblk)) & 
-                              * aice(i,j,iblk)
+                             * aice(i,j,iblk)
                enddo
                enddo
             enddo