Changeset 113 for trunk/SRC/Interpolation

Timestamp:

06/19/06 15:20:37 (18 years ago)

Author:

smasson

Message:

bugfix in fromirr and fromreg + add full path to call IDL in save saxo

Location:

trunk/SRC/Interpolation

Files:

• fromirr.pro (modified) (3 diffs)
• fromreg.pro (modified) (4 diffs)

trunk/SRC/Interpolation/fromirr.pro

@@ -11 +11 @@
 ;    @param method: {in}{required} a string defining the interpolation method. must be 'bilinear'
 ;    @param datain: {in}{required} a 2D array the input data to interpolate
-;    @param lonin: {in}{optional} a 2D array defining the longitude of the input data
-;           optionals if WEIG and ADDR keywords used.
-;    @param latin: {in}{optional} a 2D array defining the latitude of the input data.
-;                     optionals if WEIG and ADDR keywords used.
-;    @param mskin: {in}{optional} a 2D array, the land-sea mask of the input data (1 on ocean, 0 on land)
-;    @param lonout: {in}{optional} 1D or 2D array defining the longitude of the output data.
-;                       optionals if WEIG and ADDR keywords used.
-;    @param latout: {in}{optional} 1D or 2D array defining the latitude of the output data.
-;                       optionals if WEIG and ADDR keywords used.
-;    @param mskout: {in}{optional} a 2D array, the land-sea mask of the ouput data (1 on ocean, 0 on land)
+;    @param lonin: {in}{required} a 2D array defining the longitude of the input data
+;    @param latin: {in}{required} a 2D array defining the latitude of the input data.
+;    @param mskin: {in}{required} a 2D array, the land-sea mask of the input data (1 on ocean, 0 on land)
+;    @param lonout: {in}{required} 1D or 2D array defining the longitude of the output data.
+;    @param latout: {in}{required} 1D or 2D array defining the latitude of the output data.
+;    @param mskout: {in}{required} a 2D array, the land-sea mask of the ouput data (1 on ocean, 0 on land)
 ;
 ; @keyword WEIG (see ADDR)
-; @keyword ADDR: 2D arrays, weig and addr are the weight and addresses used to
+; @keyword ADDR 2D arrays, weig and addr are the weight and addresses used to
 ;     perform the interpolation:
 ;          dataout = total(weig*datain[addr], 1)
 ;          dataout = reform(dataout, jpio, jpjo, /over)
-;     Those keywords can be set to named variables into which the values will be
-;     copied when the current routine exits. Next, they can be used to perform
+;     Those keywords can be set to named variables (that are undefined or equal to 0) into which the
+;     values will be copied when the current routine exits. Next, they can be used to perform
 ;     the interpolation whithout computing again those 2 parameters. This greatly
 ;     speed-up the interpolation! In that case, lonin, latin, lonout and latout are not necessary.
@@ -62 +58 @@
   compile_opt strictarr, strictarrsubs 
 ;
-  IF NOT (keyword_set(weig) AND keyword_set(addr)) THEN BEGIN
 ;---------------
 ; atmospheric grid parameters
@@ -78 +73 @@
 ; Compute weight and address
 ;---------------
+  IF NOT (keyword_set(weig) AND keyword_set(addr)) THEN BEGIN
     CASE method OF
       'bilinear':compute_fromirr_bilinear_weigaddr, alon, alat, mskin, olon, olat, mskout, weig, addr

trunk/SRC/Interpolation/fromreg.pro

@@ -14 +14 @@
 ;            must be 'bilinear' or 'imoms3'
 ;    @param datain {in}{required}  a 2D array the input data to interpolate
-;    @param lonin {in}{optional}  longitude of the input data. optionals if
-;            WEIG and ADDR keywords used.
-;    @param latin {in}{optional}  latitude of the input data. optionals if
-;            WEIG and ADDR keywords used.
-;    @param lonout {in}{optional}  longitude of the output data. optionals if
-;            WEIG and ADDR keywords used.
-;    @param lonout {in}{optional}  latitude of the output data. optionals if
-;            WEIG and ADDR keywords used.
+;    @param lonin {in}{required}  1D or 2D array defining the longitude of the input data
+;    @param latin {in}{required}  1D or 2D array defining the latitude of the input data
+;    @param lonout {in}{required}  1D or 2D array defining the longitude of the output data
+;    @param lonout {in}{required}  1D or 2D array defining the latitude of the output data
 ;
 ; @keyword     WEIG (see ADDR)
@@ -28 +24 @@
 ;          dataout = total(weig*datain[addr], 1)
 ;          dataout = reform(dataout, jpio, jpjo, /over)
-;     Those keywords can be set to named variables into which the values will be
-;     copied when the current routine exits. Next, they can be used to perform
+;     Those keywords can be set to named variables (that are undefined or equal to 0) into which the
+;     values will be copied when the current routine exits. Next, they can be used to perform
 ;     the interpolation whithout computing again those 2 parameters. In that
 ;     case, lonin, latin, lonout and latout are not necessary.
@@ -66 +62 @@
   compile_opt strictarr, strictarrsubs 
 ;
-  IF NOT (keyword_set(weig) AND keyword_set(addr)) THEN BEGIN
 ;---------------
 ; atmospheric grid parameters
@@ -82 +77 @@
 ; Compute weight and address
 ;---------------
+  IF NOT (keyword_set(weig) AND keyword_set(addr)) THEN BEGIN
     CASE method OF
       'bilinear':compute_fromreg_bilinear_weigaddr, alon, alat, olon, olat, weig, addr, NONORTHERNLINE = nonorthernline, NOSOUTHERNLINE = nosouthernline