Changeset 236 for trunk/SRC/Interpolation

Timestamp:

03/21/07 18:18:44 (17 years ago)

Author:

pinsard

Message:

replace some print by some report in some .pro #2

Location:

trunk/SRC/Interpolation

Files:

• angle.pro (modified) (1 diff)
• compute_fromirr_bilinear_weigaddr.pro (modified) (1 diff)
• extrapolate.pro (modified) (1 diff)
• extrapsmooth.pro (modified) (2 diffs)
• fromirr.pro (modified) (1 diff)
• fromreg.pro (modified) (1 diff)
• get_gridparams.pro (modified) (6 diffs)
• inquad.pro (modified) (3 diffs)

trunk/SRC/Interpolation/angle.pro

@@ -111 +111 @@
   fileoce = findfile(fileoce, count = okfile)
   IF okfile NE 1 THEN BEGIN
-    print, 'the file '+fileoce+' is not found... we stop'
+    ras = report('the file '+fileoce+' is not found... we stop')
     stop
   ENDIF

trunk/SRC/Interpolation/compute_fromirr_bilinear_weigaddr.pro

@@ -72 +72 @@
   IF n_elements(amsk) EQ 1 AND amsk[0] EQ -1 THEN amsk = replicate(1b, jpia, jpja)
   IF n_elements(omsk) NE jpio*jpjo THEN BEGIN
-    print, 'input grid mask do not have the good size'
+    ras = report('input grid mask do not have the good size')
     stop
   ENDIF
   IF n_elements(amsk) NE jpia*jpja THEN BEGIN
-    print, 'output grid mask do not have the good size'
+    ras = report('output grid mask do not have the good size')
     stop
   ENDIF

trunk/SRC/Interpolation/extrapolate.pro

@@ -75 +75 @@
   IF n_elements(maskinput) EQ 1 AND maskinput[0] EQ -1 THEN maskinput = replicate(1b, nx, ny)
   IF n_elements(maskinput) NE nx*ny THEN BEGIN
-    print, 'input grid mask do not have the good size'
+    ras = report('input grid mask do not have the good size')
     return, -1
   ENDIF

trunk/SRC/Interpolation/extrapsmooth.pro

@@ -52 +52 @@
   sz = size(reform(in))
   IF sz[0] NE 2 THEN BEGIN
-    print, 'Input arrays must have 2 dimensions'
+    ras = report('Input arrays must have 2 dimensions')
     return, -1
   ENDIF
@@ -59 +59 @@
   IF n_elements(mskin) EQ 1 AND mskin[0] EQ -1 THEN mskin = replicate(1b, nx, ny)
   IF n_elements(mskin) NE nx*ny THEN BEGIN
-    print, 'input grid mask do not have the good size'
+    ras = report('input grid mask do not have the good size')
     return, -1
   ENDIF

trunk/SRC/Interpolation/fromirr.pro

@@ -110 +110 @@
       'bilinear':compute_fromirr_bilinear_weigaddr, alon, alat, mskin, olon, olat, mskout, weig, addr
       ELSE:BEGIN
-        print, ' unknown interpolation method... we stop'
+        ras = report(' unknown interpolation method... we stop')
         stop
       ENDELSE

trunk/SRC/Interpolation/fromreg.pro

@@ -113 +113 @@
       'imoms3':  compute_fromreg_imoms3_weigaddr,   alon, alat, olon, olat, weig, addr, NONORTHERNLINE = nonorthernline, NOSOUTHERNLINE = nosouthernline
       ELSE:BEGIN
-        print, ' unknown interpolation method... we stop'
+        ras = report(' unknown interpolation method... we stop')
         stop
       ENDELSE

trunk/SRC/Interpolation/get_gridparams.pro

@@ -87 +87 @@
 ; get longitude and latitude
       IF file_test(in1) EQ 0 THEN BEGIN
-        print, 'file ' + in1 + ' does not exist'
+        ras = report('file ' + in1 + ' does not exist')
         stop
       ENDIF
