Changeset 12943 for NEMO/branches/UKMO/dev_r12745_HPC-02_Daley_Tiling_trial_public/src/OCE/TRA/traldf_iso.F90

Timestamp:

2020-05-18T13:28:54+02:00 (4 years ago)

Author:

hadcv

Message:

Merge changes from dev_r12866_HPC-02_Daley_Tiling_trial_extra_halo

File:

• NEMO/branches/UKMO/dev_r12745_HPC-02_Daley_Tiling_trial_public/src/OCE/TRA/traldf_iso.F90 (modified) (4 diffs)

NEMO/branches/UKMO/dev_r12745_HPC-02_Daley_Tiling_trial_public/src/OCE/TRA/traldf_iso.F90

@@ -114 +114 @@
       !
       IF( kpass == 1 .AND. kt == kit000 )  THEN
-         IF( ntile == 1 )  THEN                       ! Do only on the first tile
+         IF( ntile == 0 .OR. ntile == 1 )  THEN                       ! Do only on the first tile
             ! TODO: TO BE TILED
             IF(lwp) WRITE(numout,*)
@@ -197 +197 @@
          !!----------------------------------------------------------------------
 !!gm : bug.... why (x,:,:)?   (1,jpj,:) and (jpi,1,:) should be sufficient....
-         zdit (1,:,:) = 0._wp     ;     zdit (jpi,:,:) = 0._wp
-         zdjt (1,:,:) = 0._wp     ;     zdjt (jpi,:,:) = 0._wp
+         zdit (Ntis2,:,:) = 0._wp     ;     zdit (Ntie2,:,:) = 0._wp
+         zdjt (Ntis2,:,:) = 0._wp     ;     zdjt (Ntie2,:,:) = 0._wp
          !!end
 
@@ -321 +321 @@
          END_3D
          !
-         IF( ntile == nijtile )  THEN                          ! Do only after all tiles finish
             IF( ( kpass == 1 .AND. ln_traldf_lap ) .OR.  &     !==  first pass only (  laplacian)  ==!
                 ( kpass == 2 .AND. ln_traldf_blp ) ) THEN      !==  2nd   pass      (bilaplacian)  ==!
@@ -334 +333 @@
                !
             ENDIF                                                    !== end pass selection  ==!
-         ENDIF
          !
          !                                                        ! ===============