Index: /BOL/script_install/install_xios.bash
===================================================================
--- /BOL/script_install/install_xios.bash	(revision 4781)
+++ /BOL/script_install/install_xios.bash	(revision 4782)
@@ -13,5 +13,9 @@
 fi
 arch="local"
-xios_rev="1786"
+#xios_branch="trunk"
+xios_branch="2.6"
+#xios_rev="HEAD"
+xios_rev="2568"
+
 #########################################################################
 #  Options 
@@ -29,4 +33,6 @@
        [ -MPI path ]          top directory of the MPI library
                               (default: $mpi_home)
+       [ -branch branch]      XIOS branch trunk|2.5|2.6
+                              (default: $xios_branch)
        [ -rev number ]        XIOS revision
                               (default: $xios_rev)
@@ -39,4 +45,5 @@
      "-hdf5" ) hdf5_home=$2 ; shift ; shift ;;
      "-MPI") mpi_home=$2 ; shift ; shift ;;
+     "-branch") xios_branch=$2 ; shift ; shift ;;
      "-rev") xios_rev=$2 ; shift ; shift ;;
      "-arch") arch=$2 ; shift ; shift ;;
@@ -50,9 +57,17 @@
 
 # Download XIOS
+case $xios_branch in
+  "trunk")
+  xios_http="http://forge.ipsl.jussieu.fr/ioserver/svn/XIOS/trunk" ;;
+  "2.5")
+  xios_http="http://forge.ipsl.jussieu.fr/ioserver/svn/XIOS/branchs/xios-2.5" ;;
+  "2.6")
+  xios_http="http://forge.ipsl.jussieu.fr/ioserver/svn/XIOS2/branches/xios-2.6" ;;
+*)
+echo "Error, bad argument for -branch ! Did not expect $xios_branch" ; exit ;;
+esac
+
 cd $install_dir
-#svn co --revision $xios_rev http://forge.ipsl.jussieu.fr/ioserver/svn/XIOS/trunk XIOS
-#XIOS 2.5 branch
-#svn co --revision $xios_rev http://forge.ipsl.jussieu.fr/ioserver/svn/XIOS/branchs/xios-2.5 XIOS
-svn co --revision $xios_rev http://forge.ipsl.jussieu.fr/ioserver/svn/XIOS2/branches/xios-2.5 XIOS
+svn co --revision $xios_rev $xios_http XIOS
 
 # Make arch files, if necesary:
@@ -82,5 +97,5 @@
 echo '%BASE_CFLAGS    -w -ansi'                >> arch-local.fcm
 else
-echo '%BASE_CFLAGS    -w -ansi -std=c++03'                >> arch-local.fcm
+echo '%BASE_CFLAGS    -w -std=c++11 -D__XIOS_EXCEPTION'   >> arch-local.fcm
 fi
 echo '%PROD_CFLAGS    -O3 -D BOOST_DISABLE_ASSERTS'       >> arch-local.fcm