Ignore:
Timestamp:
Nov 29, 2013, 9:40:25 AM (11 years ago)
Author:
Laurent Fairhead
Message:

Merged trunk changes r1860:1909 into testing branch

Location:
LMDZ5/branches/testing
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • LMDZ5/branches/testing

  • LMDZ5/branches/testing/libf

    • Property copyright set to
      Name of program: LMDZ
      Creation date: 1984
      Version: LMDZ5
      License: CeCILL version 2
      Holder: Laboratoire de m\'et\'eorologie dynamique, CNRS, UMR 8539
      See the license file in the root directory

  • LMDZ5/branches/testing/libf/dyn3dpar

    • Property copyright set to
      Name of program: LMDZ
      Creation date: 1984
      Version: LMDZ5
      License: CeCILL version 2
      Holder: Laboratoire de m\'et\'eorologie dynamique, CNRS, UMR 8539
      See the license file in the root directory

  • LMDZ5/branches/testing/libf/dyn3dpar/mod_const_mpi.F90

    • Property copyright set to
      Name of program: LMDZ
      Creation date: 1984
      Version: LMDZ5
      License: CeCILL version 2
      Holder: Laboratoire de m\'et\'eorologie dynamique, CNRS, UMR 8539
      See the license file in the root directory
    r1864 r1910  
    33!
    44MODULE mod_const_mpi
    5 
     5  IMPLICIT NONE
    66  INTEGER,SAVE :: COMM_LMDZ
    77  INTEGER,SAVE :: MPI_REAL_LMDZ
    … …  
    1212  SUBROUTINE Init_const_mpi
    1313#ifdef CPP_IOIPSL
    14     USE IOIPSL
     14    USE IOIPSL, ONLY: getin
    1515#else
    1616! if not using IOIPSL, we still need to use (a local version of) getin
    17     USE ioipsl_getincom
     17    USE ioipsl_getincom, only: getin
    1818#endif
    1919
    … …  
    2222    INCLUDE 'mpif.h'
    2323#endif
     24
    2425    INTEGER             :: ierr
    2526    INTEGER             :: comp_id
    … …  
    5253  SUBROUTINE Init_mpi
    5354#ifdef CPP_XIOS
    54     USE wxios
     55    USE wxios, only: wxios_init
    5556#endif
    5657  IMPLICIT NONE
    … …  
    7374      COMM_LMDZ=MPI_COMM_WORLD
    7475      MPI_REAL_LMDZ=MPI_REAL8
    75 
    76     !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
    77     ! Initialisation de XIOS
    78     !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
     76!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
     77! Initialisation de XIOS
     78!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
    7979#ifdef CPP_XIOS
    8080      CALL wxios_init("LMDZ", outcom=COMM_LMDZ)
    … …  
    8888#endif
    8989#endif
     90
    9091   END SUBROUTINE Init_mpi
    9192   
Note: See TracChangeset for help on using the changeset viewer.