Changeset 118 for trunk

Timestamp:

08/07/08 12:49:54 (16 years ago)

Author:

ericg

Message:

Added 6mm support

Location:

trunk/procs

Files:

• def_month.pro (modified) (1 diff)
• plt_map.pro (modified) (5 diffs)
• search_time_file.pro (modified) (1 diff)

trunk/procs/def_month.pro

@@ -81 +81 @@
             ENDELSE 
       END 
+      '6m': BEGIN 
+         IF strpos(timave, '6mm') GT -1 THEN BEGIN 
+            CASE strmid(date, strlen(date)-2, 2) OF 
+               '01': mn = 'JFMAMJ'
+               '02': mn = 'JASOND'
+               ELSE: mn = '??????'
+            ENDCASE 
+         ENDIF 
+      END 
       ELSE:
    ENDCASE  

trunk/procs/plt_map.pro

@@ -29 +29 @@
 ;
    trend_typp = cmd.trend
-;   CASE cmd.timave OF
-;      '1mm': cmd.trend = '0'
-;      '3mm': cmd.trend = '0'
-;      ELSE:
-;   ENDCASE 
 ;
 ; =============
@@ -420 +415 @@
       'yfx': varlegend2 = field.legend2+trd_txt+' ('+field.units2+')'
       'ybinx': BEGIN 
-         IF strmid(cmd2.trend, 0, 1) EQ '4' THEN varlegend = field.legend2+trd_txt+' ('+field.units+')' $
-          ELSE varlegend = field.legend2+' ('+field.units+')'
-         varlegend2 = field.legend+trd_txt+' ('+field.units2+')' 
+         IF strmid(cmd2.trend, 0, 1) EQ '4' THEN varlegend = field.legend2+trd_txt+' ('+field.units2+')' $
+          ELSE varlegend = field.legend2+' ('+field.units2+')'
+         varlegend2 = field.legend+trd_txt+' ('+field.units+')' 
       END 
       ELSE: BEGIN 
@@ -441 +436 @@
          mn = def_month(cmd.timave, cmd.date1)
          IF strmid(cmd.timave, 0, 3) EQ '3mm' THEN $
+          date_txt = mn+' ('+strmid(cmd.date1, 3, strlen(cmd.date1)-3)+')' $
+         ELSE date_txt = mn+' '+strmid(cmd.date1, 0, strlen(cmd.date1)-2)
+      END 
+      '6m': BEGIN
+         mn = def_month(cmd.timave, cmd.date1)
+         IF strmid(cmd.timave, 0, 3) EQ '6mm' THEN $
           date_txt = mn+' ('+strmid(cmd.date1, 3, strlen(cmd.date1)-3)+')' $
          ELSE date_txt = mn+' '+strmid(cmd.date1, 0, strlen(cmd.date1)-2)
@@ -715 +716 @@
    IF iover EQ 1 THEN com_strplt = com_strplt+contour_options
 
-   IF debug_w THEN print, '   cmd before making output in plt_map = ', cmd
-
+   IF debug_w THEN print, '   Cmd before making output in plt_map = ', cmd
+
+   IF debug_w THEN print, '   We are in plt_map: '
+   @zoom_indices_debug
 
 ; ============================
@@ -815 +818 @@
                   ;; For 2D plots with overlays (correlation and proba for instance)
                   ;; Scratch the titles and define contours style for the second plot
+
                   IF nover GT 1 AND iover GT 1 THEN BEGIN
                      contour_style = ',c_thick=2,c_linestyle=2,c_charthick=2'

trunk/procs/search_time_file.pro

@@ -14 +14 @@
    suff_var = ''
 
-   CASE cmd.timave OF
-      '1mm': meanm = 'yes'
-      '3mm': meanm = 'yes'
-      ELSE: meanm = 'no'
-   ENDCASE
+   IF strpos(cmd.timave, 'mm') NE -1 THEN meanm = 'yes' ELSE meanm = 'no'
 
    CASE meanm OF