[Yt-svn] yt-commit r455 - trunk/examples

[britton at wrangler.dreamhost.com]

Author: britton
Date: Fri May  9 14:08:35 2008
New Revision: 455
URL: http://yt.spacepope.org/changeset/455

Log:
Changed clump finding wrappers so that they output a little more information.

9 May, 2008

Britton Smith


Modified:
   trunk/examples/find_clumps_all_datasets.py
   trunk/examples/find_clumps_dataset.py

Modified: trunk/examples/find_clumps_all_datasets.py
==============================================================================
--- trunk/examples/find_clumps_all_datasets.py	(original)
+++ trunk/examples/find_clumps_all_datasets.py	Fri May  9 14:08:35 2008
@@ -3,24 +3,28 @@
 # In this example, we are looking for clumps in a sphere of radius 10 pc surrounding 
 # the density maximum in each datadump.
 
+import yt.lagos as lagos
 from find_clumps_dataset import *
 
-data_dir = "/Users/britton/EnzoRuns/real_4/cl-4/"
+data_dir = "/Users/britton/EnzoRuns/runs_08/cl-2.5/"
+#data_dir = "/Volumes/Turducken/EnzoRuns/runs_08/cl-5/"
 
 # Time datadumps.
-time_dumps = [q for q in range(25)]
+time_dumps = [34]
 time_dump_dir = "DataDir"
 time_dump_prefix = "DataDump"
 
 # Redshift datadumps.
-redshift_dumps = [q for q in range(5)]
+redshift_dumps = []
 redshift_dump_dir = "RedshiftDir"
 redshift_dump_prefix = "RedshiftDump"
 
 field = "Density"
-radius = 10
+radius = 0.0001
 units = "pc"
-step = 10**(1./5.) # 5 steps each order of magnitude
+step = 10**(1./4.) # 4 steps each order of magnitude
+
+minCells = 64 # not setting anything, only for file prefix
 
 # Prepare list of datasets.
 datasets = []
@@ -33,13 +37,20 @@
 for dataset in datasets:
     print "Finding clumps in %s." % dataset
 
+    prefix = "%s_%.1e%s_step%.2f_min%d" % (dataset,radius,units,step,minCells)
+
     dataset_object = lagos.EnzoStaticOutput(dataset)
 
     # Look for clumps in a sphere surrounding the density maximum.
     v, c = dataset_object.h.find_max(field)
     sphere = dataset_object.h.sphere(c, radius/dataset_object[units], [field]) # cache our field
 
-    find_clumps_dataset(dataset,sphere,field,step)
+    print "Sphere is %s %s." % (radius,units)
+    print "Min %s: %e, Max %s: %e." % (field,sphere.data[field].min(),
+                                      field,sphere.data[field].max())
+
+    master = find_clumps_dataset(prefix,sphere,field,step)
 
+    del master
     del sphere
     del dataset_object

Modified: trunk/examples/find_clumps_dataset.py
==============================================================================
--- trunk/examples/find_clumps_dataset.py	(original)
+++ trunk/examples/find_clumps_dataset.py	Fri May  9 14:08:35 2008
@@ -1,31 +1,35 @@
 # This is a wrapper for the clump finder in Clump.py.
 # Arguments:
-#     dataset: name of dataset, used as a prefix for the output files.
+#     prefix: name of file prefix for text output
 #     data_object: object over which contouring is performed (region or sphere).
 #     field: data field over which contours are made (example: "Density" or "AveragedDensity").
 #     step: contouring stepsize.  The field minimum is multiplied by this value each round of 
 #           the clump finding.
 
 import sys, time
+import Clump as cl
 from math import *
-from Clump import *
 
-def find_clumps_dataset(dataset,data_object,field,step):
+def find_clumps_dataset(prefix,data_object,field,step):
     t1 = time.time()
 
     c_min = 10**floor(log10(data_object[field].min()))
     c_max = 10**floor(log10(data_object[field].max())+1)
 
-    master_clump = Clump(data_object, None, field)
-    find_clumps(master_clump, c_min, c_max, step)
+    master_clump = cl.Clump(data_object, None, field)
+    cl.find_clumps(master_clump, c_min, c_max, step)
 
     t2=time.time()
     print "Took %0.3e seconds" % (t2-t1)
 
-    f = open('%s_clump_hierarchy.txt' % dataset,'w')
-    write_clump_hierarchy(master_clump,0,f)
+    f = open('%s_clump_hierarchy.txt' % prefix,'w')
+    cl.write_clump_finder_parameters(f)
+    cl.write_clump_hierarchy(master_clump,0,f)
     f.close()
 
-    f = open('%s_clumps.txt' % dataset,'w')
-    write_clumps(master_clump,0,f)
+    f = open('%s_clumps.txt' % prefix,'w')
+    cl.write_clump_finder_parameters(f)
+    cl.write_clumps(master_clump,0,f)
     f.close()
+
+    return master_clump