Changeset 2031 in lmdz_wrf

Timestamp:

Aug 6, 2018, 5:10:39 PM (7 years ago)

Author:

lfita

Message:

Introducing selection of frequency of markers in `draw_multiWindRose'

Location:

trunk/tools

Files:

• drawing.py (modified) (3 diffs)
• drawing_tools.py (modified) (5 diffs)
• obs-sim_Comparison.bash (modified) (5 diffs)

trunk/tools/drawing.py

@@ -9918 +9918 @@
           'linepoint': consecutive (time, height, level, ...) line-point angle and speed values. Three different species
             'multicol': line-marker color changing according to a third variable [extravarn]
-               values: [extravarn];[lines];[markers];[colbar];[Nang]
+               values: [extravarn];[lines];[markers];[freqmarkers];[colbar];[Nang]
             'multicoltime': line-marker color changing according to a temporal variable [extravarn]
                values: [extravarn];[lines];[markers];[colbar];[Nang];[timekind];[timefmt];[timelabel]
@@ -9934 +9934 @@
              [lines]: '@' separated list of type of lines (matplotlib ref)
              [markers]: '@' separated list of type of markers to use (matplotlib ref)
+             [freqmarkers]: '@' separated list of frequency of drawing markers ('auto' for every 10)
              [cols] = '@' separated list of colors ('#[RR][GG][BB])
              [colbar]: name of the colorbar ('auto' for 'spectral_r')
@@ -9997 +9998 @@
     if lpvals[0] == 'linepoint':
         if lkind == 'multicol':
-            if len(lpvals) != 7:
+            if len(lpvals) != 8:
                 print errormsg
                 print '  ' + fname + ": line-point kind '" + lkind + "' requires " + \
                   "6 values !!"
-                print "    'multiecol';[extravarn];[line];[marker];[colbar];[Nang]"
+                print "    'multiecol';[extravarn];[line];[marker];[freqmarker];" +  \
+                  "[colbar];[Nang]"
                 print '    provided:', lpvals
                 quit(-1)     

trunk/tools/drawing_tools.py

@@ -8855 +8855 @@
         lpvals[>=2]: specific values for the specie Wind Rose
         'linepoint';[kind];[val1];[...;[valN]]: consecutive (time, height, level, ...) line-point angle and speed values
-          'multicol';[extravarn];[lines];[markers];[colbar]
+          'multicol';[extravarn];[lines];[markers];[freqmarkers];[colbar]
           'multicoltime';[extravarn];[lines];[markers];[colbar];[timekind];[timefmt];[timelabel]
           'singlecol';[lines];[markers];[cols]
@@ -8896 +8896 @@
     if lpvals[0] == 'linepoint':
         if lkind == 'multicol':
-            colbar = gen.auto_val(lpvals[5],'spectral_r')
-            Nang = gen.auto_val(lpvals[6],8)
+            colbar = gen.auto_val(lpvals[6],'spectral_r')
+            Nang = gen.auto_val(lpvals[7],8)
             # Setting up colors for each label
             #   From: http://stackoverflow.com/questions/15235630/matplotlib-pick-up-one-color-associated-to-one-value-in-a-colorbar
@@ -8914 +8914 @@
             ltyps = gen.auto_val_list(lpvals[3].split('@'), Nsnds, linekindsauto)
             lmrks = gen.auto_val_list(lpvals[4].split('@'), Nsnds, pointkindsauto)
+            lfrqs = gen.auto_val_list(lpvals[5].split('@'), Nsnds,                   \
+              np.ones((Nsnds), dtype=int)*10)
 
             for isnds in range(Nsnds):
@@ -8921 +8923 @@
                 ltyp = ltyps[isnds]
                 lmrk = lmrks[isnds]
+                lfrq = lfrqs[isnds]
 
                 sndS = labs[isnds]
@@ -8930 +8933 @@
                         plt.plot([ang[ie], ang[ie+1]], [speed[ie], speed[ie+1]],     \
                           ltyp, marker=lmrk, color=labcol, label=gen.latex_text(sndS))
+
+                    if np.mod(ie,lfrq) == 0:
+                        plt.plot([ang[ie], ang[ie+1]], [speed[ie], speed[ie+1]],     \
+                          ltyp, marker=lmrk, color=labcol)
                     else:
                         plt.plot([ang[ie], ang[ie+1]], [speed[ie], speed[ie+1]],     \
-                          ltyp, marker=lmrk, color=labcol)
+                          ltyp, color=labcol)
 
                 ie = dime-1

trunk/tools/obs-sim_Comparison.bash

@@ -913 +913 @@
     figheader=`echo ${valuesfig} | tr '%' ' ' | awk '{print $9}'`
 
-    values='linepoint;multicol;pres;-;'${lmark}';spectral;auto:'${labs}':'
+    values='linepoint;multicol;pres;-;'${lmark}';auto;spectral;auto:'${labs}':'
     values=${values}'WindRose!obs!,!sim!comparison!at!'${stid}'!on!'${timeS}'!UTC:'
     values=${values}${kfig}':auto:''True'
@@ -932 +932 @@
       echo "* "${ofign} >> ${ofilefigs}
       echo python ${pyHOME}/drawing.py -o draw_multiWindRose -f "'"${files}"'"       \
-        -S "'"${values}"'" -v ${sfcv} >> ${ofilefigs}
+        -S "'"${values}"'" >> ${ofilefigs}
       echo " "${ofign} >> ${ofilefigs}
     fi
@@ -1465 +1465 @@
           fstats=`python $pyHOME/nc_var.py -o field_stats -S full,1.e+20,None        \
             -f ${simsndptf} -v pres | grep MAT | grep pres`
-          nsimpres=`echo ${fstats} | awk '{printf ("%d",$3*1000)}'`
+          nsimpres=`echo ${fstats} | awk '{printf ("%d",$3)}'`
         fi
 
@@ -1471 +1471 @@
         obspres=`python $pyHOME/nc_var.py -o varout -f ${obsuavaf} -S time:${it}     \
           -v pres | awk '{print $2}' | tr '\n' ':'`
-        vals=${obspres}',threshold,:,'${nsimpres}
+        Lobspres1=`expr length ${obspres} | awk '{print $1-1}'`
+        vals=${obspres:0:${Lobspres1}}',threshold,:,'${nsimpres}
         kobs=`python ${pyHOME}/generic.py -o inf_operSlist -S ${vals}`
         if test $? -ne 0; then
@@ -1479 +1480 @@
             exit
         fi
-        echo "      obs level of sim npres "${nsimpres}": "${kobs}
+        vals=${obspres:0:${Lobspres1}}',getvalue,:,'${kobs}
+        onpres=`python ${pyHOME}/generic.py -o inf_operSlist -S ${vals}`
+        echo "      obs level of sim npres "${nsimpres}": "${kobs}" "${onpres}
 
         mWRcomplabs='obs,'${expn}