Changeset 1452 for XIOS/trunk

Timestamp:

03/09/18 11:02:12 (6 years ago)

Author:

oabramkina

Message:

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

Location:

XIOS/trunk

Files:

• 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)
• make_xios (modified) (5 diffs)

XIOS/trunk/arch/arch-X64_CURIE.env

@@ -4 +4 @@
 module load netcdf/4.3.3.1_hdf5_parallel
 module load boost
+module load blitz

XIOS/trunk/arch/arch-X64_CURIE.path

@@ -15 +15 @@
 BOOST_LIB=""
 
+BLITZ_INCDIR="-I $BLITZ_INCDIR"
+BLITZ_LIBDIR="-L $BLITZ_LIBDIR"
+BLITZ_LIB=""
+
 OASIS_INCDIR="-I$PWD/../../oasis3-mct/BLD/build/lib/psmile.MPI1"
 OASIS_LIBDIR="-L$PWD/../../oasis3-mct/BLD/lib"

XIOS/trunk/arch/arch-XC30_Cray.env

@@ -7 +7 @@
 export BOOST_INC_DIR=""
 export BOOST_LIB_DIR=""
+
+export BLITZ_INC_DIR=""
+export BLITZ_LIB_DIR=""

XIOS/trunk/arch/arch-XC30_Cray.path

@@ -15 +15 @@
 BOOST_LIB=""
 
+BLITZ_INCDIR="-I $BLITZ_INCDIR"
+BLITZ_LIBDIR="-L $BLITZ_LIBDIR"
+BLITZ_LIB=""
+
 OASIS_INCDIR=""
 OASIS_LIBDIR=""

XIOS/trunk/make_xios

@@ -6 +6 @@
 oasis="oasis3_mct"
 use_extern_boost="false"
+use_extern_blitz="false"
 use_memtrack="false"
 job="1"
@@ -31 +32 @@
             echo "       [--use_oasis 'oasis3' 'oasis3_mct' : default oasis3_mct] : to use Oasis coupler"i
         echo "       [--use_extern_boost : to use external boost library"
+        echo "       [--use_extern_blitz : to use external blitz library"
             echo "       [--doc] : to generate Doxygen documentation (not available yet)"
             echo "       [--job ntasks] : to use parallel compilation with ntasks"
@@ -47 +49 @@
          "--use_oasis")  use_oasis="true" oasis=$2 ; shift ; shift  ;;
          "--use_extern_boost")  use_extern_boost="true" ; shift  ;;
+         "--use_extern_blitz")  use_extern_blitz="true" ; shift  ;;
          "--doc")   doc="true"          ; shift ;;
          "--job")   job=$2              ; shift ; shift ;;
@@ -183 +186 @@
 fi
 
+# Setting path for blitz
+if [[ "$use_extern_blitz" == "true" ]]
+then
+   ln -s $PWD/.void_dir $PWD/extern/blitz
+else
+   export BLITZ_INCDIR="-I${PWD}/extern/blitz"
+   export BLITZ_LIBDIR=""
+   export BLITZ_LIB=""
+fi
+
+
 if [[ "$use_memtrack" == "true" ]]
    then
@@ -200 +214 @@
 fi 
 
-XIOS_CINCDIR="$NETCDF_INCDIR $HDF5_INCDIR $MPI_INCDIR $BOOST_INCDIR"
-XIOS_FINCDIR="$NETCDF_INCDIR $XIOS_FINCDIR $MPI_INCDIR $BOOST_INCDIR"
+XIOS_CINCDIR="$NETCDF_INCDIR $HDF5_INCDIR $MPI_INCDIR $BOOST_INCDIR $BLITZ_INCDIR"
+XIOS_FINCDIR="$NETCDF_INCDIR $XIOS_FINCDIR $MPI_INCDIR $BOOST_INCDIR $BLITZ_INCDIR"
 
 XIOS_LIB="$XIOS_LIB $NETCDF_LIBDIR $HDF5_LIBDIR $MPI_LIBDIR $NETCDF_LIB $HDF5_LIB $MPI_LIB"