Changeset 812

Timestamp:

08/11/07 00:20:56 (13 months ago)

Author:

mankoff

Message:

read_rain moved out of clouds to own file.

clouds.pro made considerably less memory hungry.

• arrconcat is useful but inefficient for large arrays
  
• arrconcat still okay in current context for 'time'.
  
• precompute array size, and then fill it directly in the structure
  
• don't calculate rain
  

Still plenty of work to do to make xyztn more memory efficient.

Location:

misc/clouds

Files:

• clouds.pro (modified) (1 diff)
• read_rain.pro (added)

misc/clouds/clouds.pro

@@ -1 +1 @@
 
-function read_rain, yr_in, mo_in, dy_in, hr_in, mn_in
-
-year = STRING(yr_in,FORMAT='(I4.4)')
-month = STRING(mo_in,FORMAT='(I2.2)')
-day = STRING(dy_in,FORMAT='(I2.2)')
-hour = STRING(hr_in,FORMAT='(I2.2)')
-minute = STRING(mn_in,FORMAT='(I2.2)')
-
-fname = 'data/'+'twpcpoldarX1.00.'+year+month+day+'.'+hour+minute+ '00.raw.asc'
-if file_exist( fname+'.sav' ) then begin
-    restore, fname+'.sav'
-    print, "Loading from cache: " + fname
-    return, s
-end
-openr, lun, fname, /GET_LUN
-print, "Reading and caching: " + fname
-
-datetime = ''
-readf, lun, datetime
-if datetime ne year+month+day+' '+hour+minute then $
-  MESSAGE, "Requested data/time do not match file internals", /CONTINUE
-readf, lun, lat, lon, xmin, xmax, nx, ymin, ymax, ny, zmin, zmax, nz
-
-data = fltarr( nx*2, ny, nz )
-readf, lun, data
-
-class = data[ makex( 1, (nx*2)-1, 2 ), *, * ]
-data = TEMPORARY( data[ makex( 0, (nx*2)-1, 2 ), *, * ] )
-
-s = {data: data, $
-     class: class, $
-     classtype: INDGEN(11), $
-     classname: ['unclassified', 'drizzle', 'rain', 'dry low density snow', $
-                 'dry high density snow', 'melting snow', 'dry graupel', $
-                 'wet graupel', 'small hail lt 2 cms', 'large hail gt 2 cms', $
-                 'rain hail mix' ], $
-     date: year+month+day, $
-     time: hour+minute, $
-     lat: lat, $
-     lon: lon }
-save, s, filename=fname+'.sav'
-free_lun, lun
-return, s
-end
-
-
-
-pro clouds, h0,h1, filename=filename
+pro clouds, h0,h1
 
 if n_params() eq 0 then begin
     print, " "
     print, "  CLOUDS, H0, H1"
-    print, "  CLOUDS, FILENAME=<cached_file.sav>"
     print, " "
     print, "  H0 is 1st hour, H1 is 2nd hour"
-    print, "  Examples: "
+    print, "  Example: "
     print, "  idl> CLOUDS, 18, 22                ; load data from 6 to 10PM"
-    print, "  idl> CLOUDS, file='everything.sav' ; load a save file of EVERYTHING."
     print, " "
-    print, "  hint: CLOUDS,00,23 then copy tmp.sav to everything.sav"
-    print, "  Question/Bugs: mankoff@giss.nasa.gov"
     return
 end
-if keyword_set( filename ) then begin
-   xyztn, loaddata=filename
-   return
-endif
 
+arr = fltarr( 121, 121, 40, (h1-h0+1)*6 )
+data = { dbZ: arr, class: arr }
+idx = 0
 for hr=h0,h1 do begin
     for min=0,50,10 do begin
-        d = read_rain(2006,01,22,hr,min)
-        
-        dd = d.data
-        gd = where( dd ne -99.9, complement=bad )
-        dd[bad] = 0 ;-999.99
-        
-        cc = d.class
-        gd = where( cc ne -9, complement=bad )
-        cc[bad] = 0 ;-999.99
+        rec = read_rain(2006,01,22,hr,min)
 
-        rr = d.data * (d.class eq 2) 
-        
-        data0 = arrconcat( data0, dd )
-        data1 =arrconcat( data1, cc )
-        rain = arrconcat( rain, rr )
-        time = arrconcat( time, d.time )
+        d = rec.data
+        bad = where( d eq -99.9, nbad )
+        if nbad ne 0 then d[bad] = 0
+        data.dbz[ *,*,*, idx ] = d
+
+        c = rec.class
+        bad = where( c eq -9, nbad )
+        if nbad ne 0 then c[bad] = 0
+        data.class[ *,*,*, idx ] = c
+
+        time = arrconcat( time, rec.time )
+
+        idx = idx+1
    endfor
 endfor
-data = { $
-       dbZ: data0, $
-       class: data1, $
-       rain: rain }
 
 meta = { time: time, $