Changeset 14537 for NEMO/branches/2021/dev_r14273_HPC-02_Daley_Tiling/src/OCE/DIA

Timestamp:

2021-02-23T15:18:28+01:00 (3 years ago)

Author:

hadcv

Message:

#2600: Reorganise dom_tile code

File:

• NEMO/branches/2021/dev_r14273_HPC-02_Daley_Tiling/src/OCE/DIA/diaptr.F90 (modified) (4 diffs)

NEMO/branches/2021/dev_r14273_HPC-02_Daley_Tiling/src/OCE/DIA/diaptr.F90

@@ -93 +93 @@
 
          ! Calculate diagnostics only when zonal integrals have finished
-         IF( ntile == 0 .OR. ntile == nijtile ) CALL dia_ptr_iom(kt, Kmm, pvtr)
+         IF( .NOT. l_istiled .OR. ntile == nijtile ) CALL dia_ptr_iom(kt, Kmm, pvtr)
       ENDIF
 
@@ -317 +317 @@
          !
          IF( iom_use( 'uocetr_vsum_cumul' ) ) THEN
-            IF( ln_tile ) CALL dom_tile( ntsi, ntsj, ntei, ntej, ktile = 0 )         ! Use full domain
+            IF( ln_tile ) CALL dom_tile_stop( ldhold=.TRUE., cstr='diaptr' )             ! Use full domain
             CALL iom_get_var(  'uocetr_vsum_op', z2d ) ! get uocetr_vsum_op from xml
             z2d(:,:) = ptr_ci_2d( z2d(:,:) )
             CALL iom_put( 'uocetr_vsum_cumul', z2d )
-            IF( ln_tile ) CALL dom_tile( ntsi, ntsj, ntei, ntej, ktile = nijtile )   ! Revert to tile domain
+            IF( ln_tile ) CALL dom_tile_start( ldhold=.TRUE., cstr='diaptr' )            ! Revert to tile domain
          ENDIF
          !
@@ -589 +589 @@
 
 #if ! defined key_mpi_off
-      IF( ntile == 0 .OR. ntile == nijtile ) THEN
+      IF( .NOT. l_istiled .OR. ntile == nijtile ) THEN
          ish1d(1) = jpj*nbasin
          ish2d(1) = jpj ; ish2d(2) = nbasin
@@ -627 +627 @@
 
 #if ! defined key_mpi_off
-      IF( ntile == 0 .OR. ntile == nijtile ) THEN
+      IF( .NOT. l_istiled .OR. ntile == nijtile ) THEN
          ish1d(1) = jpj*jpk*nbasin
          ish3d(1) = jpj ; ish3d(2) = jpk ; ish3d(3) = nbasin