Changeset 1965


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
Files:
9 edited

Legend:

Unmodified
Added
Removed

  • LMDZ5/trunk/arch/arch-X64_ADA.path

    r1949 r1965  
    77ORCH_INCDIR=$LMDGCM/../../lib
    88ORCH_LIBDIR=$LMDGCM/../../lib
    9 OASIS_INCDIR=$LMDGCM/../../prism/X64/build/lib/psmile.$couple
    10 OASIS_LIBDIR=$LMDGCM/../../prism/X64/lib
     9OASIS_INCDIR=$LMDGCM/../../oasis3-mct/BLD/build/lib/psmile.MPI1
     10OASIS_LIBDIR=$LMDGCM/../../oasis3-mct/BLD/lib
    1111INCA_LIBDIR=$LMDGCM/../INCA/config/lib
    1212INCA_INCDIR=$LMDGCM/../INCA/config/lib

  • LMDZ5/trunk/arch/arch-X64_CURIE.path

    r1907 r1965  
    55ORCH_INCDIR=$LMDGCM/../../lib
    66ORCH_LIBDIR=$LMDGCM/../../lib
    7 OASIS_INCDIR=$LMDGCM/../../prism/X64/build/lib/psmile.$couple
    8 OASIS_LIBDIR=$LMDGCM/../../prism/X64/lib
     7OASIS_INCDIR=$LMDGCM/../../oasis3-mct/BLD/build/lib/psmile.MPI1
     8OASIS_LIBDIR=$LMDGCM/../../oasis3-mct/BLD/lib
    99INCA_LIBDIR=$LMDGCM/../INCA/config/lib
    1010INCA_INCDIR=$LMDGCM/../INCA/config/lib
    11 

  • LMDZ5/trunk/bld.cfg

    r1944 r1965  
    8383bld::excl_dep        use::mod_prism_get_proto
    8484bld::excl_dep        use::mod_prism_put_proto
     85bld::excl_dep        use::mod_prism
    8586bld::excl_dep        use::xios
    8687bld::excl_dep        use::iaxis

  • 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)

  • LMDZ5/trunk/makelmdz_fcm

    r1907 r1965  
    6666[-p PHYS]                  : set of physical parametrizations (in libf/phyPHYS), (default: lmd)
    6767[-prod / -dev / -debug]    : compilation mode production (default) / developement / debug
    68 [-c false/MPI1/MPI2]       : coupling with ocean model : MPI1/MPI2/false (default: false)
     68[-c false/MPI1/OMCT]       : coupling with ocean model : MPI1/OMCT/false (default: false)
    6969[-v false/orchidee2.0/orchidee1.9/true] : version of the vegetation model to include (default: false)
    7070          false       : no vegetation model
    … …  
    231231if [[ "$couple" != "false" ]]
    232232then
    233    CPP_KEY="$CPP_KEY CPP_COUPLE"
    234    INCLUDE="$INCLUDE -I${OASIS_INCDIR}"
    235    LIB="$LIB -L${OASIS_LIBDIR} -lpsmile.${couple} -lmpp_io"
     233    if [[ "$couple" == "MPI1" ]]
     234    then
     235        CPP_KEY="$CPP_KEY CPP_COUPLE"
     236        export OASIS_INCDIR=$LMDGCM/../../prism/X64/build/lib/psmile.MPI1
     237        export OASIS_LIBDIR=$LMDGCM/../../prism/X64/lib
     238        INCLUDE="$INCLUDE -I${OASIS_INCDIR}"
     239        LIB="$LIB -L${OASIS_LIBDIR} -lpsmile.MPI1 -lmpp_io"
     240    else
     241        CPP_KEY="$CPP_KEY CPP_COUPLE CPP_OMCT"
     242        INCLUDE="$INCLUDE -I${OASIS_INCDIR}"
     243        LIB="$LIB -L${OASIS_LIBDIR} -lpsmile.MPI1 -lscrip -lmct -lmpeu"
     244    fi
    236245fi
    237246
Note: See TracChangeset for help on using the changeset viewer.