Index: /BOL/Multi_atlas/Utils/atlas0.sh =================================================================== --- /BOL/Multi_atlas/Utils/atlas0.sh (revision 4307) +++ /BOL/Multi_atlas/Utils/atlas0.sh (revision 4308) @@ -1,30 +1,24 @@ -# Definitions en fonction de la machine -# CICLAD -hostname=`hostname` -if [ ${hostname:0:5} = cicla ] ; then -######################################################################################################## +########################################################################### # Environnement -module purge -module load netcdf4/4.3.3.1-ifort cdo/1.6.8 nco/4.5.2 ncl/6.3.0 -ulimit -s unlimited -export PYTHONPATH=:/opt/canopy-1.3.0/Canopy_64bit/User/bin/python:/home/igcmg/prodiguer-client:/home/fabric/users/denvil/climaf:/home/fabric/users/denvil/climaf -export PATH=$PATH:/home/fabric/users/denvil/climaf/bin -STORAGE=$DODSDIR/$login/lmdz/STORE -if [ ! -d $DODSDIR/$login/climafCache ] ; then mkdir -p $DODSDIR/$login/climafCache ; fi -export CLIMAF_CACHE=$DODSDIR/$login/climafCache -echo CLIMAF_CACHE $DODSDIR/$login/climafCache -MULTIDIR=$DODSDIR/$login/lmdz/MultiSimu -DIRATLAS=$DODSDIR/$login/lmdz/atlas -######################################################################################################## -ATLAS_DIR=$DODSDIR/$login/lmdz/atlas/Atlas$$ -if [ ! -d $DODSDIR/$login/lmdz/atlas/Atlas$$ ] ; then mkdir -p $DODSDIR/$login/lmdz/atlas/Atlas$$ ; fi -fi local=`pwd -P` -date +module list +which python +ulimit -s unlimited +ATLAS_DIR=${DODSDIR}/${login}/lmdz/atlas/Atlas$$ ; mkdir -p $ATLAS_DIR +STORAGE=${DODSDIR}/${login}/lmdz/STORE +dirpng=${DODSDIR}/${login}/lmdz/VLR +export PYTHONPATH=$PYTHONPATH:/home/fabric/users/denvil/climaf +export PATH=$PATH:/home/fabric/users/denvil/climaf/bin + +\rm -rf $DODSDIR/$login/climafCache$$ +mkdir -p $DODSDIR/$login/climafCache$$ +export CLIMAF_CACHE=$DODSDIR/$login/climafCache$$ +echo CLIMAF_CACHE $DODSDIR/$login/climafCache$$ +########################################################################### vars="" vars="sst" -#runstxt=$local/../runs.txt +#runstxt=/home/fabric/LMDZ/multi/runs.txt if [ $# = 1 ] ; then @@ -41,5 +35,10 @@ if [ "$key" = "OUTDIR" ] ; then OUT_D=$val ; fi if [ "$key" = "RUNSTXT" ] ; then runstxt=$val ; fi - if [ "$key" = "VARS" ] ; then vars="`echo $val | sed -e 's/+/,/g'`" ; fi + if [ "$key" = "VARS" ] ; then vars="`echo $val | sed -e 's/+/ /g'`" ; fi + if [ "$key" = "lonmin" ] ; then lonmin=$val ; fi + if [ "$key" = "lonmax" ] ; then lonmax=$val ; fi + if [ "$key" = "latmin" ] ; then latmin=$val ; fi + if [ "$key" = "latmax" ] ; then latmax=$val ; fi + if [ "$key" = "pmin" ] ; then pmin=$val ; fi done elif [ $# = 0 ] ; then @@ -50,9 +49,17 @@ OUT_D=$OUTDIR runstxt=$RUNSTXT - vars=`echo $VARS | sed -e 's/+/,/g'` + vars=`echo $VARS | sed -e 's/+/ /g'` + lonmin=$lonmin + lonmax=$lonmax + latmin=$latmin + latmax=$latmax + pmin=$pmin + echo lonmin=$lonmin lonmax=$lonmax + echo latmin=$latmin latmax=$latmax + echo pmin=$pmin else echo USE echo Job mode : - echo $submit -v RUN=NPv5.3_1982_1989,SEASON=YEAR,PROJ=GLOB,OUTDIR=$MULTIDIR/V5/ATLAS,VARS=pr+tas atlas.sh + echo qsub -v RUN=NPv5.3_1982_1989,SEASON=YEAR,PROJ=GLOB,OUTDIR=$MULTIDIR/V5/ATLAS,VARS=pr+tas atlas.sh echo interactif : echo ./atlas.sh RUN=NPv5.3_1982_1989,SEASON=YEAR,PROJ=GLOB,OUTDIR=$MULTIDIR/V5/ATLAS,VARS=pr+tas @@ -61,15 +68,16 @@ if [ "$vars" = "" ] ; then - vars=pr,tas,hurs,hfls,hfss,albt,albtcs,albs,rldscs,rlds,rlus,rsdscs,rsds,rsuscs,rsus,rsutcs,rsut,rlut,rlutcs,psl,prw,sst,pme,tasmax,tasmin + vars="pr tas hurs hfls hfss albt albtcs albs rldscs rlds rlus rsdscs rsds rsuscs rsus rsutcs rsut rlut rlutcs psl prw sst pme tasmax tasmin" fi -#,ua850,va850,ta850,ua500,va500,ta500,ua200,va200,ta200 +if [ "$sim" != "OBS" ]; then echo sim $sim srun=`echo $sim | sed -e 's/_[0-9][0-9][0-9][0-9]_[0-9][0-9][0-9][0-9]//'` echo srun $srun -simdir=`grep -w "^$srun" $runstxt | awk ' { print $2 } '` +simdir=`grep -w "^$srun " $runstxt | awk ' { print $2 } '` run=`basename $simdir ` years=`echo $sim | sed -e 's/'$srun'//' | sed -e 's/_//'` sim=${run}_${years} + echo $run $years $sim $ref echo ENTREES : $run, $years, $seas, $vars, $ref @@ -79,4 +87,5 @@ echo sim $sim echo simdir $simdir +fi keys_strgv=$sim$seas$proj$vars$ref @@ -98,64 +107,61 @@ echo sim $sim seas $seas > atlas.sh.log -########################################################################### -# Boucle pour construire l'atlas en plusieurs passages -echo IL FAUT FAIRE L ATLAS EN PLUSIEURS PASSAGE SINON CA PLANTE ... -########################################################################### - case "$proj" in "SH"|"NH") pyatlas="atlas_SH.py --projection $proj" ;; "GLOB") Var3D=,ua,va,ta,hus,hur ; pyatlas=atlas_none.py ;; + *) Var3D=,ua,va,ta,hus,hur ; pyatlas=atlas_none.py ;; esac - -npass=1 -ipass=1 - -while [ $ipass -le $npass ] ; do - - echo Nettoyage des fichiers corrompus du cache - $local/clean_cache.sh $DIRATLAS - echo passage $ipass >> atlas.sh.log html=index_example_"$seas"_"$sim".html htmlopt=index_"${proj}"_"$seas"_"$sim".html - rm -f $html + echo rm -f $htmlopt +# + for var in $vars; do + datevar=`date` + echo Creation repertoires *MAP* et check variables 3D + mkdir -p ${dirpng}/${seas}/${sim}/MAP + mkdir -p ${dirpng}/${seas}/${sim}/MAP/${proj} +# + mkdir -p ${dirpng}/${seas}/${ref}/MAP + mkdir -p ${dirpng}/${seas}/${ref}/MAP/${proj} +# + mkdir -p ${dirpng}/${seas}/${sim}/DMAP_${ref} + mkdir -p ${dirpng}/${seas}/${sim}/DMAP_${ref}/${proj} - INDIR=$simdir/ATM/Analyse/SE - file=${INDIR}/`basename $simdir`_SE_$years_1M_histmth.nc - if [ ! -f ${file} ]; then - echo PB fichier $file inexistant - INDIR=$DODSDIR/$login/lmdz/SE/ORIG - file=$INDIR/`basename $simdir`_SE_$years_1M_histmth.nc - fi + mapok=${dirpng}/${seas}/${sim}/MAP/${proj}/${var}.pdf + dmapok=${dirpng}/${seas}/${sim}/DMAP_${ref}/${proj}/${var}.pdf +# + datevar=`date` +# +# for var3D check if pres exist +# echo ~/LMDZ/check/make_check_var3D_SE.sh $dirpng $seas $sim $ref $var +# ~/LMDZ/check/make_check_var3D_SE.sh $dirpng $seas $sim $ref $var > out_check_var3D_SE.log - #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 [ "$var" == "ua" ] || [ "$var" == "va" ] || [ "$var" == "ta" ] || [ "$var" == "hur" ] || [ "$var" == "hus" ]; then + echo python ${local}/$pyatlas -v $var -s $sim -t $ref -p $seas -r $proj --dirpng ${dirpng} + python ${local}/$pyatlas -v $var -s $sim -t $ref -p $seas -r $proj --dirpng ${dirpng} + else + echo python ${local}/$pyatlas -v $var -s $sim -t $ref -p $seas -r $proj --dirpng ${dirpng} --lonmin ${lonmin} --lonmax ${lonmax} --latmin ${latmin} --latmax ${latmax} + python ${local}/$pyatlas -v $var -s $sim -t $ref -p $seas -r $proj --dirpng ${dirpng} --lonmin ${lonmin} --lonmax ${lonmax} --latmin ${latmin} --latmax ${latmax} + fi +# + echo Creation graphes png + ~/LMDZ/atlas/make_pdf2png.sh $dirpng $seas $proj $sim $ref $var > out_pdf2png.log +# + done - #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 : $htmlopt inexistant ou vide | tee >> atlas.sh.log echo ECHEC ATLAS : $htmlopt inexistant ou vide else - #echo cp -f $html tmp$$.$passage - #cp -f $html tmp$$.$passage pwd - #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 \cp -f $htmlopt $OUT_D/ - 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/:'` + sed -i -e "s:thredds\/IPSLFS:thredds\/fileServer\/ipsl_thredds:g" $OUT_D/$htmlopt + 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 fi - (( ipass = $ipass + 1 )) - -done \rm -f $OUT_D/$keys_strg.ENCOURS + +\rm -rf $DODSDIR/$login/climafCache$$ Index: /BOL/Multi_atlas/Utils/lmdz_SE0.py =================================================================== --- /BOL/Multi_atlas/Utils/lmdz_SE0.py (revision 4307) +++ /BOL/Multi_atlas/Utils/lmdz_SE0.py (revision 4308) @@ -32,7 +32,7 @@ # Saisons gérées et leur traduction CDO ######################################################################################### -seasons={ 'YEAR':"", 'DJF' : "-timavg -selmon,1,2,12", 'JJA' : "-timavg -selmon,6,7,8" , 'JJAS' : "-timavg -selmon,6,7,8,9" } #seasons={ 'YEAR':"", 'DJF' : " selmon,1,2,12", 'JJA' : " selmon,6,7,8" , 'JJAS' : "-timavg -selmon,6,7,8,9" } - +#seasons={ 'YEAR':"", 'DJF' : "-timavg -selmon,1,2,12", 'JJA' : "-timavg -selmon,6,7,8" , 'JJAS' : "-timavg -selmon,6,7,8,9" } +seasons={ 'YEAR':"", 'DJF' : "-timavg -selmon,1,2,12", 'JJA' : "-timavg -selmon,6,7,8" , 'JJAS' : "-timavg -selmon,6,7,8,9", 'MAM' : "-timavg -selmon,3,4,5", 'SON' : "-timavg -selmon,9,10,11" } @@ -101,4 +101,5 @@ derive('OBS','dtr','minus','tasmax','tasmin') +calias('OBS', 'hflsevap', 'hfls', scale=1./2.5e6) ######################################################################################### @@ -164,8 +165,8 @@ calias('SE','hur','rhum', scale=100.) calias('SE','clt','cldt', scale=100.) -calias('SE','cltcalipso', scale=100.) -calias('SE','clhcalipso', scale=100.) -calias('SE','clmcalipso', scale=100.) -calias('SE','cllcalipso', scale=100.) +calias('SE','cltcalipso','cltcalipso', scale=100.) +calias('SE','clhcalipso','clhcalipso', scale=100.) +calias('SE','clmcalipso','clmcalipso', scale=100.) +calias('SE','cllcalipso','cllcalipso', scale=100.) # Variables dérivées Index: /BOL/Multi_atlas/Utils/multi.sh =================================================================== --- /BOL/Multi_atlas/Utils/multi.sh (revision 4307) +++ /BOL/Multi_atlas/Utils/multi.sh (revision 4308) @@ -14,5 +14,5 @@ html=1 atlas=1 -newatlas=1 +#newatlas=0 atlas_cesmep=0 get=0 @@ -24,9 +24,9 @@ axe4=0 esmval2=0 -refld_histo=0 +reflcld_histo=0 vertcld_calipso=0 stations_day=0 stations_mth=0 -qsub=0 +qsub=1 mjo=0 river=0 @@ -35,4 +35,11 @@ ref=OBS echo $ref + +lonmin=-180 +lonmax=180 +latmin=-90 +latmax=90 +pmin=1 + # ./job_multi.sh -1D 0 -get 0 -atlas 0 -pcmdi 0 -tuning 0 -lma 0 -trmm 0 runstxt=$local/runs.txt @@ -57,9 +64,14 @@ -stations_day) stations_day=$2 ; shift ;; -stations_mth) stations_mth=$2 ; shift ;; - -refld_histo) refld_histo=$2 ; shift ;; + -reflcld_histo) refld_histo=$2 ; shift ;; -vertcld_calipso) vertcld_calipso=$2 ; shift ;; -mjo) mjo=$2 ; shift ;; -river) river=$2 ; shift ;; -dataref) dataref=$2 ; shift ;; + -lonmin) lonmin=$2 ; shift ;; + -lonmax) lonmax=$2 ; shift ;; + -latmin) latmin=$2 ; shift ;; + -latmax) latmax=$2 ; shift ;; + -pmin) pmin=$2 ; shift ;; *) comp=$1 ;; esac @@ -67,4 +79,6 @@ done +echo multi=$comp region: lonmin=$lonmin lonmax=$lonmax latmin=$latmin latmax=$latmax +echo multi=$comp pmin: pmin=$pmin rm -f out.com$$ runstxt=$local/runs.txt @@ -84,7 +98,42 @@ COMP_D=$MULTIDIR/$comp DEF_FILE=$COMP_D/def.txt ; if [ ! -f $DEF_FILE ] ; then echo renseigner $DEF_FILE ; exit ; fi +LOGD=$COMP_D/log ; mkdir -p $LOGD +outfile=$LOGD/out$$ ; if [ -f ${outfile} ] ; then \rm -f $outfile ; fi +echo Ecriture des logs dans $outfile + +### +#~/LMDZ/check/make_warning.sh $COMP_D +### nom2 +listsims="" ; for s in `awk ' {print $1} ' $DEF_FILE | uniq` ; do listsims="$listsims $s" ; done +#echo listsims $listsims listsims="" ; for s in `awk ' {print $1} ' $DEF_FILE | uniq` ; do listsims="$listsims $s" ; done echo listsims $listsims +### nom1, simdir +for s in $listsims ; do +### simdir +simdir=`grep -w "^$s " $runstxt | awk ' { print $2 } '` +### nom1 +ss=`basename $simdir ` +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 + +if [ ! -f ${file} ]; then + if [ -f ${simdir}/ATM/Analyse/SE/${ss}_SE_${year}_1M_histmth.nc ]; then + ln -s ${simdir}/ATM/Analyse/SE/${ss}_SE_${year}_1M_histmth.nc $file + elif [ "${ss}" == "UQLMDZ6A1000" ]; then + echo NO need to ln -s; the *1M_histmth.nc does not exist anymore + else + ln -s ${simdir}/ATM/Output/MO/${ss}_${year}0101_${year}1230_1M_histmth.nc $file + fi +fi + +\rm ${MAIN_SE}/ORIG/UQLMDZ6AW1000_SE_1979_1988_1M_histmth.nc +done +done +#${local}/../check/mk_check-avail-data.sh ${comp} echo ### On supprime dans def.txt les lignes vides ######## @@ -96,13 +145,25 @@ srun=`grep -w "^$s " $runstxt | awk ' { print $1 } '` echo 's='"$s" ' srun=' "$srun" -if [ "$s" = "$srun" ] ; then - echo Meme nom de la simulation dans def.txt et $runstxt 's=' "$s" ' srun=' "$srun" -else - echo ATTENTION : la simulation "$s" de votre def.txt n est pas repertoriee dans $runstxt - echo ou le meme nom est attribue a plusieures simulations - echo Il faut la rajouter dans $runstxt - echo avec le chemin vers les SE et TS dans ciclad : /modfs/$login/IGCM_OUT - echo ou renomer votre simulation +if [ "$s" != "$srun" ] ; then + #echo Meme nom de la simulation dans def.txt et $runstxt 's=' "$s" ' srun=' "$srun" +#else + echo ATTENTION : la simulation "$s" de votre def.txt n est pas repertoriee dans $runstxt >${LOGD}/error_${comp} + echo ou le meme nom est attribue a plusieures simulations >> ${LOGD}/error_${comp} + echo Il faut la rajouter dans $runstxt >> ${LOGD}/error_${comp} + echo avec le chemin vers les SE et TS dans ciclad : /thredds/ipsl/fabric/IGCM_OUT >> ${LOGD}/error_${comp} + echo ou renomer votre simulation >> ${LOGD}/error_${comp} + more ${LOGD}/error_${comp} exit +fi +echo Checking if $s simulation is referenced many times in runs.txt +#nrun=`./how_many_times_run.sh $s` +#nrun=`./how_many_times_run.sh $srun` +nrun=1 + +if [ "$nrun" != "1" ]; then + echo Simulation $s est repertoriee ${nrun} fois dans $runstxt >> ${LOGD}/error_${comp} + echo STOPping here >> ${LOGD}/error_${comp} + more ${LOGD}/error_${comp} + exit fi done @@ -124,16 +185,9 @@ done done -echo listruns = $listruns -echo listrunss= $listrunss -echo listrune= $listrune -echo ================================================================ -echo la commande suivante -echo ls -lrt $MAIN_SE/ORIG -echo peut prendre beaucoup de temps lorsque -echo l acces aux espaces du CCRT et/ou de l IDRIS thredds est lent ou si -echo les espaces /thredds/tgcc et/ou /thredds/idris ne sont pas montes sur ciclad. -echo On ne l utilise plus !!! -echo ================================================================ -###ls -lrt $MAIN_SE/ORIG +#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 @@ -172,11 +226,19 @@ if [ $get = 1 ] ; then - cd $MAIN_SE - for sim in $listsimss ; do echo ./getun.sh ${sim} >> $local/out.com$$ ; ./getun.sh ${sim} ; done - cd $TS_DA ; pwd - for sim in $listsimss ; do echo ./getun.sh ${sim} >> $local/out.com$$ ; ./getun.sh ${sim} ; done - cd $TS_MO ; pwd - for sim in $listsimss ; do echo ./getun.sh ${sim} >> $local/out.com$$ ; ./getun.sh ${sim} ; done -fi + +cd $MAIN_SE +for sim in $listsimss ; do echo ./getun.sh ${sim} >> $outfile 2>&1 ; ./getun.sh ${sim} ; done +cd $TS_DA +for sim in $listsimss ; do echo ./getun.sh ${sim} >> $outfile 2>&1 ; ./getun.sh ${sim} ; done +cd $TS_MO +for sim in $listsimss ; do echo ./getun.sh ${sim} >> $outfile 2>&1 ; ./getun.sh ${sim} ; done + +fi + +echo '########################################################################' +echo 1.1/ Check des fichiers input et des variables demandees pour l atlas avec +echo des exit si un des fichiers ou des variables ne sont pas accessibles +echo '########################################################################' +#IM TBC ${local}/../check/make_check_fin.sh $comp ${LOGD}/check_finput$$ 2>&1 if [ $cmor = 1 ] ; then @@ -190,8 +252,10 @@ ######################################################################### # Deux lignes suivantes modif FH 2016/11/09 -# Files are taken from /modfs/ipslfs/dods/fabric/lmdz/SE/ORIG and -# results are in /modfs/ipslfs/dods/fabric/lmdz/SE/CMOR +# Files are taken from /thredds/ipsl/fabric/lmdz/SE/ORIG and +# results are in /thredds/ipsl/fabric/lmdz/SE/CMOR ######################################################################### - ./cmor.sh -runsfile $runstxt $comp + +echo cmor.sh : output dans ${LOGD}/cmor$$ +./cmor.sh -runsfile $runstxt $comp > ${LOGD}/cmor$$ 2>&1 if [ $? != 0 ] ; then exit ; fi # Probleme de histmth non present. On arrete tout @@ -201,10 +265,14 @@ # average in time "YEAR", "JJA" ... # Results are put on -# /modfs/ipslfs/dods/fabric/lmdz/VLR/YEAR/[SIMU_NAME]_[period]/NC +# /thredds/ipsl/fabric/lmdz/VLR/YEAR/[SIMU_NAME]_[period]/NC # If wanting to rerun season.sh for observations : # ./season.sh -s OBS ######################################################################### - ./season.sh -comp $comp - cd $local + +cd $MAIN_SE +echo season.sh : output dans ${LOGD}/season$$ +./season.sh -comp $comp > ${LOGD}/season$$ 2>&1 +cd $local + fi @@ -216,11 +284,11 @@ if [ $atlas = 1 ] ; then -if [ $newatlas = 1 ]; then -sed -e 's/COMPAR/'${comp}'/' ${local}/atlas/make_atlas.sh > ${local}/atlas/make_atlas_${comp}.sh -$submit -v COMP=${comp},DATAREF=${dataref} ${local}/atlas/make_atlas_${comp}.sh - -./make_timecount.sh ${comp} - -else +#if [ $newatlas = 1 ]; then +#sed -e 's/COMPAR/'${comp}'/' ${local}/atlas/make_atlas.sh > ${local}/atlas/make_atlas_${comp}.sh +#$submit -v COMP=${comp},DATAREF=${dataref} ${local}/atlas/make_atlas_${comp}.sh + +#./make_timecount.sh ${comp} + +#else for sim in $listsimss ; do @@ -237,19 +305,18 @@ vars=`echo $line | awk ' { print $3 } '` atlas=${sim}+${seas}+${proj}+$vars - echo AAAAAAAAAAAAAAAAAAAAAAAA $atlas - #grep $atlas $COMP_D/ATLAS/atlas_OK - echo BBBBBB - #if [ "`grep $atlas $COMP_D/ATLAS/atlas_OK`" = "" ] ; then - cd $local/atlas ; pwd ; ls -l atlas.sh - varg=`echo $vars | sed -e 's/,/+/g'` - echo Atlas $atlas a creer - if [ $qsub = 0 ] ; then - ./atlas.sh RUN=$sim,SEASON=$seas,PROJ=$proj,OUTDIR=$COMP_D/ATLAS,REF=$ref,VARS="$varg",RUNSTXT=$runstxt - else - $submit -v RUN=$sim,SEASON=$seas,PROJ=$proj,OUTDIR=$COMP_D/ATLAS,REF=$ref,VARS="$varg",RUNSTXT=$runstxt atlas.sh + cd ${local}/atlas + varg=`echo $vars | sed -e 's/,/+/g'` + 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 + 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 + $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 + if [ "$ref" != "OBS" ]; then + echo $submit -v 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 atlas.sh >> ${LOGD}/ATLAS$$ 2>&1 + $submit -v 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 atlas.sh fi - echo $submit -v RUN=$sim,SEASON=$seas,PROJ=$proj,OUTDIR=$COMP_D/ATLAS,REF=$ref,VARS="$varg" atlas.sh >> out.com$$ - echo $submit -v RUN=$sim,SEASON=$seas,PROJ=$proj,OUTDIR=$COMP_D/ATLAS,REF=$ref,VARS="$varg" atlas.sh - (( count_atlas = $count_atlas + 1 )) + fi + (( count_atlas = $count_atlas + 1 )) (( il = $il + 1 )) done @@ -263,16 +330,18 @@ fi -fi #newatlas +#fi #newatlas fi #atlas # atlas_cesmep : cles pour activer les nouveau atlas (C-ESM-EP) +# AI avril 2020 : Passage a la version v2 de C-ESM-EP +# FH Juin 2022 : Passage a la version v3 de C-ESM-EP (changement de prodigfs en thredds) if [ $atlas_cesmep = 1 ] ; then cd ~/LMDZ/C-ESM-EP - ./AtlasLMDZ.sh -runsfile $runstxt $comp + ./AtlasLMDZ.sh -runsfile $runstxt $comp >> ${LOGD}/CESMEP$$ 2>&1 fi # atlas_cesmep echo '########################################################################' echo 3/ Calcul des moyennes zonales nco -echo '########################################################################' +echo '#####################################################################' @@ -282,53 +351,76 @@ mkdir -p $COMP_D/ZON for sim in $listsimse OBS ; do + echo make_MOY for simulation $sim, log in ${LOGD}/MOY$$ years=`echo $sim | sed -e 's/_SE_/ /' | awk ' { print $2 } '` run=`echo $sim | sed -e 's/_SE_/ /' | awk ' { print $1 } '` - ./make_MOY.sh "$years" YEAR "$run" GLOB - ./make_MOY.sh "$years" YEAR "$run" ZON - ./make_MOY.sh "$years" JJA "$run" ZON - ./make_MOY.sh "$years" DJF "$run" ZON - ./make_MOY.sh "$years" JJAS "$run" AMMACROSS + ./make_MOY.sh "$years" YEAR "$run" GLOB >> ${LOGD}/MOY$$ 2>&1 + ./make_MOY.sh "$years" YEAR "$run" ZON >> ${LOGD}/MOY$$ 2>&1 + ./make_MOY.sh "$years" JJA "$run" ZON >> ${LOGD}/MOY$$ 2>&1 + ./make_MOY.sh "$years" DJF "$run" ZON >> ${LOGD}/MOY$$ 2>&1 + ./make_MOY.sh "$years" JJAS "$run" AMMACROSS >> ${LOGD}/MOY$$ 2>&1 + ./make_MOY.sh "$years" MAM "$run" ZON >> ${LOGD}/MOY$$ 2>&1 + ./make_MOY.sh "$years" SON "$run" ZON >> ${LOGD}/MOY$$ 2>&1 done cd $local ### ajout nuages LMDZ dans la compa et doit faire des liens symbol. sur #### les OBS calipso toujurs pour le moment - ./mk_clouds_NOcalipso.sh YEAR ZON - ./mk_clouds_NOcalipso.sh DJF ZON - ./mk_clouds_NOcalipso.sh JJA ZON - ./mk_clouds_NOcalipso.sh JJAS AMMACROSS -# - pwd - ./multi_ZONE.sh YEAR $comp ZON -runsfile $runstxt - ./multi_ZONE.sh JJA $comp ZON -runsfile $runstxt - ./multi_ZONE.sh DJF $comp ZON -runsfile $runstxt - ./multi_ZONE.sh JJAS $comp AMMACROSS -runsfile $runstxt - -fi - -echo '########################################################################' -echo 4/ Lancement du 1D si necessaire -echo '########################################################################' + echo mk_clouds_NOcalipso.sh, log in ${LOGD}/calipso$$ + ./mk_clouds_NOcalipso.sh YEAR ZON >> ${LOGD}/calipso$$ 2>&1 + ./mk_clouds_NOcalipso.sh DJF ZON >> ${LOGD}/calipso$$ 2>&1 + ./mk_clouds_NOcalipso.sh JJA ZON >> ${LOGD}/calipso$$ 2>&1 + ./mk_clouds_NOcalipso.sh JJAS AMMACROSS >> ${LOGD}/calipso$$ 2>&1 + ./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 + ./multi_ZONE.sh JJA $comp ZON -runsfile $runstxt >> ${LOGD}/Z$$ 2>&1 + ./multi_ZONE.sh DJF $comp ZON -runsfile $runstxt >> ${LOGD}/Z$$ 2>&1 + ./multi_ZONE.sh JJAS $comp AMMACROSS -runsfile $runstxt >> ${LOGD}/Z$$ 2>&1 + ./multi_ZONE.sh MAM $comp ZON -runsfile $runstxt >> ${LOGD}/Z$$ 2>&1 + ./multi_ZONE.sh SON $comp ZON -runsfile $runstxt >> ${LOGD}/Z$$ 2>&1 +fi + if [ ! -f $COMP_D/1D/1D.html -a $und = 1 ] ; then +echo '#####################################################################' +echo 4/ Lancement du 1D +echo '#####################################################################' cd $COMP_D - ~/LMDZ/1D/serie1d.sh $comp + echo log in ${LOGD}/1D$$ + ~/LMDZ/1D/serie1d.sh $comp > ${LOGD}/1D$$ 2>&1 cd $local fi -echo '########################################################################' -echo 5/ Métriques -echo '########################################################################' if [ $tuning_metrics = 1 -a ! -d $COMP_D/METRICS ] ; then - echo metrics.sh +echo '#####################################################################' +echo 5.1/ Metriques LMD : $tuning_metrics +echo '#####################################################################' + echo metrics.sh, log in ${LOGD}/METRICS$$ cd $local/METRICS - ./metrics.sh $comp + #./metrics.sh -runsfile $runstxt $comp + ./metrics.sh $comp > ${LOGD}/METRICS$$ 2>&1 +fi + +if [ $pcmdi_metrics = 1 ] ; then +echo '#####################################################################' +echo 5.2/ Metriques PCMDI : $pcmdi_metrics +echo '#####################################################################' +cd $local + ./make_pcmdi.sh $comp fi if [ $regdyn = 1 ]; then +echo '#####################################################################' +echo 6/ Sorting by dynamical regimes : $regdyn +echo '#####################################################################' cd ~/users/musat/regdyn/clean_regdyn - ./mk_all_regdyn.sh $comp 0 + ./mk_all_regdyn.sh $comp 0 > ${LOGD}/REGDYN$$ 2>&1 cd $local fi if [ $esmval2 = 1 ]; then +echo '#####################################################################' +echo 7/ ESMvalTool : $esmval2 +echo '#####################################################################' cd $local ./cvdp4atlas.sh $comp @@ -337,4 +429,7 @@ if [ $mjo = 1 ]; then +echo '#####################################################################' +echo 8.1/ Rainfall variability / MJO diagnostics : $mjo +echo '#####################################################################' cd ~/users/idelkadi/MJO ./make_diagnosMJO.sh $comp @@ -347,21 +442,44 @@ if [ $lma = 1 ]; then - cd $local - ./make_lma.sh $comp -fi +echo '#####################################################################' +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} +fi + if [ $axe2 = 1 ]; then - cd $local - ./make_axe2.sh -runstxt $runstxt $comp -fi +echo '#####################################################################' +echo 8.3/ Rainfall variability / metrics +echo '#####################################################################' + cd $local + bash make_axe2.sh -runstxt $runstxt $comp > ${LOGD}/axe2_$$ 2>&1 + echo make_axe2.sh -runstxt $runstxt $comp '-->' ${LOGD}/axe2_$$ +fi + if [ $trmm = 1 ]; then - cd ~/users/mbonaz/ +echo '#####################################################################' +echo 8.4/ Rainfall variability / Marine Bonazzola : $trmm +echo '#####################################################################' + cd ~/users/musat/atlas/d_AXE2 ./Axe2_Marine.sh $comp cd $local fi -cd $local -if [ $pcmdi_metrics = 1 ] ; then - ./make_pcmdi.sh $comp -fi + +if [ $river = 1 ]; then +echo '#####################################################################' +echo 9/ River discharges +echo '#####################################################################' + cd ~/users/idelkadi/AXE1/River + ./make_diagnoRiver.sh $comp +fi + if [ $axe4 = 1 ]; then +echo '#####################################################################' +echo 10/ Poles +echo '#####################################################################' cd $local ./make_axe4.sh $comp @@ -369,5 +487,8 @@ if [ "$reflcld_histo" = "1" ] ; then - cd ~/users/idelkadi/AXE3/ +echo '#####################################################################' +echo 11/ reflcld_histo : $reflcld_histo +echo '#####################################################################' + cd ~/users/idelkadi/AXE3/CldReflCldFrac ./make_scatReflCld.sh $comp cd $local @@ -375,8 +496,15 @@ if [ $vertcld_calipso = 1 ] ; then +echo '#####################################################################' +echo 12/ Calipso : $vertcld_calipso +echo '#####################################################################' cd ~/users/idelkadi/AXE3/Calipso/CoupeVerticale/DJF ./make_VerticalMzCldCalipso.sh $comp cd ~/users/idelkadi/AXE3/Calipso/CoupeVerticale/JJA ./make_VerticalMzCldCalipso.sh $comp + cd ~/users/idelkadi/AXE3/Calipso/CoupeVerticale/MAM + ./make_VerticalMzCldCalipso.sh $comp + cd ~/users/idelkadi/AXE3/Calipso/CoupeVerticale/SON + ./make_VerticalMzCldCalipso.sh $comp cd ~/users/idelkadi/AXE3/Calipso/Stratos ./make_StratosCalipso.sh $comp @@ -384,9 +512,8 @@ -echo '########################################################################' -echo 6/ Stations -echo '########################################################################' - if [ $stations_day = 1 ] ; then +echo '#####################################################################' +echo 13/ Stations +echo '#####################################################################' ~/users/Binta/bibi.sh $comp ~/users/cheruy/bibi.sh $comp @@ -397,20 +524,22 @@ fi -echo '########################################################################' -echo 7/ generation des pages html -echo '########################################################################' - if [ $html = 1 ] ; then - echo ./make_html_libigcm_ai.sh --comp $comp - ./make_html_libigcm.sh --comp $comp - cd $local - ./html_entete.sh ${comp} ${dataref} - ./make_index_html.sh ${comp} ${dataref} - ./html_tuning.sh $comp - ./html_tuning_min.sh $comp - ./html_accueil.sh $comp - ./html_1D.sh $comp - ./html_lma.sh $comp - ./html_pcmdi.sh $comp +echo '#####################################################################' +echo 14/ generation des pages html +echo '#####################################################################' + cd ${local} + echo ./make_html_libigcm.sh --comp $comp --runstxt $runstxt + ./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 + 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 @@ -425,11 +554,14 @@ # cat $COMP_D/metrics-CMIP5-AMIP-as-ref.html >> $COMP_D/PCMDI.html for i in 1 2 3 4 5 6 7 ; do - ./html_axe$i.sh $comp + ./html_axe$i.sh $comp >> ${LOGD}/html$$ 2>&1 done + + 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 - for season in YEAR DJF JJA ; do - echo ./multi_atlas.sh $comp $bias $season $proj $RUNS - ./multi_atlas.sh $comp $bias $season $proj $RUNS >> out.com$$ + for season in YEAR DJF JJA MAM SON ; do + ./multi_atlas.sh $comp $bias $season $proj $RUNS >> ${LOGD}/multiatlas$$ 2>&1 done done @@ -441,4 +573,5 @@ cd $local ./webpage_multi.sh $comp - -fi +fi + +echo UN NOVEL MULTI ATLAS EST DISPONIBLE sur $COMP_D/ACCUEIL.html