Changeset 14215 for NEMO/trunk/src/OCE/DYN/dynldf_iso.F90

Timestamp:

2020-12-18T14:49:22+01:00 (4 years ago)

Author:

acc

Message:

trunk changes to swap the order of arguments to the DO LOOP macros. These changes result in a more natural i-j-k ordering as explained in #2595. SETTE is passed before and after these changes and results are unchanged. This fixes #2595

File:

• NEMO/trunk/src/OCE/DYN/dynldf_iso.F90 (modified) (5 diffs)

NEMO/trunk/src/OCE/DYN/dynldf_iso.F90

@@ -168 +168 @@
 
          IF( ln_zps ) THEN      ! z-coordinate - partial steps : min(e3u)
-            DO_2D( 0, 0, 0, 1 )
+            DO_2D( 0, 1, 0, 0 )
                zabe1 = ( ahmt(ji,jj,jk)+rn_ahm_b ) * e2t(ji,jj)   &
                   &    * MIN( e3u(ji  ,jj,jk,Kmm),                &
@@ -183 +183 @@
             END_2D
          ELSE                   ! other coordinate system (zco or sco) : e3t
-            DO_2D( 0, 0, 0, 1 )
+            DO_2D( 0, 1, 0, 0 )
                zabe1 = ( ahmt(ji,jj,jk)+rn_ahm_b )   &
                   &     * e2t(ji,jj) * e3t(ji,jj,jk,Kmm) * r1_e1t(ji,jj)
@@ -219 +219 @@
          ! i-flux at f-point              |   t   |
 
-         DO_2D( 0, 0, 1, 0 )
+         DO_2D( 1, 0, 0, 0 )
             zabe1 = ( ahmf(ji,jj,jk) + rn_ahm_b )   &
                &     * e2f(ji,jj) * e3f(ji,jj,jk) * r1_e1f(ji,jj)
@@ -235 +235 @@
          ! j-flux at t-point
          IF( ln_zps ) THEN      ! z-coordinate - partial steps : min(e3u)
-            DO_2D( 0, 1, 1, 0 )
+            DO_2D( 1, 0, 0, 1 )
                zabe2 = ( ahmt(ji,jj,jk)+rn_ahm_b ) * e1t(ji,jj)   &
                   &     * MIN( e3v(ji,jj  ,jk,Kmm),                 &
@@ -250 +250 @@
             END_2D
          ELSE                   ! other coordinate system (zco or sco) : e3t
-            DO_2D( 0, 1, 1, 0 )
+            DO_2D( 1, 0, 0, 1 )
                zabe2 = ( ahmt(ji,jj,jk)+rn_ahm_b )   &
                   &     * e1t(ji,jj) * e3t(ji,jj,jk,Kmm) * r1_e2t(ji,jj)