Changeset 14834 for NEMO/trunk/src/OCE/ZDF/zdfddm.F90

Timestamp:

2021-05-11T11:24:44+02:00 (3 years ago)

Author:

hadcv

Message:

#2600: Merge in dev_r14273_HPC-02_Daley_Tiling

File:

• NEMO/trunk/src/OCE/ZDF/zdfddm.F90 (modified) (5 diffs)

NEMO/trunk/src/OCE/ZDF/zdfddm.F90

@@ -83 +83 @@
       REAL(dp) ::          zavfs    !   -      -
       REAL(wp) ::   zavdt, zavds    !   -      -
-      REAL(wp), DIMENSION(jpi,jpj) ::   zrau, zmsks, zmskf, zmskd1, zmskd2, zmskd3
+      REAL(wp), DIMENSION(A2D(nn_hls)) ::   zrau, zmsks, zmskf, zmskd1, zmskd2, zmskd3
       !!----------------------------------------------------------------------
       !
@@ -95 +95 @@
 !!gm                            and many acces in memory
          
-         DO_2D( 1, 1, 1, 1 )           !==  R=zrau = (alpha / beta) (dk[t] / dk[s])  ==!
+         DO_2D( nn_hls-1, nn_hls-1, nn_hls-1, nn_hls-1 )           !==  R=zrau = (alpha / beta) (dk[t] / dk[s])  ==!
             zrw =   ( gdepw(ji,jj,jk  ,Kmm) - gdept(ji,jj,jk,Kmm) )   &
 !!gm please, use e3w at Kmm below 
@@ -111 +111 @@
          END_2D
 
-         DO_2D( 1, 1, 1, 1 )           !==  indicators  ==!
+         DO_2D( nn_hls-1, nn_hls-1, nn_hls-1, nn_hls-1 )           !==  indicators  ==!
             ! stability indicator: msks=1 if rn2>0; 0 elsewhere
             IF( rn2(ji,jj,jk) + 1.e-12  <= 0. ) THEN   ;   zmsks(ji,jj) = 0._wp
@@ -135 +135 @@
          END_2D
          ! mask zmsk in order to have avt and avs masked
-         zmsks(:,:) = zmsks(:,:) * wmask(:,:,jk)
+         zmsks(:,:) = zmsks(:,:) * wmask(A2D(nn_hls),jk)
 
 
@@ -141 +141 @@
          ! ------------------
          ! Constant eddy coefficient: reset to the background value
-         DO_2D( 1, 1, 1, 1 )
+         DO_2D_OVR( nn_hls-1, nn_hls-1, nn_hls-1, nn_hls-1 )
             zinr = 1._wp / zrau(ji,jj)
             ! salt fingering