Changeset 534 for trunk

Timestamp:

04/20/12 10:43:38 (12 years ago)

Author:

pinsard

Message:

fix too many openr

Location:

trunk/src

Files:

• extract_amsua.pro (modified) (4 diffs)
• read_amsua1c.pro (modified) (5 diffs)

trunk/src/extract_amsua.pro

@@ -158 +158 @@
 ;
 ; $URL$
+;
+; - fplod 20120420
+;
+;   * remove extra openr to avoid 
+;     ``% GET_LUN: All available logical units are currently in use``
+;     openr is included in :ref:`read_amsua1c.pro`
 ;
 ; - fplod 20120417
@@ -326 +332 @@
 ; boucle sur les elements de la liste
 
-msg = report(['iii : ' + routine + ' : traitement du jour' + string(yyyy, format='(1x,I4.4)') + string(mm, format='(I2.2)') + string(dd, format='(I2.2)')])
+msg = report(['iii : ' + routine + ' : traitement du jour' $
+      + string(yyyy, format='(1x,I4.4)') $
+      + string(mm, format='(I2.2)') $
+      + string(dd, format='(I2.2)')])
 a = STRARR(nb_file)
+
 IF key_performance EQ 1 THEN BEGIN
     msg = report(['ppp : ' + routine + ' :  durï¿œe intermediaire demarrage boucle sur fichier ' $
@@ -341 +351 @@
                    + string(SYSTIME(1)-time1,format='(F12.6)')])
    ENDIF
-   openr,lu1,filea,Error=error,/get_lun
-   IF (error NE 0) then begin
-       ras = report(['eee : can not open for reading'$
-             + '!C' $
-             + 'code : ' + !ERROR_STATE.MSG $
-             + filea])
-       STOP
-   ENDIF
-
    read_amsua1c,filea, flag1
-   close,lu1
-   free_lun,lu1
    if (flag1 eq 0) then goto, labfile
    na=SIZE(reform(ama_scan.btemps[0,*,*]))
@@ -385 +384 @@
    msg = report(['iii : ' + routine + ' : nb de points du fichier dans le domaine geographique +15deg ' + string(nzon,format='(I8.8)')])
    IF key_performance EQ 1 THEN BEGIN
-       msg = report(['ppp : ' + routine + ' : durï¿œe intermediaire avant openr filea' $
+       msg = report(['ppp : ' + routine + ' : durï¿œe intermediaire avant test nzon' $
                    + string(SYSTIME(1)-time1,format='(F12.6)')])
    ENDIF
-   openr,lu1,filea,Error=error,/get_lun
    if nzon gt 1 then begin
       amalat=amalati[*,jnd]

trunk/src/read_amsua1c.pro

@@ -34 +34 @@
 ;  $Id: read_amsua1c.pro 235 2011-05-16 15:52:50Z pinsard $
 ;
+; - fplod 20120420
+;
+;   * use get_lun instead of hard coded unit
+;
 ; - fplod 20120417
 ; 
@@ -63 +67 @@
 ;
 ; Open input file
-OPENR,1,filename, ERROR = error
+OPENR, lu,filename, ERROR = error,/GET_LUN
 IF (error NE 0) then begin
    ras = report(['eee : can not open for reading'$
@@ -74 +78 @@
 ; Define and read in header structure
 define_amsua_header_struct
-READU,1, ama_head
+READU, lu, ama_head
 ; byteorder,ama_head,/Lswap
 ;
@@ -83 +87 @@
 ; read each scanline sperately
 FOR i = 0L,ama_head.h_scnlin-1 DO BEGIN
-   ; if (eof(1) eq 0) then goto, pb_file
-   READU,1,one_scana
+   ; if (eof(lu) eq 0) then goto, pb_file
+   READU, lu, one_scana
    ;byteorder,one_scana,/Lswap
    ama_scan[i] = one_scana
@@ -91 +95 @@
 ; Close input file
 pb_file:
-CLOSE,1
+CLOSE, lu
+FREE_LUN, lu
 
 IF key_performance EQ 1 THEN BEGIN