Changeset 12943 for NEMO/branches/UKMO/dev_r12745_HPC-02_Daley_Tiling_trial_public/src/OCE/TRA/traldf.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.F90 (modified) (3 diffs)

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

@@ -58 +58 @@
       !!----------------------------------------------------------------------
       !
-      IF( ntile == 1 )  THEN                      ! Do only on the first tile
-         ! TODO: TO BE TILED
          IF( ln_timing )   CALL timing_start('tra_ldf')
-      ENDIF
       !
-      IF( ntile == nijtile )  THEN                ! Do only after all tiles finish
+      IF( ntile == 0 .OR. ntile == nijtile )  THEN                ! Do only after all tiles finish
          IF( l_trdtra )   THEN                    !* Save ta and sa trends
             ! TODO: TO BE TILED
@@ -83 +80 @@
       END SELECT
       !
-      IF( ntile == nijtile )  THEN                ! Do only after all tiles finish
+      IF( ntile == 0 .OR. ntile == nijtile )  THEN                ! Do only after all tiles finish
          IF( l_trdtra )   THEN                    !* save the horizontal diffusive trends for further diagnostics
             ! TODO: TO BE TILED
@@ -93 +90 @@
             DEALLOCATE( ztrdt, ztrds )
          ENDIF
-
+      ENDIF
          !                                        !* print mean trends (used for debugging)
-         ! TODO: TO BE TILED
          IF(sn_cfctl%l_prtctl)   CALL prt_ctl( tab3d_1=pts(:,:,:,jp_tem,Krhs), clinfo1=' ldf  - Ta: ', mask1=tmask,               &
             &                                  tab3d_2=pts(:,:,:,jp_sal,Krhs), clinfo2=       ' Sa: ', mask2=tmask, clinfo3='tra' )
          !
-         ! TODO: TO BE TILED
          IF( ln_timing )   CALL timing_stop('tra_ldf')
-      ENDIF
       !
    END SUBROUTINE tra_ldf