Changeset 5

Timestamp:

11/26/07 17:08:23 (16 years ago)

Author:

kolasinski

Message:

Define def_file_suff_var.pro routine and add it in def_grid.pro

Location:

trunk/procs

Files:

• def_file_suff_var.pro (added)
• def_grid.pro (modified) (6 diffs)

trunk/procs/def_grid.pro

@@ -7 +7 @@
 @common
 @com_eg
+   IF debug_w THEN print, ' '
+   IF debug_w THEN print, '  ENTER def_grid / cmd =', cmd
 
    IF cmd.out EQ 'cdf' THEN BEGIN
@@ -31 +33 @@
    IF strpos(cmd.grid, '#') NE -1 THEN BEGIN
       cmd.grid = strmid(cmd.grid, 0, strlen(cmd.grid)-1)
-      IF strpos(cmd.var, '@@') NE -1 THEN BEGIN 
-         CASE cmd.var OF
-            '@@voenergy': file_suff_var = '_thetao'
-            ELSE: BEGIN
-               print, ' Define base field for grid for macro in def_grid'
-               stop
-            END 
-         ENDCASE 
-      ENDIF ELSE file_suff_var = '_'+cmd.var
-   ENDIF 
+      @def_file_suff_var
+   ENDIF 
+
+   IF debug_w THEN print, '  file_suff_var = ', file_suff_var
 
 ; read_grid_from_file ?
@@ -53 +49 @@
    ENDIF 
 
-;   print, cmd.grid
+   IF debug_w THEN print,    '  cmd.grid after test read_grid_from_file: ', cmd.grid
 
 ; choose grid (if not already loaded)
@@ -72 +68 @@
  ; 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
       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 length EQ 0 THEN BEGIN
@@ -155 +154 @@
       END 
       'reg1m': BEGIN 
+         IF test_read EQ 1 THEN read_grid_from_file = 1 
+      END 
+      'reg1': BEGIN 
          IF test_read EQ 1 THEN read_grid_from_file = 1 
       END 
@@ -256 +258 @@
 final:
 
-box_h_prev = box_h
-
-IF debug_w THEN print,  'meshlec_type : ',  meshlec_type
+   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,  '   meshlec_type in def_grid:      ', meshlec_type
+   IF debug_w THEN print,  '  ...EXIT def_grid'
    
 END