Changeset 1965 for LMDZ5/trunk/libf


Ignore:
Timestamp:
Feb 11, 2014, 11:42:52 AM (11 years ago)
Author:
acaubel
Message:

AC : Modified to run with Oasis-MCT as coupler in IPSLCM6 coupled configuration

Location:
LMDZ5/trunk/libf
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • LMDZ5/trunk/libf/dyn3dmem/mod_const_mpi.F90

    r1907 r1965  
    1717    USE ioipsl_getincom, only: getin
    1818#endif
    19 
     19! Use of Oasis-MCT coupler
     20#ifdef CPP_OMCT
     21    USE mod_prism
     22#endif
    2023    IMPLICIT NONE
    2124#ifdef CPP_MPI
  • LMDZ5/trunk/libf/dyn3dmem/parallel_lmdz.F90

    r1907 r1965  
    392392#endif
    393393#ifdef CPP_COUPLE
     394! Use of Oasis-MCT coupler
     395#if defined CPP_OMCT
     396    use mod_prism
     397#else
    394398    use mod_prism_proto
     399#endif
    395400! Ehouarn: surface_data module is in 'phylmd' ...
    396401      use surface_data, only : type_ocean
  • LMDZ5/trunk/libf/dyn3dpar/mod_const_mpi.F90

    r1907 r1965  
    1717    USE ioipsl_getincom, only: getin
    1818#endif
    19 
     19! Use of Oasis-MCT coupler
     20#ifdef CPP_OMCT
     21    USE mod_prism
     22#endif
    2023    IMPLICIT NONE
    2124#ifdef CPP_MPI
  • LMDZ5/trunk/libf/dyn3dpar/parallel_lmdz.F90

    r1907 r1965  
    225225#endif
    226226#ifdef CPP_COUPLE
     227! Use of Oasis-MCT coupler
     228#if defined CPP_OMCT
     229    use mod_prism
     230#else
    227231    use mod_prism_proto
     232#endif
    228233! Ehouarn: surface_data module is in 'phylmd' ...
    229234      use surface_data, only : type_ocean
  • LMDZ5/trunk/libf/phylmd/oasis.F90

    r1907 r1965  
    1515
    1616#ifdef CPP_COUPLE
     17! Use of Oasis-MCT coupler
     18#if defined CPP_OMCT
     19  USE mod_prism
     20! Use of Oasis3 coupler
     21#else
    1722  USE mod_prism_proto
    1823  USE mod_prism_def_partition_proto
    1924  USE mod_prism_get_proto
    2025  USE mod_prism_put_proto
     26#endif
    2127#endif
    2228 
     
    337343   
    338344    DO i = 1, maxrecv
    339       IF (inforecv(i)%action) THEN
     345      IF (inforecv(i)%action .AND. inforecv(i)%nid .NE. -1) THEN
    340346          field(:) = -99999.
    341347          CALL prism_get_proto(inforecv(i)%nid, ktime, field(istart:iend), ierror)
     
    421427
    422428    DO i = 1, maxsend
    423       IF (infosend(i)%action) THEN
     429      IF (infosend(i)%action .AND. infosend(i)%nid .NE. -1 ) THEN
    424430          field = RESHAPE(tab_put(:,:,i),(/iim*jj_nb/))
    425431          CALL prism_put_proto(infosend(i)%nid, ktime, field(istart:iend), ierror)
Note: See TracChangeset for help on using the changeset viewer.