Changeset 1453


Ignore:
Timestamp:
03/09/18 11:04:30 (3 years ago)
Author:
oabramkina
Message:

DEV_CMIP6: adding a compilation option '--use_extern_blitz' to allow usage of external blitz.

Location:
XIOS/dev/XIOS_DEV_CMIP6
Files:
5 edited

Legend:

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

    r1449 r1453  
    44module load netcdf/4.3.3.1_hdf5_parallel 
    55module load boost 
     6module load blitz 
  • XIOS/dev/XIOS_DEV_CMIP6/arch/arch-X64_CURIE.path

    r1449 r1453  
    1515BOOST_LIB="" 
    1616 
     17BLITZ_INCDIR="-I $BLITZ_INCDIR" 
     18BLITZ_LIBDIR="-L $BLITZ_LIBDIR" 
     19BLITZ_LIB="" 
     20 
    1721OASIS_INCDIR="-I$PWD/../../oasis3-mct/BLD/build/lib/psmile.MPI1" 
    1822OASIS_LIBDIR="-L$PWD/../../oasis3-mct/BLD/lib" 
  • XIOS/dev/XIOS_DEV_CMIP6/arch/arch-XC30_Cray.env

    r1449 r1453  
    77export BOOST_INC_DIR="" 
    88export BOOST_LIB_DIR="" 
     9 
     10export BLITZ_INC_DIR="" 
     11export BLITZ_LIB_DIR="" 
  • XIOS/dev/XIOS_DEV_CMIP6/arch/arch-XC30_Cray.path

    r1449 r1453  
    1515BOOST_LIB="" 
    1616 
     17BLITZ_INCDIR="-I $BLITZ_INCDIR" 
     18BLITZ_LIBDIR="-L $BLITZ_LIBDIR" 
     19BLITZ_LIB="" 
     20 
    1721OASIS_INCDIR="" 
    1822OASIS_LIBDIR="" 
  • XIOS/dev/XIOS_DEV_CMIP6/make_xios

    r1451 r1453  
    66oasis="oasis3_mct" 
    77use_extern_boost="false" 
     8use_extern_blitz="false" 
    89use_memtrack="false" 
    910job="1" 
     
    3132            echo "       [--use_oasis 'oasis3' 'oasis3_mct' : default oasis3_mct] : to use Oasis coupler"i 
    3233        echo "       [--use_extern_boost : to use external boost library" 
     34        echo "       [--use_extern_blitz : to use external blitz library" 
    3335            echo "       [--doc] : to generate Doxygen documentation (not available yet)" 
    3436            echo "       [--job ntasks] : to use parallel compilation with ntasks" 
     
    4749         "--use_oasis")  use_oasis="true" oasis=$2 ; shift ; shift  ;; 
    4850         "--use_extern_boost")  use_extern_boost="true" ; shift  ;; 
     51         "--use_extern_blitz")  use_extern_blitz="true" ; shift  ;; 
    4952         "--doc")   doc="true"          ; shift ;; 
    5053         "--job")   job=$2              ; shift ; shift ;; 
     
    183186fi 
    184187 
     188# Setting path for blitz 
     189if [[ "$use_extern_blitz" == "true" ]] 
     190then 
     191   ln -s $PWD/.void_dir $PWD/extern/blitz 
     192else 
     193   export BLITZ_INCDIR="-I${PWD}/extern/blitz" 
     194   export BLITZ_LIBDIR="" 
     195   export BLITZ_LIB="" 
     196fi 
     197 
     198 
    185199if [[ "$use_memtrack" == "true" ]] 
    186200   then 
     
    200214fi  
    201215 
    202 XIOS_CINCDIR="$NETCDF_INCDIR $HDF5_INCDIR $MPI_INCDIR $BOOST_INCDIR" 
    203 XIOS_FINCDIR="$NETCDF_INCDIR $XIOS_FINCDIR $MPI_INCDIR $BOOST_INCDIR" 
     216XIOS_CINCDIR="$NETCDF_INCDIR $HDF5_INCDIR $MPI_INCDIR $BOOST_INCDIR $BLITZ_INCDIR" 
     217XIOS_FINCDIR="$NETCDF_INCDIR $XIOS_FINCDIR $MPI_INCDIR $BOOST_INCDIR $BLITZ_INCDIR" 
    204218 
    205219XIOS_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.