Changeset 135

Timestamp:

06/03/09 16:40:02 (15 years ago)

Author:

ericg

Message:

Simplfied definition of macro_base_fld

Location:

trunk/procs

Files:

• def_macro_base_fld.pro (modified) (1 diff)
• macro_read.pro (modified) (1 diff)
• macros/make_wdiv.pro (modified) (1 diff)

trunk/procs/def_macro_base_fld.pro

@@ -4 +4 @@
                   CASE macro_def[1] OF
                      '=:': BEGIN
-                        CASE macro_def[2] OF
-                           'make_stddev': macro_base_fld =  extract_str(line, '\', '/')
-                           'make_grad' : macro_base_fld =  extract_str(line, '\', '/')
-                           'make_ratio' : macro_base_fld =  extract_str(line, '\', '/')
-                           'make_interp' : macro_base_fld =  extract_str(line, '\', '/')     
-                           'make_skewness': macro_base_fld =  extract_str(line, '\', '/')
-                           'make_correlation': macro_base_fld =  extract_str(line, '\', '/')
-                           'make_linfit': macro_base_fld =  extract_str(line, '\', '/')
-                           'make_correldomain': macro_base_fld =  extract_str(line, '\', '/')
-                           'make_thdepth': macro_base_fld = 'votemper'
-                           'make_linfitdom': macro_base_fld =  extract_str(line, '\', '/')
-                           'make_wwv': macro_base_fld =  extract_str(line, '\', '/')
-                           'make_wdiv': macro_base_fld =  extract_str(line, '\', '/')
-                           ELSE: BEGIN 
-                              print, ' Define macro in fld_macro.def'
-                              print, ' macro_def[2] is ', macro_def[2]
-                              stop
-                           END 
-                        ENDCASE
+                        ids1 = strpos(line, '\')
+                        ids2 = strpos(line, '/')
+                        IF ids1*ids2 GE 0 THEN BEGIN 
+                           macro_base_fld =  extract_str(line, '\', '/')
+                        ENDIF ELSE macro_base_fld = 'undefined'
                      END 
                      ELSE: macro_base_fld = macro_def[1]

trunk/procs/macro_read.pro

@@ -23 +23 @@
          ; 2.1 call specific function
 
-         ; if stat extract base field
-
-         CASE macro_def[2] OF
-            'make_stddev': macro_base_fld =  extract_str(line, '\', '/')
-            'make_grad' : macro_base_fld =  extract_str(line, '\', '/')
-            'make_ratio' : macro_base_fld =  extract_str(line, '\', '/')
-            'make_interp' : macro_base_fld =  extract_str(line, '\', '/')     
-            'make_skewness': macro_base_fld =  extract_str(line, '\', '/')
-            'make_anomaly': macro_base_fld =  extract_str(line, '\', '/')            
-            'make_correlation': macro_base_fld =  extract_str(line, '\', '/')            
-            'make_linfit': macro_base_fld =  extract_str(line, '\', '/')            
-            'make_correldomain': macro_base_fld =  extract_str(line, '\', '/')            
-            'make_thdepth': macro_base_fld = 'votemper'       
-            'make_linfitdom': macro_base_fld =  extract_str(line, '\', '/')            
-            'make_wwv': macro_base_fld =  extract_str(line, '\', '/')
-            'make_wdiv': macro_base_fld =  extract_str(line, '\', '/')            
-            ELSE: 
-         ENDCASE 
+         ; extract base field if existant
+         BEGIN
+            ids1 = strpos(line, '\')
+            ids2 = strpos(line, '/')
+            IF ids1*ids2 GE 0 THEN BEGIN 
+               macro_base_fld =  extract_str(line, '\', '/')
+            ENDIF ELSE macro_base_fld = 'undefined'
+         END 
          strcall = 'field_lec = '+macro_def[2]+'(file_name, ncdf_db, BOXZOOM = boxzoom, TIME_1 = time_1,  TIME_2 =  time_2, ALL_DATA = all_data, _extra = ex)'
          res = execute(strcall)

trunk/procs/macros/make_wdiv.pro

@@ -37 +37 @@
    grille,mask,glam,gphi,gdep,nx,ny,nz,premierx,premiery,premierz,dernierx,derniery,dernierz 
 
-stop
-
    IF jpt EQ 1 THEN BEGIN 
       wdiv =  (var_x.data - shift(var_x.data, -1, 0))/e1t[premierx:dernierx, premiery:derniery] + (var_y.data-shift(var_y.data, 0, -1))/e2t[premierx:dernierx, premiery:derniery]