Changeset 14215 for NEMO/trunk/src/OCE/TRA/traqsr.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/TRA/traqsr.F90 (modified) (10 diffs)

NEMO/trunk/src/OCE/TRA/traqsr.F90

@@ -151 +151 @@
          ELSE                                           ! No restart or Euler forward at 1st time step
             z1_2 = 1._wp
-            DO_3D( isj, iej, isi, iei, 1, jpk )
+            DO_3D( isi, iei, isj, iej, 1, jpk )
                qsr_hc_b(ji,jj,jk) = 0._wp
             END_3D
@@ -157 +157 @@
       ELSE                             !==  Swap of qsr heat content  ==!
          z1_2 = 0.5_wp
-         DO_3D( isj, iej, isi, iei, 1, jpk )
+         DO_3D( isi, iei, isj, iej, 1, jpk )
             qsr_hc_b(ji,jj,jk) = qsr_hc(ji,jj,jk)
          END_3D
@@ -168 +168 @@
       CASE( np_BIO )                   !==  bio-model fluxes  ==!
          !
-         DO_3D( isj, iej, isi, iei, 1, nksr )
+         DO_3D( isi, iei, isj, iej, 1, nksr )
             qsr_hc(ji,jj,jk) = r1_rho0_rcp * ( etot3(ji,jj,jk) - etot3(ji,jj,jk+1) )
          END_3D
@@ -190 +190 @@
             ! most expensive calculations)
             !
-            DO_2D( isj, iej, isi, iei )
+            DO_2D( isi, iei, isj, iej )
                        ! zlogc = log(zchl)
                zlogc = LOG ( MIN( 10. , MAX( 0.03, sf_chl(1)%fnow(ji,jj,1) ) ) )
@@ -209 +209 @@
 
 !
-            DO_3D( isj, iej, isi, iei, 1, nksr + 1 )
+            DO_3D( isi, iei, isj, iej, 1, nksr + 1 )
                ! zchl    = ALOG( ze0(ji,jj) )
                zlogc = ze0(ji,jj)
@@ -239 +239 @@
          !
          zcoef  = ( 1. - rn_abs ) / 3._wp    !* surface equi-partition in R-G-B
-         DO_2D( isj, iej, isi, iei )
+         DO_2D( isi, iei, isj, iej )
             ze0(ji,jj) = rn_abs * qsr(ji,jj)
             ze1(ji,jj) = zcoef  * qsr(ji,jj)
@@ -250 +250 @@
          !
          !                                    !* interior equi-partition in R-G-B depending on vertical profile of Chl
-         DO_3D( isj, iej, isi, iei, 2, nksr + 1 )
+         DO_3D( isi, iei, isj, iej, 2, nksr + 1 )
             ze3t = e3t(ji,jj,jk-1,Kmm)
             irgb = NINT( ztmp3d(ji,jj,jk) )
@@ -264 +264 @@
          END_3D
          !
-         DO_3D( isj, iej, isi, iei, 1, nksr )          !* now qsr induced heat content
+         DO_3D( isi, iei, isj, iej, 1, nksr )          !* now qsr induced heat content
             qsr_hc(ji,jj,jk) = r1_rho0_rcp * ( ztmp3d(ji,jj,jk) - ztmp3d(ji,jj,jk+1) )
          END_3D
@@ -274 +274 @@
          zz0 =        rn_abs   * r1_rho0_rcp      ! surface equi-partition in 2-bands
          zz1 = ( 1. - rn_abs ) * r1_rho0_rcp
-         DO_3D( isj, iej, isi, iei, 1, nksr )          !* now qsr induced heat content
+         DO_3D( isi, iei, isj, iej, 1, nksr )          !* now qsr induced heat content
             zc0 = zz0 * EXP( -gdepw(ji,jj,jk  ,Kmm)*xsi0r ) + zz1 * EXP( -gdepw(ji,jj,jk  ,Kmm)*xsi1r )
             zc1 = zz0 * EXP( -gdepw(ji,jj,jk+1,Kmm)*xsi0r ) + zz1 * EXP( -gdepw(ji,jj,jk+1,Kmm)*xsi1r )
@@ -292 +292 @@
       !
       ! sea-ice: store the 1st ocean level attenuation coefficient
-      DO_2D( isj, iej, isi, iei )
+      DO_2D( isi, iei, isj, iej )
          IF( qsr(ji,jj) /= 0._wp ) THEN   ;   fraqsr_1lev(ji,jj) = qsr_hc(ji,jj,1) / ( r1_rho0_rcp * qsr(ji,jj) )
          ELSE                             ;   fraqsr_1lev(ji,jj) = 1._wp