Changeset 13295 for NEMO/trunk/src/OCE/ICB

Timestamp:

2020-07-10T20:24:21+02:00 (4 years ago)

Author:

acc

Message:

Replace do-loop macros in the trunk with alternative forms with greater flexibility for extra halo applications. This alters a lot of routines but does not change any behaviour or results. do_loop_substitute.h90 is greatly simplified by this change. SETTE results are identical to those with the previous revision

Location:

NEMO/trunk/src/OCE/ICB

Files:

• icbclv.F90 (modified) (2 diffs)
• icbini.F90 (modified) (1 diff)

NEMO/trunk/src/OCE/ICB/icbclv.F90

@@ -71 +71 @@
          !  where (berg_grid%calving==0.) berg_grid%stored_ice(:,:,jn)=0.
          !end do
-         DO_2D_00_00
+         DO_2D( 0, 0, 0, 0 )
             IF( berg_grid%calving(ji,jj) /= 0._wp )                                          &    ! Need units of J
                berg_grid%stored_heat(ji,jj) = SUM( berg_grid%stored_ice(ji,jj,:) ) *         &    ! initial stored ice in kg
@@ -81 +81 @@
       ! assume that all calving flux must be distributed even if distribution array does not sum
       ! to one - this may not be what is intended, but it's what you've got
-      DO_2D_11_11
+      DO_2D( 1, 1, 1, 1 )
          imx = berg_grid%maxclass(ji,jj)
          zdist = SUM( rn_distribution(1:nclasses) ) / SUM( rn_distribution(1:imx) )

NEMO/trunk/src/OCE/ICB/icbini.F90

@@ -123 +123 @@
       nicbfldproc(:) = -1
 
-      DO_2D_11_11
+      DO_2D( 1, 1, 1, 1 )
          src_calving_hflx(ji,jj) = narea
          src_calving     (ji,jj) = nicbpack * mjg(jj) + mig(ji)