Changeset 3915 for BOL


Ignore:
Timestamp:
May 26, 2021, 4:56:17 PM (4 years ago)
Author:
musat
Message:

Corrections pour la realisation et l'acceleration des cartes des multi-atlas
IM

Location:
BOL/Multi_atlas
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • BOL/Multi_atlas/Utils/atlas0.sh

    r3885 r3915  
    136136   #if [ ! -f "$html"  -o "`wc -l $html | awk ' { print $1 } '`" = "0" ] ; then
    137137   if [ ! -f "$htmlopt"  -o "`wc -l $htmlopt | awk ' { print $1 } '`" = "0" ] ; then
    138       echo ECHEC ATLAS : $html inexistant ou vide | tee >>  atlas.sh.log
    139       echo ECHEC ATLAS : $html inexistant ou vide
     138      echo ECHEC ATLAS : $htmlopt inexistant ou vide | tee >>  atlas.sh.log
     139      echo ECHEC ATLAS : $htmlopt inexistant ou vide
    140140   else
    141141      #echo cp -f $html tmp$$.$passage

  • BOL/Multi_atlas/Utils/multi.sh

    r3885 r3915  
    1414html=1
    1515atlas=1
     16newatlas=1
    1617atlas_cesmep=0
    1718get=0
    … …  
    126127echo listrunss= $listrunss
    127128echo listrune= $listrune
    128 ls -lrt $MAIN_SE/ORIG
    129 #listsimss="" ; for ss in `awk ' {print $1"_"$2 } ' $DEF_FILE`    ; do listsimss="$listsimss $ss" ; done
     129echo ================================================================
     130echo la commande suivante
     131echo ls -lrt $MAIN_SE/ORIG
     132echo peut prendre beaucoup de temps lorsque
     133echo l acces aux espaces du CCRT et/ou de l IDRIS thredds est lent ou si
     134echo les espaces /thredds/tgcc et/ou /thredds/idris ne sont pas montes sur ciclad.
     135echo On ne l utilise plus !!!
     136echo ================================================================
     137###ls -lrt $MAIN_SE/ORIG
    130138
    131139ns=0
    … …  
    150158echo SIMULATIONS: $listsims
    151159
     160RUNS=""
     161RUNS=`awk ' {print $1"_"$2 } ' $DEF_FILE`
     162echo $RUNS
     163echo listrunss=$RUNS
     164
    152165echo '########################################################################'
    153166echo  1/ Rapatriement des simulations manquantes
    … …  
    204217
    205218if [ $atlas = 1 ] ; then
     219if [ $newatlas = 1 ]; then
     220sed -e 's/COMPAR/'${comp}'/' ${local}/atlas/make_atlas.sh > ${local}/atlas/make_atlas_${comp}.sh
     221$submit -v COMP=${comp},DATAREF=${dataref} ${local}/atlas/make_atlas_${comp}.sh
     222
     223else
     224
    206225for sim in $listsimss ; do
    207226   il=1
    … …  
    249268#   exit
    250269fi
    251 fi
     270
     271fi #newatlas
     272fi #atlas
    252273
    253274# atlas_cesmep : cles pour activer les nouveau atlas (C-ESM-EP)
    … …  
    390411   ./make_html_libigcm.sh --comp $comp
    391412   cd $local
    392    ./html_entete.sh $comp
     413   ./html_entete.sh ${comp} ${dataref}
     414   ./make_index_html.sh ${comp} ${dataref}
    393415   ./html_tuning.sh  $comp
    394416   ./html_tuning_min.sh  $comp
    … …  
    414436   for bias in BIAS MAPS ; do
    415437       for season in YEAR DJF JJA ; do
    416         echo ./multi_atlas.sh $comp $bias $season $proj $listrunss 
    417         ./multi_atlas.sh $comp $bias $season $proj $listrunss  >> out.com$$
     438        echo ./multi_atlas.sh $comp $bias $season $proj $RUNS 
     439        ./multi_atlas.sh $comp $bias $season $proj $RUNS  >> out.com$$
    418440       done
    419441   done

  • BOL/Multi_atlas/atlas/atlas_none.py

    r3885 r3915  
    3636parser.add_option("-f", "--force", help="force le recalcul de champs existants",
    3737                  action="store_true",default=None)
     38parser.add_option("--dirpng",help="Path of the simulation directory", action="store",default=None)
    3839parser.add_option("-o", "--pdf", help="nom du pdf de sortie (default: atlas_<SIMU>_<SAISON>.pdf)", action="store")
    3940(opts, args) = parser.parse_args()
    … …  
    131132                  mpCenterLonF=0,
    132133                  **pparams)
     134###11052021 begin
     135#    # Single figures
     136    page=cpage([[simu_fig]],orientation='landscape', page_trim=True, fig_trim=True)
     137    pdf_page=cpage([[simu_fig]],orientation='landscape',
     138        page_trim=True, fig_trim=True, format='pdf', title=variable+" "+opts.simulation)
     139#pdfargs.append(cfile(pdf_page,target='/home/fabric/users/musat/myatlas/simu_fig.pdf'))
     140    #pdffile="atlas_"+opts.simulation+"_"+opts.season+".pdf"
     141    #pdfargs.append(cfile(pdf_page,target=opts.simumapp))
     142    pdfargs.append(cfile(pdf_page,target=opts.dirpng+"/"+opts.season+"/"+opts.simulation+"/MAP/"+variable+".pdf"))
     143#
     144###11052021 end
    133145    simu_avg=cvalue(space_average(simu))
    134146    #
    … …  
    141153                 mpCenterLonF=0,
    142154                 **pparams)
     155###11052021 begin
     156    #    # Single figures ref_fig
     157    page=cpage([[ref_fig]],orientation='landscape', page_trim=True, fig_trim=True)
     158    pdf_page=cpage([[ref_fig]],orientation='landscape',
     159        page_trim=True, fig_trim=True, format='pdf', title=variable+" "+opts.simulation)
     160    pdfargs.append(cfile(pdf_page,target=opts.dirpng+"/"+opts.season+"/"+opts.reference+"/MAP/"+variable+".pdf"))
     161###11052021 end
    143162    ref_avg=cvalue(space_average(reff))
    144163    #
    … …  
    174193                  gsnStringFontHeightF=stringFontHeight,
    175194                  aux_options='cnLineThicknessF=2|cnLineLabelsOn=True', **p)
     195    #    # Single figures diff_fig
     196        page=cpage([[diff_fig]],orientation='landscape', page_trim=True, fig_trim=True)
     197        pdf_page=cpage([[diff_fig]],orientation='landscape',
     198                page_trim=True, fig_trim=True, format='pdf', title=variable+" "+opts.simulation)
     199        pdfargs.append(cfile(pdf_page,target=opts.dirpng+"/"+opts.season+"/"+opts.simulation+"/DMAP_"+opts.reference+"/"+variable+".pdf"))
    176200    else:
    177201        p.update({'contours':1})
    … …  
    229253                                 'gsnRightString='+opts.season+'|'+\
    230254                                 'gsnStringFontHeightF='+str(stringFontHeight))
     255    #    # Single figures
     256        page=cpage([[simu_fig]],orientation='landscape', page_trim=True, fig_trim=True)
     257        pdf_page=cpage([[simu_fig]],orientation='landscape',
     258                page_trim=True, fig_trim=True, format='pdf', title=variable+" "+opts.simulation)
     259        pdfargs.append(cfile(pdf_page,target=opts.dirpng+"/"+opts.season+"/"+opts.simulation+"/MAP/"+variable+".pdf"))
     260    #    # Single figures ref_fig
     261        page=cpage([[ref_fig]],orientation='landscape', page_trim=True, fig_trim=True)
     262        pdf_page=cpage([[ref_fig]],orientation='landscape',
     263                page_trim=True, fig_trim=True, format='pdf', title=variable+" "+opts.simulation)
     264        pdfargs.append(cfile(pdf_page,target=opts.dirpng+"/"+opts.season+"/"+opts.reference+"/MAP/"+variable+".pdf"))
     265    #    # Single figures diff_fig
     266        page=cpage([[diff_fig]],orientation='landscape', page_trim=True, fig_trim=True)
     267        pdf_page=cpage([[diff_fig]],orientation='landscape',
     268                page_trim=True, fig_trim=True, format='pdf', title=variable+" "+opts.simulation)
     269        pdfargs.append(cfile(pdf_page,target=opts.dirpng+"/"+opts.season+"/"+opts.simulation+"/DMAP_"+opts.reference+"/"+variable+".pdf"))
     270# Creation du Pdf multi-pages
     271        comm=subprocess.Popen(pdfargs, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
    231272    #    # Composite figure
    232273    if is3d(variable):
    … …  
    238279        pdf_page=cpage([[simu_fig,ref_fig],[diff_fig,zmean_fig]],orientation='landscape',
    239280                   page_trim=True, fig_trim=True, format='pdf', title=variable+" "+opts.simulation)
    240     pdfargs.append(cfile(pdf_page))
    241281    #
    242282    thumbnail_size = 200

  • BOL/Multi_atlas/install_multi_atlas.sh

    r3882 r3915  
    160160chmod +x job_multi.sh
    161161
    162 #### script pour creer les atlas
     162#### scripts pour creer les atlas
    163163rm -f atlas.sh
    164164cat entete.sh >| atlas.sh
    … …  
    166166chmod +x atlas.sh
    167167\mv atlas.sh atlas/.
     168###
     169rm -f make_atlas.sh
     170cat entete.sh >| make_atlas.sh
     171cat Utils/make_atlas0.sh >> make_atlas.sh
     172chmod +x make_atlas.sh
     173\mv make_atlas.sh atlas/.
     174
    168175cp Utils/lmdz_SE0.py tmp0.py
    169176sed -e s:ROOT_SIM_DIR:$ROOT_SIM_DIR:g tmp0.py > tmp.py

  • BOL/Multi_atlas/multi_atlas.sh

    r3881 r3915  
    4444# Le nom semble avoir changé ... sref=$COMP_D/ATLAS/index_${proj}_${season}_${ref}.html
    4545sref=$COMP_D/ATLAS/index_${proj}_${season}_${ref}.html
     46
     47sed -i -e "s:thredds\/ipsl:thredds\/fileServer\/IPSLFS:g" ${sref}
    4648#############################################################################
    4749
Note: See TracChangeset for help on using the changeset viewer.