Changeset 271 for trunk/SRC/ReadWrite/ncdf_getaxis.pro

Timestamp:

08/30/07 14:44:23 (17 years ago)

Author:

smasson

Message:

bugfix for interpolation from ORCA2 without mask

File:

• trunk/SRC/ReadWrite/ncdf_getaxis.pro (modified) (11 diffs)

trunk/SRC/ReadWrite/ncdf_getaxis.pro

@@ -5 +5 @@
 ;
 ; @categories
-; Reading
+; Read NetCDF file
 ;
 ; @param cdfid {in}{required}{type=scalar}
@@ -29 +29 @@
 ;
 ; @keyword XDIMNAME {default='longitude', 'lon', 'x', 'longitude*', 'lon*', 'x*', '*longitude*', '*lon*' or '*x*'}{type=scalar string}
-; A string giving the name of the x dimension
+; A string giving the name of the x dimension or/and a named variable
+; in which x dimension name is returned.
 ;
 ; @keyword YDIMNAME {default='latitude', 'lat', 'y', 'latitude*', 'lat*', 'y*', 'eta_*', '*latitude*', '*lat*', '*y*'}{type=scalar string}
-; A string giving the name of the y dimension
+; A string giving the name of the y dimension or/and a named variable
+; in which y dimension name is returned.
 ;
 ; @keyword XAXISNAME {default='x', 'longitude', 'nav_lon', 'lon', 'lon_rho' or 'NbLongitudes'}{type=scalar string}
 ; A string giving the name of the variable in the file
-; that contains the [xyz]axis.
+; that contains the x axis or/and a named variable
+; in which this variable name is returned.
 ;
 ; @keyword YAXISNAME {default='y', 'latitude', 'nav_lat','lat', 'lat_rho' or 'NbLatitudes'}{type=scalar string}
 ; A string giving the name of the variable in the file
-; that contains the [xyz]axis.
+; that contains the y axis or/and a named variable
+; in which this variable name is returned.
 ;
 ; @keyword XYINDEX {default=0}{type=scalar: 0 or 1}
@@ -47 +51 @@
 ; x/yaxis = keyword_set(start1) + findgen(jpi/jpj)
 ;
-; @keyword XYINDEX {default=0}{type=scalar: 0 or 1}
-;
 ; @keyword _EXTRA
 ; Used to be able to call ncdf_getaxis with _extra
@@ -60 +62 @@
 ;-
 ;
-PRO ncdf_getaxis, cdfid, dimidx, dimidy, xaxis, yaxis $
+PRO ncdf_getaxis, fileid, dimidx, dimidy, xaxis, yaxis $
                   , XAXISNAME = xaxisname, YAXISNAME = yaxisname $
                   , XDIMNAME = xdimname, YDIMNAME = ydimname $
@@ -67 +69 @@
   compile_opt idl2, strictarrsubs
 ;
-
+; should we open the file?
+  IF size(fileid, /type) EQ 7 THEN cdfid = ncdf_open(fileid) ELSE cdfid = fileid
 ; what is inside the file
   inside = ncdf_inquire(cdfid)
@@ -97 +100 @@
                     , '''longitude'', ''nav_lon'', ''lon'', ''lon_rho'', ''nblongitudes''' $
                     , ' we use a fake xaxis based on x dimension size (or use XAXISNAME keyword)'], /simple)
+    xaxisname = 'Not Found'
 ; try to get the dimension corresponding to x
 ; roms file?
@@ -125 +129 @@
         ENDELSE
       ENDCASE
-    ENDIF
-    romsgrid = 0b
+      romsgrid = 0b
+    ENDIF ELSE romsgrid = 1b
   ENDIF ELSE BEGIN
     romsgrid = strmid(namevar[xvarid], 0, 4) EQ 'lon_'
     xinq = ncdf_varinq(cdfid, xvarid)
+    xaxisname = xinq.name
     dimidx = xinq.dim[0]
     IF xinq.ndims GE 2 THEN ncdf_diminq, cdfid, xinq.dim[1], blabla, jpjfromx
   ENDELSE
+  IF arg_present(xdimname) THEN ncdf_diminq, cdfid, dimidx,  xdimname, jpifromx
 ;
   IF arg_present(xaxis) THEN BEGIN
@@ -162 +168 @@
                     , '''latitude'', ''nav_lat'', ''lat'', ''lat_rho'', ''nblatitudes''' $
                     , ' we use a fake yaxis based on y dimension size (or use YAXISNAME keyword)'], /simple)
+    yaxisname = 'Not Found'
 ; try to get the dimension corresponding to y
 ; roms file?
@@ -193 +200 @@
   ENDIF ELSE BEGIN
     yinq = ncdf_varinq(cdfid, yvarid)
+    yaxisname = yinq.name
     IF yinq.ndims GE 2 THEN BEGIN
       ncdf_diminq, cdfid, yinq.dim[0], blabla, jpifromy
@@ -198 +206 @@
     ENDIF ELSE dimidy = yinq.dim[0]
   ENDELSE
+  IF arg_present(ydimname) THEN ncdf_diminq, cdfid, dimidy,  ydimname, jpjfromy
 ;
   IF arg_present(yaxis) THEN BEGIN
@@ -224 +233 @@
   ENDIF
 
+  IF size(fileid, /type) EQ 7 THEN ncdf_close, cdfid
+
   return
 END