@@ -102 +102 @@
     END
     ELSE:BEGIN
-      print, 'Bad nimber of input parameters'
+      ras = report('Bad number of input parameters')
       stop
     end
@@ -140 +140 @@
         1:BEGIN
           IF array_equal(lon, lon[*, 0] # replicate(1, jpj)) NE 1 THEN BEGIN
-            print, 'Longitudes are not the same for all latitudes, impossible to extract a 1D array of the longitudes'
+            ras = report('Longitudes are not the same for all latitudes, impossible to extract a 1D array of the longitudes')
             stop
           ENDIF
@@ -161 +161 @@
         1:BEGIN
           IF array_equal(lat, replicate(1, jpi) # lat[0, *]) NE 1 THEN BEGIN
-            print, 'Latitudes are not the same for all longitudes, impossible to extract a 1D array of the latitudes'
+            ras = report('Latitudes are not the same for all longitudes, impossible to extract a 1D array of the latitudes')
             stop
           ENDIF
@@ -182 +182 @@
         1:BEGIN
           IF array_equal(lon, lon[*, 0] # replicate(1, jpj)) NE 1 THEN BEGIN
-            print, 'Longitudes are not the same for all latitudes, impossible to extract a 1D array of the longitudes'
+            ras = report('Longitudes are not the same for all latitudes, impossible to extract a 1D array of the longitudes')
             stop
           ENDIF
           lon = lon[*, 0]
           IF array_equal(lat, replicate(1, jpi) # reform(lat[0, *])) NE 1 THEN BEGIN
-            print, 'Latitudes are not the same for all longitudes, impossible to extract a 1D array of the latitudes'
+            ras = report('Latitudes are not the same for all longitudes, impossible to extract a 1D array of the latitudes')
             stop
           ENDIF
@@ -199 +199 @@
 ; lon and lat are not 1D and/or 2D arrays
 ;-------
-    ELSE:stop
+    ELSE: BEGIN
+             ras = report('Longitudes and latitudes are not 1D and/or 2D arrays')
+             stop
+          END
   ENDCASE
 ;

trunk/SRC/Interpolation/inquad.pro

@@ -261 +261 @@
 ; points out of the cells
     IF (where(chtest EQ 0))[0] NE -1 THEN BEGIN
-      IF NOT keyword_set(noprint) THEN print, 'Points number '+strjoin(strtrim(where(chtest EQ 0), 1), ', ')+' are out of the grid'
+      IF NOT keyword_set(noprint) THEN BEGIN
+         ras = report('Points number '+strjoin(strtrim(where(chtest EQ 0), 1), ', ')+' are out of the grid')
+      ENDIF
       stop
     ENDIF
 ; points in more than one cell
     IF (where(chtest GT 1))[0] NE -1 THEN BEGIN
-      IF NOT keyword_set(noprint) THEN print, 'Points number '+strjoin(strtrim(where(chtest GT 1), 1), ', ')+' are in more than one cell'
+      IF NOT keyword_set(noprint) THEN BEGIN
+        ras = report('Points number '+strjoin(strtrim(where(chtest GT 1), 1), ', ')+' are in more than one cell')
+      ENDIF
       stop
     ENDIF
@@ -277 +281 @@
     CASE 1 OF
       found[0] EQ -1:BEGIN
-        IF NOT keyword_set(noprint) THEN print, 'The point is out of the cells'
+        IF NOT keyword_set(noprint) THEN BEGIN
+           ras = report('The point is out of the cells')
+        ENDIF
         IF keyword_set(onsphere) THEN BEGIN
 ; restore old !map...
@@ -289 +295 @@
       END
       n_elements(found) GT ntofind:BEGIN
-        IF NOT keyword_set(noprint) THEN print, 'The point is in more than one cell'
+        IF NOT keyword_set(noprint) THEN BEGIN
+          ras = report('The point is in more than one cell')
+        ENDIF
       END
       ELSE: