Changeset 41 for trunk/procs/def_grid.pro

Timestamp:

01/26/08 10:18:52 (16 years ago)

Author:

ericg

Message:

Misc modifs, incl. read_from_grid in yfx, debug_w prints, removal of mesh_lmdz and small bug corrections

File:

• trunk/procs/def_grid.pro (modified) (8 diffs)

trunk/procs/def_grid.pro

@@ -9 +9 @@
    IF debug_w THEN print, ' '
    IF debug_w THEN print, '  ENTER def_grid / cmd =', cmd
+
+   varexp = cmd.exp
 
    IF cmd.out EQ 'cdf' THEN BEGIN
@@ -36 +38 @@
    ENDIF 
 
-   IF debug_w THEN print, '  file_suff_var = ', file_suff_var
+   IF debug_w THEN print, '    file_suff_var = ', file_suff_var
 
 ; read_grid_from_file ?
@@ -45 +47 @@
       cmd.grid = strmid(cmd.grid, 1, strlen(cmd.grid)-1)
       read_grid_from_file = 1
-      print, ' Will read grid info '+cmd.grid+' from data file'
+      print, '   Will read grid info '+cmd.grid+' from data file'
       key_shift_map = 0
       IF strpos(cmd.var, '@@') NE -1 THEN BEGIN 
@@ -53 +55 @@
    ENDIF ELSE var_read_grd_file = cmd.var
 
-   IF debug_w THEN print,    '  cmd.grid after test read_grid_from_file: ', cmd.grid
+   IF debug_w THEN print,    '    cmd.grid after test read_grid_from_file: ', cmd.grid
 
 ; choose grid (if not already loaded)
@@ -72 +74 @@
  ; read attributes from Defaults/Grids/grid_config.def
       file_grid_config = hom_def+'grid_config.def'
-      IF debug_w THEN print, '    doing: grep -i "\ '+cmd.grid+' " '+file_grid_config
+      IF debug_w THEN print, '      doing: grep -i "\ '+cmd.grid+' " '+file_grid_config
       spawn, 'grep -i "\ '+cmd.grid+' " '+file_grid_config, line
       line = strcompress(strtrim(line[0], 2)) 
       length = strlen(line)
 
-      IF debug_w THEN print, '  line from grid_config.def  ',line 
+      IF debug_w THEN print, '      line from grid_config.def  ',line 
 
       IF length EQ 0 THEN BEGIN
-         print, '    *** def_grid : define grid ', cmd.grid, ' in file ', file_grid_config 
+         print, ' *** def_grid : define grid ', cmd.grid, ' in file ', file_grid_config 
          stop   
       ENDIF ELSE BEGIN 
@@ -88 +90 @@
          mesh_type2 = argvar[3]
          vargrid = argvar[4]
+         name_level = argvar[5]
       ENDELSE 
       meshlec_type = mesh_type
    ENDIF 
+
+   IF masked_data EQ 0 THEN atmos_msk = 0
 
 ; init zoom for data read
@@ -99 +104 @@
       izmindta = 0
    ENDIF 
+   IF debug_w THEN print,  '     varexp in def_grid before case cmd.grid:', varexp
 
    IF read_grid_from_file EQ 1 THEN GOTO, final
@@ -275 +281 @@
    box_h_prev = box_h
 
-   IF debug_w THEN print,  '   cmd.grid in def_grid:          ', cmd.grid 
-   IF debug_w THEN print,  '   file_suff_var in def_grid:     ', file_suff_var 
-   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,  '     cmd.grid in def_grid:          ', cmd.grid 
+   IF debug_w THEN print,  '     file_suff_var in def_grid:     ', file_suff_var 
+   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'
+   IF debug_w THEN print,  '  '
   
 END