Changeset 176

Timestamp:

Oct 11, 2019, 3:26:01 PM (6 years ago)

Author:

htune

Message:

Minor bug fig in post_*sh. Naj

Location:

src

Files:

• post_plots.sh (modified) (4 diffs)
• post_scores.sh (modified) (4 diffs)

src/post_plots.sh

@@ -2 +2 @@
 
 
-wavemin=1
-wavemax=1
+wavemin=2
+wavemax=2
 nwave=$(( $wavemax - $wavemin + 1))
-wave_inc=2
 
 if [ `python -V   2>&1 | awk ' { print $2 } ' | cut -c1` != 2 ] ; then
@@ -17 +16 @@
         echo $i
         # Computing scores fore all the SCM simulations if not already done
-        if [ ! -f score$i.csv ] ; then echo Runing post_scores.sh first ; pause 10 ; ./post_scores.sh $wavemin $nwave ; fi
+        if [ ! -f score$i.csv ] ; then echo Runing post_scores.sh first ; pause 10 ; ./post_scores.sh $wavemin $wavemax ; fi
         # Compute the mean and max of the ensembles
         for d in WAVE$i/*/* ; do
@@ -42 +41 @@
 iname=0
 
-
+exit
 
 #############################################################################
@@ -150 +149 @@
 
 echo 'list_ens=[\'  >> simus.py
-for wave_ens in $(seq  $wavemin $wave_inc $wavemax) ; do
+for wave_ens in $(seq  $wavemin $wavemax) ; do
 cat <<eod>> simus.py
 'WAVE$wave_ens/'+Case+'/'+SubCase,\\

src/post_scores.sh

@@ -2 +2 @@
 
 wavemin=$1
-nwave=$2
+wavemax=$2
 SCMvsLES=1
 
@@ -8 +8 @@
 
 # Loop on waves
-for wave in $(seq $wavemin $nwave) ; do
+for wave in $(seq $wavemin $wavemax) ; do
 
   if [ $SCMvsLES = 1 ] ; then
@@ -39 +39 @@
           for i in `cat csv.$type` ; do echo $i >> line.$type ; done
      done
+     #paste line.SCM line.mean line.std | sed -n -e '2,$p' | awk ' { print ( $1 - $2 )^2 } ' > tmp
      paste line.SCM line.mean line.std | sed -n -e '2,$p' | awk ' { print ( $1 - $2 )^2 / $3 } ' > tmp
      metrics_scores=`cat tmp` ; metrics_scores=`echo $metrics_scores |sed -e 's/ /,/g'`
@@ -52 +53 @@
 
 mkdir -p XMGR/AVE
-for i in $(seq $wavemin $nwave)  ; do awk -F, ' { print $(NF-1) } ' score$i.csv | sed -e 1d > XMGR/AVE/$i ; done
+for i in $(seq $wavemin $wavemax)  ; do awk -F, ' { print $(NF-1) } ' score$i.csv | sed -e 1d > XMGR/AVE/$i ; done
 if [ XMGR/AVE/0 ] ; then  for ii in $( seq 5 ) ; do cat XMGR/AVE/0 XMGR/AVE/0 >| tt ; \mv -f tt XMGR/AVE/0 ; done ; fi
 cd XMGR/AVE/ ; xmgrace -legend load -log y * -viewport 0.1 0.1 0.8 0.8 -hardcopy -hdevice EPS -printfile tmp.eps  ; epstopdf tmp.eps ; evince tmp.pdf ; cd -
 
 mkdir -p XMGR/MAX
-for i in $(seq $wavemin $nwave)  ; do awk -F, ' { print $(NF) } ' score$i.csv | sed -e 1d > XMGR/MAX/$i ; done
+for i in $(seq $wavemin $wavemax)  ; do awk -F, ' { print $(NF) } ' score$i.csv | sed -e 1d > XMGR/MAX/$i ; done
 if [ XMGR/MAX/0 ] ; then  for ii in $( seq 5 ) ; do cat XMGR/MAX/0 XMGR/MAX/0 >| tt ; \mv -f tt XMGR/MAX/0 ; done ; fi
 cd XMGR/MAX/ ; xmgrace -legend load -log y * -viewport 0.1 0.1 0.8 0.8 -hardcopy -hdevice EPS -printfile tmp.eps  ; epstopdf tmp.eps ; evince tmp.pdf ; cd -
 
 # Diag sur la dernière vague métrique par métrique :
-mkdir -p XMGR/WAVE$nwave
-for i in $(seq 2 $(( $nmetrics + 1 )) ) ; do awk -F, ' { print $'$i' } ' score$nwave.csv | sed -e 1d > XMGR/WAVE$nwave/`sed -n -e 1p  score$nwave.csv | awk -F, ' { print $'$i' } '` ; done
-cd XMGR/WAVE$nwave ; xmgrace -legend load -log y * -viewport 0.1 0.1 0.8 0.8 -hardcopy -hdevice EPS -printfile tmp.eps  ; epstopdf tmp.eps ; evince tmp.pdf ; cd -
+mkdir -p XMGR/WAVE$wavemax
+for i in $(seq 2 $(( $nmetrics + 1 )) ) ; do awk -F, ' { print $'$i' } ' score$wavemax.csv | sed -e 1d > XMGR/WAVE$wavemax/`sed -n -e 1p  score$wavemax.csv | awk -F, ' { print $'$i' } '` ; done
+cd XMGR/WAVE$wavemax ; xmgrace -legend load -log y * -viewport 0.1 0.1 0.8 0.8 -hardcopy -hdevice EPS -printfile tmp.eps  ; epstopdf tmp.eps ; evince tmp.pdf ; cd -
 
 # awk -F, ' { if ( $2 < 4. && $NF < 5 ) { print $1 } } ' score1.csv