Changeset 36

Timestamp:

10/18/10 04:55:37 (19 months ago)

Author:

tabel

Message:

More flash support.

Location:

trunk/TOOLS

Files:

• AMRslice.pro (modified) (4 diffs)
• construct_histogram.pro (modified) (1 diff)
• construct_interpolated_slice_data.pro (modified) (1 diff)
• flash2/read_all_flash2_grid_hdf5.pro (modified) (1 diff)
• flash2/read_flash_grid_info.pro (modified) (1 diff)
• get_data.pro (modified) (4 diffs)
• show_image.pro (modified) (1 diff)

trunk/TOOLS/AMRslice.pro

@@ -597 +597 @@
         if Ntimes eq 1 then begin 
            regular = 0
+           data_format = determine_data_format_from_file_name(file_name)
           if strpos(file_name, '.hierarchy') gt 3 then begin
               regular = 1
               timenum =  strmid(file_name, strpos(file_name, '.hierarchy')-4, 4)  ; 4 digit number 
-           endif else $
-             timenum =  strmid(file_name, strpos(file_name, 'snapshot_')+9, 3) ; 3 digit number
-
+           endif else begin
+              case data_format of 
+                 2: timenum =  strmid(file_name, strpos(file_name, 'snapshot_')+9, 3) ; 3 digit number
+                 7: begin
+                    timenum = strmid(file_name, strlen(file_name)-4,4)
+                    regular = 1 
+                 end
+                 else: print, 'something wrong with data format'
+              endcase
+           endelse
+                 
            sp = strsplit(file_name, timenum, /extract, /regex)
            ns = N_elements(sp)
@@ -620 +629 @@
            if exists[0] ne '' then begin
               print, 'found previous time step file:', protofname
-              if regular then file_name = protofname+'.hierarchy' $ 
+              if regular and not (data_format eq 7) then file_name = protofname+'.hierarchy' $ 
               else file_name = protofname
               file_list = file_name
@@ -650 +659 @@
               regular = 1
               timenum =  strmid(file_name, strpos(file_name, '.hierarchy')-4, 4)  ; 4 digit number 
-           endif else $
-             timenum =  strmid(file_name, strpos(file_name, 'snapshot_')+9, 3) ; 3 digit number
-
+           endif else begin
+              case data_format of 
+                 2: timenum =  strmid(file_name, strpos(file_name, 'snapshot_')+9, 3) ; 3 digit number
+                 7: begin
+                    timenum = strmid(file_name, strlen(file_name)-4,4)
+                    regular = 1 
+                 end
+                 else: print, 'something wrong with data format'
+              endcase
+           endelse
+                 
            sp = strsplit(file_name, timenum, /extract, /regex)
            ns = N_elements(sp)
@@ -668 +685 @@
            if exists[0] ne '' then begin
               print, 'found next time step file:', protofname
-              if regular then file_name = protofname+'.hierarchy' $ 
+              if regular and not (data_format eq 7) then file_name = protofname+'.hierarchy' $ 
               else file_name = protofname
               file_list = file_name

trunk/TOOLS/construct_histogram.pro

@@ -12 +12 @@
 function mean_hist, x,y, min, max, nbins, weight=z,meanx=meanx
 ; set weight to one if it was not given
+if min gt max then return, 0
 if N_elements(z) ne N_elements(x) then begin 
    z = x

trunk/TOOLS/construct_interpolated_slice_data.pro

@@ -224 +224 @@
   if total(a.np_total) lt 1 then return, 0
   if verbose then print, 'constructing image'
-  zero = -1e-30
+  zero = -1d-70
   zero_solution_under_subgrid, u_g, a, ZERO=zero
 

trunk/TOOLS/flash2/read_all_flash2_grid_hdf5.pro

@@ -165 +165 @@
             all[cnt].data_fields[i] = fields[i]
             if fields[i] eq 'particle massdensity' then data *= product(dd)
-            if fields[i] eq 'mass' then data *= product(dd[where(dd gt 0.)])
+;            print,  product(dd[where(d gt 0.)]),  'dd:', dd[where(d gt 0.)], 'where ',where(d gt 0.)
+            if fields[i] eq 'mass' then data *= product(dd[where(d gt 0.)])
             all[cnt].Data[i]     = ptr_new(data, /no_copy)
           ENDFOR                 ; loop over patches

trunk/TOOLS/flash2/read_flash_grid_info.pro

@@ -45 +45 @@
      tgi.num = LINDGEN(p.totblocks)+1
      tgi.time = p.time
+     tgi.hier_file  = file_name
      tgi.baryon_file  = file_name
      tgi.particle_file = file_name

trunk/TOOLS/get_data.pro

@@ -9 +9 @@
 pro pack_as_list, use_g, a
 ; pack all data into 1D arrays 
-   zero = -1E30
+   zero = 0.D
    zero_solution_under_subgrid, use_g, a, ZERO=zero
 
@@ -160 +160 @@
 ind = sort(r)
 Menc = (TOTAL((mass)[ind],/double,/cumulative))[sort(ind)]
+
 return,Menc
 end
@@ -438 +439 @@
       ii = N_elements(a[0].data)
       match = is_derived_field_number(VariableNames[i], dfields)
+   
       if match ge 0 then begin
          for j=0L,N_elements(a)-1 DO BEGIN
@@ -580 +582 @@
 
      if keyword_set(ral) then pack_as_list, gi, a
-
+print, 'RRAAAAAAAAAALLL'
+help, ral
    for j=0L,N_elements(a)-1 DO BEGIN
       heap_free, a[j].data[Nvar:*] 

trunk/TOOLS/show_image.pro

@@ -96 +96 @@
             charsize=2, thick=3
       xm = obin1
-      if (N_elements(meanh) gt 0) then begin
+      if (N_elements(meanh) gt 1) then begin
          ym = meanh
          if onelog then xm = 10.^meanx