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

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

@@ -90 +90 @@
       REAL(wp), DIMENSION(jpi,jpj,jpk,jpts,jpt), INTENT(inout) :: pts            ! active tracers and RHS of tracer equation
       !
-      ! TEMP: This change not necessary after trd_tra is tiled
-      INTEGER ::   itile
       INTEGER ::   ji, jj, jk   ! dummy loop index
       ! TEMP: This change not necessary and can be ST_2D(nn_hls) if using XIOS (subdomain support)
       REAL(wp), DIMENSION(:,:,:), ALLOCATABLE, SAVE :: zuu, zvv, zww   ! 3D workspace
-      ! TEMP: This change not necessary after trd_tra is tiled
-      REAL(wp), DIMENSION(:,:,:), ALLOCATABLE, SAVE :: ztrdt, ztrds
+      REAL(wp), DIMENSION(:,:,:), ALLOCATABLE :: ztrdt, ztrds
       ! TEMP: This change not necessary after extra haloes development
       LOGICAL :: lskip
@@ -108 +105 @@
       IF( ntile == 0 .OR. ntile == 1 )  THEN                       ! Do only on the first tile
          ALLOCATE( zuu(jpi,jpj,jpk), zvv(jpi,jpj,jpk), zww(jpi,jpj,jpk) )
-         ! TEMP: This can be ST_2D(nn_hls) after trd_tra is tiled
-         IF( l_trdtra ) ALLOCATE( ztrdt(jpi,jpj,jpk), ztrds(jpi,jpj,jpk) )
-      ENDIF
-
-      ! TEMP: These changes not necessary after extra haloes development (lbc_lnk removed from tra_adv_*, ldf_eiv_dia)
+      ENDIF
+
+      ! TEMP: These changes not necessary after extra haloes development (lbc_lnk removed from tra_adv_*)
       IF( nadv /= np_CEN .OR. (nadv == np_CEN .AND. nn_cen_h == 4) .OR. ln_ldfeiv_dia )  THEN
          IF( ln_tile ) THEN
@@ -123 +118 @@
       ENDIF
       IF( .NOT. lskip ) THEN
-
-         ! TEMP: This change not necessary after trd_tra is tiled
-         itile = ntile
          !                                         !==  effective transport  ==!
          ! TODO: NOT TESTED- requires waves
@@ -178 +170 @@
 
          IF( l_trdtra )   THEN                    !* Save ta and sa trends
-            DO_3D( 0, 0, 0, 0, 1, jpk )
-               ztrdt(ji,jj,jk) = pts(ji,jj,jk,jp_tem,Krhs)
-               ztrds(ji,jj,jk) = pts(ji,jj,jk,jp_sal,Krhs)
-            END_3D
+            ALLOCATE( ztrdt(jpi,jpj,jpk), ztrds(jpi,jpj,jpk) )
+            ztrdt(:,:,:) = pts(:,:,:,jp_tem,Krhs)
+            ztrds(:,:,:) = pts(:,:,:,jp_sal,Krhs)
          ENDIF
          !
@@ -199 +190 @@
          END SELECT
          !
-         ! TEMP: These changes not necessary after trd_tra is tiled
          IF( l_trdtra )   THEN                      ! save the advective trends for further diagnostics
-            DO_3D( 0, 0, 0, 0, 1, jpk )
-               ztrdt(ji,jj,jk) = pts(ji,jj,jk,jp_tem,Krhs) - ztrdt(ji,jj,jk)
-               ztrds(ji,jj,jk) = pts(ji,jj,jk,jp_sal,Krhs) - ztrds(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_totad, ztrdt )
-               CALL trd_tra( kt, Kmm, Krhs, 'TRA', jp_sal, jptra_totad, ztrds )
-               DEALLOCATE( ztrdt, ztrds )
-
-               IF( ln_tile ) CALL dom_tile( ntsi, ntsj, ntei, ntej, ktile = itile )     ! Revert to tile domain
-            ENDIF
-         ENDIF
-
-         ! TEMP: This change not necessary after extra haloes development (lbc_lnk removed from tra_adv_*, ldf_eiv_dia)
+            DO jk = 1, jpkm1
+               ztrdt(:,:,jk) = pts(:,:,jk,jp_tem,Krhs) - ztrdt(:,:,jk)
+               ztrds(:,:,jk) = pts(:,:,jk,jp_sal,Krhs) - ztrds(:,:,jk)
+            END DO
+            CALL trd_tra( kt, Kmm, Krhs, 'TRA', jp_tem, jptra_totad, ztrdt )
+            CALL trd_tra( kt, Kmm, Krhs, 'TRA', jp_sal, jptra_totad, ztrds )
+            DEALLOCATE( ztrdt, ztrds )
+         ENDIF
+
+         ! TEMP: This change not necessary after extra haloes development (lbc_lnk removed from tra_adv_*)
          IF( ln_tile .AND. ntile == 0 ) CALL dom_tile( ntsi, ntsj, ntei, ntej, ktile = 1 )
 
@@ -224 +206 @@
       !                                              ! print mean trends (used for debugging)
       IF(sn_cfctl%l_prtctl)   CALL prt_ctl( tab3d_1=pts(:,:,:,jp_tem,Krhs), clinfo1=' adv  - Ta: ', mask1=tmask, &
-         &                                  tab3d_2=pts(:,:,:,jp_sal,Krhs), clinfo2=       ' Sa: ', mask2=tmask, &
-         &                                  clinfo3='tra' )
+         &                                  tab3d_2=pts(:,:,:,jp_sal,Krhs), clinfo2=       ' Sa: ', mask2=tmask, clinfo3='tra' )
 
       ! TEMP: This change not necessary if using XIOS (subdomain support)