Changeset 3745 for BOL

Timestamp:

Jul 1, 2020, 9:31:32 PM (4 years ago)

Author:

idelkadi

Message:

Repository under svn of a first version of Multiatlas diagnostics for LMDZ. This version is adapted to be able to run a LMDZ multiatlas on an individual account on the ciclad machine of the IPSL. In this version, the parts to be modified are identified so as to subsequently adapt it to other machines.
Update atlas scripts

Location:

BOL/Multi_atlas

Files:

• AFAIRE (modified) (1 diff)
• Utils/multi.sh (modified) (1 diff)
• atlas/atlas.sh (modified) (1 diff)
• atlas/lmdz_SE.py (modified) (1 diff)
• install_multi_atlas.sh (modified) (8 diffs)
• multi_atlas.sh (modified) (4 diffs)
• webpage_multi.sh (modified) (2 diffs)

BOL/Multi_atlas/AFAIRE

@@ -42 +42 @@
 Mise en service de http://esgf.cines.fr/thredds prévue ultérieurement
 
-2. cmor.sh et season.sh a tester
+2. cmor.sh et season.sh :  ok
 
 3. atlas classique :

BOL/Multi_atlas/Utils/multi.sh

@@ -396 +396 @@
    done
    done
-exit
-   cd $COMP_D
+#exit
+#   cd $COMP_D
 #   ln -sf BIASYEAR.html  $comp.html
-   ln -sf ACCUEIL.html  $comp.html
-fi
+#   ln -sf ACCUEIL.html  $comp.html
 cd $local
 ./webpage_multi.sh $comp
+
+fi

BOL/Multi_atlas/atlas/atlas.sh

@@ -1 @@
-#PBS -N atlas
-#PBS -m a
-#PBS -j oe
-#PBS -q h12
-#PBS -o atlasNOMSIMULATION.out
-#PBS -S /bin/bash
-#PBS -l nodes=1:ppn=1
-#PBS -l mem=30gb
-#PBS -l vmem=30gb
-#
-# Commande pour soumettre en bash
-submit=qsub
-
-login=aidelkad
-DODSDIR=/modfs/ipslfs/dods
 #PBS -N atlas
 #PBS -m a

BOL/Multi_atlas/atlas/lmdz_SE.py

@@ -40 +40 @@
 # Definitions pour l'acces aux obs gérées par Ionela
 #########################################################################################
-cproject('OBS', ('period','fx'),   ('root','/modfs/ipslfs/dods/aidelkad/lmdz/SE/CMOR/OBS'))  #, '/data/musat/LMDZ6/SE/CMOR/OBS'))
+cproject('OBS', ('period','fx'),   ('root','/modfs/ipslfs/dods/fabric/lmdz/SE/CMOR/OBS'))  #, '/data/musat/LMDZ6/SE/CMOR/OBS'))
 dataloc(project='OBS',url='${root}/${variable}.nc')
 # Définiton de variables dérivées pour ce projet

BOL/Multi_atlas/install_multi_atlas.sh

@@ -5 +5 @@
 # Reprise Mars 2020
 # installer les scripts de post-traitement multi-atlas pour LMDZ sur une machine
-# le packege sera integrer sous svn aux sources du modele ..../BOL/
+# le packege sera integre sous svn aux ..../BOL/Multi-Atlas
 # Ce script permet de definir les differents repertoires en fonction de la machine
 # Permet de creer les sscripts job_multi.sh et 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'
@@ -19 +21 @@
 
 #set -x
-# Nom machine et compte
+# Nom machine et login
 hostname=`hostname`
 login=`whoami`
@@ -32 +34 @@
 # Rep ou se trouve les sorties cmorizees
 ROOT_SIM_DIR=$DODSDIR/$login/lmdz/SE/ORIG
-ROOT_OBS_DIR=$DODSDIR/$login/lmdz/SE/CMOR/OBS
+ROOT_OBS_DIR=$DODSDIR/fabric/lmdz/SE/CMOR/OBS
 if [ ! -d $MULTIDIR ] ; then mkdir -p $MULTIDIR ; fi
-
-# Def entete des job 
+# Def entete des jobs 
 cat <<eod >> entete.sh
 #PBS -N atlas
@@ -103 +104 @@
 fi
 
-# JEAN-
+# JEAN-ZAY
 if [ ${hostname:0:5} = jean- ] ; then
 cat <<eod > definerep.sh
@@ -133 +134 @@
 
 # PC (formation et perso linux)
-
 # Machines locales lmd
 
@@ -140 +140 @@
 echo -e "${noir}%%%%%%%%%%%%%%%%%%%%%%% ${rougefonce} LMDZ MULTIATLAS ${noir}%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%"
 echo
-echo -e "${vertfonce}"To create your multi-atlas you needs :
+echo -e "${bleufonce}"To create your multi-atlas you needs :
 echo 1.  to create your multiatlas directory "example Multi01" :
 echo     mkdir -p /modfs/ipslfs/dods/$login/lmdz/MultiSimu/Multi01
@@ -153 +153 @@
 echo 3.   Add the link to the simulation outputs in your file : $local/runs.txt
 echo 
+
+### creer le job principal
 rm -f job_multi.sh
 cat entete.sh >| job_multi.sh 
@@ -170 +172 @@
 \mv lmdz_SE.py atlas/.
 
-
 echo 4. Then you can run your multiatlas :
 echo ./job_multi.sh Multi01

BOL/Multi_atlas/multi_atlas.sh

@@ -1 +1 @@
 #!/bin/bash
 
-set -v
+#set -v
 
 login=`whoami`
@@ -59 +59 @@
 echo PROJ $proj
 echo SEASON $season
+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
@@ -122 +123 @@
          years=`echo $sim | sed -e 's/'$simb'//'`
          index=$COMP_D/ATLAS/index_${proj}_${season}_${sim}.html
-        if [ -f $index ] ; then
+#        if [ -f $index ] ; then
          is=`sed -n -e '/<TH ALIGN=LEFT> <li.*.('$var')/=' $index | head -1`
          echo $sim $var $is
@@ -132 +133 @@
             sed -n -e ${isbiais}p $index >> $compf
          fi
-        fi
+#        fi
       done
       echo ' <TR>' >> $compf
    fi
 done
+fi
 
-echo VOTRE MULTIATLAS EST DISPONIBLE SUR $HTML/ACCUEIl.html
+#echo VOTRE MULTIATLAS EST DISPONIBLE SUR $HTML/ACCUEIl.html

BOL/Multi_atlas/webpage_multi.sh

@@ -13 +13 @@
 if [ ${hostname:0:5} = cicla ] ; then
 DODSDIR=/modfs/ipslfs/dods
-HTML=http://vesg.ipsl.upmc.fr/thredds/fileServer/IPSLFS/$login/lmdz/MultiSimu/$comp
+HTML=https://vesg.ipsl.upmc.fr/thredds/fileServer/IPSLFS/$login/lmdz/MultiSimu/$comp
 fi
 if [ ${hostname:0:5} = camel ] ; then
@@ -25 +25 @@
 fi
 
-echo -e "${vertfonce}YOUR MULTIATLAS IS AVAILABLE ON THE PAGE: : "
+echo -e "${noir}%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%"
+echo -e "${bleufonce}YOUR MULTIATLAS IS AVAILABLE ON THE PAGE: : "
 rm -f tmp_web.txt
 cat <<  eod >> tmp_web.txt
-$HTML/ACCUEIl.html
+$HTML/ACCUEIL.html
 eod
 cat tmp_web.txt
+echo -e "${noir}%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%"