Changeset 26

Timestamp:

11/28/07 17:35:42 (16 years ago)

Author:

kolasinski

Message:

Add varexp in data_read, plt_map, mesh_from_file, mesh_orca and mesh_pcmdi

Location:

trunk/procs

Files:

• data_read.pro (modified) (5 diffs)
• def_grid.pro (modified) (2 diffs)
• meshes/mesh_from_file.pro (modified) (3 diffs)
• meshes/mesh_orca.pro (modified) (2 diffs)
• meshes/mesh_pcmdi.pro (modified) (5 diffs)
• plt_map.pro (modified) (1 diff)

trunk/procs/data_read.pro

@@ -10 +10 @@
 ; same data as previous read ?
 
-read = 1
+   IF debug_w THEN print, '   ENTER data_read...'
+   IF debug_w THEN print, '       cmd at top of data_read = ', cmd
+
+   read = 1
 
 IF cmd.var EQ cmd_prev.var AND cmd.grid EQ cmd_prev.grid AND cmd.plt EQ cmd_prev.plt AND cmd.timave EQ cmd_prev.timave AND cmd.date1 EQ cmd_prev.date1 THEN BEGIN 
@@ -70 +73 @@
    ncdf_db = def_dbase(cmd.exp)
 
+   IF debug_w THEN print, '       varexp defined in data_read = ', varexp
+
 ; define file name
 
    def_file_name, cmd, ncdf_db, file_name, delta_t1
 
+   IF debug_w THEN print, '       varexp step 1 in data_read = ', varexp
+
 ; get file if remote
 
    get_file, file_name, ncdf_db
+
+   IF debug_w THEN print, '       varexp step 2 in data_read = ', varexp
 
 ; read grid from file if require (@<grid> option) 
@@ -84 +93 @@
       key_shift_map = key_shift
    ENDIF 
+
+   IF debug_w THEN print, '       varexp step 3 in data_read = ', varexp
 
 ; define data domain
@@ -141 +152 @@
             box_plot = def_box(cmd.plt, 2, legbox, time_stride) 
             domdef, box_plot[0:3], /MEMEINDICES
+            ; force all_data read
+            all_data = 1
          END 
          ELSE: domdef, /MEMEINDICES
@@ -487 +500 @@
 ENDELSE
 
+IF debug_w THEN print, '       varexp before exit in data_read = ', varexp
+IF debug_w THEN print, '   ...EXIT data_read'
+
 return, fldr
 

trunk/procs/def_grid.pro

@@ -73 +73 @@
       file_grid_config = hom_def+'grid_config.def'
       IF debug_w THEN print, '    doing: grep -i "\ '+cmd.grid+' " '+file_grid_config
-      spawn, 'grep -i \ '+cmd.grid+' '+file_grid_config, line
+      spawn, 'grep -i "\ '+cmd.grid+' " '+file_grid_config, line
       line = strcompress(strtrim(line[0], 2)) 
       length = strlen(line)
@@ -279 +279 @@
    IF debug_w THEN print,  '   var_read_grd_file in def_grid: ', var_read_grd_file 
    IF debug_w THEN print,  '   meshlec_type in def_grid:      ', meshlec_type
+   IF debug_w THEN print,  '   varexp in def_grid:            ', varexp
    IF debug_w THEN print,  '  ...EXIT def_grid'
   

trunk/procs/meshes/mesh_from_file.pro

@@ -17 +17 @@
    sm_file = hom_idl+'grids/grids_'+model+'.nc' 
    res = find(sm_file)
-
+   varexpp = varexp
    IF res NE 'NOT FOUND' THEN BEGIN 
 
@@ -58 +58 @@
    ENDELSE 
 
+   varexp = varexpp
+
    key_offset = [0, 0, 0]
 ;
@@ -63 +65 @@
 ;
    diaznl_idx = 1
+   IF debug_w THEN print, '     model, vargrid, varexp at exit = ',model, vargrid,  varexp
    IF debug_w THEN print, '  ...EXIT mesh_from_file'
 

trunk/procs/meshes/mesh_orca.pro

@@ -10 +10 @@
    print, '                     vertical config '+v_config
 
+   varexpp = varexp
 
 ;----------------------------------------------------------
@@ -229 +230 @@
             diaznl_idx = 25-1
             
-         END
-         
+         END 
       ENDCASE 
    ENDIF
 
+   varexp = varexpp
+
    IF keyword_set(NO_SHIFT) THEN key_offset = [0, 0, 0]
 
    print, '     key_shift =', key_shift
+   IF debug_w THEN print, '     vargrid, varexp at exit = ',vargrid,  varexp
 
    print, '    End of ORCA mesh config '

trunk/procs/meshes/mesh_pcmdi.pro

@@ -6 +6 @@
 ;
    print,' Model inits for ', model
+
+   varexpp =  varexp
 
  ; use key_shiftg if grid and data file are not organized the same
@@ -33 +35 @@
    ENDIF
 
-   IF debug_w THEN print, ' key_yreverse = ', key_yreverse      
+   IF debug_w THEN print, '      key_yreverse = ', key_yreverse      
    
    IF res NE 'NOT FOUND' THEN BEGIN 
@@ -40 +42 @@
       res_grid =  execute(cmd_grid)                  
       
-      IF debug_w THEN print, ' Found mask from ',sm_file 
+      IF debug_w THEN print, '      Found mask from ',sm_file 
       
       tmask = byte(read_ncdf('sftlf', 0, 0, /timestep, file = sm_file, /nostruct))
@@ -54 +56 @@
    ENDIF
    
-   IF debug_w THEN print, ' key_shift = ', key_shift
-   IF debug_w THEN print, ' key_yreverse = ', key_yreverse   
+   IF debug_w THEN print, '      key_shift = ', key_shift
+   IF debug_w THEN print, '      key_yreverse = ', key_yreverse   
    
    masked_data = 0
@@ -65 +67 @@
 ;
    diaznl_idx = 1
+
+   varexp =  varexpp
    
-   print,'    End of initialisation for pcmdi grid:', model
+   print,' End of initialisation for pcmdi grid:', model
    
    return

trunk/procs/plt_map.pro

@@ -158 +158 @@
    sw_diffg =  0
    def_grid, cmd
+   IF debug_w THEN  print,  '   after def_grid in plt_map: cmd.grid, varexp, vargrid ',cmd.grid, varexp, vargrid 
 
 ; vertical average if 3D field