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 629 – NEMO

Changeset 629


Ignore:
Timestamp:
2007-03-01T15:38:55+01:00 (17 years ago)
Author:
opalod
Message:

nemo_v2_bugfix_018 : CT : change variables name "size" & "rank" into "mppsize" & "mpprank" to avoid conflicts when they become PUBLIC when using key_oasis[3-4] cpp keys

Location:
trunk/NEMO/OPA_SRC
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • trunk/NEMO/OPA_SRC/SBC/cpl_oasis3.F90

    r532 r629  
    3939!##################### WARNING coupled mode ############################### 
    4040#if defined key_mpp_mpi 
    41    USE lib_mpp, only : size, rank  ! message passing 
    42    USE lib_mpp, only : mppsend      ! message passing 
    43    USE lib_mpp, only : mpprecv      ! message passing 
     41   USE lib_mpp, only : mppsize, mpprank ! message passing 
     42   USE lib_mpp, only : mppsend          ! message passing 
     43   USE lib_mpp, only : mpprecv          ! message passing 
    4444#endif 
    4545   USE daymod                       ! date and time info 
    … …  
    250250      commRank = .false. 
    251251 
    252       localRank = rank ! from lib_mpp 
    253       localSize = size ! from lib_mpp 
     252      localRank = mpprank ! from lib_mpp 
     253      localSize = mppsize ! from lib_mpp 
    254254 
    255255      IF ( rootexchg ) THEN 

  • trunk/NEMO/OPA_SRC/SBC/cpl_oasis4.F90

    r581 r629  
    3434!##################### WARNING coupled mode ############################### 
    3535#if defined key_mpp_mpi 
    36    USE lib_mpp, only : size, rank   ! message passing 
    37    USE lib_mpp, only : mppsend      ! message passing 
    38    USE lib_mpp, only : mpprecv      ! message passing 
     36   USE lib_mpp, only : mppsize, mpprank   ! message passing 
     37   USE lib_mpp, only : mppsend            ! message passing 
     38   USE lib_mpp, only : mpprecv            ! message passing 
    3939#endif 
    4040   USE daymod                       ! date and time info 
    … …  
    338338      commRank = .false. 
    339339 
    340       localRank = rank ! from lib_mpp 
    341       localSize = size ! from lib_mpp 
     340      localRank = mpprank ! from lib_mpp 
     341      localSize = mppsize ! from lib_mpp 
    342342 
    343343      IF(lwp) WRITE(numout,*) "CALLING DEFINE" 

  • trunk/NEMO/OPA_SRC/lib_mpp.F90

    r619 r629  
    6262   PUBLIC  mpprecv, mppsend, mppscatter, mppgather, mppobc, mpp_ini_north, mppstop, mppsync 
    6363#if defined key_oasis3 || defined key_oasis4 
    64    PUBLIC  size, rank 
     64   PUBLIC  mppsize, mpprank 
    6565#endif 
    6666 
    … …  
    110110 
    111111   INTEGER ::   & 
    112       size,     &  ! number of process 
    113       rank,     &  ! process number  [ 0 - size-1 ] 
     112      mppsize,  &  ! number of process 
     113      mpprank,  &  ! process number  [ 0 - size-1 ] 
    114114      mpi_comm_opa ! opa local communicator 
    115115 
    … …  
    380380      mpi_comm_opa = mpi_comm_world 
    381381#endif 
    382         CALL mpi_comm_rank( mpi_comm_opa, rank, ierr ) 
    383         CALL mpi_comm_size( mpi_comm_opa, size, ierr ) 
    384       mynode = rank 
     382        CALL mpi_comm_rank( mpi_comm_opa, mpprank, ierr ) 
     383        CALL mpi_comm_size( mpi_comm_opa, mppsize, ierr ) 
     384      mynode = mpprank 
    385385#else 
    386386      !! * Local variables   (SHMEM version) 
Note: See TracChangeset for help on using the changeset viewer.