Changeset 4894


Ignore:
Timestamp:
Apr 8, 2024, 4:22:12 PM (8 months ago)
Author:
Laurent Fairhead
Message:

Forgot to replace some #ifdef CPP_MPI in r4600
AB/LF

Location:
LMDZ6/trunk/libf/phylmd
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • LMDZ6/trunk/libf/phylmd/surf_land_orchidee_mod.F90

    r4600 r4894  
    722722      ENDIF
    723723   
    724       CALL MPI_COMM_SPLIT(COMM_LMDZ_PHY,color,mpi_rank,orch_comm,ierr)
    725       CALL MPI_COMM_SIZE(orch_comm,orch_mpi_size,ierr)
    726       CALL MPI_COMM_RANK(orch_comm,orch_mpi_rank,ierr)
     724      IF (using_mpi) THEN
     725        CALL MPI_COMM_SPLIT(COMM_LMDZ_PHY,color,mpi_rank,orch_comm,ierr)
     726        CALL MPI_COMM_SIZE(orch_comm,orch_mpi_size,ierr)
     727        CALL MPI_COMM_RANK(orch_comm,orch_mpi_rank,ierr)
     728      ENDIF
    727729   
    728730    ENDIF

  • LMDZ6/trunk/libf/phylmd/surf_land_orchidee_nofrein_mod.F90

    r4600 r4894  
    547547      ENDIF
    548548   
    549       CALL MPI_COMM_SPLIT(COMM_LMDZ_PHY,color,mpi_rank,orch_comm,ierr)
     549     IF (using_mpi) THEN
     550       CALL MPI_COMM_SPLIT(COMM_LMDZ_PHY,color,mpi_rank,orch_comm,ierr)
     551     ENDIF
    550552   
    551553    ENDIF

  • LMDZ6/trunk/libf/phylmd/surf_land_orchidee_nolic_mod.F90

    r4600 r4894  
    711711      ENDIF
    712712   
    713       CALL MPI_COMM_SPLIT(COMM_LMDZ_PHY,color,mpi_rank,orch_comm,ierr)
    714       CALL MPI_COMM_SIZE(orch_comm,orch_mpi_size,ierr)
    715       CALL MPI_COMM_RANK(orch_comm,orch_mpi_rank,ierr)
     713      IF (using_mpi) THEN
     714        CALL MPI_COMM_SPLIT(COMM_LMDZ_PHY,color,mpi_rank,orch_comm,ierr)
     715        CALL MPI_COMM_SIZE(orch_comm,orch_mpi_size,ierr)
     716        CALL MPI_COMM_RANK(orch_comm,orch_mpi_rank,ierr)
     717      ENDIF
    716718   
    717719    ENDIF

  • LMDZ6/trunk/libf/phylmd/surf_land_orchidee_noopenmp_mod.F90

    r4600 r4894  
    621621    ENDIF
    622622   
    623     CALL MPI_COMM_SPLIT(COMM_LMDZ_PHY,color,mpi_rank,orch_comm,ierr)
     623    IF (using_mpi) THEN
     624      CALL MPI_COMM_SPLIT(COMM_LMDZ_PHY,color,mpi_rank,orch_comm,ierr)
     625    ENDIF
    624626   
    625627  END SUBROUTINE Get_orchidee_communicator
    … …  
    666668       knon_nb(:)=knon
    667669    ELSE 
    668        CALL MPI_GATHER(knon,1,MPI_INTEGER,knon_nb,1,MPI_INTEGER,0,COMM_LMDZ_PHY,ierr)
     670        CALL MPI_GATHER(knon,1,MPI_INTEGER,knon_nb,1,MPI_INTEGER,0,COMM_LMDZ_PHY,ierr)
    669671    ENDIF
    670672   

  • LMDZ6/trunk/libf/phylmd/surf_land_orchidee_nounstruct_mod.F90

    r4600 r4894  
    545545      ENDIF
    546546   
    547       CALL MPI_COMM_SPLIT(COMM_LMDZ_PHY,color,mpi_rank,orch_comm,ierr)
     547      IF (using_mpi) THEN
     548        CALL MPI_COMM_SPLIT(COMM_LMDZ_PHY,color,mpi_rank,orch_comm,ierr)
     549      ENDIF
    548550   
    549551    ENDIF

  • LMDZ6/trunk/libf/phylmd/surf_land_orchidee_noz0h_mod.F90

    r4600 r4894  
    545545      ENDIF
    546546   
    547       CALL MPI_COMM_SPLIT(COMM_LMDZ_PHY,color,mpi_rank,orch_comm,ierr)
     547      IF (using_mpi) THEN
     548        CALL MPI_COMM_SPLIT(COMM_LMDZ_PHY,color,mpi_rank,orch_comm,ierr)
     549      ENDIF
    548550   
    549551    ENDIF
Note: See TracChangeset for help on using the changeset viewer.