Changeset 70 for trunk/ReadWrite/idl-NetCDF/ncdf_read.pro

Timestamp:

05/16/06 14:41:08 (18 years ago)

Author:

pinsard

Message:

update according to idl-NetCDF-v04.tar.gz available via ​http://www.ittvis.com/codebank/search.asp?FID=418; side effects are not tested

File:

• trunk/ReadWrite/idl-NetCDF/ncdf_read.pro (modified) (2 diffs)

trunk/ReadWrite/idl-NetCDF/ncdf_read.pro

@@ -87 +87 @@
 ;; global attributes
 
-gatts=replicate({name:'', $
-                 datatype:'', $
-                 length:0L, $
-                 values:ptr_new()}, $
-                info.ngatts)
-for iatt=0,info.ngatts-1 do begin
-    name=ncdf_attname(id,iatt,/global)
-    gatts[iatt].name=name
-    att=ncdf_attinq(id,name,/global)
-    gatts[iatt].length=att.length
-    gatts[iatt].datatype=att.datatype
-    ncdf_attget,id,name,vals,/global
-    gatts[iatt].values=ptr_new(vals)
-endfor
+if info.ngatts gt 0 then begin
+    gatts=replicate({name:'', $
+                     datatype:'', $
+                     length:0L, $
+                     values:ptr_new()}, $
+                    info.ngatts)
+    for iatt=0,info.ngatts-1 do begin
+        name=ncdf_attname(id,iatt,/global)
+        gatts[iatt].name=name
+        att=ncdf_attinq(id,name,/global)
+        gatts[iatt].length=att.length
+        gatts[iatt].datatype=att.datatype
+        ncdf_attget,id,name,vals,/global
+        gatts[iatt].values=ptr_new(vals)
+    endfor
+endif else begin
+    ;; arbitary scalar value
+    ;; an empty list would be sensible but IDL doesn't support it
+    gatts=-1
+endelse
 
 
@@ -108 +114 @@
 vatts=replicate(ptr_new(),info.nvars)
 for ivar=0,info.nvars-1 do begin
-    vatts[ivar]=ptr_new(replicate({name:'', $
-                                      datatype:'', $
-                                      length:0L, $
-                                      values:ptr_new()}, $
+    if vinfo[ivar].natts gt 0 then begin
+        vatts[ivar]=ptr_new(replicate({name:'', $
+                                       datatype:'', $
+                                       length:0L, $
+                                       values:ptr_new()}, $
                                       vinfo[ivar].natts))
-    for iatt=0,vinfo[ivar].natts-1 do begin
-        name=ncdf_attname(id,ivar,iatt)
-        (*vatts[ivar])[iatt].name=name
-        att=ncdf_attinq(id,ivar,name)
-        (*vatts[ivar])[iatt].length=att.length
-        (*vatts[ivar])[iatt].datatype=att.datatype
-        ncdf_attget,id,ivar,name,vals
-        (*vatts[ivar])[iatt].values=ptr_new(vals)
-    endfor
+        for iatt=0,vinfo[ivar].natts-1 do begin
+            name=ncdf_attname(id,ivar,iatt)
+            (*vatts[ivar])[iatt].name=name
+            att=ncdf_attinq(id,ivar,name)
+            (*vatts[ivar])[iatt].length=att.length
+            (*vatts[ivar])[iatt].datatype=att.datatype
+            ncdf_attget,id,ivar,name,vals
+            (*vatts[ivar])[iatt].values=ptr_new(vals)
+        endfor
+    endif else begin
+        vatts[ivar]=ptr_new(-1)
+        ;; Pointer to arbitrary scalar -- analogous to case of lack of
+        ;; global attributes above.  We could put a <NullPointer> here
+        ;; instead, but try to be friendlier to code that might try
+        ;; to dereference it.
+    endelse
 endfor