Changeset 12942

Timestamp:

2020-05-18T13:14:54+02:00 (4 years ago)

Author:

hadcv

Message:

Correct/improve IF blocks for one tile code

Location:

NEMO/branches/UKMO/dev_r12866_HPC-02_Daley_Tiling_trial_extra_halo/src/OCE

Files:

• IOM/prtctl.F90 (modified) (1 diff)
• TRA/traldf.F90 (modified) (3 diffs)
• TRA/traldf_iso.F90 (modified) (3 diffs)
• timing.F90 (modified) (2 diffs)

NEMO/branches/UKMO/dev_r12866_HPC-02_Daley_Tiling_trial_extra_halo/src/OCE/IOM/prtctl.F90

@@ -94 +94 @@
       REAL(wp), DIMENSION(jpi,jpj,jpk) :: zmask1, zmask2, ztab3d_1, ztab3d_2
       !!----------------------------------------------------------------------
+      ! TODO: TO BE TILED
+      IF( ntile /= 0 .AND. ntile /= nijtile ) RETURN
 
       ! Arrays, scalars initialization 

NEMO/branches/UKMO/dev_r12866_HPC-02_Daley_Tiling_trial_extra_halo/src/OCE/TRA/traldf.F90

@@ -58 +58 @@
       !!----------------------------------------------------------------------
       !
-      IF( ntile == 1 )  THEN                      ! Do only on the first tile
-         ! TODO: TO BE TILED
-         IF( ln_timing )   CALL timing_start('tra_ldf')
-      ENDIF
+      IF( ln_timing )   CALL timing_start('tra_ldf')
       !
-      IF( ntile == nijtile )  THEN                ! Do only after all tiles finish
+      IF( ntile == 0 .OR. ntile == nijtile )  THEN                ! Do only after all tiles finish
          IF( l_trdtra )   THEN                    !* Save ta and sa trends
             ! TODO: TO BE TILED
@@ -83 +80 @@
       END SELECT
       !
-      IF( ntile == nijtile )  THEN                ! Do only after all tiles finish
+      IF( ntile == 0 .OR. ntile == nijtile )  THEN                ! Do only after all tiles finish
          IF( l_trdtra )   THEN                    !* save the horizontal diffusive trends for further diagnostics
             ! TODO: TO BE TILED
@@ -93 +90 @@
             DEALLOCATE( ztrdt, ztrds )
          ENDIF
-
-         !                                        !* print mean trends (used for debugging)
-         ! TODO: TO BE TILED
-         IF(sn_cfctl%l_prtctl)   CALL prt_ctl( tab3d_1=pts(:,:,:,jp_tem,Krhs), clinfo1=' ldf  - Ta: ', mask1=tmask,               &
-            &                                  tab3d_2=pts(:,:,:,jp_sal,Krhs), clinfo2=       ' Sa: ', mask2=tmask, clinfo3='tra' )
-         !
-         ! TODO: TO BE TILED
-         IF( ln_timing )   CALL timing_stop('tra_ldf')
       ENDIF
+      !                                        !* print mean trends (used for debugging)
+      IF(sn_cfctl%l_prtctl)   CALL prt_ctl( tab3d_1=pts(:,:,:,jp_tem,Krhs), clinfo1=' ldf  - Ta: ', mask1=tmask,               &
+         &                                  tab3d_2=pts(:,:,:,jp_sal,Krhs), clinfo2=       ' Sa: ', mask2=tmask, clinfo3='tra' )
+      !
+      IF( ln_timing )   CALL timing_stop('tra_ldf')
       !
    END SUBROUTINE tra_ldf

NEMO/branches/UKMO/dev_r12866_HPC-02_Daley_Tiling_trial_extra_halo/src/OCE/TRA/traldf_iso.F90

@@ -114 +114 @@
       !
       IF( kpass == 1 .AND. kt == kit000 )  THEN
-         IF( ntile == 1 )  THEN                       ! Do only on the first tile
+         IF( ntile == 0 .OR. ntile == 1 )  THEN                       ! Do only on the first tile
             ! TODO: TO BE TILED
             IF(lwp) WRITE(numout,*)
@@ -321 +321 @@
          END_3D
          !
-         IF( ntile == nijtile )  THEN                          ! Do only after all tiles finish
          IF( ( kpass == 1 .AND. ln_traldf_lap ) .OR.  &     !==  first pass only (  laplacian)  ==!
              ( kpass == 2 .AND. ln_traldf_blp ) ) THEN      !==  2nd   pass      (bilaplacian)  ==!
@@ -334 +333 @@
             !
          ENDIF                                                    !== end pass selection  ==!
-         ENDIF
          !
          !                                                        ! ===============

NEMO/branches/UKMO/dev_r12866_HPC-02_Daley_Tiling_trial_extra_halo/src/OCE/timing.F90

@@ -93 +93 @@
       !!----------------------------------------------------------------------
       CHARACTER(len=*), INTENT(in) :: cdinfo
+      ! TODO: TO BE TILED
+      IF( ntile /= 0 .AND. ntile /= 1 ) RETURN
       !
        IF(ASSOCIATED(s_timer) ) s_timer_old => s_timer
@@ -138 +140 @@
       INTEGER  :: ifinal_count, iperiods    
       REAL(wp) :: zcpu_end, zmpitime,zcpu_raw,zclock_raw
+      ! TODO: TO BE TILED
+      IF( ntile /= 0 .AND. ntile /= nijtile ) RETURN
       !
       s_wrk => NULL()