Changeset 167 for trunk/SRC/ToBeReviewed/WIDGET

Timestamp:

09/05/06 14:24:07 (18 years ago)

Author:

smasson

Message:

clean div, curl, grad + minors bugfix

Location:

trunk/SRC/ToBeReviewed/WIDGET

Files:

• AUTOUR_de_XXX/scanfile.pro (modified) (4 diffs)
• COMPOUND_WIDGET/cw_domain.pro (modified) (1 diff)

trunk/SRC/ToBeReviewed/WIDGET/AUTOUR_de_XXX/scanfile.pro

@@ -114 +114 @@
     namedim[dimiq] = strlowcase(tmpname)
   ENDFOR
-; we are looking for a x dimension...
-  dimidx = where(namedim EQ 'x' OR strmid(namedim, 0, 3) EQ 'lon' OR strmid(namedim, 0, 3) EQ 'xi_' OR namedim EQ 'xt_i7_156')
-  dimidx = dimidx[0]
-  if dimidx EQ -1 then begin
-    print, 'one of the dimensions must have the name: ''x'' or ''lon...'' or ''xi_...'' or ''xt_i7_156'''
-    stop
-  endif
-; we are looking for a y dimension...
-  dimidy = where(namedim EQ 'y' OR strmid(namedim, 0, 3) EQ 'lat' OR strmid(namedim, 4) EQ 'eta_' OR namedim EQ 'yt_j6_75')
-  dimidy = dimidy[0]
-  if dimidy EQ -1 then begin
-    print, 'one of the dimensions must have the name: ''y'' or ''lat...'' or ''eta_...'' or ''yt_j6_75'''
-    stop
-  endif
+; we are looking for a x dimension with a name matching one of the following regular expression:
+  testname = ['longitude', 'lon', 'x', 'longitude*', 'lon*', 'x*', '*longitude*', '*lon*', '*x*']
+  cnt = -1
+  ii = 0
+  WHILE cnt NE 1 AND ii LT n_elements(testname) DO BEGIN
+    dimidx = where(strmatch(namedim, testname[ii]) EQ 1, cnt)
+    ii = ii+1
+  ENDWHILE
+  CASE cnt OF
+    0:begin
+      dummy = report(['none of the dimensions name matches one of the following regular expression:' $
+                      , '''longitude'', ''lon'', ''x'', ''longitude*'', ''lon*'', ''x*'', ''*longitude*'', ''*lon*'', ''*x*''' $
+                      , ' => we cannot find the x dimension'])
+      stop
+    END
+    1:dimidx = dimidx[0]
+    ELSE:begin
+      dummy = report(['several (and not one unique) dimensions name matches the following regular expression:' $
+                      , '''longitude'', ''lon'', ''x'', ''longitude*'', ''lon*'', ''x*'', ''*longitude*'', ''*lon*'', ''*x*''' $
+                      , ' => we cannot find the x dimension'])
+      stop
+    END
+  ENDCASE
+; we are looking for a y dimension with a name matching one of the following regular expression:
+  testname = ['latitude', 'lat', 'y', 'latitude*', 'lat*', 'y*', 'eta_*', '*latitude*', '*lat*', '*y*']
+  cnt = -1
+  ii = 0
+  WHILE cnt NE 1 AND ii LT n_elements(testname) DO BEGIN
+    dimidy = where(strmatch(namedim, testname[ii]) EQ 1, cnt)
+    ii = ii+1
+  ENDWHILE
+  CASE cnt OF
+    0:begin
+      dummy = report(['none of the dimensions name matches one of the following regular expression:' $
+                      , '''latitude'', ''lat'', ''y'', ''latitude*'', ''lat*'', ''y*'', ''eta_*'', ''*latitude*'', ''*lat*'', ''*y*''' $
+                      , ' => we cannot find the y dimension'])
+      stop
+    END
+    1:dimidy = dimidy[0]
+    ELSE:begin
+      dummy = report(['several (and not one unique) dimensions name matches the following regular expression:' $
+                      , '''latitude'', ''lat'', ''y'', ''latitude*'', ''lat*'', ''y*'', ''eta_*'', ''*latitude*'', ''*lat*'', ''*y*''' $
+                      , ' => we cannot find the x dimension'])
+      stop
+    END
+  ENDCASE
 ;------------------------------------------------------------
 ; name of all variables
@@ -156 +188 @@
     varid = 0
     repeat BEGIN
-      invar = ncdf_varinq(cdfid, varid) 
-      varid = varid+1
-    endrep until n_elements(invar.dim) EQ 1 AND invar.dim[0] EQ infile.recdim
+      IF varid LT infile.nvars THEN BEGIN
+        invar = ncdf_varinq(cdfid, varid) 
+        varid = varid+1        
+      ENDIF ELSE varid = 0
+    endrep until (n_elements(invar.dim) EQ 1 AND invar.dim[0] EQ infile.recdim) OR (varid EQ 0)
     varid = varid-1
 ;
@@ -179 +213 @@
         for attiq = 0, invar.natts-1 do attnames[attiq] = ncdf_attname(cdfid, varid, attiq)
         if (where(attnames EQ 'units'))[0] EQ -1 then BEGIN
-          dummy = report('Attribut ''units'' not found for the variable '+varid.name+'!C we create a fake calendar ...')
+          dummy = report('Attribut ''units'' not found for the variable '+invar.name+'!C we create a fake calendar ...')
           fakecal = 1
           time = date0fk + lindgen(jpt)
@@ -218 +252 @@
           ENDELSE
 ;
-; BEWARE we have to recuperate the calendar attribute and ajust TIME by consequence...
-;
-;
-; We pass TIME in IDL julian days
+; BEWARE we have to get back the calendar attribute and ajust time by consequence...
+;
+;
+; We pass time in IDL julian days
 ;
           unite = strlowcase(unite)

trunk/SRC/ToBeReviewed/WIDGET/COMPOUND_WIDGET/cw_domain.pro

@@ -662 +662 @@
 ;
   min2 = gdep2[indice1]
-  if indice2 EQ jpk-1 then BEGIN 
-    max2 = max([gdept, gdepw])
-    max2 = strtrim(string(max2, format = '(e8.0)'), 1)
-    max2 = float('1'+strmid(max2, 1))+float(max2)
-  ENDIF ELSE max2 = gdep1[indice2+1]
-  if max2 EQ min2 then max2 = min2+1
+  if indice2 EQ jpk-1 then max2 = ceil(max([gdept, gdepw])) $
+  ELSE max2 = gdep1[indice2+1]
+  if floor(max2) LE floor(min2) then max2 = min2+1
   rien = cw_slider_pm(basez, value = (min2 > boxzoom[4]) > boxzoom[5] < max2 $
                       , uvalue = {name:'depth2'}, minimum = min2, maximum =  max2 $