Changeset 181 for trunk/SRC/ToBeReviewed

Timestamp:

09/15/06 10:24:36 (18 years ago)

Author:

smasson

Message:

bugfix tvplus + roms + xxx

Location:

trunk/SRC/ToBeReviewed

Files:

• LECTURE/read_ncdf.pro (modified) (3 diffs)
• PLOTS/DESSINE/pltv.pro (modified) (2 diffs)
• WIDGET/AUTOUR_de_XXX/loadgrid.pro (modified) (1 diff)
• WIDGET/AUTOUR_de_XXX/scanfile.pro (modified) (4 diffs)
• WIDGET/AUTOUR_de_XXX/selectfile.pro (modified) (1 diff)

trunk/SRC/ToBeReviewed/LECTURE/read_ncdf.pro

@@ -561 +561 @@
       ncdf_attget, cdfid, 'hc', hc, /global
 ; look for all variables names
-      allvarnames = strarr(varcontient.nvars)
-      FOR i = 0, varcontient.nvars-1 DO BEGIN
+      allvarnames = strarr(contient.nvars)
+      FOR i = 0, contient.nvars-1 DO BEGIN
         tmp = ncdf_varinq( cdfid, i)
         allvarnames[i] = tmp.name
@@ -568 +568 @@
       CASE 1 OF
         keyword_set(hfilename):  $
-           hroms = read_ncdf('h', 0, 0, FILENAME = hfile $
+           hroms = read_ncdf('h', 0, 0, FILENAME = hfilename $
                              , /TIMESTEP, /NOSTRUCT, CONT_NOFILL = CONT_NOFILL $
                              , GRID = vargrid, /CALLITSELF, _EXTRA = ex)
@@ -583 +583 @@
                             , /TIMESTEP, /NOSTRUCT, CONT_NOFILL = CONT_NOFILL $
                             , GRID = vargrid, /CALLITSELF, _EXTRA = ex)
-        (where(allvarnames EQ 'h'))[0] NE -1: $
+        (where(allvarnames EQ 'zeta'))[0] NE -1: $
            zeta = read_ncdf('zeta', firsttps, lasttps, FILENAME = filename $
                             , /TIMESTEP, /NOSTRUCT, CONT_NOFILL = CONT_NOFILL $

trunk/SRC/ToBeReviewed/PLOTS/DESSINE/pltv.pro

@@ -127 +127 @@
 ;------------------------------------------------------------
   determineminmax, z2d, msk, truemin, truemax, MININ = min, MAXIN = max, NAN = nan
+  z2d = min > temporary(z2d) < max
 ;------------------------------------------------------------
 ; apply other keywords (nointerp, c_nan, c_mask) 
@@ -132 +133 @@
   IF NOT keyword_set(nointerp) THEN BEGIN
 ; interpolation between bottom and bottom+ncolors-1
-    m = 1.*(ncolors-1)/(truemax-truemin)
-    p = bottom - 1.*truemin*m
+    m = 1.*(ncolors-1)/(max-min)
+    p = bottom - 1.*min*m
     z2d = m * temporary(z2d) + p
   ENDIF

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

@@ -64 +64 @@
 ; add the arguments and keywords if necessary
   IF n_elements(meshfile) GT 1 AND strmid(listing, 0, 1) NE '@' THEN BEGIN 
-    FOR i = 1+(filepro NE 'NOT FOUND'), n_elements(meshfile)-1 DO listing = listing + ', ' + meshfile[i]
+    FOR i = 1, n_elements(meshfile)-1 DO BEGIN
+      IF strpos(meshfile[i], '.') NE -1 THEN str = isnumber(meshfile[i]) ELSE str = createfunc('n_elements('+meshfile[i]+')')
+      IF str EQ 0 THEN listing = listing + ', ''' + meshfile[i] + '''' ELSE listing = listing + ', ' + meshfile[i]
+    ENDFOR
   ENDIF
 
   IF strmid(listing, 0, 1) NE '@' THEN listing = listing + ', strcalling = ''' + meshfilein + ''', _extra = ex'
+
+print, listing
+
 
   createpro, listing, filename = myuniquetmpdir +'for_createpro.pro', _extra = ex

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

@@ -231 +231 @@
         dummy = report('the file '+fullname+' has no time axis.!C we create a fake calendar ...')
         fakecal = 1
-        time = date0fk + lindgen(jpt)
+        time = date0fk + lindgen(1>jpt)
       END
       invar.natts EQ 0:BEGIN 
         dummy = report('the variable '+invar.name+' has no attribut.!C we create a fake calendar ...')
         fakecal = 1
-        time = date0fk + lindgen(jpt)
+        time = date0fk + lindgen(1>jpt)
       END
       ELSE:BEGIN
@@ -247 +247 @@
           dummy = report('Attribut ''units'' not found for the variable '+invar.name+'!C we create a fake calendar ...')
           fakecal = 1
-          time = date0fk + lindgen(jpt)
+          time = date0fk + lindgen(1>jpt)
         ENDIF ELSE BEGIN 
 ; we read the time axis
@@ -271 +271 @@
             dummy = report('attribut units of time has not the good format: [^ ]* since ([0-9]){4}-([0-9]){2}-([0-9]){2}.*')
             fakecal = 1
-            time = date0fk + lindgen(jpt)
+            time = date0fk + lindgen(1>jpt)
           ENDIF ELSE BEGIN 
             debut = str_sep(mots[2], '-')
@@ -325 +325 @@
             IF max(histogram([long(time-time[0])])) GT 1 THEN fakecal = 1 ELSE fakecal = 0
             date0fk = date2jul(19000101)
-            IF keyword_set(fakecal) THEN time = date0fk+lindgen(jpt) $
+            IF keyword_set(fakecal) THEN time = date0fk+lindgen(1>jpt) $
             ELSE time = long(time)
 ;

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

@@ -258 +258 @@
   based = widget_base(base, /row, /align_center, uname = 'arg base', sensitive = 0)
   dummyid = widget_label(based, value = 'procedure arguments')
-  agrbase = widget_text(based, value = '', uvalue = {name:'argtxt'} $
+  argbase = widget_text(based, value = '', uvalue = {name:'argtxt'} $
                         , uname = 'argtxt', xsize = 45, /EDITABLE)
 ; keyword informations