Changeset 3882


Ignore:
Timestamp:
Apr 29, 2021, 2:58:06 PM (3 years ago)
Author:
musat
Message:

Changements PATHS ciclad, runs.txt et sed HTML
Ajout possibilite acces simulations sur l espace "SE" dans cmor.sh
Ajout acces OBS a partir de l espace fabric multi_ZONE.sh
IM

Location:
BOL/Multi_atlas
Files:
14 edited

Legend:

Unmodified
Added
Removed

  • BOL/Multi_atlas/cmor.sh

    r3737 r3882  
    22
    33#set -vx
     4
     5local=`pwd -P`
     6cd $local
    47
    58####################################################################
    … …  
    1619hostname=`hostname`
    1720if [ ${hostname:0:5} = cicla ] ; then
    18 DODSDIR=/modfs/ipslfs/dods
     21DODSDIR=/thredds/ipsl
    1922OBSDIR=$DODSDIR/fabric/lmdz/SE/CMOR/OBS
    2023fi
    2124if [ ${hostname:0:5} = camel ] ; then
    22 DODSDIR=/modfs/ipslfs/dods
     25DODSDIR=/thredds/ipsl
    2326OBSDIR=$DODSDIR/fabric/lmdz/SE/CMOR/OBS
    2427fi
    … …  
    3235fi
    3336
    34 runstxt=/home/fabric/LMDZ/multi/runs.txt
     37runstxt=${local}/runs.txt
    3538while test -n "${1}"; do
    3639   case $1 in
    … …  
    9396  if [ ! -f $file ] ; then
    9497      echo PB fichier $file inexistant
    95       exit 22
    96   else
     98    file=$INDIR/${simorig}_SE_${years}_1M_histmth.nc
     99    echo $file
     100  fi
     101  if [ -f $file ] ; then
     102   file=$INDIR/${simorig}_SE_${years}_1M_histmth.nc
     103   echo $file
    97104   echo FILE $file
    98105   cd $WRK
    99106   dirout=$MainDIR/CMOR/${sim}_${years}/$cas
    100 #   sim=`echo $years | sed -e 's:_[0-9][0-9][0-9][0-9]_[0-9][0-9][0-9][0-9]::'`
    101107   echo $sim $years $dirout
    102108

  • BOL/Multi_atlas/html_accueil.sh

    r3737 r3882  
    66hostname=`hostname`
    77if [ ${hostname:0:5} = cicla ] ; then
    8 DODSDIR=/modfs/ipslfs/dods
     8DODSDIR=/thredds/ipsl
    99HTML=http://vesg.ipsl.upmc.fr/thredds/fileServer/IPSLFS/$login/lmdz/MultiSimu/$comp
    1010machine=ciclad
    1111fi
    1212if [ ${hostname:0:5} = camel ] ; then
    13 DODSDIR=/modfs/ipslfs/dods
     13DODSDIR=/thredds/ipsl
    1414fi
    1515if [ ${hostname:0:5} = irene ] ; then
    … …  
    3636
    3737# ATTENTION A MODIFIER POUR D AUTRES MACHINE
    38 echo $compf | sed -e 's:/modfs/ipslfs/dods/:http\://vesg.ipsl.upmc.fr/thredds/fileServer/IPSLFS/:'
     38echo $compf | sed -e 's:/thredds/ipsl/:http\://vesg.ipsl.upmc.fr/thredds/fileServer/IPSLFS/:'
    3939

  • BOL/Multi_atlas/html_all.sh

    r3684 r3882  
    55hostname=`hostname`
    66if [ ${hostname:0:5} = cicla ] ; then
    7 DODSDIR=/prodigfs/ipslfs/dods
     7DODSDIR=/thredds/ipsl
    88HTML00=http://vesg.ipsl.upmc.fr/thredds/fileServer/IPSLFS/$login
    99machine=ciclad
    1010fi
    1111if [ ${hostname:0:5} = camel ] ; then
    12 DODSDIR=/prodigfs/ipslfs/dods
     12DODSDIR=/thredds/ipsl
    1313fi
    1414if [ ${hostname:0:5} = irene ] ; then
    … …  
    2626
    2727i=1
    28 for f in /prodigfs/ipslfs/dods/fabric/lmdz/MultiSimu/*/entete.html ; do
    29     sim=`echo $f | cut -d/ -f8`
     28for f in /thredds/ipsl/fabric/lmdz/MultiSimu/*/entete.html ; do
     29    sim=`echo $f | cut -d/ -f7`
    3030# A REFAIRE
    31 echo "<TD ALIGN=LEFT><A HREF=`echo $f | sed -e 's:/prodigfs/ipslfs/dods/:http\://vesg.ipsl.upmc.fr/thredds/fileServer/IPSLFS/:'`> $sim </A> </TD>"
     31echo "<TD ALIGN=LEFT><A HREF=`echo $f | sed -e 's:/thredds/ipsl/:http\://vesg.ipsl.upmc.fr/thredds/fileServer/IPSLFS/:'`> $sim </A> </TD>"
    3232
    3333if [ $i = 8 ] ; then

  • BOL/Multi_atlas/html_axe1.sh

    r3737 r3882  
    88hostname=`hostname`
    99if [ ${hostname:0:5} = cicla ] ; then
    10 DODSDIR=/modfs/ipslfs/dods
     10DODSDIR=/thredds/ipsl
    1111HTML00=http://vesg.ipsl.upmc.fr/thredds/fileServer/IPSLFS/$login
    1212machine=ciclad
    1313fi
    1414if [ ${hostname:0:5} = camel ] ; then
    15 DODSDIR=/modfs/ipslfs/dods
     15DODSDIR=/thredds/ipsl
    1616fi
    1717if [ ${hostname:0:5} = irene ] ; then
    … …  
    9999
    100100# A REFAIRE
    101 echo $compf | sed -e 's:/modfs/ipslfs/dods/:http\://vesg.ipsl.upmc.fr/thredds/fileServer/IPSLFS/:'
     101echo $compf | sed -e 's:/thredds/ipsl/:http\://vesg.ipsl.upmc.fr/thredds/fileServer/IPSLFS/:'
    102102

  • BOL/Multi_atlas/html_axe2.sh

    r3737 r3882  
    77hostname=`hostname`
    88if [ ${hostname:0:5} = cicla ] ; then
    9 DODSDIR=/modfs/ipslfs/dods
     9DODSDIR=/thredds/ipsl
    1010HTML00=http://vesg.ipsl.upmc.fr/thredds/fileServer/IPSLFS/$login
    1111machine=ciclad
    1212fi
    1313if [ ${hostname:0:5} = camel ] ; then
    14 DODSDIR=/modfs/ipslfs/dods
     14DODSDIR=/thredds/ipsl
    1515fi
    1616if [ ${hostname:0:5} = irene ] ; then
    … …  
    5959
    6060# A REFAIRE
    61 echo $compf | sed -e 's:/modfs/ipslfs/dods/:http\://vesg.ipsl.upmc.fr/thredds/fileServer/IPSLFS/:'
     61echo $compf | sed -e 's:/thredds/ipsl/:http\://vesg.ipsl.upmc.fr/thredds/fileServer/IPSLFS/:'

  • BOL/Multi_atlas/html_axe3.sh

    r3737 r3882  
    88hostname=`hostname`
    99if [ ${hostname:0:5} = cicla ] ; then
    10 DODSDIR=/modfs/ipslfs/dods
     10DODSDIR=/thredds/ipsl
    1111HTML00=http://vesg.ipsl.upmc.fr/thredds/fileServer/IPSLFS/$login
    1212machine=ciclad
    1313fi
    1414if [ ${hostname:0:5} = camel ] ; then
    15 DODSDIR=/modfs/ipslfs/dods
     15DODSDIR=/thredds/ipsl
    1616fi
    1717if [ ${hostname:0:5} = irene ] ; then
    … …  
    128128$local/concat_html.sh $COMP_D/REG "Regimes dynamiques tropicaux" $concatarg 3 >> $COMP_D/REG/index.html
    129129
    130 echo $compf | sed -e 's:/modfs/ipslfs/dods/:http\://vesg.ipsl.upmc.fr/thredds/fileServer/IPSLFS/:'
     130echo $compf | sed -e 's:/thredds/ipsl/:http\://vesg.ipsl.upmc.fr/thredds/fileServer/IPSLFS/:'

  • BOL/Multi_atlas/html_axe4.sh

    r3737 r3882  
    77hostname=`hostname`
    88if [ ${hostname:0:5} = cicla ] ; then
    9 DODSDIR=/modfs/ipslfs/dods
     9DODSDIR=/thredds/ipsl
    1010HTML00=http://vesg.ipsl.upmc.fr/thredds/fileServer/IPSLFS/$login
    1111machine=ciclad
    1212fi
    1313if [ ${hostname:0:5} = camel ] ; then
    14 DODSDIR=/modfs/ipslfs/dods
     14DODSDIR=/thredds/ipsl
    1515fi
    1616if [ ${hostname:0:5} = irene ] ; then
    … …  
    9595
    9696
    97 echo $compf | sed -e 's:/modfs/ipslfs/dods/:http\://vesg.ipsl.upmc.fr/thredds/fileServer/IPSLFS/:'
     97echo $compf | sed -e 's:/thredds/ipsl/:http\://vesg.ipsl.upmc.fr/thredds/fileServer/IPSLFS/:'
    9898

  • BOL/Multi_atlas/html_axe5.sh

    r3737 r3882  
    77hostname=`hostname`
    88if [ ${hostname:0:5} = cicla ] ; then
    9 DODSDIR=/modfs/ipslfs/dods
     9DODSDIR=/thredds/ipsl
    1010HTML00=http://vesg.ipsl.upmc.fr/thredds/fileServer/IPSLFS/$login
    1111machine=ciclad
    1212fi
    1313if [ ${hostname:0:5} = camel ] ; then
    14 DODSDIR=/modfs/ipslfs/dods
     14DODSDIR=/thredds/ipsl
    1515fi
    1616if [ ${hostname:0:5} = irene ] ; then
    … …  
    4646eod
    4747
    48 echo $compf | sed -e 's:/modfs/ipslfs/dods/:http\://vesg.ipsl.upmc.fr/thredds/fileServer/IPSLFS/:'
     48echo $compf | sed -e 's:/thredds/ipsl/:http\://vesg.ipsl.upmc.fr/thredds/fileServer/IPSLFS/:'
    4949

  • BOL/Multi_atlas/html_axe6.sh

    r3737 r3882  
    77hostname=`hostname`
    88if [ ${hostname:0:5} = cicla ] ; then
    9 DODSDIR=/modfs/ipslfs/dods
     9DODSDIR=/thredds/ipsl
    1010HTML00=http://vesg.ipsl.upmc.fr/thredds/fileServer/IPSLFS/$login
    1111machine=ciclad
    1212fi
    1313if [ ${hostname:0:5} = camel ] ; then
    14 DODSDIR=/modfs/ipslfs/dods
     14DODSDIR=/thredds/ipsl
    1515fi
    1616if [ ${hostname:0:5} = irene ] ; then
    … …  
    4545
    4646
    47 echo $compf | sed -e 's:/modfs/ipslfs/dods/:http\://vesg.ipsl.upmc.fr/thredds/fileServer/IPSLFS/:'
     47echo $compf | sed -e 's:/thredds/ipsl/:http\://vesg.ipsl.upmc.fr/thredds/fileServer/IPSLFS/:'

  • BOL/Multi_atlas/html_axe7.sh

    r3737 r3882  
    88hostname=`hostname`
    99if [ ${hostname:0:5} = cicla ] ; then
    10 DODSDIR=/modfs/ipslfs/dods
     10DODSDIR=/thredds/ipsl
    1111HTML00=http://vesg.ipsl.upmc.fr/thredds/fileServer/IPSLFS/$login
    1212machine=ciclad
    1313fi
    1414if [ ${hostname:0:5} = camel ] ; then
    15 DODSDIR=/modfs/ipslfs/dods
     15DODSDIR=/thredds/ipsl
    1616fi
    1717if [ ${hostname:0:5} = irene ] ; then
    … …  
    128128
    129129
    130 echo $compf | sed -e 's:/modfs/ipslfs/dods/:http\://vesg.ipsl.upmc.fr/thredds/fileServer/IPSLFS/:'
     130echo $compf | sed -e 's:/thredds/ipsl/:http\://vesg.ipsl.upmc.fr/thredds/fileServer/IPSLFS/:'

  • BOL/Multi_atlas/install_multi_atlas.sh

    r3745 r3882  
    2929if [ ${hostname:0:5} = cicla ] ; then
    3030# chemin vers le rep dods de base
    31 DODSDIR=/modfs/ipslfs/dods
     31DODSDIR=/thredds/ipsl
    3232# Rep ou sont stockes les multiatlas
    3333MULTIDIR=$DODSDIR/$login/lmdz/MultiSimu
    … …  
    5858# CLIMSERV
    5959if [ ${hostname:0:5} = camel ] ; then
    60 DODSDIR=/modfs/ipslfs/dods
     60DODSDIR=/thredds/ipsl
    6161cat <<eod > entete.sh
    6262#PBS -N atlas
    … …  
    142142echo -e "${bleufonce}"To create your multi-atlas you needs :
    143143echo 1.  to create your multiatlas directory "example Multi01" :
    144 echo     mkdir -p /modfs/ipslfs/dods/$login/lmdz/MultiSimu/Multi01
     144echo     mkdir -p $DODSdir/$login/lmdz/MultiSimu/Multi01
    145145echo 
    146146echo 2.  to define some characeristics of your multi-atlas "names, dates, description of simulations and atlas variables" :
    147 echo     cp Utils/def.txt  Utils/atlas-def /modfs/ipslfs/dods/$login/lmdz/MultiSimu/Multi01/.
     147echo     cp Utils/def.txt  Utils/atlas-def ${DODSdir}/$login/lmdz/MultiSimu/Multi01/.
    148148echo     define "names, date, description" of simulations in file :
    149 echo     /modfs/ipslfs/dods/$login/lmdz/MultiSimu/Multi01/def.txt
     149echo     ${DODSdir}/$login/lmdz/MultiSimu/Multi01/def.txt
    150150echo     define atlas variables in file :
    151 echo     /modfs/ipslfs/dods/$login/lmdz/MultiSimu/Multi01/atlas-def
     151echo     $DODSdir/$login/lmdz/MultiSimu/Multi01/atlas-def
    152152echo
    153153echo 3.   Add the link to the simulation outputs in your file : $local/runs.txt

  • BOL/Multi_atlas/make_html_libigcm.sh

    r3737 r3882  
    5555hostname=`hostname`
    5656if [ ${hostname:0:5} = cicla ] ; then
    57 DODSDIR=/modfs/ipslfs/dods
     57DODSDIR=/thredds/ipsl
    5858HTML=http://vesg.ipsl.upmc.fr/thredds/fileServer/IPSLFS/$login/lmdz/MultiSimu/$comp
    5959machine=ciclad
    6060fi
    6161if [ ${hostname:0:5} = camel ] ; then
    62 DODSDIR=/modfs/ipslfs/dods
     62DODSDIR=/thredds/ipsl
    6363fi
    6464if [ ${hostname:0:5} = irene ] ; then
    … …  
    8888STORAGE=$CICLAD
    8989ROOTWEBatlas=http://vesg.ipsl.upmc.fr/thredds/fileServer/IPSLFS/$login/lmdz/STORE/$EXPNAME
    90 MULTIDIR=/modfs/ipslfs/dods/$login/lmdz/MultiSimu
     90MULTIDIR=$DODSDIR/$login/lmdz/MultiSimu
    9191COMP_D=$MULTIDIR/$comp
    9292DEF_FILE=$COMP_D/def.txt
    … …  
    210210                 fi
    211211# ATTENTION A REFAIRE EN FONCTION DE LA MACHINE
    212                  atlas_html=`echo $atlasf | sed -e 's:/modfs/ipslfs/dods/:http\://vesg.ipsl.upmc.fr/thredds/fileServer/IPSLFS/:'`
     212                 atlas_html=`echo $atlasf | sed -e 's:/thredds/ipsl/:http\://vesg.ipsl.upmc.fr/thredds/fileServer/IPSLFS/:'`
    213213                 echo atlas_html $atlas_html
    214214                 echo atlasf $atlasf

  • BOL/Multi_atlas/multi_ZONE.sh

    r3737 r3882  
    1414hostname=`hostname`
    1515if [ ${hostname:0:5} = cicla ] ; then
    16 DODSDIR=/modfs/ipslfs/dods
     16DODSDIR=/thredds/ipsl
    1717fi
    1818if [ ${hostname:0:5} = camel ] ; then
    19 DODSDIR=/modfs/ipslfs/dods
     19DODSDIR=/thredds/ipsl
    2020fi
    2121if [ ${hostname:0:5} = irene ] ; then
    … …  
    2828MAINDIR=$DODSDIR/$login/lmdz
    2929
    30 runstxt=/home/fabric/LMDZ/MultiSimu/runs.txt
     30runstxt=`pwd`/runs.txt
    3131
    3232while test -n "${1}"; do
    … …  
    5656echo $COMP_D
    5757
    58 #sims="OBS " ; for ss in `awk ' {print $1"_"$2 } ' $DEF_FILE` ; do sims="$sims $ss" ; done
    59 #echo sims $sims
    60 #exit
    6158listsims=""  ; for s  in `awk ' {print $1} ' $DEF_FILE`          ; do listsims="$listsims $s"    ; done
    6259echo listsims $listsims
     60
    6361sims="OBS "
     62
     63echo listsims= $listsims
     64
    6465for s in $listsims ; do
    6566simdir=`grep -w "^$s "  $runstxt | awk ' { print $2 } '`
    6667ss=`basename $simdir `
    67 #year=`grep -w "^$s " $DEF_FILE | awk ' { print $2 } '`
    6868year=`grep -w "^$s" $DEF_FILE | awk ' { print $2 } '`
    6969sims="$sims ${s}_$year"
    … …  
    7676#vars="pr prw rstt rlut rtt crelt crest crett hfns hfls tas sst tauu tauv psl zg500 rsts rsut rlutcs albs albt cress crels crets rts rah rahcs rahcre rlah rlahcs rlahcre rsah rsahcs rsahcre hurs hfss rldscs rlds rlus rsdscs rsds rsus rsuscs rsutcs prw"
    7777vars="pr prw rstt rlut rtt crelt crest crett hfns hfls tas sst tauu tauv psl zg500 rsts rsut rlutcs albs albt cress crels crets rts rah rahcs rahcre rlah rlahcs rlahcre rsah rsahcs rsahcre hurs hfss rldscs rlds rlus rsdscs rsds rsus rsuscs rsutcs prw rttcs rsttcs cllcalipso clmcalipso clhcalipso cll clm clh"
    78 #vars=$4
    79 #vars="eva"
    8078echo $vars
    8179
    … …  
    9795
    9896
    99 #line=`grep  "$var," $local/description.zon`
    10097line=`grep  "$var," $local/description${SEAS}.zon`
    10198if [ "$line" = "" ] ; then echo $var non prevue dans description ; exit ; fi
    … …  
    118115echo OK0 $sims
    119116for sim in $sims ; do
    120    if [ $sim = OBS ] ; then MAINDIR=$DODSDIR/fabric/lmdz ; fi
     117   MAINDIR=$DODSDIR/$login/lmdz
     118   if [ "$sim" = "OBS" ] ; then
     119     MAINDIR=$DODSDIR/fabric/lmdz ;
     120   fi
     121   echo sim is= $sim
    121122   ZONDIR=$MAINDIR/$GR/$SEAS/$sim/$ZONE
    122123   echo $ZONDIR
    … …  
    127128done
    128129
    129 
    130     #yaxis  tick major 5
    131     #yaxis  tick minor 1
    132 
    133 #if [ $nsims = 2 ] ; then
    134 #    view="0.15, 0.15, 1, 0.6"
    135 #    legend="0.15,0.7"
    136130if [ $var == "prl" ] || [ $var == "prc" ] ; then
    137131    legend="0.72,0.7"

  • BOL/Multi_atlas/season.sh

    r3737 r3882  
    1212hostname=`hostname`
    1313if [ ${hostname:0:5} = cicla ] ; then
    14 DODSDIR=/modfs/ipslfs/dods
     14DODSDIR=/thredds/ipsl
    1515fi
    1616if [ ${hostname:0:5} = camel ] ; then
    17 DODSDIR=/modfs/ipslfs/dods
     17DODSDIR=/thredds/ipsl
    1818fi
    1919if [ ${hostname:0:5} = irene ] ; then
    … …  
    4949     "-s") listesim=`echo $2 | sed -e 's/,/ /g'` ; shift ; shift ;;
    5050     "-f") force_create=1 ; shift ;;
    51      "-comp") COMP_D=/modfs/ipslfs/dods/fabric/lmdz/MultiSimu/$2 ; shift ; shift ;;
     51     "-comp") COMP_D=/thredds/ipsl/fabric/lmdz/MultiSimu/$2 ; shift ; shift ;;
    5252     "-seas") listeseas=$2 ; shift ; shift ;;
    5353     *) ./cmor.sh -h ; shift ; exit ;;
Note: See TracChangeset for help on using the changeset viewer.