Changeset 9 for trunk/procs/def_grid.pro

Timestamp:

11/27/07 17:13:57 (16 years ago)

Author:

kolasinski

Message:

Add var_read_grd_file in def_grid and mesh_from_file - Define valmask if needed when the grid is read in mesh_from_file

File:

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

trunk/procs/def_grid.pro

@@ -47 +47 @@
       print, ' Will read grid info '+cmd.grid+' from data file'
       key_shift_map = 0
-   ENDIF 
+      IF strpos(cmd.var, '@@') NE -1 THEN BEGIN 
+         @def_macro_base_fld
+         var_read_grd_file = macro_base_fld
+      ENDIF ELSE var_read_grd_file = cmd.var
+   ENDIF ELSE var_read_grd_file = cmd.var
 
    IF debug_w THEN print,    '  cmd.grid after test read_grid_from_file: ', cmd.grid
@@ -257 +261 @@
    ENDCASE  
 
-key_shift_map = key_shift
+   key_shift_map = key_shift
+
+   IF read_grid_from_file EQ 1 THEN BEGIN 
+      ; def base field if macro
+ ; needed ?     cmd.grid = strmid(cmd.grid, 0, strlen(cmd.grid)-1)
+      @def_file_suff_var
+      var_read_grd_file = macro_base_fld
+      file_suff_var = ''
+   ENDIF 
 
 final:
@@ -265 +277 @@
    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,  '  ...EXIT def_grid'