Index: BOL/script_install/install.sh
===================================================================
--- BOL/script_install/install.sh	(revision 2203)
+++ BOL/script_install/install.sh	(revision 2404)
@@ -48,6 +48,6 @@
 
 version=trunk
-version=20141127.trunk
 version=testing
+version=20151130.trunk
 
 compilo=gfortran # compilo=pgf90 or g95 or gfortran or ifort sur PC linux
@@ -69,11 +69,21 @@
 
 # choose the resolution for the bench runs
-# grid_resolution= 32x24x11 or 48x36x19 for tests (test without ORCHIDEE)
-#                  96x71x19  standard configuration
-grid_resolution=48x36x19
+# grid_resolution= 32x24x11, 32x32x39 or 48x36x19 for tests
+grid_resolution=32x32x39
 
 ## compile_with_fcm=1 : use makelmdz_fcm, possible a of version 20111103.trunk (LMDZ5/trunk rev 1578)
 ## compile_with_fcm=0 : use makelmdz
 compile_with_fcm=1
+
+
+
+if [ -d /u/lmdz/WWW/Distrib ] ; then
+  dirget=/u/lmdz/WWW/Distrib
+elif [ -d ~/LMDZ/Distrib ] ; then
+  dirget=~/LMDZ/Distrib
+else 
+  dirget=NONE
+fi
+wget='wget http://www.lmd.jussieu.fr/~lmdz/Distrib'
 
 
@@ -133,5 +143,5 @@
 elif [ $compilo = $gfortran ] ; then
    OPTIM='-O3'
-   OPTDEB="-g3 -Wall -fbounds-check -ffpe-trap=invalid,zero,overflow -O0 -fstack-protector-all"
+   OPTDEB="-g3 -Wall -fbounds-check -ffpe-trap=invalid,zero,overflow -O0 -fstack-protector-all -finit-real=nan -fbacktrace"
    OPTDEV="-Wall -fbounds-check"
    fmod='I '
@@ -143,5 +153,5 @@
 elif [ $compilo = mpif90 ] ; then
    OPTIM='-O3'
-   OPTDEB="-g3 -Wall -fbounds-check -ffpe-trap=invalid,zero,overflow -O0 -fstack-protector-all"
+   OPTDEB="-g3 -Wall -fbounds-check -ffpe-trap=invalid,zero,overflow -O0 -fstack-protector-all -finit-real=nan -fbacktrace"
    OPTDEV="-Wall -fbounds-check"
    BASE_LD="-lblas"
@@ -235,5 +245,5 @@
 
 
-for logiciel in csh wget tar gzip make $compilo gcc ; do
+for logiciel in wget tar gzip make $compilo gcc ; do
 if [ "`which $logiciel`" = "" ] ; then
 echo You must first install $logiciel on your system
@@ -262,9 +272,11 @@
 echo '##########################################################'
 cd $MODEL
-wget http://www.lmd.jussieu.fr/~lmdz/DistribG95/modipsl.$version.tar.gz
-echo install.sh wget_OK `date`
-gunzip modipsl.$version.tar.gz
-tar xvf modipsl.$version.tar
-\rm modipsl.$version.tar
+if [ -f $dirget/modipsl.$version.tar.gz ] ; then
+   tar xvf $dirget/modipsl.$version.tar.gz
+else
+   $wget/modipsl.$version.tar.gz
+   tar xvf modipsl.$version.tar.gz
+   \rm modipsl.$version.tar.gz
+fi
 
 # We download LMDZ and make some modifications to make it
@@ -282,8 +294,11 @@
 echo '##########################################################'
 cd $MODEL
-wget http://www.lmd.jussieu.fr/~lmdz/DistribG95/netcdf-4.0.1.tar.gz
-gunzip netcdf-4.0.1.tar.gz
-tar xvf netcdf-4.0.1.tar
-\rm -f netcdf-4.0.1.tar
+if [ -f $dirget/netcdf-4.0.1.tar.gz ] ; then
+   tar xvf $dirget/netcdf-4.0.1.tar.gz
+else
+   $wget/netcdf-4.0.1.tar.gz
+   tar xvf netcdf-4.0.1.tar.gz
+   \rm -f netcdf-4.0.1.tar.gz
+fi
 
 cd netcdf-4.0.1
@@ -500,5 +515,5 @@
 ##################################################################
 echo install.sh avant_compilation `date`
-if [ $compile_with_fcm = 1 ] ; then makelmdz="makelmdz_fcm -arch local" ; else makelmdz=makelmdz ; fi
+if [ $compile_with_fcm = 1 ] ; then makelmdz="makelmdz_fcm -j 8 -arch local" ; else makelmdz=makelmdz ; fi
 
 ./$makelmdz -d ${grid_resolution} -v $veget_version gcm
@@ -529,8 +544,11 @@
 bench=bench_lmdz_${grid_resolution}
 echo install.sh avant_chargement_bench  `date`
-wget http://www.lmd.jussieu.fr/~lmdz/DistribG95/$bench.tar.gz
-echo install.sh apres_chargement_bench  `date`
-gunzip $bench.tar.gz
-tar xvf $bench.tar
+if [ -f $dirget/$bench.tar.gz ] ; then
+   tar xvf $dirget/$bench.tar.gz
+else
+   $wget/$bench.tar.gz
+   echo install.sh apres_chargement_bench  `date`
+   tar xvf $bench.tar.gz
+fi
 
 if [ -f gcm.e ] ; then