Changeset 4341 for BOL

Timestamp:

Nov 10, 2022, 9:58:20 AM (19 months ago)

Author:

musat

Message:

Inclut environnement spirit et dernieres corrections (2/3)
IonelaMusat?

Location:

BOL/Multi_atlas

Files:

• make_html_libigcm.sh (modified) (2 diffs)
• make_index_html.sh (modified) (2 diffs)
• multi_atlas.sh (modified) (6 diffs)
• webpage_multi.sh (modified) (3 diffs)

BOL/Multi_atlas/make_html_libigcm.sh

@@ -3 +3 @@
 #set -x
 
-source ./env.sh
+source ~/env_Multi_atlas.sh
 
 ###########################################################################
@@ -52 +52 @@
 done
 
+HTML=http://${dthredds}/$login/lmdz/MultiSimu/$comp
+MULTIDIR=${DODSDIR}/${login}/lmdz/MultiSimu
 COMP_D=$MULTIDIR/$comp
 DEF_FILE=$COMP_D/def.txt
 HTML_D=$COMP_D
+CICLAD=/thredds/ipsl/${login}/lmdz
+ROOTWORK=$CICLAD
 
 ####################################################################
-if [ 1 == 0 ]; then
-if [ ${hostname:0:5} = cicla ] || [ ${hostname:0:5} = spiri ]; then
-
-###tmpdir=/thredds/ipsl/fabric/lmdz
-tmpdir=/thredds/ipsl/${login}/lmdz
-EXPNAME=B96x95x39/V20090611.dev/
-ROOTWORK=$tmpdir
-ROOTWEBORIG=""
-EXPNAME=IGCM_OUT/$CONFIGNAME/DEVT/clim
-
-STORAGE=$ARCHIVE
-put=mfput
-ROOTWEBatlas=http://dods.idris.fr/$LOGNAME/$EXPNAME
-HTML_D=$ROOTSTORAGE/HTML
-
-DODSDIR=/thredds/ipsl
-dthredds=thredds-su.ipsl.fr/thredds/fileServer/ipsl_thredds
-HTML=http://${dthredds}/$login/lmdz/MultiSimu/$comp
-DODSDIR=/thredds/ipsl
-dthredds=thredds-su.ipsl.fr/thredds/fileServer/ipsl_thredds
-HTML=http://${dthredds}/$login/lmdz/MultiSimu/$comp
-####################################################################
-EXPNAME=NPV5LRL79
-put=cp
-CICLAD=/thredds/ipsl/${login}/lmdz
-ARCHIVE=$CICLAD/STORE
-workdir=$CICLAD/WORK
-STORAGE=$CICLAD
-ROOTWEBatlas=http://thredds-su.ipsl.fr/thredds/fileServer/ipsl_thredds/${logname}/lmdz/STORE/$EXPNAME
-MULTIDIR=/thredds/ipsl/${login}/lmdz/MultiSimu
-COMP_D=$MULTIDIR/$comp
-DEF_FILE=$COMP_D/def.txt
-HTML_D=$COMP_D
-
-ROOTSTORAGE=$ARCHIVE/$EXPNAME
-ROOTDODS=DODS/pub/$LOGNAME/$CONFIGNAME
-ROOTWEB="http://dodsp.idris.fr/$LOGNAME/$EXPNAME"
-# http://dods.extra.cea.fr/work/aidel/IGCM_OUT/LMDZOR/DEVT/clim/AR5.0lr/ATM/Analyse/COSP/Calipso/1982-1989
-#ROOTWEB_PROD=http://dods.extra.cea.fr/work/aidel/IGCM_OUT/LMDZOR/DEVT/clim
-ROOTWEB_PROD=http://esgf.extra.cea.fr/thredds/catalog/work/aidel/IGCM_OUT/LMDZOR/DEVT/clim
-ROOTWEB_PROD=https://thredds-su.ipsl.fr/thredds/catalog/work/aidel/IGCM_OUT/LMDZOR/DEVT/clim
-ROOTWEB_PROD=https://thredds-su.ipsl.fr/thredds/catalog/store_thredds/aidel/IGCM_OUT/LMDZOR/DEVT/clim
-ROOTWEB_PRODout=https://thredds-su.ipsl.fr/thredds/catalog/store_thredds/aidel/LMDZOR/DEVT/clim
-#STOREWEB_PROD=http://dods.extra.cea.fr/store/aidel/IGCM_OUT/LMDZOR/DEVT/clim
-#STOREWEB_PROD=http://esgf.extra.cea.fr/thredds/catalog/store/aidel/IGCM_OUT/LMDZOR/DEVT/clim
-STOREWEB_PROD=http://esgf.extra.cea.fr/thredds/catalog/store_thredds/aidel/IGCM_OUT/LMDZOR/DEVT/clim
-STOREWEB_PRODold=http://esgf.extra.cea.fr/thredds/catalog/store/aidel/IGCM_OUT/LMDZOR/DEVT/clim
-#ROOTWEBatlas=http://dods.idris.fr/$LOGNAME/$CONFIGNAME/DEVT/clim
-if [ "$ROOTWEBORIG" = "" ] ; then
-ROOTWEBORIG=ROOTWEBlibigcm
-fi
-
-echo ROOTSTORAGE $ROOTSTORAGE ROOTWEB $ROOTWEB
-
-fi
-fi
- 
 glob=1
 

