New URL for NEMO forge!   http://forge.nemo-ocean.eu

Since March 2022 along with NEMO 4.2 release, the code development moved to a self-hosted GitLab.
This present forge is now archived and remained online for history.
Changeset 12942 for NEMO/branches/UKMO/dev_r12866_HPC-02_Daley_Tiling_trial_extra_halo/src/OCE/TRA/traldf.F90 – NEMO

Ignore:
Timestamp:
2020-05-18T13:14:54+02:00 (3 years ago)
Author:
hadcv
Message:

Correct/improve IF blocks for one tile code

File:
1 edited

Legend:

Unmodified
Added
Removed
  • NEMO/branches/UKMO/dev_r12866_HPC-02_Daley_Tiling_trial_extra_halo/src/OCE/TRA/traldf.F90

    r12906 r12942  
    5858      !!---------------------------------------------------------------------- 
    5959      ! 
    60       IF( ntile == 1 )  THEN                      ! Do only on the first tile 
    61          ! TODO: TO BE TILED 
    62          IF( ln_timing )   CALL timing_start('tra_ldf') 
    63       ENDIF 
     60      IF( ln_timing )   CALL timing_start('tra_ldf') 
    6461      ! 
    65       IF( ntile == nijtile )  THEN                ! Do only after all tiles finish 
     62      IF( ntile == 0 .OR. ntile == nijtile )  THEN                ! Do only after all tiles finish 
    6663         IF( l_trdtra )   THEN                    !* Save ta and sa trends 
    6764            ! TODO: TO BE TILED 
     
    8380      END SELECT 
    8481      ! 
    85       IF( ntile == nijtile )  THEN                ! Do only after all tiles finish 
     82      IF( ntile == 0 .OR. ntile == nijtile )  THEN                ! Do only after all tiles finish 
    8683         IF( l_trdtra )   THEN                    !* save the horizontal diffusive trends for further diagnostics 
    8784            ! TODO: TO BE TILED 
     
    9390            DEALLOCATE( ztrdt, ztrds ) 
    9491         ENDIF 
    95  
    96          !                                        !* print mean trends (used for debugging) 
    97          ! TODO: TO BE TILED 
    98          IF(sn_cfctl%l_prtctl)   CALL prt_ctl( tab3d_1=pts(:,:,:,jp_tem,Krhs), clinfo1=' ldf  - Ta: ', mask1=tmask,               & 
    99             &                                  tab3d_2=pts(:,:,:,jp_sal,Krhs), clinfo2=       ' Sa: ', mask2=tmask, clinfo3='tra' ) 
    100          ! 
    101          ! TODO: TO BE TILED 
    102          IF( ln_timing )   CALL timing_stop('tra_ldf') 
    10392      ENDIF 
     93      !                                        !* print mean trends (used for debugging) 
     94      IF(sn_cfctl%l_prtctl)   CALL prt_ctl( tab3d_1=pts(:,:,:,jp_tem,Krhs), clinfo1=' ldf  - Ta: ', mask1=tmask,               & 
     95         &                                  tab3d_2=pts(:,:,:,jp_sal,Krhs), clinfo2=       ' Sa: ', mask2=tmask, clinfo3='tra' ) 
     96      ! 
     97      IF( ln_timing )   CALL timing_stop('tra_ldf') 
    10498      ! 
    10599   END SUBROUTINE tra_ldf 
Note: See TracChangeset for help on using the changeset viewer.