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 14229 for NEMO/trunk/src/OCE/LBC/lib_mpp.F90 – NEMO

Ignore:
Timestamp:
2020-12-20T13:45:55+01:00 (3 years ago)
Author:
smasson
Message:

trunk: replace key_mpp_mpi by the opposite key key_mpi_off

File:
1 edited

Legend:

Unmodified
Added
Removed
  • NEMO/trunk/src/OCE/LBC/lib_mpp.F90

    r14072 r14229  
    7373   PUBLIC   mpp_bcast_nml 
    7474   PUBLIC   tic_tac 
    75 #if ! defined key_mpp_mpi 
     75#if defined key_mpp_off 
    7676   PUBLIC MPI_wait 
    7777   PUBLIC MPI_Wtime 
     
    110110   !!  MPI  variable definition !! 
    111111   !! ========================= !! 
    112 #if   defined key_mpp_mpi 
     112#if ! defined key_mpi_off 
    113113!$AGRIF_DO_NOT_TREAT 
    114114   INCLUDE 'mpif.h' 
     
    209209      LOGICAL ::   llmpi_init 
    210210      !!---------------------------------------------------------------------- 
    211 #if defined key_mpp_mpi 
     211#if ! defined key_mpi_off 
    212212      ! 
    213213      CALL mpi_initialized ( llmpi_init, ierr ) 
     
    271271      !!---------------------------------------------------------------------- 
    272272      ! 
    273 #if defined key_mpp_mpi 
     273#if ! defined key_mpi_off 
    274274      IF (wp == dp) THEN 
    275275         mpi_working_type = mpi_double_precision 
     
    299299      !!---------------------------------------------------------------------- 
    300300      ! 
    301 #if defined key_mpp_mpi 
     301#if ! defined key_mpi_off 
    302302      CALL mpi_isend( pmess, kbytes, mpi_double_precision, kdest , ktyp, mpi_comm_oce, md_req, iflag ) 
    303303#endif 
     
    322322      !!---------------------------------------------------------------------- 
    323323      ! 
    324 #if defined key_mpp_mpi 
     324#if ! defined key_mpi_off 
    325325      CALL mpi_isend( pmess, kbytes, mpi_real, kdest , ktyp, mpi_comm_oce, md_req, iflag ) 
    326326#endif 
     
    347347      !!---------------------------------------------------------------------- 
    348348      ! 
    349 #if defined key_mpp_mpi 
     349#if ! defined key_mpi_off 
    350350      ! If a specific process number has been passed to the receive call, 
    351351      ! use that one. Default is to use mpi_any_source 
     
    380380      !!---------------------------------------------------------------------- 
    381381      ! 
    382 #if defined key_mpp_mpi 
     382#if ! defined key_mpi_off 
    383383      ! If a specific process number has been passed to the receive call, 
    384384      ! use that one. Default is to use mpi_any_source 
     
    409409      !!---------------------------------------------------------------------- 
    410410      ! 
    411 #if defined key_mpp_mpi 
     411#if ! defined key_mpi_off 
    412412      ! If a specific process number has been passed to the receive call, 
    413413      ! use that one. Default is to use mpi_any_source 
     
    437437      ! 
    438438      itaille = jpi * jpj 
    439 #if defined key_mpp_mpi 
     439#if ! defined key_mpi_off 
    440440      CALL mpi_gather( ptab, itaille, mpi_double_precision, pio, itaille     ,   & 
    441441         &                            mpi_double_precision, kp , mpi_comm_oce, ierror ) 
     
    464464      itaille = jpi * jpj 
    465465      ! 
    466 #if defined key_mpp_mpi 
     466#if ! defined key_mpi_off 
    467467      CALL mpi_scatter( pio, itaille, mpi_double_precision, ptab, itaille     ,   & 
    468468         &                            mpi_double_precision, kp  , mpi_comm_oce, ierror ) 
     
    493493      COMPLEX(dp), ALLOCATABLE, DIMENSION(:) ::   ytmp 
    494494      !!---------------------------------------------------------------------- 
    495 #if defined key_mpp_mpi 
     495#if ! defined key_mpi_off 
    496496      ilocalcomm = mpi_comm_oce 
    497497      IF( PRESENT(kcom) )   ilocalcomm = kcom 
     
    568568      !!---------------------------------------------------------------------- 
    569569 
    570 #if defined key_mpp_mpi 
     570#if ! defined key_mpi_off 
    571571      if( wp == dp ) then 
    572572         MPI_TYPE = MPI_DOUBLE_PRECISION 
     
    640640      INTEGER ::   ierr 
    641641      !!---------------------------------------------------------------------- 
    642 #if defined key_mpp_mpi 
     642#if ! defined key_mpi_off 
    643643      IF( ln_timing ) CALL tic_tac( .TRUE., ld_global = .TRUE.) 
    644644      ! test on ndelayid(kid) useless as mpi_wait return immediatly if the request handle is MPI_REQUEST_NULL 
     
    662662      !!---------------------------------------------------------------------- 
    663663      ! 
    664 #if defined key_mpp_mpi 
     664#if ! defined key_mpi_off 
    665665      call MPI_BCAST(kleng, 1, MPI_INT, 0, mpi_comm_oce, iflag) 
    666666      call MPI_BARRIER(mpi_comm_oce, iflag) 
     
    928928      !!----------------------------------------------------------------------- 
    929929      ! 
    930 #if defined key_mpp_mpi 
     930#if ! defined key_mpi_off 
    931931      CALL mpi_barrier( mpi_comm_oce, ierror ) 
    932932#endif 
     
    949949      IF( PRESENT(ld_abort) ) ll_abort = ld_abort 
    950950      ! 
    951 #if defined key_mpp_mpi 
     951#if ! defined key_mpi_off 
    952952      IF(ll_abort) THEN 
    953953         CALL mpi_abort( MPI_COMM_WORLD ) 
     
    969969      !!---------------------------------------------------------------------- 
    970970      ! 
    971 #if defined key_mpp_mpi 
     971#if ! defined key_mpi_off 
    972972      CALL MPI_COMM_FREE(kcom, ierr) 
    973973#endif 
     
    10011001      INTEGER, ALLOCATABLE, DIMENSION(:) ::   kwork 
    10021002      !!---------------------------------------------------------------------- 
    1003 #if defined key_mpp_mpi 
     1003#if ! defined key_mpi_off 
    10041004      !-$$     WRITE (numout,*) 'mpp_ini_znl ', nproc, ' - ngrp_world     : ', ngrp_world 
    10051005      !-$$     WRITE (numout,*) 'mpp_ini_znl ', nproc, ' - mpi_comm_world : ', mpi_comm_world 
     
    10941094      LOGICAL, PARAMETER :: ireord = .FALSE. 
    10951095 
    1096 #if defined key_mpp_mpi 
     1096#if ! defined key_mpi_off 
    10971097 
    10981098      ideg = 0 
     
    12481248      !!---------------------------------------------------------------------- 
    12491249      ! 
    1250 #if defined key_mpp_mpi 
     1250#if ! defined key_mpi_off 
    12511251      njmppmax = MAXVAL( njmppt ) 
    12521252      ! 
     
    13301330      INTEGER ::    ji,  jj,  jk,  jh, jf, jcount   ! dummy loop indices 
    13311331      !!---------------------------------------------------------------------- 
    1332 #if defined key_mpp_mpi 
     1332#if ! defined key_mpi_off 
    13331333      ! 
    13341334      ll_lbc = .FALSE. 
     
    14511451    REAL(dp),               SAVE :: tic_ct = 0._dp 
    14521452    INTEGER :: ii 
    1453 #if defined key_mpp_mpi 
     1453#if ! defined key_mpi_off 
    14541454 
    14551455    IF( ncom_stp <= nit000 ) RETURN 
     
    14711471   END SUBROUTINE tic_tac 
    14721472 
    1473 #if ! defined key_mpp_mpi 
     1473#if defined key_mpi_off 
    14741474   SUBROUTINE mpi_wait(request, status, ierror) 
    14751475      INTEGER                            , INTENT(in   ) ::   request 
     
    17921792         !write(*,'(32A)') cdnambuff 
    17931793      ENDIF 
    1794 #if defined key_mpp_mpi 
     1794#if ! defined key_mpi_off 
    17951795      CALL mpp_bcast_nml( cdnambuff, itot ) 
    17961796#endif 
Note: See TracChangeset for help on using the changeset viewer.