Changeset 11411 for NEMO/trunk/src

Timestamp:

2019-08-06T17:08:55+02:00 (5 years ago)

Author:

jchanut

Message:

#2305, a few corrections and comestic changes following Andrew's revision 11407

File:

• NEMO/trunk/src/OCE/TRA/traadv_fct.F90 (modified) (8 diffs)

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

@@ -195 +195 @@
             CALL tridia_solver( zwdia, zwsup, zwinf, zwi, zwi , 0 )
             !
-            ztu(:,:,1) = 0._wp; ztu(:,:,jpk) = 0._wp
+            ztw(:,:,1) = 0._wp ; ztw(:,:,jpk) = 0._wp ;
             DO jk = 2, jpkm1        ! Interior value ( multiplied by wmask)
-               DO jj = 1, jpj
-                  DO ji = 1, jpi
+               DO jj = 2, jpjm1
+                  DO ji = fs_2, fs_jpim1   ! vector opt.  
                      zfp_wk = wi(ji,jj,jk) + ABS( wi(ji,jj,jk) )
                      zfm_wk = wi(ji,jj,jk) - ABS( wi(ji,jj,jk) )
-                     ztu(ji,jj,jk) =  0.5 * e1e2t(ji,jj) * ( zfp_wk * zwi(ji,jj,jk) + zfm_wk * zwi(ji,jj,jk-1) ) * wmask(ji,jj,jk)
+                     ztw(ji,jj,jk) =  0.5 * e1e2t(ji,jj) * ( zfp_wk * zwi(ji,jj,jk) + zfm_wk * zwi(ji,jj,jk-1) ) * wmask(ji,jj,jk)
+                     zwz(ji,jj,jk) = zwz(ji,jj,jk) + ztw(ji,jj,jk) ! update vertical fluxes
                   END DO
                END DO
@@ -208 +209 @@
                DO jj = 2, jpjm1
                   DO ji = fs_2, fs_jpim1   ! vector opt.  
-                     pta(ji,jj,jk,jn) = pta(ji,jj,jk,jn) - ( ztu(ji,jj,jk) - ztu(ji  ,jj  ,jk+1) ) &
+                     pta(ji,jj,jk,jn) = pta(ji,jj,jk,jn) - ( ztw(ji,jj,jk) - ztw(ji  ,jj  ,jk+1) ) &
                         &                                  * r1_e1e2t(ji,jj) / e3t_n(ji,jj,jk)
                   END DO
                END DO
             END DO
-            zwz(:,:,:) = zwz(:,:,:) + ztu(:,:,:)
             !
          END IF
@@ -324 +324 @@
             zwz(:,:,1) = 0._wp   ! only ocean surface as interior zwz values have been w-masked
          ENDIF
-         !
-         CALL lbc_lnk_multi( 'traadv_fct', zwi, 'T', 1., zwx, 'U', -1. , zwy, 'V', -1.,  zwz, 'W',  1. )
-         !
          !         
          IF ( ll_zAimp ) THEN
@@ -336 +333 @@
                         &      + zwy(ji,jj,jk) - zwy(ji  ,jj-1,jk  )   &
                         &      + zwz(ji,jj,jk) - zwz(ji  ,jj  ,jk+1) ) * r1_e1e2t(ji,jj)
-                     ztu(ji,jj,jk)  = zwi(ji,jj,jk) + p2dt * ztra / e3t_a(ji,jj,jk) * tmask(ji,jj,jk)
-                  END DO
-               END DO
-            END DO
-            !
-            CALL tridia_solver( zwdia, zwsup, zwinf, ztu, ztu , 0 )
-            !
-            ztu(:,:,1) = 0._wp
+                     ztw(ji,jj,jk)  = zwi(ji,jj,jk) + p2dt * ztra / e3t_a(ji,jj,jk) * tmask(ji,jj,jk)
+                  END DO
+               END DO
+            END DO
+            !
+            CALL tridia_solver( zwdia, zwsup, zwinf, ztw, ztw , 0 )
+            !
             DO jk = 2, jpkm1        ! Interior value ( multiplied by wmask)
                DO jj = 2, jpjm1
@@ -349 +345 @@
                      zfp_wk = wi(ji,jj,jk) + ABS( wi(ji,jj,jk) )
                      zfm_wk = wi(ji,jj,jk) - ABS( wi(ji,jj,jk) )
-                     zwz(ji,jj,jk) =  zwz(ji,jj,jk) + 0.5 * e1e2t(ji,jj) * ( zfp_wk * ztu(ji,jj,jk) + zfm_wk * ztu(ji,jj,jk-1) ) * wmask(ji,jj,jk)
+                     zwz(ji,jj,jk) =  zwz(ji,jj,jk) + 0.5 * e1e2t(ji,jj) * ( zfp_wk * ztw(ji,jj,jk) + zfm_wk * ztw(ji,jj,jk-1) ) * wmask(ji,jj,jk)
                   END DO
                END DO
             END DO
          END IF
+         !
+         CALL lbc_lnk_multi( 'traadv_fct', zwi, 'T', 1., zwx, 'U', -1. , zwy, 'V', -1.,  zwz, 'W',  1. )
+         !
          !        !==  monotonicity algorithm  ==!
          !
@@ -374 +373 @@
          IF ( ll_zAimp ) THEN
             !
+            ztw(:,:,1) = 0._wp ; ztw(:,:,jpk) = 0._wp
             DO jk = 2, jpkm1        ! Interior value ( multiplied by wmask)
                DO jj = 2, jpjm1
@@ -379 +379 @@
                      zfp_wk = wi(ji,jj,jk) + ABS( wi(ji,jj,jk) )
                      zfm_wk = wi(ji,jj,jk) - ABS( wi(ji,jj,jk) )
-                     zwz(ji,jj,jk) = - 0.5 * e1e2t(ji,jj) * ( zfp_wk * zwi(ji,jj,jk) + zfm_wk * zwi(ji,jj,jk-1) ) * wmask(ji,jj,jk)
+                     ztw(ji,jj,jk) = - 0.5 * e1e2t(ji,jj) * ( zfp_wk * zwi(ji,jj,jk) + zfm_wk * zwi(ji,jj,jk-1) ) * wmask(ji,jj,jk)
+                     zwz(ji,jj,jk) = zwz(ji,jj,jk) + ztw(ji,jj,jk) ! Update vertical fluxes for trend diagnostic
                   END DO
                END DO
@@ -386 +387 @@
                DO jj = 2, jpjm1
                   DO ji = fs_2, fs_jpim1   ! vector opt.  
-                     pta(ji,jj,jk,jn) = pta(ji,jj,jk,jn) - ( zwz(ji,jj,jk) - zwz(ji  ,jj  ,jk+1) ) &
+                     pta(ji,jj,jk,jn) = pta(ji,jj,jk,jn) - ( ztw(ji,jj,jk) - ztw(ji  ,jj  ,jk+1) ) &
                         &                                * r1_e1e2t(ji,jj) / e3t_n(ji,jj,jk)
                   END DO