Changeset 1695


Ignore:
Timestamp:
Apr 17, 2017, 4:10:07 PM (8 years ago)
Author:
emillour
Message:

Common dynamics/framework:
Removed some obsolete arch files.
Reorganization of the way paths to external libraries are handles by makelmdz_fcm and makelmdz. This will ease interfacing with Dynamico which follows simillar rules with respect to a given external library ,e.g. for SOMELIBRARY, in the arch.path file:
SOMELIBRARY_LIBDIR="-L/path/to/the/library/libdir -L/possible/other/required/path"
SOMELIBRARY_LIB"-lsomelib -lsomeotherrequiredlib"
SOMELIBRARY_INCDIR"-I/path/to/the/library/incdir -I/possible/other/required/include/path"
EM

Location:
trunk
Files:
1 added
21 deleted
16 edited

Legend:

Unmodified
Added
Removed

  • trunk/DOC/chantiers/commit_importants.log

    r1682 r1695  
    20162016                        of the horizontal domain
    20172017
     2018**********************
     2019**** commit_v1695 ****
     2020**********************
     2021Reorganization of the way paths to external libraries are handles by makelmdz_fcm
     2022and makelmdz. This will ease interfacing with Dynamico which follows simillar rules
     2023with respect to a given external library ,e.g. for SOMELIBRARY, in the arch.path file:
     2024SOMELIBRARY_LIBDIR="-L/path/to/the/library/libdir -L/possible/other/required/path"
     2025SOMELIBRARY_LIB"-lsomelib -lsomeotherrequiredlib"
     2026SOMELIBRARY_INCDIR"-I/path/to/the/library/incdir -I/possible/other/required/include/path"
     2027

  • trunk/LMDZ.COMMON/arch/arch-AMD64_CICLAD.path

    r1622 r1695  
    1 NETCDF_LIBDIR="-L/opt/netcdf/pgf/lib -lnetcdf"
    2 NETCDF_INCDIR=-I/opt/netcdf/pgf/include
    3 IOIPSL_INCDIR=/home/spiga/IOIPSL_SVN/modipsl/lib
    4 IOIPSL_LIBDIR=/home/spiga/IOIPSL_SVN/modipsl/lib
    5 XIOS_INCDIR=$LMDGCM/../XIOS/inc
    6 XIOS_LIBDIR=$LMDGCM/../XIOS/lib
     1ROOT=$PWD
     2
     3NETCDF_LIBDIR="-L/opt/netcdf/pgf/lib"
     4NETCDF_LIB="-lnetcdf"
     5NETCDF_INCDIR="-I/opt/netcdf/pgf/include"
     6
     7IOIPSL_INCDIR="-I/home/spiga/IOIPSL_SVN/modipsl/lib"
     8IOIPSL_LIBDIR="-L/home/spiga/IOIPSL_SVN/modipsl/lib"
     9IOIPSL_LIB="-lioipsl"
     10
     11XIOS_INCDIR="-I$ROOT/../XIOS/inc"
     12XIOS_LIBDIR="-L$ROOT/../XIOS/lib"
     13XIOS_LIB="-lxios -lstdc++"
     14

  • trunk/LMDZ.COMMON/arch/arch-CICLADifort.path

    r1622 r1695  
    1 NETCDF_LIBDIR="-L/opt/netcdf3/ifort/lib -lnetcdf"
    2 NETCDF_INCDIR=-I/opt/netcdf3/ifort/include
    3 IOIPSL_INCDIR=$LMDGCM/ioipsl/modipsl/lib
    4 IOIPSL_LIBDIR=$LMDGCM/ioipsl/modipsl/lib
    5 XIOS_INCDIR=$LMDGCM/../XIOS/inc
    6 XIOS_LIBDIR=$LMDGCM/../XIOS/lib
     1ROOT=$PWD
     2
     3NETCDF_LIBDIR="-L/opt/netcdf3/ifort/lib"
     4NETCDF_LIB="-lnetcdf"
     5NETCDF_INCDIR="-I/opt/netcdf3/ifort/include"
     6
     7IOIPSL_INCDIR="-I$ROOT/ioipsl/modipsl/lib"
     8IOIPSL_LIBDIR="-L$ROOT/ioipsl/modipsl/lib"
     9IOIPSL_LIB="-lioipsl"
     10
     11XIOS_INCDIR="-I$ROOT/../XIOS/inc"
     12XIOS_LIBDIR="-L$ROOT/../XIOS/lib"
     13XIOS_LIB="-lxios -lstdc++"
     14

  • trunk/LMDZ.COMMON/arch/arch-GNOMEp_large.path

    r1306 r1695  
    1 NETCDF_LIBDIR="-Wl,-rpath -Wl,/san/common/umr8539/bigDATA_netcdf.4.0.1_aymeric/lib -L/san/common/umr8539/bigDATA_netcdf.4.0.1_aymeric/lib -lnetcdf -lnetcdff"
    2 NETCDF_INCDIR=-I/san/common/umr8539/bigDATA_netcdf.4.0.1_aymeric/include
    3 IOIPSL_INCDIR=/san/common/umr8539/bigDATA_ioipsl_aymeric/modipsl/lib
    4 IOIPSL_LIBDIR=/san/common/umr8539/bigDATA_ioipsl_aymeric/modipsl/lib
     1NETCDF_LIBDIR="-Wl,-rpath -Wl,/san/common/umr8539/bigDATA_netcdf.4.0.1_aymeric/lib -L/san/common/umr8539/bigDATA_netcdf.4.0.1_aymeric/lib"
     2NETCDF_LIB="-lnetcdf -lnetcdff"
     3NETCDF_INCDIR="-I/san/common/umr8539/bigDATA_netcdf.4.0.1_aymeric/include"
     4
     5IOIPSL_INCDIR="-I/san/common/umr8539/bigDATA_ioipsl_aymeric/modipsl/lib"
     6IOIPSL_LIBDIR="-L/san/common/umr8539/bigDATA_ioipsl_aymeric/modipsl/lib"
     7IOIPSL_LIB="-lioipsl"

  • trunk/LMDZ.COMMON/arch/arch-GNOMEs.path

    r1622 r1695  
    1 NETCDF_LIBDIR="-L/usr/local/lib -lnetcdf"
    2 NETCDF_INCDIR=-I/usr/local/include
    3 IOIPSL_INCDIR=/san/home/millour/Planeto/work_dyn_830/trunk/LMDZ.COMMON/ioipsl/modipsl/lib
    4 IOIPSL_LIBDIR=/san/home/millour/Planeto/work_dyn_830/trunk/LMDZ.COMMON/ioipsl/modipsl/lib
    5 XIOS_INCDIR=$LMDGCM/../XIOS/inc
    6 XIOS_LIBDIR=$LMDGCM/../XIOS/lib
     1ROOT=$PWD
     2
     3NETCDF_LIBDIR="-L/usr/local/lib"
     4NETCDF_LIB="-lnetcdf"
     5NETCDF_INCDIR="-I/usr/local/include"
     6
     7IOIPSL_INCDIR="-I/san/home/millour/Planeto/work_dyn_830/trunk/LMDZ.COMMON/ioipsl/modipsl/lib"
     8IOIPSL_LIBDIR="-L/san/home/millour/Planeto/work_dyn_830/trunk/LMDZ.COMMON/ioipsl/modipsl/lib"
     9IOIPSL_LIB="-lioipsl"
     10
     11XIOS_INCDIR="-I$ROOT/../XIOS/inc"
     12XIOS_LIBDIR="-L$ROOT/../XIOS/lib"
     13XIOS_LIB="-lxios -lstdc++"
     14

  • trunk/LMDZ.COMMON/arch/arch-X64_ADA.fcm

    r1572 r1695  
    66%CPP_FLAGS           -P
    77%FPP_DEF             NC_DOUBLE LAPACK BLAS SGEMV=DGEMV SGEMM=DGEMM FFT_FFTW
    8 %BASE_FFLAGS         -integer-size 32 -real-size 64 -align all -mcmodel=large -auto
     8%BASE_FFLAGS         -integer-size 32 -real-size 64 -align all -auto
    99%PROD_FFLAGS         -O2 -ip -fp-model strict -axAVX,SSE4.2
    1010%DEV_FFLAGS          -p -g -O1 -fpe0 -traceback
    11 %DEBUG_FFLAGS        -p -g -O0 -fpe-all=0 -traceback -ftrapuv -fp-stack-check -check bounds,format,output_conversion,pointers,uninit -debug
     11%DEBUG_FFLAGS        -p -g -O0 -fpe-all=0 -traceback -ftrapuv -fp-stack-check -check bounds,format,output_conversion,pointers,uninit -debug -ftz
    1212%C_COMPILER          gcc
    1313%C_OPTIM             -O3
    1414%MPI_FFLAGS
    15 %OMP_FFLAGS          -openmp
    16 %BASE_LD             -shared-intel -lmkl_intel_lp64 -lmkl_intel_thread -lmkl_core -liomp5 -lpthread -L/smplocal/pub/FFTW/3.3.3_dyn/lib -lfftw3 -Wl,-rpath=/smplocal/pub/NetCDF/4.1.3/mpi/lib:/smplocal/pub/HDF5/1.8.9/par/lib:/smplocal/pub/FFTW/3.3.3_dyn/lib
     15%OMP_FFLAGS          -openmp -openmp-threadprivate=compat
     16%BASE_LD             -lmkl_intel_lp64 -lmkl_intel_thread -lmkl_core -liomp5 -lpthread -L/smplocal/pub/FFTW/3.3.3_dyn/lib -lfftw3 -Wl,-rpath=/smplocal/pub/FFTW/3.3.3_dyn/lib
    1717%MPI_LD
    18 %OMP_LD              -openmp
     18%OMP_LD              -openmp -openmp-threadprivate=compat
    1919

  • trunk/LMDZ.COMMON/arch/arch-X64_ADA.path

    r1367 r1695  
    1 NETCDF_LIBDIR="${NETCDF_LDFLAGS:--L/smplocal/pub/NetCDF/4.1.3/mpi/lib -lnetcdff -lnetcdf -L/smplocal/pub/HDF5/1.8.9/par/lib -Bstatic -lhdf5hl_fortran -lhdf5_hl -lhdf5_fortran -lhdf5 -Bdynamic -lz}"
    2 NETCDF_INCDIR="${NETCDF_FFLAGS:--I/smplocal/pub/HDF5/1.8.9/par/include -I/smplocal/pub/NetCDF/4.1.3/mpi/include}"
    3 IOIPSL_INCDIR=/smphome/rech/psl/rpsl035/IOIPSL_PLUS/modipsl/lib
    4 IOIPSL_LIBDIR=/smphome/rech/psl/rpsl035/IOIPSL_PLUS/modipsl/lib
    5 XIOS_INCDIR=$LMDGCM/../XIOS/inc
    6 XIOS_LIBDIR=$LMDGCM/../XIOS/lib
    7 ORCH_INCDIR=$LMDGCM/../../lib
    8 ORCH_LIBDIR=$LMDGCM/../../lib
    9 OASIS_INCDIR=$LMDGCM/../../oasis3-mct/BLD/build/lib/psmile.MPI1
    10 OASIS_LIBDIR=$LMDGCM/../../oasis3-mct/BLD/lib
    11 INCA_LIBDIR=$LMDGCM/../INCA/config/lib
    12 INCA_INCDIR=$LMDGCM/../INCA/config/lib
     1ROOT=$PWD
     2NETCDF_INCDIR="-I $NETCDF_INC_DIR"
     3#NETCDF_LIBDIR="-L $NETCDF_LIB_DIR"
     4#NETCDF_LIB="-lnetcdff -lnetcdf"
    135
     6MPI_INCDIR=""
     7MPI_LIBDIR=""
     8MPI_LIB=""
     9
     10#HDF5_INCDIR="-I $HDF5_INC_DIR"
     11#HDF5_LIBDIR="-L $HDF5_LIB_DIR"
     12#HDF5_LIB="-lhdf5_hl -lhdf5 -lhdf5 -lz"
     13
     14IOIPSL_INCDIR="-I/smphome/rech/psl/rpsl035/IOIPSL_PLUS/modipsl/lib"
     15IOIPSL_LIBDIR="-L/smphome/rech/psl/rpsl035/IOIPSL_PLUS/modipsl/lib"
     16IOIPSL_LIB="-lioipsl"
     17
     18XIOS_INCDIR="-I$ROOT/../XIOS/inc"
     19XIOS_LIBDIR="-L$ROOT/../XIOS/lib"
     20XIOS_LIB="-lxios -lstdc++"
     21
     22ORCHIDEE_INCDIR="-I$ROOT/../ORCHIDEE/lib"
     23ORCHIDEE_LIBDIR="-L$ROOT/../ORCHIDEE/lib"
     24ORCHIDEE_LIB="-lorchidee "
     25
     26OASIS_INCDIR="-I$ROOT/../oasis3-mct/BLD/build/lib/psmile.MPI1"
     27OASIS_LIBDIR="-L$ROOT/../oasis3-mct/BLD/lib"
     28OASIS_LIB="-lpsmile.MPI1 -lscrip -lmct -lmpeu"
     29
     30INCA_INCDIR="-I$ROOT/../INCA/config/lib"
     31INCA_LIBDIR="-I$ROOT/../INCA/config/lib"
     32INCA_LIB="-lchimie"
     33

  • trunk/LMDZ.COMMON/arch/arch-X64_MESU.path

    r1628 r1695  
    1 NETCDF_LIBDIR="-L${NETCDF_FORT_ROOT}/lib -lnetcdff"
     1ROOT=$PWD
     2
     3NETCDF_LIBDIR="-L${NETCDF_FORT_ROOT}/lib"
     4NETCDF_LIB="-lnetcdff"
    25NETCDF_INCDIR="-I${NETCDF_FORT_ROOT}/include"
    3 IOIPSL_INCDIR=$LMDGCM/ioipsl/modipsl/lib
    4 IOIPSL_LIBDIR=$LMDGCM/ioipsl/modipsl/lib
    5 XIOS_INCDIR=$LMDGCM/../XIOS/inc
    6 XIOS_LIBDIR=$LMDGCM/../XIOS/lib
    76
     7IOIPSL_INCDIR="-I$ROOT/ioipsl/modipsl/lib"
     8IOIPSL_LIBDIR="-L$ROOT/ioipsl/modipsl/lib"
     9IOIPSL_LIB="-lioipsl"
     10
     11XIOS_INCDIR="-I$ROOT/../XIOS/inc"
     12XIOS_LIBDIR="-L$ROOT/../XIOS/lib"
     13XIOS_LIB="-lxios -lstdc++"
     14

  • trunk/LMDZ.COMMON/arch/arch-X64_OCCIGEN.path

    r1671 r1695  
    1 NETCDF_LIBDIR="-L${NETCDFF_LIBDIR} -lnetcdff -lnetcdf"
     1ROOT=$PWD
     2
     3NETCDF_LIBDIR="-L${NETCDFF_LIBDIR}"
     4NETCDF_LIB="-lnetcdff -lnetcdf"
    25NETCDF_INCDIR="-I${NETCDF_INCDIR}"
    3 IOIPSL_INCDIR=$LMDGCM/ioipsl/modipsl/lib
    4 IOIPSL_LIBDIR=$LMDGCM/ioipsl/modipsl/lib
    5 XIOS_INCDIR=$LMDGCM/../XIOS/inc
    6 XIOS_LIBDIR=$LMDGCM/../XIOS/lib
     6
     7IOIPSL_INCDIR="-I$ROOT/ioipsl/modipsl/lib"
     8IOIPSL_LIBDIR="-L$ROOT/ioipsl/modipsl/lib"
     9IOIPSL_LIB="-lioipsl"
     10
     11XIOS_INCDIR="-I$ROOT/../XIOS/inc"
     12XIOS_LIBDIR="-L$ROOT/../XIOS/lib"
     13XIOS_LIB="-lxios -lstdc++"
     14

  • trunk/LMDZ.COMMON/arch/arch-gfortran.path

    r1622 r1695  
    1 NETCDF_LIBDIR="-L/home/aymeric/Science/MODELES/LMDZ.COMMON/netcdf/gfortran_netcdf-4.0.1/lib -lnetcdf"
    2 NETCDF_INCDIR=-I/home/aymeric/Science/MODELES/LMDZ.COMMON/netcdf/gfortran_netcdf-4.0.1/include
    3 IOIPSL_INCDIR=/home/aymeric/Science/MODELES/LMDZ.COMMON/ioipsl/modipsl/lib
    4 IOIPSL_LIBDIR=/home/aymeric/Science/MODELES/LMDZ.COMMON/ioipsl/modipsl/lib
    5 XIOS_INCDIR=$LMDGCM/../XIOS/inc
    6 XIOS_LIBDIR=$LMDGCM/../XIOS/lib
     1ROOT=$PWD
     2
     3NETCDF_LIBDIR="-L/home/aymeric/Science/MODELES/LMDZ.COMMON/netcdf/gfortran_netcdf-4.0.1/lib"
     4NETCDF_LIB="-lnetcdf"
     5NETCDF_INCDIR="-I/home/aymeric/Science/MODELES/LMDZ.COMMON/netcdf/gfortran_netcdf-4.0.1/include"
     6
     7IOIPSL_INCDIR="-I/home/aymeric/Science/MODELES/LMDZ.COMMON/ioipsl/modipsl/lib"
     8IOIPSL_LIBDIR="-L/home/aymeric/Science/MODELES/LMDZ.COMMON/ioipsl/modipsl/lib"
     9
     10XIOS_INCDIR="-I$ROOT/../XIOS/inc"
     11XIOS_LIBDIR="-L$ROOT/../XIOS/lib"
     12XIOS_LIB="-lxios -lstdc++"
     13

  • trunk/LMDZ.COMMON/arch/arch-linux-64bit-para.path

    r1622 r1695  
    1 NETCDF_LIBDIR="-L/donnees/emlmd/netcdf64-4.0.1_ifort/lib -lnetcdf"
    2 NETCDF_INCDIR=-I/donnees/emlmd/netcdf64-4.0.1_ifort/include
    3 IOIPSL_INCDIR=/donnees/sllmd/ioipsl/modipsl/ifortpara/lib
    4 IOIPSL_LIBDIR=/donnees/sllmd/ioipsl/modipsl/ifortpara/lib
    5 XIOS_INCDIR=$LMDGCM/../XIOS/inc
    6 XIOS_LIBDIR=$LMDGCM/../XIOS/lib
     1ROOT=$PWD
     2
     3NETCDF_LIBDIR="-L/donnees/emlmd/netcdf64-4.0.1_ifort/lib""
     4NETCDF_LIB="-lnetcdf"
     5NETCDF_INCDIR="-I/donnees/emlmd/netcdf64-4.0.1_ifort/include"
     6
     7IOIPSL_INCDIR="-I/donnees/sllmd/ioipsl/modipsl/ifortpara/lib"
     8IOIPSL_LIBDIR="-L/donnees/sllmd/ioipsl/modipsl/ifortpara/lib"
     9IOIPSL_LIB="-lioipsl"
     10
     11XIOS_INCDIR="-I$ROOT/../XIOS/inc"
     12XIOS_LIBDIR="-L$ROOT/../XIOS/lib"
     13XIOS_LIB="-lxios -lstdc++"
     14

  • trunk/LMDZ.COMMON/arch/arch-linux-64bit.path

    r1622 r1695  
    1 NETCDF_LIBDIR="-L/donnees/emlmd/netcdf64-4.0.1_pgi/lib -lnetcdf"
    2 NETCDF_INCDIR=-I/donnees/emlmd/netcdf64-4.0.1_pgi/include
    3 IOIPSL_INCDIR=/donnees/emlmd/modipsl64_pgi/modipsl/lib
    4 IOIPSL_LIBDIR=/donnees/emlmd/modipsl64_pgi/modipsl/lib
    5 XIOS_INCDIR=$LMDGCM/../XIOS/inc
    6 XIOS_LIBDIR=$LMDGCM/../XIOS/lib
    7 ORCH_INCDIR=/u/fairhead/modipsl_ioipsl_3/lib
    8 ORCH_LIBDIR=/u/fairhead/modipsl_ioipsl_3/lib
     1ROOT=$PWD
     2
     3NETCDF_LIBDIR="-L/donnees/emlmd/netcdf64-4.0.1_pgi/lib"
     4NETCDF_LIB="-lnetcdf"
     5NETCDF_INCDIR="-I/donnees/emlmd/netcdf64-4.0.1_pgi/include"
     6
     7IOIPSL_INCDIR="-I/donnees/emlmd/modipsl64_pgi/modipsl/lib"
     8IOIPSL_LIBDIR="-L/donnees/emlmd/modipsl64_pgi/modipsl/lib"
     9IOIPSL_LIB="-lioipsl"
     10
     11XIOS_INCDIR="-I$ROOT/../XIOS/inc"
     12XIOS_LIBDIR="-L$ROOT/../XIOS/lib"
     13XIOS_LIB="-lxios -lstdc++"
     14

  • trunk/LMDZ.COMMON/arch/arch-linux-ifort-para.path

    r1622 r1695  
    1 NETCDF_LIBDIR="-L/d2/emlmd/netcdf64-4.0.1_ifort/lib -lnetcdf"
    2 NETCDF_INCDIR=-I/d2/emlmd/netcdf64-4.0.1_ifort/include
    3 IOIPSL_INCDIR=/u/sllmd/LMDZ5/ioipsl/modipsl/lib-ifort
    4 IOIPSL_LIBDIR=/u/sllmd/LMDZ5/ioipsl/modipsl/lib-ifort
    5 XIOS_INCDIR=$LMDGCM/../XIOS/inc
    6 XIOS_LIBDIR=$LMDGCM/../XIOS/lib
     1ROOT=$PWD
     2
     3NETCDF_LIBDIR="-L/d2/emlmd/netcdf64-4.0.1_ifort/lib"
     4NETCDF_LIB="-lnetcdf"
     5NETCDF_INCDIR="-I/d2/emlmd/netcdf64-4.0.1_ifort/include"
     6
     7IOIPSL_INCDIR="-I/u/sllmd/LMDZ5/ioipsl/modipsl/lib-ifort"
     8IOIPSL_LIBDIR="-L/u/sllmd/LMDZ5/ioipsl/modipsl/lib-ifort"
     9IOIPSL_LIB="-lioipsl"
     10
     11XIOS_INCDIR="-I$ROOT/../XIOS/inc"
     12XIOS_LIBDIR="-L$ROOT/../XIOS/lib"
     13XIOS_LIB="-lxios -lstdc++"
     14

  • trunk/LMDZ.COMMON/arch/arch-linux-ifort.path

    r1622 r1695  
    1 NETCDF_LIBDIR="-L/d2/emlmd/netcdf64-4.0.1_ifort/lib -lnetcdf"
    2 NETCDF_INCDIR=-I/d2/emlmd/netcdf64-4.0.1_ifort/include
    3 IOIPSL_INCDIR=/u/sllmd/LMDZ5/ioipsl/modipsl/lib-ifort
    4 IOIPSL_LIBDIR=/u/sllmd/LMDZ5/ioipsl/modipsl/lib-ifort
    5 XIOS_INCDIR=$LMDGCM/../XIOS/inc
    6 XIOS_LIBDIR=$LMDGCM/../XIOS/lib
     1ROOT=$PWD
     2
     3NETCDF_LIBDIR="-L/d2/emlmd/netcdf64-4.0.1_ifort/lib"
     4NETCDF_LIB="-lnetcdf"
     5NETCDF_INCDIR="-I/d2/emlmd/netcdf64-4.0.1_ifort/include"
     6
     7IOIPSL_INCDIR="-I/u/sllmd/LMDZ5/ioipsl/modipsl/lib-ifort"
     8IOIPSL_LIBDIR="-L/u/sllmd/LMDZ5/ioipsl/modipsl/lib-ifort"
     9IOIPSL_LIB="-lioipsl"
     10
     11XIOS_INCDIR="-I$ROOT/../XIOS/inc"
     12XIOS_LIBDIR="-L$ROOT/../XIOS/lib"
     13XIOS_LIB="-lxios -lstdc++"
     14

  • trunk/LMDZ.COMMON/makelmdz

    r1661 r1695  
    401401   CPP_KEY="$CPP_KEY INCA"
    402402   INCLUDE="$INCLUDE -I${INCA_INCDIR}"
    403    LIB="$LIB -L${INCA_LIBDIR} -lchimie"
    404    libchimie=" -L${INCA_LIBDIR} -lchimie"
     403   LIB="$LIB -L${INCA_LIBDIR} ${INCA_LIB}"
     404   libchimie=" -L${INCA_LIBDIR} ${INCA_LIB}"
    405405fi
    406406
    … …  
    409409   CPP_KEY="$CPP_KEY CPP_COUPLE"
    410410   INCLUDE="$INCLUDE -I${OASIS_INCDIR}"
    411    LIB="$LIB -L${OASIS_LIBDIR} -lpsmile.${couple} -lmpp_io"
     411   LIB="$LIB -L${OASIS_LIBDIR} ${OASIS_LIB}"
    412412fi
    413413
    … …  
    472472then
    473473
    474    INCLUDE="${INCLUDE} -I${ORCH_INCDIR}"
     474   INCLUDE="${INCLUDE} ${ORCHIDEE_INCDIR}"
    475475   CPP_KEY="$CPP_KEY CPP_VEGET"
    476476# temporary, for Orchidee versions 1.9.* (before openmp activation)
    … …  
    483483      orch_libs="sechiba parameters stomate parallel orglob"
    484484   fi
    485    LIB="${LIB} -L${ORCH_LIBDIR}"
    486    for lib in ${orch_libs} ; do
    487       if [ -f ${ORCH_LIBDIR}/lib${LIBPREFIX}$lib.a ] ; then
    488          LIB="${LIB} -l${LIBPREFIX}$lib "
    489       fi
    490    done
     485   LIB="${LIB} -L${ORCHIDEE_LIBDIR} ${ORCHIDEE_LIB}"
    491486elif [[ "$veget" != "false" ]] ; then
    492487   echo "Option -v $veget does not exist"
    … …  
    498493then
    499494   CPP_KEY="$CPP_KEY CPP_IOIPSL"
    500    INCLUDE="$INCLUDE -I${IOIPSL_INCDIR}"
    501    LIB="$LIB -L${IOIPSL_LIBDIR} -l${LIBPREFIX}ioipsl"
     495   INCLUDE="$INCLUDE ${IOIPSL_INCDIR}"
     496   LIB="$LIB -L${IOIPSL_LIBDIR} ${IOIPSL_LIB}"
    502497elif [[ $io == mix ]]
    503498then
    504499   # For now, xios implies also using ioipsl
    505500   CPP_KEY="$CPP_KEY CPP_IOIPSL CPP_XIOS"
    506    INCLUDE="$INCLUDE -I${IOIPSL_INCDIR} -I${XIOS_INCDIR}"
    507    LIB="$LIB -L${IOIPSL_LIBDIR} -l${LIBPREFIX}ioipsl -L${XIOS_LIBDIR} -l${LIBPREFIX}stdc++ -l${LIBPREFIX}xios"
     501   INCLUDE="$INCLUDE ${IOIPSL_INCDIR} ${XIOS_INCDIR}"
     502   LIB="$LIB -L${IOIPSL_LIBDIR} ${IOIPSL_LIB} ${XIOS_LIBDIR} ${XIOS_LIB}"
    508503elif [[ $io == xios ]]
    509504then
    510505   # For now, xios implies also using ioipsl
    511506   CPP_KEY="$CPP_KEY CPP_IOIPSL CPP_XIOS CPP_IOIPSL_NO_OUTPUT"
    512    INCLUDE="$INCLUDE -I${IOIPSL_INCDIR} -I${XIOS_INCDIR}"
    513    LIB="$LIB -L${IOIPSL_LIBDIR} -l${LIBPREFIX}ioipsl -L${XIOS_LIBDIR} -l${LIBPREFIX}stdc++ -l${LIBPREFIX}xios"
     507   INCLUDE="$INCLUDE ${IOIPSL_INCDIR} ${XIOS_INCDIR}"
     508   LIB="$LIB ${IOIPSL_LIBDIR} ${IOIPSL_LIB} ${XIOS_LIBDIR} ${XIOS_LIB}"
    514509fi
    515510
    … …  
    549544fi
    550545
    551 
     546# NETCDF library include/library paths
    552547INCLUDE="$INCLUDE ${NETCDF_INCDIR}"
    553 LIB="$LIB ${NETCDF_LIBDIR}"
     548LIB="$LIB ${NETCDF_LIBDIR} ${NETCDF_LIB}"
    554549
    555550########################################################################

  • trunk/LMDZ.COMMON/makelmdz_fcm

    r1661 r1695  
    338338   CPP_KEY="$CPP_KEY INCA"
    339339   INCLUDE="$INCLUDE -I${INCA_INCDIR}"
    340    LIB="$LIB -L${INCA_LIBDIR} -lchimie"
     340   LIB="$LIB -L${INCA_LIBDIR} ${INCA_LIB}"
    341341fi
    342342
    … …  
    349349        export OASIS_LIBDIR=$LMDGCM/../../prism/X64/lib
    350350        INCLUDE="$INCLUDE -I${OASIS_INCDIR}"
    351         LIB="$LIB -L${OASIS_LIBDIR} -lpsmile.MPI1 -lmpp_io"
     351        LIB="$LIB -L${OASIS_LIBDIR} ${OASIS_LIB}"
    352352    else
    353353        CPP_KEY="$CPP_KEY CPP_COUPLE CPP_OMCT"
    354354        INCLUDE="$INCLUDE -I${OASIS_INCDIR}"
    355         LIB="$LIB -L${OASIS_LIBDIR} -lpsmile.MPI1 -lscrip -lmct -lmpeu"
     355        LIB="$LIB -L${OASIS_LIBDIR} ${OASIS_LIB}"
    356356    fi
    357357fi
    … …  
    394394#    For this case, cpp flag ORCHIDEE_NOOPENMP must be added to the makelmdz_fcm arguments
    395395#    option orchidee1.9 : Compile with ORCHIDEE version up to the inclusion of OpenMP in ORCHIDEE : tag 1.9-1.9.5(version AR5)-1.9.6
    396    INCLUDE="${INCLUDE} -I${ORCH_INCDIR}"
     396   INCLUDE="${INCLUDE} ${ORCHIDEE_INCDIR}"
    397397   CPP_KEY="$CPP_KEY CPP_VEGET"
    398398# temporary, for Orchidee versions 1.9.* (before openmp activation)
    … …  
    405405      orch_libs="sechiba parameters stomate parallel orglob"
    406406   fi
    407    LIB="${LIB} -L${ORCH_LIBDIR}"
    408    for lib in ${orch_libs} ; do
    409       if [ -f ${ORCH_LIBDIR}/lib${LIBPREFIX}$lib.a ] ; then
    410          LIB="${LIB} -l${LIBPREFIX}$lib "
    411       fi
    412    done
     407   LIB="${LIB} -L${ORCHIDEE_LIBDIR} ${ORCHIDEE_LIB}"
    413408elif [[ "$veget" != "false" ]] ; then
    414409   echo "Option -v $veget does not exist"
    … …  
    444439then
    445440   CPP_KEY="$CPP_KEY CPP_IOIPSL"
    446    INCLUDE="$INCLUDE -I${IOIPSL_INCDIR}"
    447    LIB="$LIB -L${IOIPSL_LIBDIR} -l${LIBPREFIX}ioipsl"
     441   INCLUDE="$INCLUDE ${IOIPSL_INCDIR}"
     442   LIB="$LIB ${IOIPSL_LIBDIR} ${IOIPSL_LIB}"
    448443elif [[ $io == mix ]]
    449444then
    450445   # For now, xios implies also using ioipsl
    451446   CPP_KEY="$CPP_KEY CPP_IOIPSL CPP_XIOS"
    452    INCLUDE="$INCLUDE -I${IOIPSL_INCDIR} -I${XIOS_INCDIR}"
    453    LIB="$LIB -L${IOIPSL_LIBDIR} -l${LIBPREFIX}ioipsl -L${XIOS_LIBDIR} -l${LIBPREFIX}stdc++ -l${LIBPREFIX}xios"
     447   INCLUDE="$INCLUDE ${IOIPSL_INCDIR} ${XIOS_INCDIR}"
     448   LIB="$LIB ${IOIPSL_LIBDIR} ${IOIPSL_LIB} ${XIOS_LIBDIR} ${XIOS_LIB}"
    454449elif [[ $io == xios ]]
    455450then
    456451   # For now, xios implies also using ioipsl
    457452   CPP_KEY="$CPP_KEY CPP_IOIPSL CPP_XIOS CPP_IOIPSL_NO_OUTPUT"
    458    INCLUDE="$INCLUDE -I${IOIPSL_INCDIR} -I${XIOS_INCDIR}"
    459    LIB="$LIB -L${IOIPSL_LIBDIR} -l${LIBPREFIX}ioipsl -L${XIOS_LIBDIR} -l${LIBPREFIX}stdc++ -l${LIBPREFIX}xios"
     453   INCLUDE="$INCLUDE ${IOIPSL_INCDIR} ${XIOS_INCDIR}"
     454   LIB="$LIB ${IOIPSL_LIBDIR} ${IOIPSL_LIB} ${XIOS_LIBDIR} ${XIOS_LIB}"
    460455fi
    461456
    … …  
    488483fi
    489484
     485# NETCDF library include/library paths
    490486INCLUDE="$INCLUDE ${NETCDF_INCDIR}"
    491 LIB="$LIB ${NETCDF_LIBDIR}"
     487LIB="$LIB ${NETCDF_LIBDIR} ${NETCDF_LIB}"
    492488
    493489########################################################################
Note: See TracChangeset for help on using the changeset viewer.