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

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

@@ -17 +17 @@
    USE oce            ! ocean dynamics and active tracers
    USE dom_oce        ! ocean space and time domain
-   ! TEMP: This change not necessary after trd_tra is tiled and extra haloes development (lbc_lnk removed)
+   ! TEMP: This change not necessary after extra haloes development (lbc_lnk removed)
    USE domain, ONLY : dom_tile
    USE phycst         ! physical constants
@@ -77 +77 @@
       REAL(wp), DIMENSION(ST_2D(nn_hls),jpk     )   ::   zn2              ! N^2
       REAL(wp), DIMENSION(ST_2D(nn_hls),jpk,jpts)   ::   zab              ! alpha and beta
-      ! TEMP: This change not necessary after trd_tra is tiled
-      REAL(wp), ALLOCATABLE, SAVE, DIMENSION(:,:,:) ::   ztrdt, ztrds ! 3D workspace
+      REAL(wp), ALLOCATABLE, DIMENSION(:,:,:) ::   ztrdt, ztrds ! 3D workspace
       !
       LOGICAL, PARAMETER :: l_LB_debug = .FALSE. ! set to true if you want to follow what is
@@ -86 +85 @@
       !
       IF( ln_timing )   CALL timing_start('tra_npc')
-
-      IF( l_trdtra )   THEN
-         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), ztrds(jpi,jpj,jpk) )
-         ENDIF
-      ENDIF
       !
       IF( MOD( kt, nn_npc ) == 0 ) THEN
          !
          IF( l_trdtra )   THEN                    !* Save initial after fields
-            DO_3D( 0, 0, 0, 0, 1, jpk )
-               ztrdt(ji,jj,jk) = pts(ji,jj,jk,jp_tem,Kaa)
-               ztrds(ji,jj,jk) = pts(ji,jj,jk,jp_sal,Kaa)
-            END_3D
+            ALLOCATE( ztrdt(jpi,jpj,jpk) , ztrds(jpi,jpj,jpk) )
+            ztrdt(:,:,:) = pts(:,:,:,jp_tem,Kaa)
+            ztrds(:,:,:) = pts(:,:,:,jp_sal,Kaa)
          ENDIF
          !
@@ -314 +305 @@
          END_2D
          !
-         ! TEMP: These changes not necessary after trd_tra is tiled and extra haloes development (lbc_lnk removed)
-         IF( l_trdtra ) THEN
+         IF( l_trdtra ) THEN         ! send the Non penetrative mixing trends for diagnostic
             z1_rDt = 1._wp / (2._wp * rn_Dt)
-
-            DO_3D( 0, 0, 0, 0, 1, jpk )
-               ztrdt(ji,jj,jk) = ( pts(ji,jj,jk,jp_tem,Kaa) - ztrdt(ji,jj,jk) ) * z1_rDt
-               ztrds(ji,jj,jk) = ( pts(ji,jj,jk,jp_sal,Kaa) - ztrds(ji,jj,jk) ) * z1_rDt
-            END_3D
+            ztrdt(:,:,:) = ( pts(:,:,:,jp_tem,Kaa) - ztrdt(:,:,:) ) * z1_rDt
+            ztrds(:,:,:) = ( pts(:,:,:,jp_sal,Kaa) - ztrds(:,:,:) ) * z1_rDt
+            CALL trd_tra( kt, Kmm, Krhs, 'TRA', jp_tem, jptra_npc, ztrdt )
+            CALL trd_tra( kt, Kmm, Krhs, 'TRA', jp_sal, jptra_npc, ztrds )
+            DEALLOCATE( ztrdt, ztrds )
          ENDIF
-
+         !
+         ! TEMP: This change not necessary after extra haloes development (lbc_lnk removed)
          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
-
-            IF( l_trdtra ) THEN         ! send the Non penetrative mixing trends for diagnostic
-               ! TODO: TO BE TILED- trd_tra
-               CALL trd_tra( kt, Kmm, Krhs, 'TRA', jp_tem, jptra_npc, ztrdt )
-               CALL trd_tra( kt, Kmm, Krhs, 'TRA', jp_sal, jptra_npc, ztrds )
-               DEALLOCATE( ztrdt, ztrds )
-            ENDIF
-
-            IF( ln_tile ) CALL dom_tile( ntsi, ntsj, ntei, ntej, ktile = nijtile )   ! Revert to tile domain
-            !
             CALL lbc_lnk_multi( 'tranpc', pts(:,:,:,jp_tem,Kaa), 'T', 1.0_wp, pts(:,:,:,jp_sal,Kaa), 'T', 1.0_wp )
             !