Changeset 13551 for NEMO/branches/2020/dev_r13383_HPC-02_Daley_Tiling/src/OCE/TRA/traadv_cen.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/traadv_cen.F90 (modified) (5 diffs)

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

@@ -12 +12 @@
    !!----------------------------------------------------------------------
    USE dom_oce        ! ocean space and time domain
-   ! TEMP: This change not necessary after trd_tra is tiled
-   USE domain, ONLY : dom_tile
    USE eosbn2         ! equation of state
    USE traadv_fct     ! acces to routine interp_4th_cpt 
@@ -73 +71 @@
       INTEGER                                  , INTENT(in   ) ::   kn_cen_h        ! =2/4 (2nd or 4th order scheme)
       INTEGER                                  , INTENT(in   ) ::   kn_cen_v        ! =2/4 (2nd or 4th order scheme)
-      ! TEMP: This can be ST_2D(nn_hls) after trd_tra is tiled
+      ! TEMP: This can be ST_2D(nn_hls) if using XIOS (subdomain support)
       REAL(wp), DIMENSION(jpi,jpj,jpk         ), INTENT(in   ) ::   pU, pV, pW      ! 3 ocean volume flux components
       REAL(wp), DIMENSION(jpi,jpj,jpk,kjpt,jpt), INTENT(inout) ::   pt              ! tracers and RHS of tracer equation
@@ -79 +77 @@
       INTEGER  ::   ji, jj, jk, jn   ! dummy loop indices
       INTEGER  ::   ierr             ! local integer
-      ! TEMP: This change not necessary after trd_tra is tiled
-      INTEGER  ::   itile
       REAL(wp) ::   zC2t_u, zC2t_v   ! local scalars
       REAL(wp), DIMENSION(ST_2D(nn_hls),jpk) ::   zwx, zwy, zwz, ztu, ztv, ztw, zltu, zltv
-      ! TEMP: This change not necessary after trd_tra is tiled
-      REAL(wp), DIMENSION(:,:,:,:), SAVE, ALLOCATABLE ::   ztrdx, ztrdy, ztrdz
       !!----------------------------------------------------------------------
-      ! TEMP: This change not necessary after trd_tra is tiled
-      itile = ntile
       !
       IF( ntile == 0 .OR. ntile == 1 )  THEN                       ! Do only on the first tile
@@ -103 +95 @@
          IF(   cdtype == 'TRA' .AND. ( iom_use("uadv_heattr") .OR. iom_use("vadv_heattr") .OR. &
             &                          iom_use("uadv_salttr") .OR. iom_use("vadv_salttr")  ) )  l_hst = .TRUE.
-
-         ! TEMP: This can be ST_2D(nn_hls) after trd_tra is tiled
-         IF( kt == kit000 .AND. l_trd ) THEN
-            ALLOCATE( ztrdx(jpi,jpj,jpk,jpts), ztrdy(jpi,jpj,jpk,jpts), ztrdz(jpi,jpj,jpk,jpts) )
-         ENDIF
       ENDIF
       !
@@ -187 +174 @@
          END_3D
          !                             ! trend diagnostics
-         ! TEMP: These changes not necessary after trd_tra is tiled
          IF( l_trd ) THEN
-            DO_3D( 1, 0, 1, 0, 1, jpk )
-               ztrdx(ji,jj,jk,jn) = zwx(ji,jj,jk)
-               ztrdy(ji,jj,jk,jn) = zwy(ji,jj,jk)
-               ztrdz(ji,jj,jk,jn) = zwz(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, cdtype, jn, jptra_xad, ztrdx(:,:,:,jn), pU, pt(:,:,:,jn,Kmm) )
-               CALL trd_tra( kt, Kmm, Krhs, cdtype, jn, jptra_yad, ztrdy(:,:,:,jn), pV, pt(:,:,:,jn,Kmm) )
-               CALL trd_tra( kt, Kmm, Krhs, cdtype, jn, jptra_zad, ztrdz(:,:,:,jn), pW, pt(:,:,:,jn,Kmm) )
-
-               IF( ln_tile ) CALL dom_tile( ntsi, ntsj, ntei, ntej, ktile = itile )     ! Revert to tile domain
-            ENDIF
+            CALL trd_tra( kt, Kmm, Krhs, cdtype, jn, jptra_xad, zwx, pU, pt(:,:,:,jn,Kmm) )
+            CALL trd_tra( kt, Kmm, Krhs, cdtype, jn, jptra_yad, zwy, pV, pt(:,:,:,jn,Kmm) )
+            CALL trd_tra( kt, Kmm, Krhs, cdtype, jn, jptra_zad, zwz, pW, pt(:,:,:,jn,Kmm) )
          ENDIF
          !                                 ! "Poleward" heat and salt transports