Changeset 3885 for BOL/Multi_atlas/Utils/atlas0.sh

Timestamp:

Apr 30, 2021, 10:38:59 AM (3 years ago)

Author:

musat

Message:

Mise a jour des scripts par rapport a la version fabric
IM

File:

• BOL/Multi_atlas/Utils/atlas0.sh (modified) (4 diffs)

BOL/Multi_atlas/Utils/atlas0.sh

@@ -45 +45 @@
 elif [ $# = 0 ] ; then
    sim=$RUN
-   ref=OBS
+   ref=$REF
    seas=$SEASON
    proj=$PROJ
@@ -109 +109 @@
 
 
-npass=5
+npass=1
 ipass=1
 
@@ -118 +118 @@
    echo passage $ipass >> atlas.sh.log
    html=index_example_"$seas"_"$sim".html
-   htmlopt=index_${proj}_"$seas"_"$sim".html
+   htmlopt=index_"${proj}"_"$seas"_"$sim".html
    rm -f $html
 
@@ -129 +129 @@
    fi
 
-   echo python $local/$pyatlas -v $vars -s `basename $simdir`_$years -t $ref -p $seas --root $INDIR
-   python $local/$pyatlas -v $vars -s `basename $simdir`_$years -t $ref -p $seas --root $INDIR
+   #echo python $local/$pyatlas -v $vars -s `basename $simdir`_$years -t $ref -p $seas --root $INDIR
+   #python $local/$pyatlas -v $vars -s `basename $simdir`_$years -t $ref -p $seas --root $INDIR
+   echo python $local/$pyatlas -v $vars -s `basename $simdir`_$years -t $ref -p $seas
+   python $local/$pyatlas -v $vars -s `basename $simdir`_$years -t $ref -p $seas
 
-   if [ ! -f "$html"  -o "`wc -l $html | awk ' { print $1 } '`" = "0" ] ; then
+   #if [ ! -f "$html"  -o "`wc -l $html | awk ' { print $1 } '`" = "0" ] ; then
+   if [ ! -f "$htmlopt"  -o "`wc -l $htmlopt | awk ' { print $1 } '`" = "0" ] ; then
       echo ECHEC ATLAS : $html inexistant ou vide | tee >>  atlas.sh.log
       echo ECHEC ATLAS : $html inexistant ou vide
    else
-      echo cp -f $html tmp$$.$passage
-      cp -f $html tmp$$.$passage
+      #echo cp -f $html tmp$$.$passage
+      #cp -f $html tmp$$.$passage
       pwd
-      echo tmp$$.$passage
-      echo LS  LS
-      ls -lrt | tail
+      #echo tmp$$.$passage
+      #echo LS  LS
+      #ls -lrt | tail
 # A ADAPTER en fonction de la machine
-      sed -e "s:/modfs/ipslfs/dods/:/thredds/fileServer/IPSLFS/:g" tmp$$.$passage >| $htmlopt
+      #sed -e "s:/modfs/ipslfs/dods/:/thredds/fileServer/IPSLFS/:g" tmp$$.$passage >| $htmlopt
       \cp -f $htmlopt $OUT_D/
-      PathHtml=`echo $OUT_D/$htmlopt | sed -e 's:/modfs/ipslfs/dods/:http\://vesg.ipsl.upmc.fr/thredds/fileServer/IPSLFS/:'`
+      sed -i -e "s:thredds\/ipsl:thredds\/fileServer\/IPSLFS:g" $OUT_D/$htmlopt
+      #PathHtml=`echo $OUT_D/$htmlopt | sed -e 's:/modfs/ipslfs/dods/:http\://vesg.ipsl.upmc.fr/thredds/fileServer/IPSLFS/:'`
       echo NOUVEL ATLAS DISPONIBLE SUR $PathHtml | tee >>  atlas.sh.log
       echo NOUVEL ATLAS DISPONIBLE SUR $PathHtml
-      echo $keys_strgv >> $OUT_D/atlas_OK
-      echo ${sim}+${seas}+${proj}+$vars >> $OUT_D/atlas_OK
+      #echo $keys_strgv >> $OUT_D/atlas_OK
+      #echo ${sim}+${seas}+${proj}+$vars >> $OUT_D/atlas_OK
    fi
    (( ipass = $ipass + 1 ))