Changeset 47 for trunk

Timestamp:

02/04/08 13:03:08 (16 years ago)

Author:

kolasinski

Message:

Resolve bug when make_grad macro is called for a file like _grid_T_soicecov.nc

Location:

trunk/procs

Files:

• def_file_suff_var.pro (modified) (1 diff)
• def_macro_base_fld.pro (modified) (1 diff)
• macros/make_grad.pro (modified) (1 diff)

trunk/procs/def_file_suff_var.pro

@@ -11 +11 @@
             END 
             ELSE: BEGIN
-               IF strpos (cmd.var, '@@') NE -1 THEN BEGIN 
+               IF strpos(cmd.var, '@@') NE -1 THEN BEGIN 
                   @def_macro_base_fld
+                  IF strpos(macro_base_fld, ',') NE -1 THEN macro_base_fld = (strsplit(macro_base_fld, ',', /EXTRACT))[0]
                   file_suff_var = '_'+macro_base_fld
                ENDIF ELSE BEGIN 

trunk/procs/def_macro_base_fld.pro

@@ -12 +12 @@
                         stop
                      END 
-                  ENDCASE 
+                  ENDCASE

trunk/procs/macros/make_grad.pro

@@ -9 +9 @@
 ;  Find the position of the comma in the character string defined
 ;  between '/' in 'fld_macros.def'
-   pos_comma = strpos(macro_base_fld,',')
+;   pos_comma = strpos(macro_base_fld,',')
 
 ;  Extract the variable and the coordinate along which we want the gradients
-   var_name =  strmid(macro_base_fld, 0, pos_comma)
-   var_name =  strtrim(var_name, 1)
-   var_name =  strcompress(var_name)
-   coord_name =  strmid(macro_base_fld, pos_comma + 1, strlen(macro_base_fld) - pos_comma - 1)
-   coord_name =  strtrim(coord_name, 1)
-   coord_name =  strcompress(coord_name)
-
-;   print, 'Variable and  coordinate'
-;   print, var_name,', ', strlen(var_name), ' ,', coord_name, ' ,',strlen(coord_name)
+;;   var_name =  strmid(macro_base_fld, 0, pos_comma)
+;;   var_name =  strtrim(var_name, 1)
+;;   var_name =  strcompress(var_name)
+;;   coord_name =  strmid(macro_base_fld, pos_comma + 1, strlen(macro_base_fld) - pos_comma - 1)
+;;   coord_name =  strtrim(coord_name, 1)
+;;   coord_name =  strcompress(coord_name)
+   var_name =  (strsplit(macro_base_fld, ',', ESCAPE = ' ', /EXTRACT))[0]
+   coord_name =  (strsplit(macro_base_fld, ',', ESCAPE = ' ', /EXTRACT))[1]
 
 ;  Read the variable in the correspondent netcdf file