Changeset 1569 in lmdz_wrf for trunk

Timestamp:

May 12, 2017, 1:49:52 PM (8 years ago)

Author:

lfita

Message:

Changing ':' character for files list by '#'.
Adding checking also files values

Location:

trunk/tools

Files:

• documentation/plotting/time_lag.html (modified) (2 diffs)
• drawing.py (modified) (1 diff)

trunk/tools/documentation/plotting/time_lag.html

@@ -20 +20 @@
     <DIV CLASS="valhelp">
     draw_time_lag(ncfile, values)<BR>
-    &nbsp;&nbsp;ncfile = ':' list of couples ('%' formed) [prefilen];[predslice];[pretvarn];[prevarn]%[futfilen];<BR>
+    &nbsp;&nbsp;ncfile = '#' list of couples ('%' formed) [prefilen];[predslice];[pretvarn];[prevarn]%[futfilen];<BR>
     &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[futdslice];[futtvarn];[futvarn]<BR>
     &nbsp;&nbsp;&nbsp;&nbsp;'pre': values to act as previous values<BR>
@@ -118 +118 @@
     <DIV CLASS="valins">
       * Plotting with cloud of points <BR>
-      &nbsp;&nbsp;$ python ${pyHOME}/drawing.py -o draw_time_lag -f 'Forcing_rainstats_OKstomate_SESA_norm_meanstd_stat2.nc;time_centered,-1;time_counter;rainnorm%DiPolo_evapstats_SESA_norm_meanstd_OKstomate.nc;time_counter,-1|stats,2;time_counter;evapnorm:Forcing_rainstats_OKstomate_SACZ_norm_meanstd_stat2.nc;time_centered,-1;time_counter;rainnorm%DiPolo_evapstats_SACZ_norm_meanstd_OKstomate.nc;time_counter,-1|stats,2;time_counter;evapnorm' -S 'auto;centered;pr;1;evap;1;-5,5;-2,2;year|seconds!since!1958-01-01!00:00:00|exct,5,y|%Y;SESA,SACZ;simplepts,1,#AA0000@#0000AA,x,2.;1-month!time-lag!at!SACZ!between!pr!&!evap!normalized!by!mean/stddev;0|12;png;mon1_timelag_pr-evap_SACZ;yes' <BR>
+      &nbsp;&nbsp;$ python ${pyHOME}/drawing.py -o draw_time_lag -f 'Forcing_rainstats_OKstomate_SESA_norm_meanstd_stat2.nc;time_centered,-1;time_counter;rainnorm%DiPolo_evapstats_SESA_norm_meanstd_OKstomate.nc;time_counter,-1|stats,2;time_counter;evapnorm#Forcing_rainstats_OKstomate_SACZ_norm_meanstd_stat2.nc;time_centered,-1;time_counter;rainnorm%DiPolo_evapstats_SACZ_norm_meanstd_OKstomate.nc;time_counter,-1|stats,2;time_counter;evapnorm' -S 'auto;centered;pr;1;evap;1;-5,5;-2,2;year|seconds!since!1958-01-01!00:00:00|exct,5,y|%Y;SESA,SACZ;simplepts,1,#AA0000@#0000AA,x,2.;1-month!time-lag!at!SACZ!between!pr!&!evap!normalized!by!mean/stddev;0|12;png;mon1_timelag_pr-evap_SACZ;yes' <BR>
       * Plotting with connected lines <BR>
