Changeset 91

Timestamp:

04/30/08 22:18:52 (16 years ago)

Author:

ericg

Message:

Misc. updates, including making macros with @grid# specs

Location:

trunk/procs

Files:

• def_file_name.pro (modified) (1 diff)
• def_file_suff_var.pro (modified) (1 diff)
• def_grid.pro (modified) (1 diff)
• def_macro_base_fld.pro (modified) (1 diff)
• get_macro_def.pro (modified) (1 diff)
• macro_read.pro (modified) (2 diffs)
• mth_decode.pro (added)
• search_time_file.pro (modified) (3 diffs)

trunk/procs/def_file_name.pro

@@ -40 +40 @@
    ENDCASE 
    IF debug_w THEN print, '     suffix after search_time_file = ', suffix
+   IF debug_w THEN print, '     date1, date2 = ', date1, ' ', date2
    
    file_name = cmd.exp+'_'+timavef+'_'+date1+'_'+date2+suffix+'.nc'

trunk/procs/def_file_suff_var.pro

@@ -5 +5 @@
          CASE cmd.var OF
             '@@voenergy': BEGIN 
+               IF debug_w THEN print, '   cmd.grid in def_file_suff_var = ', cmd.grid
                CASE cmd.grid OF
                   'T': file_suff_var = '_votemper'
                   'T05': file_suff_var = '_votemper'
-                  ELSE: file_suff_var = '_so'
+                 ELSE: file_suff_var = '_so'
                ENDCASE 
             END 

trunk/procs/def_grid.pro

@@ -51 +51 @@
       IF strpos(cmd.var, '@@') NE -1 THEN BEGIN 
          @def_macro_base_fld
-         var_read_grd_file = macro_base_fld
+         var_read_grd_file = macro_base_fld_1
       ENDIF ELSE var_read_grd_file = cmd.var
    ENDIF ELSE var_read_grd_file = cmd.var

trunk/procs/def_macro_base_fld.pro

@@ -2 +2 @@
                   @get_macro_def
                   IF debug_w THEN print, '   macro_def in def_file_suff_var =', macro_def
-                  CASE macro_def[2] OF
-                     'make_stddev': macro_base_fld =  extract_str(line, '\', '/')
-                     'make_grad' : macro_base_fld =  extract_str(line, '\', '/')
-                     'make_ratio' : macro_base_fld =  extract_str(line, '\', '/')
-                     'make_interp' : macro_base_fld =  extract_str(line, '\', '/')     
-                     'make_skewness': macro_base_fld =  extract_str(line, '\', '/')
-                     ELSE: BEGIN 
-                        print, ' Define macro in fld_macro.def'
-                        stop
+                  CASE macro_def[1] OF
+                     '=:': BEGIN
+                        CASE macro_def[2] OF
+                           'make_stddev': macro_base_fld =  extract_str(line, '\', '/')
+                           'make_grad' : macro_base_fld =  extract_str(line, '\', '/')
+                           'make_ratio' : macro_base_fld =  extract_str(line, '\', '/')
+                           'make_interp' : macro_base_fld =  extract_str(line, '\', '/')     
+                           'make_skewness': macro_base_fld =  extract_str(line, '\', '/')
+                           'make_correlation': macro_base_fld =  extract_str(line, '\', '/')
+                           'make_linfit': macro_base_fld =  extract_str(line, '\', '/')
+                           'make_correldomain': macro_base_fld =  extract_str(line, '\', '/')
+                           'make_thdepth': macro_base_fld = 'votemper'
+                           ELSE: BEGIN 
+                              print, ' Define macro in fld_macro.def'
+                              print, ' macro_def[2] is ', macro_def[2]
+                              stop
+                           END 
+                        ENDCASE
                      END 
-                  ENDCASE
+                     ELSE: macro_base_fld = macro_def[1]
+                  ENDCASE 
+                  macro_base_fld_1 = (strsplit(macro_base_fld, ',', /EXTRACT))[0]

trunk/procs/get_macro_def.pro

@@ -12 +12 @@
    pos_underscore =  strpos(var_name,'_')
    IF pos_underscore GE 0 THEN BEGIN
-      stddev_mth = STRMID(var_name, pos_underscore + 1, 2)
+      stddev_mth = STRMID(var_name, pos_underscore + 1, 3)
       var_name = STRMID(var_name, 0, pos_underscore)
    ENDIF

trunk/procs/macro_read.pro

@@ -32 +32 @@
             'make_skewness': macro_base_fld =  extract_str(line, '\', '/')
             'make_anomaly': macro_base_fld =  extract_str(line, '\', '/')            
+            'make_correlation': macro_base_fld =  extract_str(line, '\', '/')            
+            'make_linfit': macro_base_fld =  extract_str(line, '\', '/')            
+            'make_correldomain': macro_base_fld =  extract_str(line, '\', '/')            
+            'make_thdepth': macro_base_fld = 'votemper'       
             ELSE: 
          ENDCASE 
          strcall = 'field_lec = '+macro_def[2]+'(file_name, ncdf_db, BOXZOOM = boxzoom, TIME_1 = time_1,  TIME_2 =  time_2, ALL_DATA = all_data, _extra = ex)'
          res = execute(strcall)
+
          fieldo = {name: '', data: field_lec.data, legend: '', units: '', origin: '', dim: 0, direc:''}
          fieldo.name = var_name
@@ -47 +52 @@
       ELSE: BEGIN 
          
-                                ; 2.2 add fields
+        ; 2.2 add fields
          
          mult = 1.

trunk/procs/search_time_file.pro

@@ -64 +64 @@
          WHILE il LE nfiles-1 AND found EQ 0 DO BEGIN
             file = line[il]
+            IF debug_w THEN print, '    line = ', line
             ; remove root directory if exists
             IF strpos(file, '/') NE -1 THEN BEGIN
@@ -78 +79 @@
             dat2 = argvar(3)
 
-;    print, dat1,' ', date1,' ', dat2,' ', date2
+            IF debug_w THEN  print, '    dat1, date1, dat2, date2 ', dat1,' ', date1,' ', dat2,' ', date2
 
             IF strpos(dat1, '_') EQ -1 AND strpos(dat2, '_') EQ -1 AND $
@@ -90 +91 @@
                   date2 = dat2
                   var_file = strpos(file, cmd.var)
-               ENDIF ELSE stop,  'The second date in the name of the file should be higher than the first one in terms of absolute numbers... EXIT search_time_file '
+               ENDIF 
+;ELSE stop,  '***  The second date in the name of the file should be higher than the first one in terms of absolute numbers... EXIT search_time_file '
             ENDIF ELSE BEGIN
                found = 1