Changeset 4330 for BOL/Multi_atlas/Utils/multi.sh

Timestamp:

Nov 9, 2022, 3:27:12 PM (2 years ago)

Author:

musat

Message:

Ajout environnement et corrections

• champ eva(poration) moyennes zonales
• pour les appels a des fonctions climaf via mcdo (timavg, sqrt)

IonelaMusat?

File:

• BOL/Multi_atlas/Utils/multi.sh (modified) (7 diffs)

BOL/Multi_atlas/Utils/multi.sh

@@ -1 +1 @@
 #set -vx
 
-./env_ciclad.sh
+source ./env.sh
 
 local=`pwd -P`
@@ -88 +88 @@
 echo runstxt= $runstxt
 
+echo qsub is $qsub
+#exit
+
 echo DODSDIR : $DODSDIR
 MAIN_SE=$DODSDIR/$login/lmdz/SE
@@ -312 +315 @@
       echo Atlas $atlas a creer
       if [ $qsub = 0 ] ; then
-         ${local}/atlas/atlas.sh RUN=$sim,SEASON=$seas,PROJ=$proj,OUTDIR=$COMP_D/ATLAS,REF=$ref,VARS="$varg",RUNSTXT=$runstxt,lonmin=$lonmin,lonmax=$lonmax,latmin=$latmin,latmax=$latmax,pmin=$pmin >> $outfile
+         echo bash ${local}/atlas/atlas.sh RUN=$sim,SEASON=$seas,PROJ=$proj,OUTDIR=$COMP_D/ATLAS,REF=$ref,VARS="$varg",RUNSTXT=$runstxt,lonmin=$lonmin,lonmax=$lonmax,latmin=$latmin,latmax=$latmax,pmin=$pmin
+         bash ${local}/atlas/atlas.sh RUN=$sim,SEASON=$seas,PROJ=$proj,OUTDIR=$COMP_D/ATLAS,REF=$ref,VARS="$varg",RUNSTXT=$runstxt,lonmin=$lonmin,lonmax=$lonmax,latmin=$latmin,latmax=$latmax,pmin=$pmin >> $outfile
+         if [ "$ref" != "OBS" ]; then
+            echo bash ${local}/atlas/atlas.sh RUN=$sim,SEASON=$seas,PROJ=$proj,OUTDIR=$COMP_D/ATLAS,REF=OBS,VARS="$varg",RUNSTXT=$runstxt,lonmin=$lonmin,lonmax=$lonmax,latmin=$latmin,latmax=$latmax,pmin=$pmin
+            bash ${local}/atlas/atlas.sh RUN=$sim,SEASON=$seas,PROJ=$proj,OUTDIR=$COMP_D/ATLAS,REF=OBS,VARS="$varg",RUNSTXT=$runstxt,lonmin=$lonmin,lonmax=$lonmax,latmin=$latmin,latmax=$latmax,pmin=$pmin >> $outfile
+         fi
       else
          echo $submit -v RUN=$sim,SEASON=$seas,PROJ=$proj,OUTDIR=$COMP_D/ATLAS,REF=$ref,VARS="$varg",RUNSTXT=$runstxt,lonmin=$lonmin,lonmax=$lonmax,latmin=$latmin,latmax=$latmax,pmin=$pmin atlas.sh >> ${LOGD}/ATLAS$$ 2>&1
@@ -357 +365 @@
       years=`echo $sim | sed -e 's/_SE_/ /' | awk ' { print $2 } '`
       run=`echo $sim | sed -e 's/_SE_/ /' | awk ' { print $1 } '`
+      echo ./make_MOY.sh "$years" YEAR "$run" GLOB
       ./make_MOY.sh "$years" YEAR "$run" GLOB      >> ${LOGD}/MOY$$ 2>&1
       ./make_MOY.sh "$years" YEAR "$run" ZON       >> ${LOGD}/MOY$$ 2>&1
@@ -375 +384 @@
    ./mk_clouds_NOcalipso.sh MAM ZON        >> ${LOGD}/calipso$$ 2>&1
    ./mk_clouds_NOcalipso.sh SON ZON        >> ${LOGD}/calipso$$ 2>&1
-
    echo multi_ZONE.sh, log in ${LOGD}/Z$$
    ./multi_ZONE.sh YEAR $comp ZON -runsfile $runstxt >> ${LOGD}/Z$$ 2>&1
@@ -402 +410 @@
    cd $local/METRICS
    #./metrics.sh -runsfile $runstxt $comp
+   echo ./metrics.sh $comp > ${LOGD}/METRICS$$ 2>&1
    ./metrics.sh $comp > ${LOGD}/METRICS$$ 2>&1
 fi
@@ -533 +542 @@
    cd ${local}
    echo ./make_html_libigcm.sh --comp $comp --runstxt $runstxt
-   ./make_html_libigcm.sh --comp $comp --runstxt $runstxt > ${LOGD}/html$$ 2>&1
+   bash ./make_html_libigcm.sh --comp $comp --runstxt $runstxt > ${LOGD}/html$$ 2>&1
    echo log in ${LOGD}/html$$ 
-   ./html_entete.sh $comp ${dataref} >> ${LOGD}/html$$ 2>&1
+   bash ./html_entete.sh $comp ${dataref} >> ${LOGD}/html$$ 2>&1
    cd ${local}/html
-   ./make_index_html.sh ${comp} ${dataref} >> ${LOGD}/html$$ 2>&1
-   cd $local
-   ./html_tuning.sh  $comp           >> ${LOGD}/html$$ 2>&1
-   ./html_tuning_min.sh  $comp       >> ${LOGD}/html$$ 2>&1
-   ./html_accueil.sh  $comp          >> ${LOGD}/html$$ 2>&1
-   ./html_1D.sh  $comp               >> ${LOGD}/html$$ 2>&1
-   ./html_lma.sh $comp               >> ${LOGD}/html_LMA$$ 2>&1
-   ./html_pcmdi.sh $comp             >> ${LOGD}/html$$ 2>&1
-   ./html_all.sh >| $MULTIDIR/all.html
+   bash ./make_index_html.sh ${comp} ${dataref} >> ${LOGD}/html$$ 2>&1
+   cd $local
+   bash ./html_tuning.sh  $comp           >> ${LOGD}/html$$ 2>&1
+   bash ./html_tuning_min.sh  $comp       >> ${LOGD}/html$$ 2>&1
+   bash ./html_accueil.sh  $comp          >> ${LOGD}/html$$ 2>&1
+   bash ./html_1D.sh  $comp               >> ${LOGD}/html$$ 2>&1
+   bash ./html_lma.sh $comp               >> ${LOGD}/html_LMA$$ 2>&1
+   bash ./html_pcmdi.sh $comp             >> ${LOGD}/html$$ 2>&1
+   bash ./html_all.sh >| $MULTIDIR/all.html
 
    # html pour les métriques