Changeset 15074

Timestamp:

2021-07-02T17:05:38+02:00 (3 years ago)

Author:

clem

Message:

loop fusion: debug ubs

File:

• NEMO/trunk/src/OCE/TRA/traadv_ubs_lf.F90 (modified) (1 diff)

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

@@ -130 +130 @@
          !                                                       ! ===========
          !                        !==  horizontal laplacian of before tracer ==!
-         DO_3D( 1, 1, 1, 1, 1, jpkm1 )                   ! Second derivative (divergence)
+         DO_3D( 1, 0, 1, 0, 1, jpkm1 )                   ! Second derivative (divergence)
             ! First derivative (masked gradient)
-            zeeu_im1 = e2_e1u(ji-1,jj) * e3u(ji-1,jj,jk,Kmm) * umask(ji-1,jj,jk)
-            zeeu = e2_e1u(ji,jj) * e3u(ji,jj,jk,Kmm) * umask(ji,jj,jk)
-            zeeu_ip1 = e2_e1u(ji+1,jj) * e3u(ji+1,jj,jk,Kmm) * umask(ji+1,jj,jk)
-            zeev_jm1 = e1_e2v(ji,jj-1) * e3v(ji,jj-1,jk,Kmm) * vmask(ji,jj-1,jk)
-            zeev = e1_e2v(ji,jj) * e3v(ji,jj,jk,Kmm) * vmask(ji,jj,jk)
-            zeev_jp1 = e1_e2v(ji,jj+1) * e3v(ji,jj+1,jk,Kmm) * vmask(ji,jj+1,jk)
-            !
-            zztu_im1 = zeeu_im1 * ( pt(ji,jj,jk,jn,Kbb) - pt(ji-1,jj,jk,jn,Kbb) )
-            zztu = zeeu * ( pt(ji+1,jj,jk,jn,Kbb) - pt(ji,jj,jk,jn,Kbb) )
+            zeeu_im1 = e2_e1u(ji-1,jj  ) * e3u(ji-1,jj  ,jk,Kmm) * umask(ji-1,jj  ,jk)
+            zeeu     = e2_e1u(ji  ,jj  ) * e3u(ji  ,jj  ,jk,Kmm) * umask(ji  ,jj  ,jk)
+            zeeu_ip1 = e2_e1u(ji+1,jj  ) * e3u(ji+1,jj  ,jk,Kmm) * umask(ji+1,jj  ,jk)
+            zeev_jm1 = e1_e2v(ji  ,jj-1) * e3v(ji  ,jj-1,jk,Kmm) * vmask(ji  ,jj-1,jk)
+            zeev     = e1_e2v(ji  ,jj  ) * e3v(ji  ,jj  ,jk,Kmm) * vmask(ji  ,jj  ,jk)
+            zeev_jp1 = e1_e2v(ji  ,jj+1) * e3v(ji  ,jj+1,jk,Kmm) * vmask(ji  ,jj+1,jk)
+            !
+            zztu_im1 = zeeu_im1 * ( pt(ji  ,jj,jk,jn,Kbb) - pt(ji-1,jj,jk,jn,Kbb) )
+            zztu     = zeeu     * ( pt(ji+1,jj,jk,jn,Kbb) - pt(ji  ,jj,jk,jn,Kbb) )
             zztu_ip1 = zeeu_ip1 * ( pt(ji+2,jj,jk,jn,Kbb) - pt(ji+1,jj,jk,jn,Kbb) )
             !
-            zztv_jm1 = zeev_jm1 * ( pt(ji,jj,jk,jn,Kbb) - pt(ji,jj-1,jk,jn,Kbb) )
-            zztv = zeev * ( pt(ji  ,jj+1,jk,jn,Kbb) - pt(ji,jj,jk,jn,Kbb) )
+            zztv_jm1 = zeev_jm1 * ( pt(ji,jj  ,jk,jn,Kbb) - pt(ji,jj-1,jk,jn,Kbb) )
+            zztv     = zeev     * ( pt(ji,jj+1,jk,jn,Kbb) - pt(ji,jj  ,jk,jn,Kbb) )
             zztv_jp1 = zeev_jp1 * ( pt(ji,jj+2,jk,jn,Kbb) - pt(ji,jj+1,jk,jn,Kbb) )
             ! Second derivative (divergence)
-            zcoef = 1._wp / ( 6._wp * e3t(ji,jj,jk,Kmm) )
-            zcoef_ip1 = 1._wp / ( 6._wp * e3t(ji+1,jj,jk,Kmm) )
-            zcoef_jp1 = 1._wp / ( 6._wp * e3t(ji,jj+1,jk,Kmm) )
-            !
-            zzltu = (  zztu - zztu_im1  ) * zcoef
-            zzltu_ip1 = (  zztu_ip1 - zztu  ) * zcoef_ip1
-            zzltv = (  zztv - zztv_jm1  ) * zcoef
-            zzltv_jp1 = (  zztv_jp1 - zztv  ) * zcoef_jp1
+            zcoef     = 1._wp / ( 6._wp * e3t(ji  ,jj  ,jk,Kmm) )
+            zcoef_ip1 = 1._wp / ( 6._wp * e3t(ji+1,jj  ,jk,Kmm) )
+            zcoef_jp1 = 1._wp / ( 6._wp * e3t(ji  ,jj+1,jk,Kmm) )
+            !
+            zzltu     = (  zztu     - zztu_im1  ) * zcoef
+            zzltu_ip1 = (  zztu_ip1 - zztu      ) * zcoef_ip1
+            zzltv     = (  zztv     - zztv_jm1  ) * zcoef
+            zzltv_jp1 = (  zztv_jp1 - zztv      ) * zcoef_jp1
             !
             !                     !==  Horizontal advective fluxes  ==!     (UBS)