Changeset 508 for trunk

Timestamp:

06/02/17 21:22:28 (7 years ago)

Author:

smasson

Message:

minor improvments

Location:

trunk/SRC

Files:

• ToBeReviewed/INIT/initncdf.pro (modified) (2 diffs)
• ToBeReviewed/LECTURE/read_ncdf.pro (modified) (2 diffs)
• Utilities/linearequation.pro (modified) (1 diff)

trunk/SRC/ToBeReviewed/INIT/initncdf.pro

@@ -74 +74 @@
 PRO initncdf, ncfilein $
               , ZAXISNAME=zaxisname, START1=start1 $
-              , XYINDEX=xyindex, ZINDEX=zindex $
+              , XYINDEX=xyindex, ZINDEX=zindex, ABSZ = absz $
               , _EXTRA=ex
 ;
@@ -134 +134 @@
   IF keyword_set(zindex) AND keyword_set(zaxis) THEN $
      zaxis = keyword_set(start1) + findgen(n_elements(zaxis))
+  IF keyword_set(absz) AND n_elements(zaxis) NE 0 THEN zaxis = abs(zaxis)
 ;----------------------------------------------------------
 ; mask

trunk/SRC/ToBeReviewed/LECTURE/read_ncdf.pro

@@ -120 +120 @@
                     , GRID = grid, CALLITSELF = callitself, DIREC = direc $
                     , ZETAFILENAME = zetafilename, ZETAZERO = zetazero $
-                    , ZINVAR = zinvar, ISROMS = isroms, _EXTRA = ex
+                    , ZINVAR = zinvar, ISROMS = isroms, NOTROMS3D = notroms3d, _EXTRA = ex
 ;
   compile_opt idl2, strictarrsubs
@@ -405 +405 @@
 ;---------------------------------------------------------------------
 ; if it is roms outputs, we need to get additional infos...
-  IF NOT keyword_set(callitself) THEN BEGIN
+  IF NOT ( keyword_set(callitself) OR keyword_set(notroms3d) ) THEN BEGIN
     IF (strmid(dimnames[0], 0, 3) EQ 'xi_' AND strmid(dimnames[1], 0, 4) EQ 'eta_') OR keyword_set(isroms) THEN BEGIN
       ncdf_attget, cdfid, 'theta_s', theta_s, /global

trunk/SRC/Utilities/linearequation.pro

@@ -46 +46 @@
 ;
 
-   if size(point1, /type) EQ 6 OR size(point1, /type) EQ 9 then begin
-      x1 = float(point1)
-      y1 = imaginary(point1)
-   ENDIF ELSE BEGIN
+  if size(point1, /type) EQ 6 OR size(point1, /type) EQ 9 then begin
+    x1 = real_part(point1)
+    y1 = imaginary(point1)
+  ENDIF ELSE BEGIN
+    if size(point1, /type) EQ 5 then begin
+      x1 = double(reform(point1[0, *]))
+      y1 = double(reform(point1[1, *]))
+    ENDIF ELSE BEGIN
       x1 = float(reform(point1[0, *]))
       y1 = float(reform(point1[1, *]))
-   ENDELSE
-
-   if size(point2, /type) EQ 6 OR size(point2, /type) EQ 9 then begin
-      x2 = float(point2)
-      y2 = imaginary(point2)
-   ENDIF ELSE BEGIN
+    ENDELSE
+  ENDELSE
+  
+  if size(point2, /type) EQ 6 OR size(point2, /type) EQ 9 then begin
+    x2 = real_part(point2)
+    y2 = imaginary(point2)
+  ENDIF ELSE BEGIN
+    if size(point2, /type) EQ 5 then begin
+      x2 = double(reform(point2[0, *]))
+      y2 = double(reform(point2[1, *]))
+    ENDIF ELSE BEGIN
       x2 = float(reform(point2[0, *]))
       y2 = float(reform(point2[1, *]))
-   ENDELSE
-
+    ENDELSE
+  ENDELSE
+  
    vertical = where(x1 EQ x2)
    novertical = where(x1 NE x2)