Changeset 287

Timestamp:

10/21/11 19:05:17 (12 years ago)

Author:

ymipsl

Message:

Mise à jour arch Titane
=> utilisation avec bibliothèque netcdf4 patch plus hdf5 1.8.7

YM

Location:

XMLIO_V2/dev/common

Files:

• arch/arch-X64_TITANE.env (modified) (1 diff)
• arch/arch-X64_TITANE.fcm (modified) (1 diff)
• arch/arch-X64_TITANE.path (modified) (2 diffs)
• bld.cfg (modified) (2 diffs)
• make_xios (modified) (4 diffs)

XMLIO_V2/dev/common/arch/arch-X64_TITANE.env

@@ -1 +1 @@
 module unload netcdf
+module unload hdf5
+export HDF5_INC_DIR=$WORKDIR/hdf5/include
+export HDF5_LIB_DIR=$WORKDIR/hdf5/lib
+
 export NETCDF_INC_DIR=$WORKDIR/netcdf4/include
 export NETCDF_LIB_DIR=$WORKDIR/netcdf4/lib
 
-module unload phdf5
-module load phdf5/1.8.6
+#module unload phdf5
+#module load phdf5/1.8.6

XMLIO_V2/dev/common/arch/arch-X64_TITANE.fcm

@@ -7 +7 @@
 %LINKER         mpif90  -nofor-main
 
-%BASE_CFLAGS    -ansi -D XIOS_LIBRARY -DNONE -D XIOS_LIBRARY -diag-disable 1125 -diag-disable 279
-%PROD_CFLAGS    -O3
+%BASE_CFLAGS    -ansi -DXIOS_LIBRARY -DNONE -DXIOS_LIBRARY -diag-disable 1125 -diag-disable 279
+%PROD_CFLAGS    -O3 -D BOOST_DISABLE_ASSERTS
 %DEV_CFLAGS     -D XIOS_DEBUG -g -traceback
-%DEBUG_CFLAGS   -D XIOS_DEBUG -g -traceback
+%DEBUG_CFLAGS   -D XIOS_DEBUG -g -traceback -fno-inline
 
-%BASE_FFLAGS    -D XIOS_LIBRARY -DNONE -D XIOS_LIBRARY
+%BASE_FFLAGS    -DXIOS_LIBRARY -DXIOS_LIBRARY 
 %PROD_FFLAGS    -O3
-%DEV_FFLAGS     -D XIOS_DEBUG -g -traceback
-%DEBUG_FFLAGS   -D XIOS_DEBUG -g -traceback
+%DEV_FFLAGS     -DXIOS_DEBUG -g -traceback
+%DEBUG_FFLAGS   -DXIOS_DEBUG -g -traceback
 
 %BASE_INC       -D NONE

XMLIO_V2/dev/common/arch/arch-X64_TITANE.path

@@ -1 +1 @@
 NETCDF_INCDIR="-I $NETCDF_INC_DIR"
 NETCDF_LIBDIR="-L $NETCDF_LIB_DIR"
-NETCDF_LIB="-lnetcdf"
+NETCDF_LIB="-lnetcdff -lnetcdf"
 
 MPI_INCDIR=""
@@ -9 +9 @@
 HDF5_INCDIR="-I $HDF5_INC_DIR"
 HDF5_LIBDIR="-L $HDF5_LIB_DIR"
-HDF5_LIB="-lhdf5_hl -lhdf5 -lz -lcurl"
+HDF5_LIB="-lhdf5_hl -lhdf5 -lhdf5 -lz -lcurl"
+
+OASIS_INCDIR="-I$WORKDIR/NEMO_COUPLE/prism/X64/build/lib/psmile.MPI1"
+OASIS_LIBDIR="-L$WORKDIR/NEMO_COUPLE/prism/X64/lib"
+OASIS_LIB="-lpsmile.MPI1 -lmpp_io"

XMLIO_V2/dev/common/bld.cfg

@@ -27 +27 @@
 bld::lib::xmlio xmlio
 bld::target libxmlio.a
-bld::target main_server.exe
+bld::target main_server.exe test_netcdf.exe
 bld::exe_dep
 
@@ -37 +37 @@
 bld::tool::cflags    %CFLAGS %CBASE_INC -I${PWD}/extern/boost/include -I${PWD}/extern/rapidxml/include -I/usr/include
 bld::tool::fflags    %FFLAGS %FBASE_INC -I/usr/include
+bld::tool::cppkeys   %CPP_KEY
+bld::tool::fppkeys   %CPP_KEY
 
 # Pre-process code before analysing dependencies
 bld::pp              false
+bld::excl_dep        use::mod_prism_get_comm
+bld::excl_dep        use::mod_prism_proto
 bld::excl_dep        inc::mpif.h

XMLIO_V2/dev/common/make_xios

@@ -2 +2 @@
 
 install_dir=$PWD
+compil_full="false"
+use_oasis="false"
 
 # Traitement de la ligne de commande
@@ -15 +17 @@
          "--debug") compil_mode="debug" ; shift ;;
          "--arch")  arch=$2     ; shift ; shift ;;
+         "--full")  compil_full="true"  ; shift ; shift ;;
+         "--use_oasis")  use_oasis="true"  ; shift ; shift ;;
          "--doc")   doc="true"          ; shift ;;
          *)         code="$1"           ; shift ;;
@@ -73 +77 @@
 fi
 
+if [[ "$use_oasis" == "true" ]]
+   then
+   XMLIO_FINCDIR="$OASIS_INCDIR $XMLIO_FINCDIR"
+   XMLIO_LIB="$OASIS_LIBDIR $OASIS_LIB $XMLIO_LIB"
+   XMLIO_CPPKEY="$XMLIO_CPPKEY USE_OASIS"
+else
+  fcm build
+fi 
 XMLIO_CINCDIR="$NETCDF_INCDIR $HDF5_INCDIR $MPI_INCDIR"
-XMLIO_FINCDIR="$MPI_INCDIR"
+XMLIO_FINCDIR="$XMLIO_FINCDIR $MPI_INCDIR"
 
-XMLIO_LIB="$NETCDF_LIBDIR $HDF5_LIBDIR $MPI_LIBDIR $NETCDF_LIB $HDF5_LIB $MPI_LIB"
+XMLIO_LIB="$XMLIO_LIB $NETCDF_LIBDIR $HDF5_LIBDIR $MPI_LIBDIR $NETCDF_LIB $HDF5_LIB $MPI_LIB"
 
 rm -f config.fcm
 echo "%COMPIL_CFLAGS $COMPIL_CFLAGS" >> config.fcm
 echo "%COMPIL_FFLAGS $COMPIL_FFLAGS" >> config.fcm
+echo "%CPP_KEY       $XMLIO_CPPKEY"  >> config.fcm
 
 echo "%CBASE_INC     $XMLIO_CINCDIR" >> config.fcm     
@@ -102 +115 @@
 #$make_dir/tools/preprocess_f03 $make_dir/src/xmlio/fortran/ixmlioserver.f90 $make_dir/src/xmlio/fortran/ixmlioserver.f03.in
 
-fcm build
+if [[ "$compil_full" == "true" ]]
+   then
+   fcm build -f
+else
+  fcm build
+fi
 
+
+if [[ $? == 0 ]]
+  then
+#    cd $WORKDIR/XMLIO_NEMO_COUPLE/modeles/NEMO/WORK
+    cd $WORKDIR/XMLIO_NEMO/modeles/NEMO/WORK
+    make
+fi