Changes from NEMO/trunk/src/OCE/DIA/diaptr.F90 at r14229 to NEMO/branches/2021/dev_r14273_HPC-02_Daley_Tiling/src/OCE/DIA/diaptr.F90 at r14787

File:

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

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

@@ -71 +71 @@
 CONTAINS
 
+   ! NOTE: [tiling] tiling sometimes changes the diagnostics very slightly, usually where there are few zonal points e.g. the northern Indian Ocean basin. The difference is usually very small, for one point in one diagnostic. Presumably this is because of the additional zonal integration step over tiles.
    SUBROUTINE dia_ptr( kt, Kmm, pvtr )
       !!----------------------------------------------------------------------
@@ -93 +94 @@
 
          ! 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 +318 @@
          !
          IF( iom_use( 'uocetr_vsum_cumul' ) ) THEN
-            IF( ln_tile ) CALL dom_tile( ntsi, ntsj, ntei, ntej, ktile = 0 )         ! 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
          ENDIF
          !
@@ -589 +588 @@
 
 #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 +626 @@
 
 #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