Changeset 216 for trunk/SRC/ToBeReviewed

Timestamp:

02/21/07 11:20:40 (17 years ago)

Author:

smasson

Message:

include parts of ncdf_read into ncdf_read_varget. Should have no impact...

Location:

trunk/SRC/ToBeReviewed/LECTURE

Files:

• read_ncdf.pro (modified) (1 diff)
• read_ncdf_varget.pro (modified) (2 diffs)

trunk/SRC/ToBeReviewed/LECTURE/read_ncdf.pro

@@ -411 +411 @@
   if n_elements(key_stride) LE 2 then key_stride = [1, 1, 1]
   key_stride = 1l > long(key_stride)
-  key_shift = long(testvar(var = key_shift))
-;
-  IF n_elements(key_yreverse) EQ 0 THEN key_yreverse = 0
-  IF keyword_set(key_yreverse) THEN BEGIN
-    tmp = jpj-1-firsty
-    firsty = jpj-1-lasty
-    lasty = tmp
-  ENDIF
-;
-  IF n_elements(key_zreverse) EQ 0 THEN key_zreverse = 0
-  IF keyword_set(key_zreverse) THEN BEGIN
-    tmp = jpk-1-firstz
-    firstz = jpk-1-lastz
-    lastz = tmp
-  ENDIF
-;
-  IF (key_gridtype EQ 'c_u' OR key_gridtype EQ 'c_f') $
-     AND (vargrid EQ 'U' OR vargrid EQ 'F') THEN BEGIN
-    IF keyword_set(key_periodic)  THEN BEGIN
-      key_shift =  key_shift-1
-    ENDIF ELSE BEGIN 
-      firstx = firstx+1
-      lastx = lastx+1    
-    ENDELSE 
-  ENDIF
-  IF (key_gridtype EQ 'c_v' OR key_gridtype EQ 'c_f') $
-      AND (vargrid EQ 'V' OR vargrid EQ 'F') THEN BEGIN
-    firsty = firsty+1
-    lasty = lasty+1
-  ENDIF
-;
 ;---------------------------------------------------------------------
 ;---------------------------------------------------------------------
 @read_ncdf_varget
 ;---------------------------------------------------------------------
-;---------------------------------------------------------------------
-;
-  IF (key_gridtype EQ 'c_u' OR key_gridtype EQ 'c_f') AND keyword_set(key_periodic) $
-    AND (strupcase(vargrid) EQ 'U' OR strupcase(vargrid) EQ 'F') THEN key_shift = key_shift+1
 ;---------------------------------------------------------------------
 ; We define global variable joined with the variable.

trunk/SRC/ToBeReviewed/LECTURE/read_ncdf_varget.pro

@@ -55 +55 @@
 ;  This problem as an easy solution by using the keyword count with
 ;  the appropiate value!
+;
+  key_shift = long(testvar(var = key_shift))
+;
+  IF n_elements(key_yreverse) EQ 0 THEN key_yreverse = 0
+  IF keyword_set(key_yreverse) THEN BEGIN
+    tmp = jpj-1-firsty
+    firsty = jpj-1-lasty
+    lasty = tmp
+  ENDIF
+;
+  IF n_elements(key_zreverse) EQ 0 THEN key_zreverse = 0
+  IF keyword_set(key_zreverse) THEN BEGIN
+    tmp = jpk-1-firstz
+    firstz = jpk-1-lastz
+    lastz = tmp
+  ENDIF
+;
+  IF (key_gridtype EQ 'c_u' OR key_gridtype EQ 'c_f') $
+     AND (vargrid EQ 'U' OR vargrid EQ 'F') THEN BEGIN
+    IF keyword_set(key_periodic)  THEN BEGIN
+      key_shift =  key_shift-1
+    ENDIF ELSE BEGIN 
+      firstx = firstx+1
+      lastx = lastx+1    
+    ENDELSE 
+  ENDIF
+  IF (key_gridtype EQ 'c_v' OR key_gridtype EQ 'c_f') $
+      AND (vargrid EQ 'V' OR vargrid EQ 'F') THEN BEGIN
+    firsty = firsty+1
+    lasty = lasty+1
+  ENDIF
 ;
    ixmin = ixminmesh-ixmindta
@@ -457 +488 @@
      AND varcontient.ndims - ((where(varcontient.dim EQ contient.recdim))[0] NE -1) EQ 3 THEN $
         res = reverse(reform(res, nx, ny, nz, jpt, /overwrite),  3)
+;
+  IF (key_gridtype EQ 'c_u' OR key_gridtype EQ 'c_f') AND keyword_set(key_periodic) $
+    AND (strupcase(vargrid) EQ 'U' OR strupcase(vargrid) EQ 'F') THEN key_shift = key_shift+1