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

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/ISF

Files:

• isfcavmlt.F90 (modified) (1 diff)
• isfcpl.F90 (modified) (6 diffs)
• isfdiags.F90 (modified) (1 diff)
• isfhdiv.F90 (modified) (1 diff)
• isfload.F90 (modified) (1 diff)
• isftbl.F90 (modified) (7 diffs)

NEMO/trunk/src/OCE/ISF/isfcavmlt.F90

@@ -210 +210 @@
       ! compute upward heat flux zhtflx and upward water flux zwflx
       ! Resolution of a 3d equation from equation 24, 25 and 26 (note conduction through the ice has been added to Eq 24)
-      DO_2D_11_11
+      DO_2D( 1, 1, 1, 1 )
          !
          ! compute coeficient to solve the 2nd order equation

NEMO/trunk/src/OCE/ISF/isfcpl.F90

@@ -194 +194 @@
          !
          zdssmask(:,:) = ssmask(:,:) - zssmask0(:,:)
-         DO_2D_00_00
+         DO_2D( 0, 0, 0, 0 )
             jip1=ji+1; jim1=ji-1;
             jjp1=jj+1; jjm1=jj-1;
@@ -317 +317 @@
             zdmask(:,:) = tmask(:,:,jk) - ztmask0(:,:,jk);
             !
-            DO_2D_00_00
+            DO_2D( 0, 0, 0, 0 )
                jip1=ji+1; jim1=ji-1;
                jjp1=jj+1; jjm1=jj-1;
@@ -378 +378 @@
       ! -----------------------------------------------------------------------------------------
       ! case we open a cell but no neigbour cells available to get an estimate of T and S
-      DO_3D_11_11( 1,jpk-1 )
+      DO_3D( 1, 1, 1, 1, 1,jpk-1 )
          IF (tmask(ji,jj,jk) == 1._wp .AND. ts(ji,jj,jk,2,Kmm) == 0._wp)              &
             &   CALL ctl_stop('STOP', 'failing to fill all new weet cell,     &
@@ -418 +418 @@
       DO jk = 1, jpk                                 ! Horizontal slab
          ! 1.1: get volume flux before coupling (>0 out)
-         DO_2D_00_00
+         DO_2D( 0, 0, 0, 0 )
             zqvolb(ji,jj,jk) =    &
                &  (   e2u(ji  ,jj  ) * ze3u_b(ji  ,jj  ,jk) * uu(ji  ,jj  ,jk,Kmm)      &
@@ -433 +433 @@
          vv(:,:,jk,Kmm) = vv(:,:,jk,Kmm) * vmask(:,:,jk)
          ! compute volume flux divergence after coupling
-         DO_2D_00_00
+         DO_2D( 0, 0, 0, 0 )
             zqvoln(ji,jj,jk) =   &
                &  (   e2u(ji  ,jj  ) * e3u(ji  ,jj  ,jk,Kmm) * uu(ji  ,jj  ,jk,Kmm)    &
@@ -449 +449 @@
       ! 2.0: include the contribution of the vertical velocity in the volume flux correction
       !
-      DO_2D_00_00
+      DO_2D( 0, 0, 0, 0 )
          !
          ikt = mikt(ji,jj)

NEMO/trunk/src/OCE/ISF/isfdiags.F90

@@ -101 +101 @@
       zvar3d(:,:,:) = 0._wp
       !
-      DO_2D_11_11
+      DO_2D( 1, 1, 1, 1 )
          ikt = ktop(ji,jj)
          ikb = kbot(ji,jj)

NEMO/trunk/src/OCE/ISF/isfhdiv.F90

@@ -100 +100 @@
       !
       ! update divergence at each level affected by ice shelf top boundary layer
-      DO_2D_11_11
+      DO_2D( 1, 1, 1, 1 )
          ikt = ktop(ji,jj)
          ikb = kbot(ji,jj)

NEMO/trunk/src/OCE/ISF/isfload.F90

@@ -94 +94 @@
       !                                !- Surface value + ice shelf gradient
       pisfload(:,:) = 0._wp                       ! compute pressure due to ice shelf load 
-      DO_2D_11_11
+      DO_2D( 1, 1, 1, 1 )
          ikt = mikt(ji,jj)
          !

NEMO/trunk/src/OCE/ISF/isftbl.F90

@@ -78 +78 @@
          ! compute tbl property at T point
          pvarout(1,:) = 0._wp
-         DO_2D_11_01
+         DO_2D( 1, 1, 0, 1 )
             pvarout(ji,jj) = 0.5_wp * (zvarout(ji,jj) + zvarout(ji-1,jj))
          END_2D
@@ -99 +99 @@
          ! pvarout is an averaging of wet point
          pvarout(:,1) = 0._wp
-         DO_2D_01_11
+         DO_2D( 0, 1, 1, 1 )
             pvarout(ji,jj) = 0.5_wp * (zvarout(ji,jj) + zvarout(ji,jj-1))
          END_2D
@@ -138 +138 @@
       !
       ! compute tbl top.bottom level and thickness
-      DO_2D_11_11
+      DO_2D( 1, 1, 1, 1 )
          !
          ! tbl top/bottom indices initialisation
@@ -176 +176 @@
       !
       ! get htbl
-      DO_2D_11_11
+      DO_2D( 1, 1, 1, 1 )
          !
          ! tbl top/bottom indices initialisation
@@ -193 +193 @@
       !
       ! get pfrac
-      DO_2D_11_11
+      DO_2D( 1, 1, 1, 1 )
          !
          ! tbl top/bottom indices initialisation
@@ -227 +227 @@
       !
       ! get ktbl
-      DO_2D_11_11
+      DO_2D( 1, 1, 1, 1 )
          !
          ! determine the deepest level influenced by the boundary layer
@@ -261 +261 @@
       ! test: this routine run with pdep = 0 should return 1
       !
-      DO_2D_11_11
+      DO_2D( 1, 1, 1, 1 )
          ! comput ktop
          ikt = 2