Changeset 27

Timestamp:

11/29/07 12:04:29 (16 years ago)

Author:

kolasinski

Message:

Conform to SAXO new version - Structures varcontient and contient do not exist anymore in read_ncdf_varget

File:

• trunk/procs/nc_read.pro (modified) (10 diffs)

trunk/procs/nc_read.pro

@@ -81 +81 @@
 ; pour verifier si il y a une variable je fais
 
-; contient=ncdf_inquire(cdfid)
-; for varid=0,contient.nvars-1 do BEGIN
-;    varcontient=ncdf_varinq(cdfid,varid) 
-;    if varcontient.name eq nom then goto, variabletrouvee
+; inq=ncdf_inquire(cdfid)
+; for varid=0,inq.nvars-1 do BEGIN
+;    varinq=ncdf_varinq(cdfid,varid) 
+;    if varinq.name eq nom then goto, variabletrouvee
 ; endfor
 ; return, -1
@@ -109 +109 @@
 ; ouverture fichier netCDF + contenu
    cdfid=ncdf_open(directory+file_name) 
-   contient=ncdf_inquire(cdfid)
+   inq=ncdf_inquire(cdfid)
 ; que contient la variable
    varid = ncdf_varid(cdfid, var_name)
@@ -123 +123 @@
       return,  field
    ENDIF 
-   varcontient=ncdf_varinq(cdfid, var_name)
+   varinq=ncdf_varinq(cdfid, var_name)
 
 ; test sur la dimension
    err_mess = ''
-   field_dim = n_elements(varcontient.dim)
+   field_dim = n_elements(varinq.dim)
 
 ; get unlimited record variable
-   IF contient.recdim NE -1 THEN BEGIN
-      ncdf_diminq, cdfid,  contient.recdim,  name_time, nb_time
-      ;;ncdf_varget, cdfid, contient.recdim, time_array
+   IF inq.recdim NE -1 THEN BEGIN
+      ncdf_diminq, cdfid,  inq.recdim,  name_time, nb_time
+      ;;ncdf_varget, cdfid, inq.recdim, time_array
       ;;nb_time = (size(time_array))(1)
    ENDIF ELSE BEGIN
@@ -151 +151 @@
          ncdf_diminq, cdfid,  dimidt,  name_time, nb_time
          print, 'You chose ', name_time,  ' as a record dimension and its size is ',  nb_time
-         contient.recdim = dimidt
+         inq.recdim = dimidt
       ENDIF ELSE BEGIN
          print, 'No record dimension considered in the file'
@@ -157 +157 @@
       ENDELSE
 
-      IF varcontient.dim[varcontient.ndims-1] NE dimidt THEN STOP,  $
+      IF varinq.dim[varinq.ndims-1] NE dimidt THEN STOP,  $
        'Post_it cannot handle variables whose record dimension is not the last one'
 
-;      ncdf_diminq,cdfid,(n_elements(varcontient.dim)-1), name_time, nb_time     
+;      ncdf_diminq,cdfid,(n_elements(varinq.dim)-1), name_time, nb_time     
 ;      dimidl = ncdf_dimid(cdfid, name_time)
 ;      ncdf_diminq,cdfid,dimidl, name_time, nb_time
@@ -202 +202 @@
    IF debug_w THEN print, 'key_yreverse, firsty, lasty',key_yreverse, firsty, lasty
 
-   CASE n_elements(varcontient.dim) OF
+   CASE n_elements(varinq.dim) OF
 
       ;; fichier 2d : surface
@@ -215 +215 @@
       ;; fichier 3d : 2 cas = 1/ 2d espace + temps 2/ 3d espace
       3: BEGIN 
-         ;; si varcontient.dim contient la dim infinie (no 3) -> temps
+         ;; si varinq.dim contient la dim infinie (no 3) -> temps
          dim_3 = '3d'
          IF nb_time GE 1 THEN dim_3 = '2d'
@@ -495 +495 @@
 
 ; scaling ?
-   FOR i = 0, varcontient.natts-1 DO BEGIN
+   FOR i = 0, varinq.natts-1 DO BEGIN
       att_txt = ncdf_attname(cdfid, varid, i)
       IF att_txt EQ 'scale_factor' THEN BEGIN
@@ -511 +511 @@
 ; get long name 
 ;   result = '???'
-   FOR i = 0, varcontient.natts-1 DO BEGIN
+   FOR i = 0, varinq.natts-1 DO BEGIN
       att_txt = ncdf_attname(cdfid, varid, i)
       IF att_txt EQ 'long_name' OR att_txt EQ 'title' THEN ncdf_attget, cdfid, varid, att_txt, result
@@ -533 +533 @@
 
    valmask = 1.e20
-   FOR i = 0, varcontient.natts-1 DO BEGIN
+   FOR i = 0, varinq.natts-1 DO BEGIN
       att_txt = ncdf_attname(cdfid, varid, i)
       IF att_txt EQ 'missing_value' OR att_txt EQ 'mask value' OR att_txt EQ '_FillValue' THEN ncdf_attget, cdfid, varid, att_txt, valmask