Changeset 271 for trunk/SRC/Interpolation/extrapolate.pro

Timestamp:

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

Author:

smasson

Message:

bugfix for interpolation from ORCA2 without mask

File:

• trunk/SRC/Interpolation/extrapolate.pro (modified) (3 diffs)

trunk/SRC/Interpolation/extrapolate.pro

@@ -16 +16 @@
 ; put -1 if input data are not masked
 ;
-; @param nb_iteration {in}{optional}{type=integer scalar}{default=10.E20}
+; @param nb_iteration {in}{optional}{type=integer}{default=large enough to fill everything}
 ; Maximum number of iterations done in the extrapolation process. If there
 ; is no more masked values we exit extrapolate before reaching nb_iteration
-; (to be sure to fill everything, you can use a very large value)
 ;
 ; @keyword X_PERIODIC {type=scalar, 0 or 1}{default=0}
@@ -32 +31 @@
 ; @keyword GE0 {type=scalar 0 or 1}{default=0}
 ; put 1 to force the extrapolated values to be larger than 0, same as using minval=0.
+;
+; @keyword 
+; _EXTRA to be able to call extrapolate with _extra keyword
 ;
 ; @returns
@@ -54 +56 @@
 ;
 FUNCTION extrapolate, zinput, maskinput, nb_iteration, X_PERIODIC = x_periodic $
-                      , MINVAL = minval, MAXVAL = maxval, GE0 = ge0
+                      , MINVAL = minval, MAXVAL = maxval, GE0 = ge0, _EXTRA = ex
 ;
   compile_opt idl2, strictarrsubs
 ;
 ; check the number of iteration used in the extrapolation.
-  IF n_elements(nb_iteration) EQ 0 THEN nb_iteration = 10.E20
+  szin = size(zinput)
+  IF szin[0] NE 2 THEN return, -1. ELSE szin = szin[1:2]
+  nx = szin[0]
+  ny = szin[1]
+  IF n_elements(nb_iteration) EQ 0 THEN nb_iteration = max(szin)
   IF nb_iteration EQ 0 THEN return, zinput
-  nx = (size(zinput))[1]
-  ny = (size(zinput))[2]
 ; take care of the boundary conditions...
 ;