-      &nbsp;&nbsp;$ python ${pyHOME}/drawing.py -o draw_time_lag -f 'Forcing_rainstats_OKstomate_SESA_norm_meanstd_stat2.nc;time_centered,-1;time_counter;rainnorm%DiPolo_evapstats_SESA_norm_meanstd_OKstomate.nc;time_counter,-1|stats,2;time_counter;evapnorm:Forcing_rainstats_OKstomate_SACZ_norm_meanstd_stat2.nc;time_centered,-1;time_counter;rainnorm%DiPolo_evapstats_SACZ_norm_meanstd_OKstomate.nc;time_counter,-1|stats,2;time_counter;evapnorm' -S 'auto;centered;pr;1;evap;1;-5,5;-2,2;year|seconds!since!1958-01-01!00:00:00|exct,5,y|%Y;SESA,SACZ;shadTline,1,spectral,%s,horizontal,-@-.,2.,x,2.;6-month!time-lag!at!SACZ!between!pr!&!evap!normalized!by!mean/stddev;0|12;png;mon6_timelag_pr-evap_SACZ_shadline;yes' <BR>
+      &nbsp;&nbsp;$ python ${pyHOME}/drawing.py -o draw_time_lag -f 'Forcing_rainstats_OKstomate_SESA_norm_meanstd_stat2.nc;time_centered,-1;time_counter;rainnorm%DiPolo_evapstats_SESA_norm_meanstd_OKstomate.nc;time_counter,-1|stats,2;time_counter;evapnorm#Forcing_rainstats_OKstomate_SACZ_norm_meanstd_stat2.nc;time_centered,-1;time_counter;rainnorm%DiPolo_evapstats_SACZ_norm_meanstd_OKstomate.nc;time_counter,-1|stats,2;time_counter;evapnorm' -S 'auto;centered;pr;1;evap;1;-5,5;-2,2;year|seconds!since!1958-01-01!00:00:00|exct,5,y|%Y;SESA,SACZ;shadTline,1,spectral,%s,horizontal,-@-.,2.,x,2.;6-month!time-lag!at!SACZ!between!pr!&!evap!normalized!by!mean/stddev;0|12;png;mon6_timelag_pr-evap_SACZ_shadline;yes' <BR>
       * Plotting with grouped lines <BR>
-      &nbsp;&nbsp;$ python ${pyHOME}/drawing.py -o draw_time_lag -f 'Forcing_rainstats_OKstomate_SESA_norm_meanstd_stat2.nc;time_counter,0@63@1;time_counter;rainnorm%DiPolo_evapstats_SESA_norm_meanstd_OKstomate.nc;time_counter,0@63@1|stats,2;time_counter;evapnorm:Forcing_rainstats_OKstomate_SACZ_norm_meanstd_stat2.nc;time_counter,0@63@1;time_counter;rainnorm%DiPolo_evapstats_SACZ_norm_meanstd_OKstomate.nc;time_counter,0@63@1|stats,2;time_counter;evapnorm' -S 'auto;centered;pr;1;evap;1;-2.2,5;-2,2;year|seconds!since!1958-01-01!00:00:00|exct,1,y|%Y;SESA,SACZ;repeatPeriod,1,12,spectral,%s,horizontal,-@-.,2.,x,2.;1-month!time-lag!at!SACZ!between!pr!&!evap!normalized!by!mean/stddev;0|12;png;mon1_timelag_pr-evap_SACZ_repeatPeriod;yes'
+      &nbsp;&nbsp;$ python ${pyHOME}/drawing.py -o draw_time_lag -f 'Forcing_rainstats_OKstomate_SESA_norm_meanstd_stat2.nc;time_counter,0@63@1;time_counter;rainnorm%DiPolo_evapstats_SESA_norm_meanstd_OKstomate.nc;time_counter,0@63@1|stats,2;time_counter;evapnorm#Forcing_rainstats_OKstomate_SACZ_norm_meanstd_stat2.nc;time_counter,0@63@1;time_counter;rainnorm%DiPolo_evapstats_SACZ_norm_meanstd_OKstomate.nc;time_counter,0@63@1|stats,2;time_counter;evapnorm' -S 'auto;centered;pr;1;evap;1;-2.2,5;-2,2;year|seconds!since!1958-01-01!00:00:00|exct,1,y|%Y;SESA,SACZ;repeatPeriod,1,12,spectral,%s,horizontal,-@-.,2.,x,2.;1-month!time-lag!at!SACZ!between!pr!&!evap!normalized!by!mean/stddev;0|12;png;mon1_timelag_pr-evap_SACZ_repeatPeriod;yes'
     </DIV>
   </BODY>

trunk/tools/drawing.py

@@ -7408 +7408 @@
         ifile=0
         for fdv in prefutdv:
+            expectargs = '[prefilen];[predslice];[pretvarn];[prevarn]%[futfilen];' + \
+              '[futdslice];[futtvarn];[futvarn]'
+            drw.check_arguments('filevalues: '+fname, fdv, expectargs,';')
+            
             filen = fdv.split(';')[0]
             dimrange = fdv.split(';')[1]