Changeset 198 for trunk/SRC/ToBeReviewed

Timestamp:

12/01/06 12:05:05 (18 years ago)

Author:

smasson

Message:

add flexibility for the name of time attribut units

Location:

trunk/SRC/ToBeReviewed

Files:

• LECTURE/read_ncdf.pro (modified) (3 diffs)
• WIDGET/AUTOUR_de_XXX/scanfile.pro (modified) (2 diffs)

trunk/SRC/ToBeReviewed/LECTURE/read_ncdf.pro

@@ -253 +253 @@
       mots = str_sep(value, ' ')
       unite = mots[0]
-      IF unite NE 'seconds' AND unite NE 'hours' AND unite NE 'days' $
-         AND unite NE 'months' AND unite NE 'years' THEN BEGIN
+      unite = strlowcase(unite)
+      IF strpos(unite, 's', strlen(unite)-1) NE -1 THEN unite = strmid(unite, 0, strlen(unite)-1)
+      IF strpos(unite, 'julian_') NE -1 THEN unite = strmid(unite, 7)
+      IF unite NE 'second' AND unite NE 'hour' AND unite NE 'day' $
+         AND unite NE 'month' AND unite NE 'year' THEN BEGIN
         ncdf_close, cdfid
         return, report('time units does not start with seconds/hours/days/months/years')
@@ -265 +268 @@
       ncdf_varget, cdfid, timeid, time
       time = double(time)
-      unite = strlowcase(unite)
-      IF strpos(unite, 's', strlen(unite)-1) NE -1 THEN unite = strmid(unite, 0, strlen(unite)-1)
-      IF strpos(unite, 'julian_') NE -1 THEN unite = strmid(unite, 7)
       case unite of
         'second':time = julday(depart[1], depart[2], depart[0])+time/86400.d
@@ -300 +300 @@
       if lasttps[0] EQ -1 THEN BEGIN
         ncdf_close, cdfid
-        return, report('the time axis as no date before date 2: '+strtrim(jul2date(date2), 1))
+        return, report('the time axis has no date before date 2: '+strtrim(jul2date(date2), 1))
       endif
       lasttps = lasttps[n_elements(lasttps)-1]
       if lasttps LT firsttps then BEGIN
         ncdf_close, cdfid
-        return, report('the time axis as no dates between date1 and  date 2: '+strtrim(jul2date(date1), 1)+' '+strtrim(jul2date(date2), 1))
+        return, report('the time axis has no dates between date1 and  date 2: '+strtrim(jul2date(date1), 1)+' '+strtrim(jul2date(date2), 1))
       endif
     ENDELSE

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

@@ -261 +261 @@
           mots = str_sep(value, ' ')
           unite = mots[0]
+          unite = strlowcase(unite)
+          IF strpos(unite, 's', strlen(unite)-1) NE -1 THEN unite = strmid(unite, 0, strlen(unite)-1)
+          IF strpos(unite, 'julian_') NE -1 THEN unite = strmid(unite, 7)
           err = 0
-          IF unite NE 'seconds' AND unite NE 'hours' AND unite NE 'days' $
-             AND unite NE 'months' AND unite NE 'years' THEN BEGIN
+          IF unite NE 'second' AND unite NE 'hour' AND unite NE 'day' $
+             AND unite NE 'month' AND unite NE 'year' THEN BEGIN
             dummy = report('time units does not start with seconds/hours/days/months/years')
             err = 1
           ENDIF
-          err = err + 1 - stregex(value, '[^ ]* since ([0-9]){4}-([0-9]){2}-([0-9]){2}.*', /boolean)
+          IF stregex(value, '[^ ]* since ([0-9]){4}-([0-9]){2}-([0-9]){2}.*', /boolean) EQ 0 THEN BEGIN
+            dummy = report('attribut units of time has not the good format: [^ ]* since ([0-9]){4}-([0-9]){2}-([0-9]){2}.*')
+            err = 1
+          ENDIF
           IF err GT 0 THEN BEGIN 
-            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(1>jpt)
@@ -301 +306 @@
 ; We pass time in IDL julian days
 ;
-            unite = strlowcase(unite)
-            IF strpos(unite, 's', strlen(unite)-1) NE -1 THEN unite = strmid(unite, 0, strlen(unite)-1)
-            IF strpos(unite, 'julian_') NE -1 THEN unite = strmid(unite, 7)
             case unite of
               'second':time = julday(debut[1], debut[2], debut[0])+time/86400.d