Changeset 8387 for branches


Ignore:
Timestamp:
2024-01-18T14:16:15+01:00 (12 months ago)
Author:
josefine.ghattas
Message:

Added new argument -linkwithoasis needed to compile offline drivers in the fully coupled configuration IPSLCM7 (when OASIS is included). See ticket #968

Location:
branches/ORCHIDEE_2_2/ORCHIDEE
Files:
8 edited

Legend:

Unmodified
Added
Removed

  • branches/ORCHIDEE_2_2/ORCHIDEE/arch/arch-X64_IRENE-AMD.path

    r6594 r8387  
    1111XIOS_LIB="-lxios" 
    1212 
     13OASIS_INCDIR="-I${ORCHDIR}/../oasis3-mct/BLD/build/lib/psmile.MPI1 -I${ORCHDIR}/../oasis3-mct/BLD/build/lib/scrip -I${ORCHDIR}/../oasis3-mct/BLD/build/lib/mct" 
     14OASIS_LIBDIR="-L${ORCHDIR}/../oasis3-mct/BLD/lib" 
     15OASIS_LIB="-lpsmile.MPI1 -lscrip -lmct -lmpeu" 
     16 

  • branches/ORCHIDEE_2_2/ORCHIDEE/arch/arch-X64_IRENE.path

    r5836 r8387  
    1111XIOS_LIB="-lxios" 
    1212 
     13OASIS_INCDIR="-I${ORCHDIR}/../oasis3-mct/BLD/build/lib/psmile.MPI1 -I${ORCHDIR}/../oasis3-mct/BLD/build/lib/scrip -I${ORCHDIR}/../oasis3-mct/BLD/build/lib/mct" 
     14OASIS_LIBDIR="-L${ORCHDIR}/../oasis3-mct/BLD/lib" 
     15OASIS_LIB="-lpsmile.MPI1 -lscrip -lmct -lmpeu" 
     16 

  • branches/ORCHIDEE_2_2/ORCHIDEE/arch/arch-X64_JEANZAY.path

    r8377 r8387  
    1111XIOS_LIB="-lxios" 
    1212 
    13 OASIS_INCDIR="-I${ORCHDIR}/../oasis3-mct/BLD/build/lib" 
     13OASIS_INCDIR="-I${ORCHDIR}/../oasis3-mct/BLD/build/lib/psmile.MPI1 -I${ORCHDIR}/../oasis3-mct/BLD/build/lib/scrip -I${ORCHDIR}/../oasis3-mct/BLD/build/lib/mct" 
    1414OASIS_LIBDIR="-L${ORCHDIR}/../oasis3-mct/BLD/lib" 
    15 OASIS_LIB="" 
     15OASIS_LIB="-lpsmile.MPI1 -lscrip -lmct -lmpeu" 
     16 

  • branches/ORCHIDEE_2_2/ORCHIDEE/arch/arch-X64_JEANZAY_OPENMPI.path

    r8380 r8387  
    1111XIOS_LIB="-lxios" 
    1212 
    13 OASIS_INCDIR="-I${ORCHDIR}/../oasis3-mct/BLD/build/lib" 
     13OASIS_INCDIR="-I${ORCHDIR}/../oasis3-mct/BLD/build/lib/psmile.MPI1 -I${ORCHDIR}/../oasis3-mct/BLD/build/lib/scrip -I${ORCHDIR}/../oasis3-mct/BLD/build/lib/mct" 
    1414OASIS_LIBDIR="-L${ORCHDIR}/../oasis3-mct/BLD/lib" 
    15 OASIS_LIB="" 
     15OASIS_LIB="-lpsmile.MPI1 -lscrip -lmct -lmpeu" 
     16 

  • branches/ORCHIDEE_2_2/ORCHIDEE/arch/arch-ifort_LSCE.path

    r5836 r8387  
    1111XIOS_LIB="-lxios" 
    1212 
     13OASIS_INCDIR="-I${ORCHDIR}/../oasis3-mct/BLD/build/lib/psmile.MPI1 -I${ORCHDIR}/../oasis3-mct/BLD/build/lib/scrip -I${ORCHDIR}/../oasis3-mct/BLD/build/lib/mct" 
     14OASIS_LIBDIR="-L${ORCHDIR}/../oasis3-mct/BLD/lib" 
     15OASIS_LIB="-lpsmile.MPI1 -lscrip -lmct -lmpeu" 
     16 

  • branches/ORCHIDEE_2_2/ORCHIDEE/arch/arch-ifort_LSCE_2023.path

    r8380 r8387  
    1111XIOS_LIB="-lxios" 
    1212 
     13OASIS_INCDIR="-I${ORCHDIR}/../oasis3-mct/BLD/build/lib/psmile.MPI1 -I${ORCHDIR}/../oasis3-mct/BLD/build/lib/scrip -I${ORCHDIR}/../oasis3-mct/BLD/build/lib/mct" 
     14OASIS_LIBDIR="-L${ORCHDIR}/../oasis3-mct/BLD/lib" 
     15OASIS_LIB="-lpsmile.MPI1 -lscrip -lmct -lmpeu" 
     16 

  • branches/ORCHIDEE_2_2/ORCHIDEE/arch/arch-ifort_MESOIPSL.path

    r8380 r8387  
    1111XIOS_LIB="-lxios" 
    1212 
    13 OASIS_INCDIR="-I${ORCHDIR}/../oasis3-mct/BLD/build/lib" 
     13OASIS_INCDIR="-I${ORCHDIR}/../oasis3-mct/BLD/build/lib/psmile.MPI1 -I${ORCHDIR}/../oasis3-mct/BLD/build/lib/scrip -I${ORCHDIR}/../oasis3-mct/BLD/build/lib/mct" 
    1414OASIS_LIBDIR="-L${ORCHDIR}/../oasis3-mct/BLD/lib" 
    15 OASIS_LIB="" 
     15OASIS_LIB="-lpsmile.MPI1 -lscrip -lmct -lmpeu" 
     16 

  • branches/ORCHIDEE_2_2/ORCHIDEE/makeorchidee_fcm

    r8377 r8387  
    5858arch_path="arch" 
    5959 
     60# Option linkwithoasis is used when XIOS is compiled with OASIS. This is the case in IPSLCM7 configuration  
     61# where the OASIS libraries needs to be included in the creation of the executables.  
     62linkwithoasis=FALSE 
     63 
    6064# Path to store files produced during compilation 
    6165# Note: config_path was previously named .config 
    … …  
    105109        is_other_opt=TRUE 
    106110        is_driver_opt=TRUE ; shift ;; 
     111     
     112    "-linkwithoasis") 
     113        linkwithoasis=TRUE ; shift ;; 
    107114 
    108115    "-arch") 
    … …  
    492499echo "XXXXXX $is_oasisdriver_opt" 
    493500 
     501 
    494502if [[ "$is_oasisdriver_opt" == "TRUE" ]] ; then 
    495503    CPP_KEY="OASIS ${CPP_KEY}" 
    496504    TARGET="${TARGET} driver2oasis.exe orchideeoasis.exe" 
    497     INCDIR="${INCDIR} ${OASIS_INCDIR}/psmile.MPI1 ${OASIS_INCDIR}/scrip  ${OASIS_INCDIR}/mct" 
    498     LIBDIR="${LIBDIR} ${OASIS_LIBDIR} -lpsmile.MPI1 -lmct -lmpeu -lscrip" 
     505    INCDIR="${INCDIR} ${OASIS_INCDIR}" 
     506    LIBDIR="${LIBDIR} ${OASIS_LIBDIR} ${OASIS_LIB}" 
    499507    echo "OASIS : ${INCDIR}" 
     508fi 
     509 
     510 
     511if [[ "$linkwithoasis" == "TRUE" ]] ; then  
     512    LIBDIR="${LIBDIR} ${OASIS_LIBDIR} ${OASIS_LIB}" 
    500513fi 
    501514 
Note: See TracChangeset for help on using the changeset viewer.