Changeset 4307 for BOL


Ignore:
Timestamp:
Oct 26, 2022, 1:07:21 PM (2 years ago)
Author:
musat
Message:

Fusion entre la version commune (compte fabric) et la version perso
du multi-atlas incluant

  • la fiabilisation de la realisation des cartes
  • la correction des coupes (latitude,altitude) pour les biais
  • l'ajout d'une option pour des multi-atlas par rapport a une simulation de reference
  • l'ajout d'options pour un multi-atlas regional
  • la mise a jour des thredds (repertoire & html) pour ciclad

IonelaMusat?

Location:
BOL/Multi_atlas
Files:
22 edited

Legend:

Unmodified
Added
Removed

  • BOL/Multi_atlas/concat_html.sh

    r3883 r4307  
    2828<table>
    2929
    30 <h1> $2 <A HREF=`echo $PNG_D/index.pdf | sed -e 's:/thredds/ipsl/:http\://vesg.ipsl.upmc.fr/thredds/fileServer/IPSLFS/:'`> PDF </A></h1>
     30<h1> $2 <A HREF=`echo $PNG_D/index.pdf | sed -e 's:/thredds/ipsl/:http\://thredds-su.ipsl.fr/thredds/fileServer/ipsl_thredds/:'`> PDF </A></h1>
    3131eod
    3232
    … …  
    3939       file=$PNG_D/${vv}.png
    4040       if [ -f $file ] ; then
    41           thredds=`echo $file | sed -e 's:/thredds/ipsl/:http\://vesg.ipsl.upmc.fr/thredds/fileServer/IPSLFS/:'`
     41          thredds=`echo $file | sed -e 's:/thredds/ipsl/:http\://thredds-su.ipsl.fr/thredds/fileServer/ipsl_thredds/:'`
    4242          echo '<TD ALIGN=CENTER><A HREF="'$thredds'"><IMG HEIGHT=250 WIDTH=350 SRC="'$thredds'"></a></TD>'
    4343       else

  • BOL/Multi_atlas/html_1D.sh

    r3881 r4307  
    88if [ ${hostname:0:5} = cicla ] ; then
    99DODSDIR=/thredds/ipsl
    10 HTML00=http://vesg.ipsl.upmc.fr/thredds/fileServer/IPSLFS/$login
     10dthredds=thredds-su.ipsl.fr/thredds/fileServer/ipsl_thredds
     11HTML00=http://${dthredds}/$login
    1112machine=ciclad
     13fi
     14if [ ${hostname:0:5} = spiri ] ; then
     15DODSDIR=/thredds/ipsl
     16dthredds=thredds-su.ipsl.fr/thredds/fileServer/ipsl_thredds
     17HTML00=http://${dthredds}/$login
     18machine=spirit
    1219fi
    1320if [ ${hostname:0:5} = camel ] ; then

  • BOL/Multi_atlas/html_accueil.sh

    r3882 r4307  
    77if [ ${hostname:0:5} = cicla ] ; then
    88DODSDIR=/thredds/ipsl
    9 HTML=http://vesg.ipsl.upmc.fr/thredds/fileServer/IPSLFS/$login/lmdz/MultiSimu/$comp
     9dthredds=thredds-su.ipsl.fr/thredds/fileServer/ipsl_thredds
     10HTML=http://${dthredds}/$login/lmdz/MultiSimu/$comp
    1011machine=ciclad
     12fi
     13if [ ${hostname:0:5} = spiri ] ; then
     14DODSDIR=/thredds/ipsl
     15dthredds=thredds-su.ipsl.fr/thredds/fileServer/ipsl_thredds
     16HTML=http://${dthredds}/$login/lmdz/MultiSimu/$comp
     17machine=spirit
    1118fi
    1219if [ ${hostname:0:5} = camel ] ; then
    … …  
    3643
    3744# ATTENTION A MODIFIER POUR D AUTRES MACHINE
    38 echo $compf | sed -e 's:/thredds/ipsl/:http\://vesg.ipsl.upmc.fr/thredds/fileServer/IPSLFS/:'
    39 
     45echo $compf | sed -e 's:/thredds/ipsl/:http\://thredds-su.ipsl.fr/thredds/fileServer/ipsl_thredds/:'

  • BOL/Multi_atlas/html_all.sh

    r3882 r4307  
    66if [ ${hostname:0:5} = cicla ] ; then
    77DODSDIR=/thredds/ipsl
    8 HTML00=http://vesg.ipsl.upmc.fr/thredds/fileServer/IPSLFS/$login
     8dthredds=thredds-su.ipsl.fr/thredds/fileServer/ipsl_thredds
     9HTML00=http://${dthredds}/$login
    910machine=ciclad
     11fi
     12if [ ${hostname:0:5} = spiri ] ; then
     13DODSDIR=/thredds/ipsl
     14dthredds=thredds-su.ipsl.fr/thredds/fileServer/ipsl_thredds
     15HTML00=http://${dthredds}/$login
     16machine=spirit
    1017fi
    1118if [ ${hostname:0:5} = camel ] ; then
    … …  
    2633
    2734i=1
    28 for f in /thredds/ipsl/fabric/lmdz/MultiSimu/*/entete.html ; do
     35for f in $DODSDIR/${login}/lmdz/MultiSimu/*/entete.html ; do
    2936    sim=`echo $f | cut -d/ -f7`
    3037# A REFAIRE
    31 echo "<TD ALIGN=LEFT><A HREF=`echo $f | sed -e 's:/thredds/ipsl/:http\://vesg.ipsl.upmc.fr/thredds/fileServer/IPSLFS/:'`> $sim </A> </TD>"
     38echo "<TD ALIGN=LEFT><A HREF=`echo $f | sed -e 's:/thredds/ipsl/:http\://thredds-su.ipsl.fr/thredds/fileServer/ipsl_thredds/:'`> $sim </A> </TD>"
    3239
    3340if [ $i = 8 ] ; then

  • BOL/Multi_atlas/html_axe1.sh

    r3882 r4307  
    99if [ ${hostname:0:5} = cicla ] ; then
    1010DODSDIR=/thredds/ipsl
    11 HTML00=http://vesg.ipsl.upmc.fr/thredds/fileServer/IPSLFS/$login
     11dthredds=thredds-su.ipsl.fr/thredds/fileServer/ipsl_thredds
     12HTML00=http://${dthredds}/$login
    1213machine=ciclad
     14fi
     15if [ ${hostname:0:5} = spiri ] ; then
     16DODSDIR=/thredds/ipsl
     17dthredds=thredds-su.ipsl.fr/thredds/fileServer/ipsl_thredds
     18HTML00=http://${dthredds}/$login
     19machine=spirit
    1320fi
    1421if [ ${hostname:0:5} = camel ] ; then
    … …  
    99106
    100107# A REFAIRE
    101 echo $compf | sed -e 's:/thredds/ipsl/:http\://vesg.ipsl.upmc.fr/thredds/fileServer/IPSLFS/:'
     108echo $compf | sed -e 's:/thredds/ipsl/:http\://thredds-su.ipsl.fr/thredds/fileServer/ipsl_thredds/:'
    102109

  • BOL/Multi_atlas/html_axe2.sh

    r3882 r4307  
    88if [ ${hostname:0:5} = cicla ] ; then
    99DODSDIR=/thredds/ipsl
    10 HTML00=http://vesg.ipsl.upmc.fr/thredds/fileServer/IPSLFS/$login
     10dthredds=thredds-su.ipsl.fr/thredds/fileServer/ipsl_thredds
     11HTML00=http://${dthredds}/$login
    1112machine=ciclad
     13fi
     14if [ ${hostname:0:5} = spiri ] ; then
     15DODSDIR=/thredds/ipsl
     16dthredds=thredds-su.ipsl.fr/thredds/fileServer/ipsl_thredds
     17HTML00=http://${dthredds}/$login
     18machine=spirit
    1219fi
    1320if [ ${hostname:0:5} = camel ] ; then
    … …  
    5966
    6067# A REFAIRE
    61 echo $compf | sed -e 's:/thredds/ipsl/:http\://vesg.ipsl.upmc.fr/thredds/fileServer/IPSLFS/:'
     68echo $compf | sed -e 's:/thredds/ipsl/:http\://thredds-su.ipsl.fr/thredds/fileServer/ipsl_thredds/:'

  • BOL/Multi_atlas/html_axe3.sh

    r3882 r4307  
    99if [ ${hostname:0:5} = cicla ] ; then
    1010DODSDIR=/thredds/ipsl
    11 HTML00=http://vesg.ipsl.upmc.fr/thredds/fileServer/IPSLFS/$login
     11dthredds=thredds-su.ipsl.fr/thredds/fileServer/ipsl_thredds
     12HTML00=http://${dthredds}/$login
    1213machine=ciclad
     14fi
     15if [ ${hostname:0:5} = spiri ] ; then
     16DODSDIR=/thredds/ipsl
     17dthredds=thredds-su.ipsl.fr/thredds/fileServer/ipsl_thredds
     18HTML00=http://${dthredds}/$login
     19machine=spirit
    1320fi
    1421if [ ${hostname:0:5} = camel ] ; then
    … …  
    128135$local/concat_html.sh $COMP_D/REG "Regimes dynamiques tropicaux" $concatarg 3 >> $COMP_D/REG/index.html
    129136
    130 echo $compf | sed -e 's:/thredds/ipsl/:http\://vesg.ipsl.upmc.fr/thredds/fileServer/IPSLFS/:'
     137echo $compf | sed -e 's:/thredds/ipsl/:http\://thredds-su.ipsl.fr/thredds/fileServer/ipsl_thredds/:'

  • BOL/Multi_atlas/html_axe4.sh

    r3882 r4307  
    88if [ ${hostname:0:5} = cicla ] ; then
    99DODSDIR=/thredds/ipsl
    10 HTML00=http://vesg.ipsl.upmc.fr/thredds/fileServer/IPSLFS/$login
     10dthredds=thredds-su.ipsl.fr/thredds/fileServer/ipsl_thredds
     11HTML00=http://${dthredds}/$login
    1112machine=ciclad
     13fi
     14if [ ${hostname:0:5} = spiri ] ; then
     15DODSDIR=/thredds/ipsl
     16dthredds=thredds-su.ipsl.fr/thredds/fileServer/ipsl_thredds
     17HTML00=http://${dthredds}/$login
     18machine=spirit
    1219fi
    1320if [ ${hostname:0:5} = camel ] ; then
    … …  
    95102
    96103
    97 echo $compf | sed -e 's:/thredds/ipsl/:http\://vesg.ipsl.upmc.fr/thredds/fileServer/IPSLFS/:'
     104echo $compf | sed -e 's:/thredds/ipsl/:http\://thredds-su.ipsl.fr/thredds/fileServer/ipsl_thredds/:'
    98105

  • BOL/Multi_atlas/html_axe5.sh

    r3882 r4307  
    88if [ ${hostname:0:5} = cicla ] ; then
    99DODSDIR=/thredds/ipsl
    10 HTML00=http://vesg.ipsl.upmc.fr/thredds/fileServer/IPSLFS/$login
     10dthredds=thredds-su.ipsl.fr/thredds/fileServer/ipsl_thredds
     11HTML00=http://${dthredds}/$login
    1112machine=ciclad
     13fi
     14if [ ${hostname:0:5} = spiri ] ; then
     15DODSDIR=/thredds/ipsl
     16dthredds=thredds-su.ipsl.fr/thredds/fileServer/ipsl_thredds
     17HTML00=http://${dthredds}/$login
     18machine=spirit
    1219fi
    1320if [ ${hostname:0:5} = camel ] ; then
    … …  
    4653eod
    4754
    48 echo $compf | sed -e 's:/thredds/ipsl/:http\://vesg.ipsl.upmc.fr/thredds/fileServer/IPSLFS/:'
     55echo $compf | sed -e 's:/thredds/ipsl/:http\://thredds-su.ipsl.fr/thredds/fileServer/ipsl_thredds/:'
    4956

  • BOL/Multi_atlas/html_axe6.sh

    r3882 r4307  
    88if [ ${hostname:0:5} = cicla ] ; then
    99DODSDIR=/thredds/ipsl
    10 HTML00=http://vesg.ipsl.upmc.fr/thredds/fileServer/IPSLFS/$login
     10dthredds=thredds-su.ipsl.fr/thredds/fileServer/ipsl_thredds
     11HTML00=http://${dthredds}/$login
    1112machine=ciclad
     13fi
     14if [ ${hostname:0:5} = spiri ] ; then
     15DODSDIR=/thredds/ipsl
     16dthredds=thredds-su.ipsl.fr/thredds/fileServer/ipsl_thredds
     17HTML00=http://${dthredds}/$login
     18machine=spirit
    1219fi
    1320if [ ${hostname:0:5} = camel ] ; then
    … …  
    4552
    4653
    47 echo $compf | sed -e 's:/thredds/ipsl/:http\://vesg.ipsl.upmc.fr/thredds/fileServer/IPSLFS/:'
     54echo $compf | sed -e 's:/thredds/ipsl/:http\://thredds-su.ipsl.fr/thredds/fileServer/ipsl_thredds/:'

  • BOL/Multi_atlas/html_axe7.sh

    r3882 r4307  
    99if [ ${hostname:0:5} = cicla ] ; then
    1010DODSDIR=/thredds/ipsl
    11 HTML00=http://vesg.ipsl.upmc.fr/thredds/fileServer/IPSLFS/$login
     11dthredds=thredds-su.ipsl.fr/thredds/fileServer/ipsl_thredds
     12HTML00=http://${dthredds}/$login
    1213machine=ciclad
     14fi
     15if [ ${hostname:0:5} = spiri ] ; then
     16DODSDIR=/thredds/ipsl
     17dthredds=thredds-su.ipsl.fr/thredds/fileServer/ipsl_thredds
     18HTML00=http://${dthredds}/$login
     19machine=spirit
    1320fi
    1421if [ ${hostname:0:5} = camel ] ; then
    … …  
    128135
    129136
    130 echo $compf | sed -e 's:/thredds/ipsl/:http\://vesg.ipsl.upmc.fr/thredds/fileServer/IPSLFS/:'
     137echo $compf | sed -e 's:/thredds/ipsl/:http\://thredds-su.ipsl.fr/thredds/fileServer/ipsl_thredds/:'

  • BOL/Multi_atlas/html_entete.sh

    r3881 r4307  
    99if [ ${hostname:0:5} = cicla ] ; then
    1010DODSDIR=/thredds/ipsl
    11 HTML00=http://vesg.ipsl.upmc.fr/thredds/fileServer/IPSLFS/$login
     11HTML00=http://thredds-su.ipsl.fr/thredds/fileServer/ipsl_thredds/$login
    1212machine=ciclad
     13fi
     14if [ ${hostname:0:5} = spiri ] ; then
     15DODSDIR=/thredds/ipsl
     16HTML00=http://thredds-su.ipsl.fr/thredds/fileServer/ipsl_thredds/$login
     17machine=spirit
    1318fi
    1419if [ ${hostname:0:5} = camel ] ; then
    … …  
    6671          <li><a href="$HTML0/HOWTO.html">HOWTO contribute</a> </li>
    6772          <li><a href="http://forge.ipsl.jussieu.fr/igcmg/wiki/IPSLCM6 ">Liste des simulations CM6</a> </li>
    68           <li><a href="https://vesg.ipsl.upmc.fr/thredds/catalog/IPSLFS/fabric/lmdz/MultiSimu/catalog.html">ALL : avail. directories </a> </li>
     73          <li><a href="https://thredds-su.ipsl.fr/thredds/catalog/ipsl_thredds/fabric/lmdz/MultiSimu/catalog.html">ALL : avail. directories </a> </li>
    6974        </ul></li>
    7075......eod
    71       for SEAS in YEAR DJF JJA ; do
     76      for SEAS in YEAR DJF JJA MAM SON ; do
    7277      cat <<......eod>> $compf
    7378        <li><a href="#">Atlas $SEAS</a>

  • BOL/Multi_atlas/html_lma.sh

    r3881 r4307  
    88if [ ${hostname:0:5} = cicla ] ; then
    99DODSDIR=/thredds/ipsl
    10 HTML00=http://vesg.ipsl.upmc.fr/thredds/fileServer/IPSLFS/$login
     10dthredds=thredds-su.ipsl.fr/thredds/fileServer/ipsl_thredds
     11HTML00=https://${dthredds}/$login
    1112machine=ciclad
     13fi
     14if [ ${hostname:0:5} = spiri ] ; then
     15DODSDIR=/thredds/ipsl
     16dthredds=thredds-su.ipsl.fr/thredds/fileServer/ipsl_thredds
     17HTML00=https://${dthredds}/$login
     18machine=spirit
    1219fi
    1320if [ ${hostname:0:5} = camel ] ; then
    … …  
    2330runstxt=$local/runs.txt
    2431PREF_F=$DODSDIR
    25 PREF_W=http\://vesg.ipsl.upmc.fr/thredds/fileServer/IPSLFS
     32dthredds=thredds-su.ipsl.fr/thredds/fileServer/ipsl_thredds
     33#PREF_W=http\://vesg.ipsl.upmc.fr/thredds/fileServer/IPSLFS
     34PREF_W=http\://${dthredds}
     35
    2636MULTIDIR=$PREF_F/$login/lmdz/MultiSimu
    2737#BASE_D=/home/fabric/users/dcugnet

  • BOL/Multi_atlas/html_pcmdi.sh

    r3881 r4307  
    66if [ ${hostname:0:5} = cicla ] ; then
    77DODSDIR=/thredds/ipsl
    8 HTML00=http://vesg.ipsl.upmc.fr/thredds/fileServer/IPSLFS/$login
     8dthredds=thredds-su.ipsl.fr/thredds/fileServer/ipsl_thredds
     9HTML00=http://${dthredds}/$login
    910machine=ciclad
     11fi
     12if [ ${hostname:0:5} = spiri ] ; then
     13DODSDIR=/thredds/ipsl
     14dthredds=thredds-su.ipsl.fr/thredds/fileServer/ipsl_thredds
     15HTML00=http://${dthredds}/$login
     16machine=spirit
    1017fi
    1118if [ ${hostname:0:5} = camel ] ; then

  • BOL/Multi_atlas/html_tuning.sh

    r3881 r4307  
    88if [ ${hostname:0:5} = cicla ] ; then
    99DODSDIR=/thredds/ipsl
    10 HTML00=http://vesg.ipsl.upmc.fr/thredds/fileServer/IPSLFS/$login
     10dthredds=thredds-su.ipsl.fr/thredds/fileServer/ipsl_thredds
     11HTML00=https://${dthredds}/$login
    1112machine=ciclad
     13fi
     14if [ ${hostname:0:5} = spiri ] ; then
     15DODSDIR=/thredds/ipsl
     16dthredds=thredds-su.ipsl.fr/thredds/fileServer/ipsl_thredds
     17HTML00=https://${dthredds}/$login
     18machine=spirit
    1219fi
    1320if [ ${hostname:0:5} = camel ] ; then

  • BOL/Multi_atlas/html_tuning_min.sh

    r3881 r4307  
    88if [ ${hostname:0:5} = cicla ] ; then
    99DODSDIR=/thredds/ipsl
    10 HTML00=http://vesg.ipsl.upmc.fr/thredds/fileServer/IPSLFS/$login
     10dthredds=thredds-su.ipsl.fr/thredds/fileServer/ipsl_thredds
     11HTML00=http://${dthredds}/$login
    1112machine=ciclad
     13fi
     14if [ ${hostname:0:5} = spiri ] ; then
     15DODSDIR=/thredds/ipsl
     16dthredds=thredds-su.ipsl.fr/thredds/fileServer/ipsl_thredds
     17HTML00=http://${dthredds}/$login
     18machine=spirit
    1219fi
    1320if [ ${hostname:0:5} = camel ] ; then

  • BOL/Multi_atlas/install_multi_atlas.sh

    r3915 r4307  
    7373submit=qsub
    7474eod
    75 fi
    7675
    7776# IRENE
    … …  
    173172\mv make_atlas.sh atlas/.
    174173
     174fi
     175
    175176cp Utils/lmdz_SE0.py tmp0.py
    176177sed -e s:ROOT_SIM_DIR:$ROOT_SIM_DIR:g tmp0.py > tmp.py
    … …  
    179180\mv lmdz_SE.py atlas/.
    180181
     182exit
    181183echo 4. Then you can run your multiatlas :
    182184echo ./job_multi.sh Multi01

  • BOL/Multi_atlas/make_html_libigcm.sh

    r3882 r4307  
    11#!/bin/bash
    2 # AI mai 2020
    3 # A REFAIRE PROPREMENT
    4 # A NETTOYER, ADAPTER AUX AUTRES MACHINES
     2
    53
    64###########################################################################
    … …  
    2321
    2422
     23logname=aidel
    2524comp=COMP
    2625
    … …  
    3938        --comp) comp="${2}"
    4039                 shift;;
     40        --runstxt) runstxt="${2}"
     41                 shift ;;
    4142        --id) CONFIGNAME="${2}"
    4243                 shift;;
    … …  
    5051done
    5152
    52 local=`pwd -P`
    53 
    54 login=`whoami`
    55 hostname=`hostname`
    56 if [ ${hostname:0:5} = cicla ] ; then
    57 DODSDIR=/thredds/ipsl
    58 HTML=http://vesg.ipsl.upmc.fr/thredds/fileServer/IPSLFS/$login/lmdz/MultiSimu/$comp
    59 machine=ciclad
    60 fi
    61 if [ ${hostname:0:5} = camel ] ; then
    62 DODSDIR=/thredds/ipsl
    63 fi
    64 if [ ${hostname:0:5} = irene ] ; then
    65 DODSDIR=
    66 fi
    67 if [ ${hostname:0:5} = jean- ] ; then
    68 DODSDIR=
    69 fi
    70 
    71 tmpdir=$DODSDIR/$login/lmdz
     53###tmpdir=/thredds/ipsl/fabric/lmdz
     54tmpdir=/thredds/ipsl/fabric/lmdz
    7255EXPNAME=B96x95x39/V20090611.dev/
    7356ROOTWORK=$tmpdir
    7457ROOTWEBORIG=""
    7558EXPNAME=IGCM_OUT/$CONFIGNAME/DEVT/clim
     59machine=ciclad
     60
    7661
    7762STORAGE=$ARCHIVE
    … …  
    8065HTML_D=$ROOTSTORAGE/HTML
    8166
     67machine=ciclad
     68
    8269if [ "$machine" = "ciclad" ] ; then
    8370EXPNAME=NPV5LRL79
    8471put=cp
    85 CICLAD=$DODSDIR/$login/lmdz
     72###CICLAD=/thredds/ipsl/fabric/lmdz
     73CICLAD=/thredds/ipsl/fabric/lmdz
    8674ARCHIVE=$CICLAD/STORE
    8775workdir=$CICLAD/WORK
    8876STORAGE=$CICLAD
    89 ROOTWEBatlas=http://vesg.ipsl.upmc.fr/thredds/fileServer/IPSLFS/$login/lmdz/STORE/$EXPNAME
    90 MULTIDIR=$DODSDIR/$login/lmdz/MultiSimu
     77ROOTWEBatlas=http://thredds-su.ipsl.fr/thredds/fileServer/ipsl_thredds/fabric/lmdz/STORE/$EXPNAME
     78###MULTIDIR=/thredds/ipsl/fabric/lmdz/MultiSimu
     79MULTIDIR=/thredds/ipsl/fabric/lmdz/MultiSimu
    9180COMP_D=$MULTIDIR/$comp
    9281DEF_FILE=$COMP_D/def.txt
    9382HTML_D=$COMP_D
    94 runstxt=$local/runs.txt
     83#runstxt=/home/fabric/LMDZ/MultiSimu/runs.txt
    9584fi
    9685
    … …  
    9988ROOTDODS=DODS/pub/$LOGNAME/$CONFIGNAME
    10089ROOTWEB="http://dodsp.idris.fr/$LOGNAME/$EXPNAME"
    101 ROOTWEB_PRODout=https://vesg.ipsl.upmc.fr/thredds/catalog/store_thredds/aidel/LMDZOR/DEVT/clim
     90# http://dods.extra.cea.fr/work/aidel/IGCM_OUT/LMDZOR/DEVT/clim/AR5.0lr/ATM/Analyse/COSP/Calipso/1982-1989
     91#ROOTWEB_PROD=http://dods.extra.cea.fr/work/aidel/IGCM_OUT/LMDZOR/DEVT/clim
     92ROOTWEB_PROD=http://esgf.extra.cea.fr/thredds/catalog/work/aidel/IGCM_OUT/LMDZOR/DEVT/clim
     93ROOTWEB_PROD=https://thredds-su.ipsl.fr/thredds/catalog/work/aidel/IGCM_OUT/LMDZOR/DEVT/clim
     94ROOTWEB_PROD=https://thredds-su.ipsl.fr/thredds/catalog/store_thredds/aidel/IGCM_OUT/LMDZOR/DEVT/clim
     95ROOTWEB_PRODout=https://thredds-su.ipsl.fr/thredds/catalog/store_thredds/aidel/LMDZOR/DEVT/clim
     96#STOREWEB_PROD=http://dods.extra.cea.fr/store/aidel/IGCM_OUT/LMDZOR/DEVT/clim
     97#STOREWEB_PROD=http://esgf.extra.cea.fr/thredds/catalog/store/aidel/IGCM_OUT/LMDZOR/DEVT/clim
    10298STOREWEB_PROD=http://esgf.extra.cea.fr/thredds/catalog/store_thredds/aidel/IGCM_OUT/LMDZOR/DEVT/clim
    10399STOREWEB_PRODold=http://esgf.extra.cea.fr/thredds/catalog/store/aidel/IGCM_OUT/LMDZOR/DEVT/clim
     100#ROOTWEBatlas=http://dods.idris.fr/$LOGNAME/$CONFIGNAME/DEVT/clim
    104101if [ "$ROOTWEBORIG" = "" ] ; then
    105102ROOTWEBORIG=ROOTWEBlibigcm
    … …  
    126123longc="" ; i=0 ; while [ $i != $longn ] ; do (( i = $i + 1 )) ; longc="$longc"_ ; done
    127124
    128 if [ ! -d $STORAGE/HTML ] ; then mkdir -p $STORAGE/HTML ; fi
    129 htmlfile=$STORAGE/HTML/tmp.html   ; rm -f $htmlfile ; touch $htmlfile
    130 errfile=$STORAGE/HTML/tmphtml$$.err ; rm -f $errfile  ; touch $errfile
     125htmlfile=$CICLAD/HTML/tmp.html   ; rm -f $htmlfile ; touch $htmlfile
     126errfile=$CICLAD/HTML/tmphtml$$.err ; rm -f $errfile  ; touch $errfile
    131127D_work=$ROOTWORK/tmp_makehtml$$ ; rm -rf $D_work ; mkdir -p $D_work
    132128emptyelt='<td> - </td>'
     129
    133130cat <<eod>| $htmlfile
    134131<table cellpadding="2" cellspacing="2" border="1"
    … …  
    136133margin-right: auto;">
    137134<tr>
    138 <td><a href="$HTML/def.txt"> RUN (link to outputs)  </a></td>
     135<td><a href="https://thredds-su.ipsl.fr/thredds/fileServer/ipsl_thredds/fabric/lmdz/MultiSimu/$comp/def.txt"> RUN (link to outputs)  </a></td>
    139136<td> Atlas YEAR</td>
    140137<td> Atlas --DJF-- </td>
    141138<td> Atlas --JJA-- </td>
     139<td> Atlas --MAM-- </td>
     140<td> Atlas --SON-- </td>
    142141<td> Description of the simulation $longc </td>
    143142<td> Period </td>
    … …  
    154153echo '<tr>' >> $htmlfile
    155154echo "<td> CLIMATOS </td>" >> $htmlfile
     155echo "<td>        </td>" >> $htmlfile
     156echo "<td>        </td>" >> $htmlfile
    156157echo "<td>        </td>" >> $htmlfile
    157158echo "<td>        </td>" >> $htmlfile
    … …  
    176177    sim=`echo $line | awk ' { print $1 } '`
    177178    simdir=`grep -w "^$sim "  $runstxt | awk ' { print $2 } '`
     179    echo simdir $simdir
    178180    run=`basename $simdir `
    179181    years=`echo $line | awk ' { print $2 } '`
     182#    years=`grep '^'$run' ' $DEF_FILE | awk ' { print $2 }'`
    180183    yearsb=`echo $years | sed -e 's/_/-/'`
    181184    echo run $run
    … …  
    187190NCFILE=${run}_SE_${years}_1M_histmth.nc
    188191
     192# AI partie rapat
     193#$home/Diagnos_v6/dods_publi.sh $EXPNAME/$run/DEBUG
     194#Mettre les sorties sur dods
     195#$home/Diagnos_v6/dods_publi.sh $EXPNAME/$run/ATM/Output
     196#Mettre les sorties sur dods les restart
     197#$home/Diagnos_v6/dods_publi.sh $EXPNAME/$run/RESTART
     198
     199
    189200#--------------------------------------------------------------------------
    190201# Liens vers les fichiers, monitoring et atlas
    191202#--------------------------------------------------------------------------
     203#    echo "<td><a href=\"$ROOTWEBatlas/"$run"\"> "$run" </a></td>" >> $htmlfile
    192204    echo "<td><a href=\"$ROOTWEB_PRODout/"$run"/catalog.html\"> "$sim" </a></td>" >> $htmlfile
    193205
    … …  
    198210     if [ 1 = 1 ] ; then
    199211
    200             for SEAS in YEAR DJF JJA ; do
     212            for SEAS in YEAR DJF JJA MAM SON ; do
    201213               echo '<td>' >> $htmlfile
    202214               for PROJ in GLOB NH SH ; do
    … …  
    209221                     atlasf=$ROOTSTORAGE/$run/ATLAS/SE_$years/ATM/$atlas
    210222                 fi
    211 # ATTENTION A REFAIRE EN FONCTION DE LA MACHINE
    212                  atlas_html=`echo $atlasf | sed -e 's:/thredds/ipsl/:http\://vesg.ipsl.upmc.fr/thredds/fileServer/IPSLFS/:'`
     223                 ###atlas_html=`echo $atlasf | sed -e 's:/thredds/ipsl/:http\://thredds-su.ipsl.fr/thredds/fileServer/ipsl_thredds/:'`
     224                 atlas_html=`echo $atlasf | sed -e 's:/thredds/ipsl/:http\://thredds-su.ipsl.fr/thredds/fileServer/ipsl_thredds/:'`
    213225                 echo atlas_html $atlas_html
    214226                 echo atlasf $atlasf
    … …  
    244256echo OK0
    245257   if [ $glob = 1 ] ; then
    246      echo OK GGGGGGGGGGGGG $glob
    247      listeval=""
    248      echo LISTEVAR $listevar
    249      for var in $listevar ; do
    250      echo $ROOTWORK/VLR/YEAR/${sim}_$years/METRICS/glob
    251           if [ -f "$ROOTWORK/VLR/YEAR/${sim}_$years/METRICS/glob" ] ; then
     258      echo OK GGGGGGGGGGGGG $glob
     259      listeval=""
     260      echo LISTEVAR $listevar
     261#      echo NCFILE $NCFILE
     262      for var in $listevar ; do
     263      echo $ROOTWORK/VLR/YEAR/${sim}_$years/METRICS/glob
     264#          if [ -f "$ROOTSTORAGE/$run/ATM/Analyse/Bilans/$years/${run}_bilans.data" ] ; then
     265#           if [ -f "$ROOTWORK/VLR/YEAR/${run}_$years/METRICS/glob" ] ; then
     266           if [ -f "$ROOTWORK/VLR/YEAR/${sim}_$years/METRICS/glob" ] ; then
    252267              val=`grep "^$var " $ROOTWORK/VLR/YEAR/${sim}_$years/METRICS/glob | awk ' { print $2 }' `
    253268            echo $val
    … …  
    262277echo LISTEVAL $listeval
    263278
     279
    264280###########################################################################
    265281# FIN DE LA BOUCLE SUR LES SIMULATIONS
    … …  
    305321
    306322mkdir -p $HTML_D
    307 $put $htmlfile $HTML_D/Table_simulations_${comp}.html
    308 echo $put $htmlfile $HTML_D/Table_simulations_${comp}.html
    309 
     323$put $htmlfile $HTML_D/Table_simulations_$comp.html
     324echo $put $htmlfile $HTML_D/Table_simulations_$comp.html
     325
     326#$home/Diagnos_v6/dods_publi.sh $EXPNAME/HTML

  • BOL/Multi_atlas/make_index_html.sh

    r3916 r4307  
    55
    66login=`whoami`
    7 login=${login}
    8 
    9 local=`pwd -P`
    10 runstxt=$local/runs.txt
    11 echo runstxt= $runstxt
    12 
    13 login=${login}
    147DODSDIR=/thredds/ipsl
    158
    … …  
    2518ref=OBS
    2619elif [ $dataref = 0 ]; then
    27 ref=`head -1 ${COMP_D}/def.txt | awk ' { print $1 } '`
     20ref=`head -1 ${COMP_D}/def.txt | awk ' { print $1"_"$2 } '`
    2821fi
     22
     23echo dataref=$dataref
     24echo ref=$ref
    2925
    3026DEF_FILE=$COMP_D/def.txt ; if [ ! -f $DEF_FILE ] ; then echo renseigner $DEF_FILE ; exit ; fi
    … …  
    6965          ta) titre='Air Temperature' ;;
    7066          ua) titre='Zonal wind' ;;
    71           hur) titre='Specific Humidity' ;;
    72           hurs) titre='Surface Specific Humidity' ;;
     67          hur) titre='Relative Humidity' ;;
     68          hurs) titre='Surface Relative Humidity' ;;
     69          psl) titre='Sea level pressure' ;;
     70          albs) titre='Surface albedo' ;;
    7371          *) titre=${var} ;;
    7472esac
    … …  
    8280cp var_html.html "${var}"_html.html
    8381
    84 echo var=$var"endvar" titre=$titre"endtitre"
     82#echo var=$var"endvar" titre=$titre"endtitre"
    8583sed -i -e "s/VAR/${var}/g" ${var}_html.html
    8684sed -i -e "s/TITRE/${titre}/g" ${var}_html.html
    … …  
    8987sed -i -e "s/SEASON/"${seas}"/g" ${var}_html.html
    9088sed -i -e "s/DREF/"${ref}"/g" ${var}_html.html
     89sed -i -e "s/REGION/"${proj}"/g" ${var}_html.html
    9190listvar="$listvar ${var}_html.html"
    9291done
    9392cat entete_html.html ${listvar} suff_html.html > ${COMP_D}/ATLAS/index_${proj}_${seas}_${sim}.html
     93echo \rm ${listvar}
     94\rm ${listvar}
    9495(( il = $il + 1 ))
    9596done
     97
    9698done
    9799
    98 for var in $varg; do
    99 echo \rm ${var}_html.html
    100 done
    101100
    102101exit

  • BOL/Multi_atlas/multi_ZONE.sh

    r3882 r4307  
    7272echo $SEAS $outd "$sims"
    7373
    74 vars='psl'
    75 #vars="pr 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 cltcalipso clhcalipso clmcalipso cllcalipso hurs hfss rldscs rlds rlus rsdscs rsds rsus rsuscs rsutcs prw"
    76 #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"
    77 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 rttcs rsttcs cllcalipso clmcalipso clhcalipso cll clm clh"
     74vars="pr prw rstt rlut rtt crelt crest crett hfns hfls eva 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"
    7875echo $vars
    7976
    … …  
    168165ii=0
    169166for style in 1 3 2 ; do
    170 for color in 1 2 3 4 9 8 10 ; do
     167for color in 1 2 3 4 9 8 10 11 12 5 6 ; do
    171168(( ii = $ii + 1 ))
    172169cat <<eod>> tmp.param

  • BOL/Multi_atlas/multi_atlas.sh

    r3915 r4307  
    2222if [ ${hostname:0:5} = cicla ] ; then
    2323DODSDIR=/thredds/ipsl
    24 HTML=http://vesg.ipsl.upmc.fr/thredds/fileServer/IPSLFS/$login/lmdz/MultiSimu/$comp
     24dthredds=thredds-su.ipsl.fr/thredds/fileServer/ipsl_thredds
     25HTML=http://${dthredds}/$login/lmdz/MultiSimu/$comp
     26fi
     27if [ ${hostname:0:5} = spiri ] ; then
     28DODSDIR=/thredds/ipsl
     29dthredds=thredds-su.ipsl.fr/thredds/fileServer/ipsl_thredds
     30HTML=http://${dthredds}/$login/lmdz/MultiSimu/$comp
    2531fi
    2632if [ ${hostname:0:5} = camel ] ; then
    … …  
    4551sref=$COMP_D/ATLAS/index_${proj}_${season}_${ref}.html
    4652
    47 sed -i -e "s:thredds\/ipsl:thredds\/fileServer\/IPSLFS:g" ${sref}
     53sed -i -e "s:thredds\/ipsl:thredds\/fileServer\/ipsl_thredds:g" ${sref}
    4854#############################################################################
    4955
    … …  
    111117      # Inclusion des moyennes zonales
    112118      if [ -f $ZON_DIR/${var}zon.png ] ; then
    113           thredds=/thredds/fileServer/IPSLFS/fabric/lmdz/MultiSimu/$comp/ZON/${var}zon.png
     119          thredds=/thredds/fileServer/ipsl_thredds/fabric/lmdz/MultiSimu/$comp/ZON/${var}zon.png
    114120          echo '<TD ALIGN=RIGHT><A HREF="'$thredds'"><IMG HEIGHT=200 WIDTH=200 SRC="'$thredds'"></a></TD>' >> $compf
    115121      else

  • BOL/Multi_atlas/webpage_multi.sh

    r3745 r4307  
    1212hostname=`hostname`
    1313if [ ${hostname:0:5} = cicla ] ; then
    14 DODSDIR=/modfs/ipslfs/dods
    15 HTML=https://vesg.ipsl.upmc.fr/thredds/fileServer/IPSLFS/$login/lmdz/MultiSimu/$comp
     14DODSDIR=/thredds/ipsl
     15dthredds=thredds-su.ipsl.fr/thredds/fileServer/ipsl_thredds
     16HTML=https://${dthredds}/$login/lmdz/MultiSimu/$comp
     17fi
     18if [ ${hostname:0:5} = spiri ] ; then
     19DODSDIR=/thredds/ipsl
     20dthredds=thredds-su.ipsl.fr/thredds/fileServer/ipsl_thredds
     21HTML=https://${dthredds}/$login/lmdz/MultiSimu/$comp
    1622fi
    1723if [ ${hostname:0:5} = camel ] ; then
Note: See TracChangeset for help on using the changeset viewer.