Changeset 30 for trunk/TOOLS/AMRslice.pro

Timestamp:

07/30/10 13:16:33 (22 months ago)

Author:

tabel

Message:

Added radial and tangential velocity as well as cylindrical radius for the particles as a derived field.

File:

• trunk/TOOLS/AMRslice.pro (modified) (6 diffs)

trunk/TOOLS/AMRslice.pro

@@ -696 +696 @@
           if STOPIT then begin
              stopit = 0
-             break
+             return
           endif
           
@@ -970 +970 @@
            endfor
         end else begin
-           while ofname ne file_name do begin
+           while ofname ne strmid(file_name, 0, strpos(file_name,'.',/reverse_search)) do begin
               select_current_grids
               check_cancel, stopit=stopit
@@ -985 +985 @@
               if last_was eq 5 then j_event, 'PROJECTHII'
               if verbose then print, 'memory use in Gb', memory()/1024./1e6
-              ofname = file_name
+              
+              print, 'ofname:', $
+                     ofname
+              print, strmid(file_name, 0, strpos(file_name,'.',/reverse_search))
+              ofname = strmid(file_name, 0, strpos(file_name,'.',/reverse_search))
+
+              
               for i=0,astep-1 do j_event, 'NEXT TIME STEP'
-              wait, 1
+              wait, .2
            endwhile
         endelse           
@@ -1079 +1085 @@
            if parti.myturn eq 1 then begin
               pdata = render_particle_data()
-              ind = where(pdata ne min(pdata)) > 0
-              data[ind] = max(data)
+;              data[ind] = max(data)
+;              data[ind] = pdata[ind]
               last_was = 2
            end 
-        endelse
+
         if (size(data))[0] eq 2 then begin
            construct_image, data
+           if N_elements(pdata) eq N_elements((*image_stack[image_index].image_d)) then begin
+; combine particles with projection
+              imi = min(pdata[where(pdata gt min(pdata))], max=ima)
+              dmi = min((*image_stack[image_index].image_d), max=dma)
+;              dma = sqrt(dmi*dma) ; stop particle colors in the geometric mean of min and max of grid data
+              im = (pdata-imi)/(ima-imi)*(dma-dmi)+dmi
+              ind = where(im gt dmi, count) > 0
+              if count eq 0 then ind = lindgen(N_elements(im))
+              print, imi, ima, dmi, dma
+              if parti.myturn eq 1 then (*image_stack[image_index].image_d)[ind] = im[ind]
+              im = 0.
+           endif
            show_image
+
         endif 
         if (vel.myturn) then j_event, 'VELPlot'
         fresh_image = 1
+
+        endelse
     END
 
@@ -1338 +1359 @@
         help = ['PICK PEAK FILE', 'Select existing peak file or', $
                 'specify a new file name to create your own list of peaks']
-        peak_file_name = dialog_pickfile(GROUP=TOP_BASE, FILTER = '*.peaks', $
-                                         Path=data_dir,   $
+        peak_file_name = dialog_pickfile(GROUP=TOP_BASE, FILTER = '*.peaks;*.dat', $
+                                         Path=data_dir+'../FOF',   $
                                          TITLE  = 'Choose peak file', $
                                          GET_PATH = peak_in_dir)
@@ -1845 +1866 @@
                        UVALUE='BASE2')
 
-  BASE2 = WIDGET_BASE(parent, $
-                      /COLUMN, MAP=1, $ ;  SCR_XSIZE=350,Y_SCROLL_SIZE=wxysize+100, $
-                      UVALUE='BASE2')
-  
+;  BASE2 = WIDGET_BASE(parent, /COLUMN, MAP=1,   SCR_XSIZE=350,Y_SCROLL_SIZE=wxysize+100, UVALUE='BASE2') ; projector
+  BASE2 = WIDGET_BASE(parent, /COLUMN, MAP=1,  UVALUE='BASE2')   
+
   ISO_BASE = WIDGET_BASE(parent, /COLUMN, MAP=0, UVALUE = 'VALUE_BASE')