Index: /BOL/Multi_atlas/Utils/multi.sh
===================================================================
--- /BOL/Multi_atlas/Utils/multi.sh	(revision 4701)
+++ /BOL/Multi_atlas/Utils/multi.sh	(revision 4702)
@@ -1,5 +1,7 @@
+
 #set -vx
 
 source ~/env_Multi_atlas.sh
+module purge
 
 local=`pwd -P`
@@ -15,5 +17,5 @@
 zon=1
 html=1
-atlas=1
+atlas=0
 #newatlas=0
 atlas_cesmep=0
@@ -89,11 +91,6 @@
 
 echo qsub is $qsub
-#exit
 
 echo DODSDIR : $DODSDIR
-MAIN_SE=$DODSDIR/$login/lmdz/SE
-TS_DA=$DODSDIR/$login/lmdz/TS_DA
-TS_MO=$DODSDIR/$login/lmdz/TS_MO
-MULTIDIR=$DODSDIR/$login/lmdz/MultiSimu
 
 if [ ! -d $MULTIDIR ] ; then mkdir -p $MULTIDIR ; fi
@@ -124,5 +121,4 @@
 for year in `grep -w "^$s" $DEF_FILE | awk ' { print $2 } '` ; do
 file=${MAIN_SE}/ORIG/${s}_SE_${year}_1M_histmth.nc
-###file=${MAIN_SE}/ORIG/${ss}_SE_${year}_1M_histmth.nc
 
 echo $file $year
@@ -134,13 +130,21 @@
   echo NO need to ln -s; the *1M_histmth.nc does not exist anymore
  else
+  \rm year.txt
   echo $year>>year.txt
   sed -i -e 's/_/ /' year.txt 
   year1=`less year.txt | awk '{print $1}'`
   year2=`less year.txt | awk '{print $2}'`
-  ln -s ${simdir}/ATM/Output/MO/${ss}_${year1}0101_${year2}1230_1M_histmth.nc $file
+  echo yr1=${year1} yr2=${year2}
+  ls -l ${simdir}/ATM/Output/MO/${ss}_${year1}0101_${year2}1230_1M_histmth.nc
+  ls -l ${simdir}/ATM/Output/MO/${ss}_${year1}0101_${year2}1231_1M_histmth.nc
+  if [ -f ${simdir}/ATM/Output/MO/${ss}_${year1}0101_${year2}1230_1M_histmth.nc ]; then
+   ln -s ${simdir}/ATM/Output/MO/${ss}_${year1}0101_${year2}1230_1M_histmth.nc $file
+  elif [ -f ${simdir}/ATM/Output/MO/${ss}_${year1}0101_${year2}1231_1M_histmth.nc ]; then
+   ln -s ${simdir}/ATM/Output/MO/${ss}_${year1}0101_${year2}1231_1M_histmth.nc $file
+  fi
  fi
 fi
 
-\rm ${MAIN_SE}/ORIG/UQLMDZ6AW1000_SE_1979_1988_1M_histmth.nc
+#\rm ${MAIN_SE}/ORIG/UQLMDZ6AW1000_SE_1979_1988_1M_histmth.nc
 done
 done
@@ -178,5 +182,5 @@
 fi
 done
-#exit
+
 listruns=""
 listrunss=""
@@ -186,5 +190,5 @@
 simdir=`grep -w "^$s "  $runstxt | awk ' { print $2 } '`
 echo $simdir
-( cd $MAIN_SE/ORIG ; ln -sf $simdir/ATM/Analyse/SE/*mth*nc . ) > /dev/null 2>&1
+cd $MAIN_SE/ORIG ; 
 echo $simdir
 ss=`basename $simdir `
@@ -195,9 +199,4 @@
 done
 done
-#echo listruns = $listruns
-#echo listrunss= $listrunss
-#echo listrune= $listrune 
-#ls -lrt $MAIN_SE/ORIG # Eviter de laisser des ls qui rendent la sortire illisible FH
-#listsimss="" ; for ss in `awk ' {print $1"_"$2 } ' $DEF_FILE`    ; do listsimss="$listsimss $ss" ; done
 
 ns=0
@@ -413,5 +412,4 @@
    echo metrics.sh, log in ${LOGD}/METRICS$$
    cd $local/METRICS
-   #./metrics.sh -runsfile $runstxt $comp
    echo ./metrics.sh $comp > ${LOGD}/METRICS$$ 2>&1
    ./metrics.sh $comp > ${LOGD}/METRICS$$ 2>&1
@@ -454,5 +452,5 @@
 if [ $river = 1 ]; then 
    cd ~/users/idelkadi/AXE1/River
-   ./make_diagnoRiver.sh $comp
+   ./make_diagnoRiver.sh $comp >> ${LOGD}/out_river
 fi  
 
@@ -461,8 +459,7 @@
 echo 8.2/ Rainfall variability / LMA analysis of the MJO : $lma
 echo '#####################################################################'
-   #IM150722 cd $local
-   #IM120722 ./make_lma.sh $comp
-   cd ~/users/musat/d_AXE2_LMA/
-   ./make_LMA.sh $comp >  ${LOGD}/LMA$$ 2>&1
+   cd ${local}/d_AXE2_LMA/
+   bash ./make_LMA.sh $comp >  ${LOGD}/LMA$$ 2>&1
+   echo ./make_LMA.sh $comp >  ${LOGD}/LMA$$ 2>&1
    cd ${local}
 fi
@@ -481,6 +478,7 @@
 echo 8.4/ Rainfall variability / Marine Bonazzola : $trmm
 echo '#####################################################################'
-   cd ~/users/musat/atlas/d_AXE2
-   ./Axe2_Marine.sh $comp
+   cd ${local}/d_AXE2
+   bash ./Axe2_Marine.sh $comp >  ${LOGD}/axe2_Marine_$$ 2>&1
+   echo ./Axe2_Marine.sh $comp '-->'  ${LOGD}/axe2_Marine_$$ 2>&1
    cd $local
 fi
@@ -499,5 +497,6 @@
 echo '#####################################################################'
   cd $local
-   ./make_axe4.sh $comp
+   bash ./make_axe4.sh $comp >  ${LOGD}/axe4_$$ 2>&1
+   echo  make_axe4.sh $comp '-->' ${LOGD}/axe4_$$
 fi
 
@@ -574,6 +573,4 @@
 
    echo Multi atlas, log in ${LOGD}/multiatlas$$ 
-#  for proj in GLOB SH NH ; do
-#  for proj in ATLTN GLOB SH NH ; do
    for proj in GLOB SH NH ; do
    for bias in BIAS MAPS ; do
@@ -583,8 +580,4 @@
    done
    done
-#exit
-#   cd $COMP_D
-#   ln -sf BIASYEAR.html  $comp.html
-#   ln -sf ACCUEIL.html  $comp.html
 cd $local
 ./webpage_multi.sh $comp