Changeset 460 for trunk

Timestamp:

12/13/11 15:51:21 (13 years ago)

Author:

pinsard

Message:

geobox in amsu t2 file terminology

Location:

trunk/src

Files:

• file_amsu_t2_to_mem.pro (modified) (11 diffs)
• mem_to_file_amsu_t2.pro (modified) (7 diffs)

trunk/src/file_amsu_t2_to_mem.pro

@@ -5 +5 @@
 ; =======================
 ;
-; .. function:: file_amsu_t2_to_mem(yyyy, mm, dd, numch, testfilename)
+; .. function:: file_amsu_t2_to_mem(yyyy, mm, dd, numch, lon_min, lon_max, lat_min, lat_max, testfilename)
 ;
 ; DESCRIPTION
@@ -13 +13 @@
 ;
 ; This type of file has been produced by :ref:`extract_amsua.pro`
-; thow landseamask is NaN++
 ;
 ; If **testfilename** is not empty, this filename will be written, otherwise
@@ -25 +24 @@
 ;
 ; Realistic example with VARAMMA file AMSU-A chanel 5
-; :file:`${PROJECT_ID}/AMSU/2006/08/a5_20060801.dat`::
+; :file:`${PROJECT_ID}/AMSU/2006/08/a5_20060801_060w30s_050e45n.dat`::
 ;
 ;   IDL> numch='a5'
@@ -31 +30 @@
 ;   IDL> mm=8
 ;   IDL> dd=1
+;   IDL> lon_min=-60.
+;   IDL> lon_max=50.
+;   IDL> lat_min=-30.
+;   IDL> lat_max=45.
 ;   IDL> testfilename=''
-;   IDL> result = file_amsu_t2_to_mem(yyyy, mm, dd, numch, testfilename)
+;   IDL> result = file_amsu_t2_to_mem(yyyy, mm, dd, numch, lon_min, lon_max, lat_min, lat_max, testfilename)
 ;
 ; impression de controle : structure et 1re ligne de données::
@@ -53 +56 @@
 ; ajouter de # dans les lignes d'entete
 ;
-; à intégrer dans correct_nadir_amsu.pro
+; à intégrer dansla chaine de traitement amsu
 ;
 ; check args
@@ -65 +68 @@
 ;
 ; $URL$
+;
+; - fplod 20111213T143503Z aedon.locean-ipsl.upmc.fr (Darwin)
+;
+;   * geobox in filename
 ;
 ; - fplod 20111213T094118Z cratos (Linux)
@@ -95 +102 @@
 ;-
 FUNCTION file_amsu_t2_to_mem, yyyy, mm, dd, numch $
+                            , lon_min, lon_max, lat_min, lat_max $
                             , testfilename
 ;
@@ -106 +114 @@
 usage = 'result=file_amsu_t2_to_mem(yyyy, mm, dd, numch, testfilename)'
 nparam = N_PARAMS()
-IF (nparam NE 5) THEN BEGIN
+IF (nparam NE 9) THEN BEGIN
    ras = report(['Incorrect number of arguments.' $
          + '!C' $
@@ -114 +122 @@
 ;
 if (testfilename eq '') then begin
+    look = 'filename'
+    scale = 1.
+    geomin = geolocation_to_string_idl(lon_min, lat_min, look, scale)
+    geomax = geolocation_to_string_idl(lon_max, lat_max, look, scale)
     fullfilename = project_id_env+ 'AMSU/' $
             + string(yyyy,format='(I4.4)') + '/' $
@@ -120 +132 @@
             + string(yyyy,format='(I4.4)') $
             + string(mm,format='(I2.2)') $
-            + string(dd,format='(I2.2)') $
+            + string(dd,format='(I2.2)') + '_' $
+            + geomin + '_' $
+            + geomax $
             + '.dat'
 endif else begin
@@ -165 +179 @@
 ;++ handle error
 ;
-help, result,/structure
-help, header1,/structure
 ; read header lines
 READF, lun, header1, format=format_header1

trunk/src/mem_to_file_amsu_t2.pro

@@ -5 +5 @@
 ; =======================
 ;
-; .. function:: mem_to_file_amsu_t2(yyyy, mm, dd, numch, amsu_t2, testfilename)
+; .. function:: mem_to_file_amsu_t2(amsu_t2, testfilename)
 ;
 ; DESCRIPTION
@@ -44 +44 @@
 ; :func:`file_amsu_t2_to_mem`
 ;
+; use :func:`geolocation_to_string_idl`
+;
 ; TODO
 ; ====
@@ -55 +57 @@
 ; check args
 ;
-; spécial idl : je narrive pas à éviter la boucle sur les ligens de data !!
+; spécial idl : je n'arrive pas à éviter la boucle sur les lignes de data !!
 ;
 ; EVOLUTIONS
@@ -63 +65 @@
 ;
 ; $URL$
+;
+; - fplod 20111213T143503Z aedon.locean-ipsl.upmc.fr (Darwin)
+;
+;   * geobox in filename
 ;
 ; - fplod 20111213T094118Z cratos (Linux)
@@ -89 +95 @@
 ;-
 FUNCTION mem_to_file_amsu_t2, amsu_t2 $
-                            , testfilename
+                            , testfilename
 ;
 compile_opt idl2, strictarrsubs
@@ -109 +115 @@
 ENDIF
 ;
+
 if (testfilename eq '') then begin
+    look = 'filename'
+    scale = 1.
+    geomin = geolocation_to_string_idl(amsu_t2.header2.lon_min, amsu_t2.header2.lat_min, look, scale)
+    geomax = geolocation_to_string_idl(amsu_t2.header2.lon_max, amsu_t2.header2.lat_max, look, scale)
     fullfilename = project_id_env+ 'AMSU/' $
             + string(amsu_t2.header1.yyyy,format='(I4.4)') + '/' $
@@ -116 +127 @@
             + string(amsu_t2.header1.yyyy,format='(I4.4)') $
             + string(amsu_t2.header1.mm,format='(I2.2)') $
-            + string(amsu_t2.header1.dd,format='(I2.2)') $
+            + string(amsu_t2.header1.dd,format='(I2.2)') + '_' $
+            + geomin + '_' $
+            + geomax $
             + '.dat'
 endif else begin