Changeset 13551 for NEMO/branches/2020/dev_r13383_HPC-02_Daley_Tiling/src/OCE/TRA/traqsr.F90

Timestamp:

2020-10-01T12:04:12+02:00 (4 years ago)

Author:

hadcv

Message:

#2365: Replace trd_tra workarounds with ctl_warn if using tiling

File:

• NEMO/branches/2020/dev_r13383_HPC-02_Daley_Tiling/src/OCE/TRA/traqsr.F90 (modified) (4 diffs)

NEMO/branches/2020/dev_r13383_HPC-02_Daley_Tiling/src/OCE/TRA/traqsr.F90

@@ -115 +115 @@
       REAL(wp) ::   zCb, zCmax, zpsi, zpsimax, zrdpsi, zCze
       REAL(wp) ::   zlogc, zlogze, zlogCtot, zlogCze
-      ! TEMP: These changes not necessary after trd_tra is tiled
-      REAL(wp), ALLOCATABLE, SAVE, DIMENSION(:,:,:) ::   ztrdt
       REAL(wp), ALLOCATABLE, DIMENSION(:,:)   :: ze0, ze1, ze2, ze3
       REAL(wp), ALLOCATABLE, DIMENSION(:,:,:) :: ztrdt, zetot, ztmp3d
@@ -132 +130 @@
       !
       IF( l_trdtra ) THEN      ! trends diagnostic: save the input temperature trend
-         IF( ntile == 0 .OR. ntile == 1 )  THEN                       ! Do only on the first tile
-            ! TEMP: This can be ST_2D(nn_hls) after trd_tra is tiled
-            ALLOCATE( ztrdt(jpi,jpj,jpk) )
-         ENDIF
-
-         DO_3D( 0, 0, 0, 0, 1, jpk )
-            ztrdt(ji,jj,jk) = pts(ji,jj,jk,jp_tem,Krhs)
-         END_3D
+         ALLOCATE( ztrdt(jpi,jpj,jpk) )
+         ztrdt(:,:,:) = pts(:,:,:,jp_tem,Krhs)
       ENDIF
       !
@@ -236 +228 @@
             ! Convert chlorophyll value to attenuation coefficient look-up table index
             zlui = 41 + 20.*LOG10(zchl) + 1.e-15
-            DO_3D( 1, 1, 1, 1, 1, nksr + 1 )
-               ztmp3d(ji,jj,jk) = zlui
-            END_3D
+            DO jk = 1, nksr + 1
+               ztmp3d(:,:,jk) = zlui
+            END DO
          ENDIF
          !
@@ -325 +317 @@
       ENDIF
       !
-      ! TEMP: These changes not necessary after trd_tra is tiled
       IF( l_trdtra ) THEN     ! qsr tracers trends saved for diagnostics
-         DO_3D( 0, 0, 0, 0, 1, jpk )
-            ztrdt(ji,jj,jk) = pts(ji,jj,jk,jp_tem,Krhs) - ztrdt(ji,jj,jk)
-         END_3D
-
-         IF( ntile == 0 .OR. ntile == nijtile )  THEN                ! Do only for the full domain
-            IF( ln_tile ) CALL dom_tile( ntsi, ntsj, ntei, ntej, ktile = 0 )         ! Use full domain
-
-            ! TODO: TO BE TILED- trd_tra
-            CALL trd_tra( kt, Kmm, Krhs, 'TRA', jp_tem, jptra_qsr, ztrdt )
-            DEALLOCATE( ztrdt )
-
-            IF( ln_tile ) CALL dom_tile( ntsi, ntsj, ntei, ntej, ktile = nijtile )   ! Revert to tile domain
-         ENDIF
+         ztrdt(:,:,:) = pts(:,:,:,jp_tem,Krhs) - ztrdt(:,:,:)
+         CALL trd_tra( kt, Kmm, Krhs, 'TRA', jp_tem, jptra_qsr, ztrdt )
+         DEALLOCATE( ztrdt )
       ENDIF
       !                       ! print mean trends (used for debugging)