Changeset 1449


Ignore:
Timestamp:
03/08/18 16:48:55 (3 years ago)
Author:
oabramkina
Message:

DEV_CMIP6: adding a compilation option '--use_extern_boost' to allow usage of external boost.

Location:
XIOS/dev/XIOS_DEV_CMIP6
Files:
8 edited

Legend:

Unmodified
Added
Removed
  • XIOS/dev/XIOS_DEV_CMIP6/arch/arch-GCC_LINUX.env

    r983 r1449  
    55export NETCDF_LIB_DIR=$HOME/netcdf4/lib 
    66 
     7export BOOST_INC_DIR=$HOME/boost 
     8export BOOST_LIB_DIR=$HOME/boost 
     9 
     10 
  • XIOS/dev/XIOS_DEV_CMIP6/arch/arch-GCC_LINUX.path

    r983 r1449  
    1111HDF5_LIB="-lhdf5_hl -lhdf5 -lhdf5 -lz" 
    1212 
     13BOOST_INCDIR="-I $BOOST_INC_DIR" 
     14BOOST_LIBDIR="-L $BOOST_LIB_DIR" 
     15BOOST_LIB="" 
     16 
    1317OASIS_INCDIR="-I$PWD/../../oasis3-mct/BLD/build/lib/psmile.MPI1" 
    1418OASIS_LIBDIR="-L$PWD/../../oasis3-mct/BLD/lib" 
  • XIOS/dev/XIOS_DEV_CMIP6/arch/arch-X64_CURIE.env

    r574 r1449  
    11module unload netcdf 
    22module unload hdf5 
     3module unload boost 
    34module load netcdf/4.3.3.1_hdf5_parallel 
     5module load boost 
  • XIOS/dev/XIOS_DEV_CMIP6/arch/arch-X64_CURIE.path

    r660 r1449  
    1111HDF5_LIB="-lhdf5_hl -lhdf5 -lz -lcurl" 
    1212 
     13BOOST_INCDIR="-I $BOOST_INCDIR" 
     14BOOST_LIBDIR="-L $BOOST_LIBDIR" 
     15BOOST_LIB="" 
     16 
    1317OASIS_INCDIR="-I$PWD/../../oasis3-mct/BLD/build/lib/psmile.MPI1" 
    1418OASIS_LIBDIR="-L$PWD/../../oasis3-mct/BLD/lib" 
  • XIOS/dev/XIOS_DEV_CMIP6/arch/arch-XC30_Cray.env

    r582 r1449  
    44export NETCDF_INC_DIR="" 
    55export NETCDF_LIB_DIR="" 
     6 
     7export BOOST_INC_DIR="" 
     8export BOOST_LIB_DIR="" 
  • XIOS/dev/XIOS_DEV_CMIP6/arch/arch-XC30_Cray.path

    r582 r1449  
    1111HDF5_LIB="" 
    1212 
     13BOOST_INCDIR="-I $BOOST_INCDIR" 
     14BOOST_LIBDIR="-L $BOOST_LIBDIR" 
     15BOOST_LIB="" 
     16 
    1317OASIS_INCDIR="" 
    1418OASIS_LIBDIR="" 
  • XIOS/dev/XIOS_DEV_CMIP6/bld.cfg

    r1446 r1449  
    2525search_src           true 
    2626src::zzz . 
    27 src::date $PWD/extern/boost/src/date_time 
     27#src::date $PWD/extern/boost/src/date_time 
    2828src::blitz $PWD/extern/blitz/src 
    2929src::netcdf $PWD/extern/netcdf4 
  • XIOS/dev/XIOS_DEV_CMIP6/make_xios

    r660 r1449  
    55use_oasis="false" 
    66oasis="oasis3_mct" 
     7use_extern_boost="false" 
    78use_memtrack="false" 
    89job="1" 
    910netcdf_lib="netcdf4_par" 
    1011compil_mode="prod" 
     12 
    1113 
    1214# Traitement de la ligne de commande 
     
    2527            echo "       [--full] : to generate dependencies and recompile from scratch" 
    2628            echo "       [--use_oasis 'oasis3' 'oasis3_mct' : default oasis3_mct] : to use Oasis coupler" 
     29        echo "       [--use_extern_boost : to use external boost library" 
    2730            echo "       [--doc] : to generate Doxygen documentation (not available yet)" 
    2831            echo "       [--job ntasks] : to use parallel compilation with ntasks" 
     
    3942         "--full")  compil_full="true"  ; shift ;; 
    4043         "--use_oasis")  use_oasis="true" oasis=$2 ; shift ; shift  ;; 
     44         "--use_extern_boost")  use_extern_boost="true" ; shift  ;; 
    4145         "--doc")   doc="true"          ; shift ;; 
    4246         "--job")   job=$2              ; shift ; shift ;; 
     
    147151    XIOS_FINCDIR="$OASIS_INCDIR $XIOS_FINCDIR" 
    148152    XIOS_LIB="$OASIS_LIBDIR $OASIS_LIB $XIOS_LIB" 
    149 fi  
     153fi 
     154 
     155# Setting path for boost 
     156if [[ "$use_extern_boost" == "true" ]] 
     157then 
     158   ln -s $PWD/.void_dir $PWD/extern/boost 
     159else 
     160   ln -s $PWD/extern/boost $PWD/extern/boost 
     161   export BOOST_INCDIR="-I${PWD}/extern/boost" 
     162   export BOOST_LIBDIR="" 
     163   export BOOST_LIB="" 
     164fi 
     165 
    150166 
    151167if [[ "$use_memtrack" == "true" ]] 
     
    155171fi  
    156172 
    157 XIOS_CINCDIR="$NETCDF_INCDIR $HDF5_INCDIR $MPI_INCDIR" 
    158 XIOS_FINCDIR="$NETCDF_INCDIR $XIOS_FINCDIR $MPI_INCDIR" 
     173XIOS_CINCDIR="$NETCDF_INCDIR $HDF5_INCDIR $MPI_INCDIR $BOOST_INCDIR" 
     174XIOS_FINCDIR="$NETCDF_INCDIR $XIOS_FINCDIR $MPI_INCDIR $BOOST_INCDIR" 
    159175 
    160176XIOS_LIB="$XIOS_LIB $NETCDF_LIBDIR $HDF5_LIBDIR $MPI_LIBDIR $NETCDF_LIB $HDF5_LIB $MPI_LIB" 
Note: See TracChangeset for help on using the changeset viewer.