Changeset 3885


Ignore:
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

Location:
BOL/Multi_atlas
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • BOL/Multi_atlas/Utils/atlas0.sh

    r3884 r3885  
    4545elif [ $# = 0 ] ; then
    4646   sim=$RUN
    47    ref=OBS
     47   ref=$REF
    4848   seas=$SEASON
    4949   proj=$PROJ
    … …  
    109109
    110110
    111 npass=5
     111npass=1
    112112ipass=1
    113113
    … …  
    118118   echo passage $ipass >> atlas.sh.log
    119119   html=index_example_"$seas"_"$sim".html
    120    htmlopt=index_${proj}_"$seas"_"$sim".html
     120   htmlopt=index_"${proj}"_"$seas"_"$sim".html
    121121   rm -f $html
    122122
    … …  
    129129   fi
    130130
    131    echo python $local/$pyatlas -v $vars -s `basename $simdir`_$years -t $ref -p $seas --root $INDIR
    132    python $local/$pyatlas -v $vars -s `basename $simdir`_$years -t $ref -p $seas --root $INDIR
     131   #echo python $local/$pyatlas -v $vars -s `basename $simdir`_$years -t $ref -p $seas --root $INDIR
     132   #python $local/$pyatlas -v $vars -s `basename $simdir`_$years -t $ref -p $seas --root $INDIR
     133   echo python $local/$pyatlas -v $vars -s `basename $simdir`_$years -t $ref -p $seas
     134   python $local/$pyatlas -v $vars -s `basename $simdir`_$years -t $ref -p $seas
    133135
    134    if [ ! -f "$html"  -o "`wc -l $html | awk ' { print $1 } '`" = "0" ] ; then
     136   #if [ ! -f "$html"  -o "`wc -l $html | awk ' { print $1 } '`" = "0" ] ; then
     137   if [ ! -f "$htmlopt"  -o "`wc -l $htmlopt | awk ' { print $1 } '`" = "0" ] ; then
    135138      echo ECHEC ATLAS : $html inexistant ou vide | tee >>  atlas.sh.log
    136139      echo ECHEC ATLAS : $html inexistant ou vide
    137140   else
    138       echo cp -f $html tmp$$.$passage
    139       cp -f $html tmp$$.$passage
     141      #echo cp -f $html tmp$$.$passage
     142      #cp -f $html tmp$$.$passage
    140143      pwd
    141       echo tmp$$.$passage
    142       echo LS  LS
    143       ls -lrt | tail
     144      #echo tmp$$.$passage
     145      #echo LS  LS
     146      #ls -lrt | tail
    144147# A ADAPTER en fonction de la machine
    145       sed -e "s:/modfs/ipslfs/dods/:/thredds/fileServer/IPSLFS/:g" tmp$$.$passage >| $htmlopt
     148      #sed -e "s:/modfs/ipslfs/dods/:/thredds/fileServer/IPSLFS/:g" tmp$$.$passage >| $htmlopt
    146149      \cp -f $htmlopt $OUT_D/
    147       PathHtml=`echo $OUT_D/$htmlopt | sed -e 's:/modfs/ipslfs/dods/:http\://vesg.ipsl.upmc.fr/thredds/fileServer/IPSLFS/:'`
     150      sed -i -e "s:thredds\/ipsl:thredds\/fileServer\/IPSLFS:g" $OUT_D/$htmlopt
     151      #PathHtml=`echo $OUT_D/$htmlopt | sed -e 's:/modfs/ipslfs/dods/:http\://vesg.ipsl.upmc.fr/thredds/fileServer/IPSLFS/:'`
    148152      echo NOUVEL ATLAS DISPONIBLE SUR $PathHtml | tee >>  atlas.sh.log
    149153      echo NOUVEL ATLAS DISPONIBLE SUR $PathHtml
    150       echo $keys_strgv >> $OUT_D/atlas_OK
    151       echo ${sim}+${seas}+${proj}+$vars >> $OUT_D/atlas_OK
     154      #echo $keys_strgv >> $OUT_D/atlas_OK
     155      #echo ${sim}+${seas}+${proj}+$vars >> $OUT_D/atlas_OK
    152156   fi
    153157   (( ipass = $ipass + 1 ))

  • BOL/Multi_atlas/Utils/multi.sh

    r3745 r3885  
    3030mjo=0
    3131river=0
    32 
     32dataref=1
     33
     34ref=OBS
     35echo $ref
    3336# ./job_multi.sh -1D 0 -get 0 -atlas 0 -pcmdi 0 -tuning 0 -lma 0 -trmm 0
    3437runstxt=$local/runs.txt
    … …  
    5760      -mjo) mjo=$2 ; shift ;;
    5861      -river) river=$2 ; shift ;;
     62      -dataref) dataref=$2 ; shift ;;
    5963      *) comp=$1 ;;
    6064   esac
    … …  
    123127echo listrune= $listrune
    124128ls -lrt $MAIN_SE/ORIG
    125 listsimss="" ; for ss in `awk ' {print $1"_"$2 } ' $DEF_FILE`    ; do listsimss="$listsimss $ss" ; done
     129#listsimss="" ; for ss in `awk ' {print $1"_"$2 } ' $DEF_FILE`    ; do listsimss="$listsimss $ss" ; done
     130
     131ns=0
     132listsimss="" ;
     133for ss in `awk ' {print $1"_"$2 } ' $DEF_FILE`    ; do 
     134if [ $dataref = 0 ] ; then
     135   if [ ${ns} = 0 ] ; then
     136      ref=$ss
     137      echo ref=$ref
     138   fi 
     139fi
     140let "ns = ${ns} + 1"
     141listsimss="$listsimss $ss" ;
     142done
     143echo ref=$ref
     144
    126145listsimse="" ; for se in `awk ' {print $1"_SE_"$2 } ' $DEF_FILE` ; do listsimse="$listsimse $se" ; done
    127146echo listsims $listsims
    … …  
    199218      atlas=${sim}+${seas}+${proj}+$vars
    200219      echo AAAAAAAAAAAAAAAAAAAAAAAA $atlas
    201       grep $atlas $COMP_D/ATLAS/atlas_OK
     220      #grep $atlas $COMP_D/ATLAS/atlas_OK
    202221      echo BBBBBB
    203       if [ "`grep $atlas $COMP_D/ATLAS/atlas_OK`" = "" ] ; then
     222      #if [ "`grep $atlas $COMP_D/ATLAS/atlas_OK`" = "" ] ; then
    204223         cd $local/atlas ; pwd ; ls -l atlas.sh
    205224         varg=`echo $vars | sed -e 's/,/+/g'`
    206225         echo Atlas $atlas a creer
    207226         if [ $qsub = 0 ] ; then
    208             ./atlas.sh RUN=$sim,SEASON=$seas,PROJ=$proj,OUTDIR=$COMP_D/ATLAS,REF=OBS,VARS="$varg",RUNSTXT=$runstxt
     227            #./atlas.sh RUN=$sim,SEASON=$seas,PROJ=$proj,OUTDIR=$COMP_D/ATLAS,REF=OBS,VARS="$varg",RUNSTXT=$runstxt
     228            ./atlas.sh RUN=$sim,SEASON=$seas,PROJ=$proj,OUTDIR=$COMP_D/ATLAS,REF=$ref,VARS="$varg",RUNSTXT=$runstxt
    209229         else
    210             $submit -v RUN=$sim,SEASON=$seas,PROJ=$proj,OUTDIR=$COMP_D/ATLAS,REF=OBS,VARS="$varg",RUNSTXT=$runstxt atlas.sh
     230            #$submit -v RUN=$sim,SEASON=$seas,PROJ=$proj,OUTDIR=$COMP_D/ATLAS,REF=OBS,VARS="$varg",RUNSTXT=$runstxt atlas.sh
     231            $submit -v RUN=$sim,SEASON=$seas,PROJ=$proj,OUTDIR=$COMP_D/ATLAS,REF=$ref,VARS="$varg",RUNSTXT=$runstxt atlas.sh
    211232         fi
    212          echo $submit -v RUN=$sim,SEASON=$seas,PROJ=$proj,OUTDIR=$COMP_D/ATLAS,REF=OBS,VARS="$varg" atlas.sh >> out.com$$
    213          echo $submit -v RUN=$sim,SEASON=$seas,PROJ=$proj,OUTDIR=$COMP_D/ATLAS,REF=OBS,VARS="$varg" atlas.sh
     233         #echo $submit -v RUN=$sim,SEASON=$seas,PROJ=$proj,OUTDIR=$COMP_D/ATLAS,REF=OBS,VARS="$varg" atlas.sh >> out.com$$
     234         echo $submit -v RUN=$sim,SEASON=$seas,PROJ=$proj,OUTDIR=$COMP_D/ATLAS,REF=$ref,VARS="$varg" atlas.sh >> out.com$$
     235         #echo $submit -v RUN=$sim,SEASON=$seas,PROJ=$proj,OUTDIR=$COMP_D/ATLAS,REF=OBS,VARS="$varg" atlas.sh
     236         echo $submit -v RUN=$sim,SEASON=$seas,PROJ=$proj,OUTDIR=$COMP_D/ATLAS,REF=$ref,VARS="$varg" atlas.sh
    214237         (( count_atlas = $count_atlas + 1 ))
    215       else
    216            echo Atlas $atlas existant
    217       fi
     238      #else
     239           #echo Atlas $atlas existant
     240      #fi
    218241      (( il = $il + 1 ))
    219242   done

  • BOL/Multi_atlas/atlas/atlas_none.py

    r3684 r3885  
    107107       simu_pres = svsg(opts.simulation,'pres',opts.season,opts.grid)
    108108       simu = ml2pl(simu,simu_pres)
     109       if (ref != 'OBS' ) :
     110           reff_pres = svsg(opts.reference,'pres',opts.season,opts.grid)
     111           reff = ml2pl(reff,reff_pres)
    109112       simu = zonmean(simu)
    110113       reff = zonmean(reff)
    … …  
    265268index += trailer()
    266269#out="index_example.html"
    267 out="index_example_"+opts.season+"_"+opts.simulation+".html"
     270out="index_"+opts.region+"_"+opts.season+"_"+opts.simulation+".html"
    268271with open(out,"w") as filout : filout.write(index)
    269272#
Note: See TracChangeset for help on using the changeset viewer.