Changeset 1449

Timestamp:

03/08/18 16:48:55 (6 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:

• arch/arch-GCC_LINUX.env (modified) (1 diff)
• arch/arch-GCC_LINUX.path (modified) (1 diff)
• arch/arch-X64_CURIE.env (modified) (1 diff)
• arch/arch-X64_CURIE.path (modified) (1 diff)
• arch/arch-XC30_Cray.env (modified) (1 diff)
• arch/arch-XC30_Cray.path (modified) (1 diff)
• bld.cfg (modified) (1 diff)
• make_xios (modified) (5 diffs)

XIOS/dev/XIOS_DEV_CMIP6/arch/arch-GCC_LINUX.env

@@ -5 +5 @@
 export NETCDF_LIB_DIR=$HOME/netcdf4/lib
 
+export BOOST_INC_DIR=$HOME/boost
+export BOOST_LIB_DIR=$HOME/boost
+
+

XIOS/dev/XIOS_DEV_CMIP6/arch/arch-GCC_LINUX.path

@@ -11 +11 @@
 HDF5_LIB="-lhdf5_hl -lhdf5 -lhdf5 -lz"
 
+BOOST_INCDIR="-I $BOOST_INC_DIR"
+BOOST_LIBDIR="-L $BOOST_LIB_DIR"
+BOOST_LIB=""
+
 OASIS_INCDIR="-I$PWD/../../oasis3-mct/BLD/build/lib/psmile.MPI1"
 OASIS_LIBDIR="-L$PWD/../../oasis3-mct/BLD/lib"

XIOS/dev/XIOS_DEV_CMIP6/arch/arch-X64_CURIE.env

@@ -1 +1 @@
 module unload netcdf
 module unload hdf5
+module unload boost
 module load netcdf/4.3.3.1_hdf5_parallel
+module load boost

XIOS/dev/XIOS_DEV_CMIP6/arch/arch-X64_CURIE.path

@@ -11 +11 @@
 HDF5_LIB="-lhdf5_hl -lhdf5 -lz -lcurl"
 
+BOOST_INCDIR="-I $BOOST_INCDIR"
+BOOST_LIBDIR="-L $BOOST_LIBDIR"
+BOOST_LIB=""
+
 OASIS_INCDIR="-I$PWD/../../oasis3-mct/BLD/build/lib/psmile.MPI1"
 OASIS_LIBDIR="-L$PWD/../../oasis3-mct/BLD/lib"

XIOS/dev/XIOS_DEV_CMIP6/arch/arch-XC30_Cray.env

@@ -4 +4 @@
 export NETCDF_INC_DIR=""
 export NETCDF_LIB_DIR=""
+
+export BOOST_INC_DIR=""
+export BOOST_LIB_DIR=""

XIOS/dev/XIOS_DEV_CMIP6/arch/arch-XC30_Cray.path

@@ -11 +11 @@
 HDF5_LIB=""
 
+BOOST_INCDIR="-I $BOOST_INCDIR"
+BOOST_LIBDIR="-L $BOOST_LIBDIR"
+BOOST_LIB=""
+
 OASIS_INCDIR=""
 OASIS_LIBDIR=""

XIOS/dev/XIOS_DEV_CMIP6/bld.cfg

@@ -25 +25 @@
 search_src           true
 src::zzz .
-src::date $PWD/extern/boost/src/date_time
+#src::date $PWD/extern/boost/src/date_time
 src::blitz $PWD/extern/blitz/src
 src::netcdf $PWD/extern/netcdf4

XIOS/dev/XIOS_DEV_CMIP6/make_xios

@@ -5 +5 @@
 use_oasis="false"
 oasis="oasis3_mct"
+use_extern_boost="false"
 use_memtrack="false"
 job="1"
 netcdf_lib="netcdf4_par"
 compil_mode="prod"
+
 
 # Traitement de la ligne de commande
@@ -25 +27 @@
             echo "       [--full] : to generate dependencies and recompile from scratch"
             echo "       [--use_oasis 'oasis3' 'oasis3_mct' : default oasis3_mct] : to use Oasis coupler"
+        echo "       [--use_extern_boost : to use external boost library"
             echo "       [--doc] : to generate Doxygen documentation (not available yet)"
             echo "       [--job ntasks] : to use parallel compilation with ntasks"
@@ -39 +42 @@
          "--full")  compil_full="true"  ; shift ;;
          "--use_oasis")  use_oasis="true" oasis=$2 ; shift ; shift  ;;
+         "--use_extern_boost")  use_extern_boost="true" ; shift  ;;
          "--doc")   doc="true"          ; shift ;;
          "--job")   job=$2              ; shift ; shift ;;
@@ -147 +151 @@
     XIOS_FINCDIR="$OASIS_INCDIR $XIOS_FINCDIR"
     XIOS_LIB="$OASIS_LIBDIR $OASIS_LIB $XIOS_LIB"
-fi 
+fi
+
+# Setting path for boost
+if [[ "$use_extern_boost" == "true" ]]
+then
+   ln -s $PWD/.void_dir $PWD/extern/boost
+else
+   ln -s $PWD/extern/boost $PWD/extern/boost
+   export BOOST_INCDIR="-I${PWD}/extern/boost"
+   export BOOST_LIBDIR=""
+   export BOOST_LIB=""
+fi
+
 
 if [[ "$use_memtrack" == "true" ]]
@@ -155 +171 @@
 fi 
 
-XIOS_CINCDIR="$NETCDF_INCDIR $HDF5_INCDIR $MPI_INCDIR"
-XIOS_FINCDIR="$NETCDF_INCDIR $XIOS_FINCDIR $MPI_INCDIR"
+XIOS_CINCDIR="$NETCDF_INCDIR $HDF5_INCDIR $MPI_INCDIR $BOOST_INCDIR"
+XIOS_FINCDIR="$NETCDF_INCDIR $XIOS_FINCDIR $MPI_INCDIR $BOOST_INCDIR"
 
 XIOS_LIB="$XIOS_LIB $NETCDF_LIBDIR $HDF5_LIBDIR $MPI_LIBDIR $NETCDF_LIB $HDF5_LIB $MPI_LIB"