BOL/Multi_atlas/make_index_html.sh

@@ -2 +2 @@
 
 comp=$1
-dataref=$2
+ref=$2
 
 login=`whoami`
@@ -15 +15 @@
 COMP_D=$MULTIDIR/$comp
 
+if [ 1 == 0 ]; then
 if [ $dataref = 1 ]; then
 ref=OBS
 elif [ $dataref = 0 ]; then
 ref=`head -1 ${COMP_D}/def.txt | awk ' { print $1"_"$2 } '`
+fi
 fi
 

BOL/Multi_atlas/multi_atlas.sh

@@ -2 +2 @@
 
 #set -v
+
+source ~/env_Multi_atlas.sh
 
 login=`whoami`
@@ -9 +11 @@
 season=$3
 proj=$4
-ref=$5
-shift ; shift ; shift ; shift ; shift
+dref=$5
+ref=$6
+
+shift ; shift ; shift ; shift ; shift ; shift
 
 sims="$*"
+echo sims are: $sims
+
 nsims=$#
-echo REF $ref
-echo SIM $sims
+echo REF $dref
+#echo SIM $sims
+echo SIM are $ref
+#sims="$ref $sims"
+#echo sims are: $sims
 
+if [ 1 == 0 ]; then
 login=`whoami`
-
 hostname=`hostname`
 if [ ${hostname:0:5} = cicla ] ; then
@@ -38 +47 @@
 if [ ${hostname:0:5} = jean- ] ; then
 DODSDIR=
+fi
 fi
 
@@ -67 +77 @@
 echo PROJ $proj
 echo SEASON $season
-if [ -f $sref ] ; then
+#if [ -f $sref ] ; then
 for i in `sed -n -e '/TH ALIGN=LEFT.*.li/=' $sref` ; do
 #for i in `sed -n -e '/<TH ALIGN=LEFT> <li>/=' $sref` ; do
@@ -89 +99 @@
       #####################################################################
       echo '<hr/>' >> $compf
-      echo '<h1> Multi atlas, '$season', simulation de référence : '$ref' ('$bias') </h1>' >> $compf
+      echo '<h1> Multi atlas, '$season', simulation de référence : '$dref' ('$bias') </h1>' >> $compf
      #####################################################################
 
@@ -146 +156 @@
    fi
 done
-fi
+#fi
 
 #echo VOTRE MULTIATLAS EST DISPONIBLE SUR $HTML/ACCUEIl.html

BOL/Multi_atlas/webpage_multi.sh

@@ -2 +2 @@
 
 #set -v
+
+source ~/env_Multi_atlas.sh
+
 # Definition des coleurs d'affichage
 noir='\e[0;30m' gris='\e[1;30m' rougefonce='\e[0;31m' rose='\e[1;31m' vertfonce='\e[0;32m' vertclair='\e[1;32m' orange='\e[0;33m' jaune='\e[1;33m' bleufonce='\e[0;34m' bleuclair='\e[1;34m' violetfonce='\e[0;35m' violetclair='\e[1;35m' cyanfonce='\e[0;36m' cyanclair='\e[1;36m' grisclair='\e[0;37m' blanc='\e[1;37m' neutre='\e[0;m'
@@ -10 +13 @@
 comp=$1
 
+HTML=https://${dthredds}/$login/lmdz/MultiSimu/$comp
+
+if [ 1 == 0 ]; then
 hostname=`hostname`
 if [ ${hostname:0:5} = cicla ] ; then
@@ -30 +36 @@
 DODSDIR=
 fi
+fi
 
 echo -e "${noir}%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%"