[Yt-svn] yt: 5 new changesets
hg at spacepope.org
hg at spacepope.org
Fri Jun 25 10:50:19 PDT 2010
hg Repository: yt
details: yt/rev/b86d04c0dad1
changeset: 1813:b86d04c0dad1
user: sskory
date:
Thu Jun 24 18:29:49 2010 -0700
description:
[svn r1761] Adding docstrings to the merger tree & star analysis stuff.
hg Repository: yt
details: yt/rev/78aed3469844
changeset: 1814:78aed3469844
user: sskory
date:
Fri Jun 25 09:05:42 2010 -0700
description:
[svn r1762] Adding docstrings to HaloFinding and TwoPointFunctions.
hg Repository: yt
details: yt/rev/5d11a64c5ca0
changeset: 1815:5d11a64c5ca0
user: joishi
date:
Fri Jun 25 09:46:42 2010 -0700
description:
[svn r1763] fixed another minor bug, thanks to Andrew Myers.
hg Repository: yt
details: yt/rev/df3b6fb61cd3
changeset: 1816:df3b6fb61cd3
user: mturk
date:
Fri Jun 25 10:35:14 2010 -0700
description:
[svn r1764] Changing SIGUSR2 to insert an IPython session
hg Repository: yt
details: yt/rev/1642520950b6
changeset: 1817:1642520950b6
user: Matthew Turk <matthewturk at gmail.com>
date:
Fri Jun 25 10:50:14 2010 -0700
description:
Merging from trunk
diffstat:
.hgignore | 3 +
scripts/fbranch | 5 +-
scripts/fbury | 5 +-
scripts/fdigup | 5 +-
scripts/fido | 5 +-
scripts/fimport | 5 +-
yt/amr_utils.c | 2242 +++++++++++-----------
yt/arraytypes.py | 11 +
yt/extensions/StarAnalysis.py | 134 +-
yt/extensions/kdtree/fKD.f90 | 2 +-
yt/extensions/light_ray.py | 372 +++
yt/extensions/merger_tree.py | 125 +
yt/extensions/opengl_image_viewer.py | 4 +-
yt/extensions/opengl_widgets/calculateRay.vertex.glsl | 63 +
yt/extensions/opengl_widgets/colormap.fragment.glsl | 12 +
yt/extensions/opengl_widgets/framebuffer.vertex.glsl | 12 +
yt/extensions/opengl_widgets/mip.fragment.glsl | 135 +
yt/extensions/opengl_widgets/mip_viewer.py | 450 ++++
yt/extensions/opengl_widgets/rendering_contexts.py | 88 +
yt/extensions/volume_rendering/multi_texture.py | 302 +++
yt/fido/share_data.py | 83 +
yt/funcs.py | 7 +-
yt/lagos/BaseDataTypes.py | 1 -
yt/lagos/Clump.py | 290 --
yt/lagos/HaloFinding.py | 495 ++++-
yt/lagos/TwoPointFunctions.py | 160 +-
yt/raven/plot_collection.py | 4 +-
yt/reason/plot_editors.py | 10 +-
yt/reason/reason_v2.py | 7 +-
yt/reason/tvtk_interface.py | 26 +-
30 files changed, 3454 insertions(+), 1609 deletions(-)
diffs (truncated from 13562 to 300 lines):
diff -r 75fc681cb9dc -r 1642520950b6 .hgignore
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/.hgignore Fri Jun 25 10:50:14 2010 -0700
@@ -0,0 +1,3 @@
+syntax: glob
+*.pyc
+.*.swp
diff -r 75fc681cb9dc -r 1642520950b6 scripts/fbranch
--- a/scripts/fbranch Thu Jun 24 17:12:57 2010 -0700
+++ b/scripts/fbranch Fri Jun 25 10:50:14 2010 -0700
@@ -1,1 +1,4 @@
-basic.py
\ No newline at end of file
+#!python2.5
+import yt.fido
+
+yt.fido.runAction()
diff -r 75fc681cb9dc -r 1642520950b6 scripts/fbury
--- a/scripts/fbury Thu Jun 24 17:12:57 2010 -0700
+++ b/scripts/fbury Fri Jun 25 10:50:14 2010 -0700
@@ -1,1 +1,4 @@
-basic.py
\ No newline at end of file
+#!python2.5
+import yt.fido
+
+yt.fido.runAction()
diff -r 75fc681cb9dc -r 1642520950b6 scripts/fdigup
--- a/scripts/fdigup Thu Jun 24 17:12:57 2010 -0700
+++ b/scripts/fdigup Fri Jun 25 10:50:14 2010 -0700
@@ -1,1 +1,4 @@
-basic.py
\ No newline at end of file
+#!python2.5
+import yt.fido
+
+yt.fido.runAction()
diff -r 75fc681cb9dc -r 1642520950b6 scripts/fido
--- a/scripts/fido Thu Jun 24 17:12:57 2010 -0700
+++ b/scripts/fido Fri Jun 25 10:50:14 2010 -0700
@@ -1,1 +1,4 @@
-basic.py
\ No newline at end of file
+#!python2.5
+from yt.mods import *
+
+fido.runAction()
diff -r 75fc681cb9dc -r 1642520950b6 scripts/fimport
--- a/scripts/fimport Thu Jun 24 17:12:57 2010 -0700
+++ b/scripts/fimport Fri Jun 25 10:50:14 2010 -0700
@@ -1,1 +1,4 @@
-basic.py
\ No newline at end of file
+#!python2.5
+from yt.mods import *
+
+fido.runAction()
diff -r 75fc681cb9dc -r 1642520950b6 yt/amr_utils.c
--- a/yt/amr_utils.c Thu Jun 24 17:12:57 2010 -0700
+++ b/yt/amr_utils.c Fri Jun 25 10:50:14 2010 -0700
@@ -1,4 +1,4 @@
-/* Generated by Cython 0.12.1 on Thu Jun 24 08:38:56 2010 */
+/* Generated by Cython 0.12.1 on Thu Jun 24 08:40:25 2010 */
#define PY_SSIZE_T_CLEAN
#include "Python.h"
@@ -378,7 +378,7 @@
typedef npy_cdouble __pyx_t_5numpy_complex_t;
-/* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/VolumeIntegrator.pyx":76
+/* "/Users/matthewturk/yt/yt/yt/_amr_utils/VolumeIntegrator.pyx":76
* cdef class VectorPlane
*
* cdef struct FieldInterpolationTable: # <<<<<<<<<<<<<<
@@ -398,7 +398,7 @@
int pass_through;
};
-/* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/VolumeIntegrator.pyx":89
+/* "/Users/matthewturk/yt/yt/yt/_amr_utils/VolumeIntegrator.pyx":89
* int pass_through
*
* cdef void FIT_initialize_table(FieldInterpolationTable *fit, int nbins, # <<<<<<<<<<<<<<
@@ -413,7 +413,7 @@
int pass_through;
};
-/* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/QuadTree.pyx":39
+/* "/Users/matthewturk/yt/yt/yt/_amr_utils/QuadTree.pyx":39
* void *alloca(int)
*
* cdef struct QuadTreeNode: # <<<<<<<<<<<<<<
@@ -430,7 +430,7 @@
struct __pyx_t_2yt_9amr_utils_QuadTreeNode *children[2][2];
};
-/* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/VolumeIntegrator.pyx":118
+/* "/Users/matthewturk/yt/yt/yt/_amr_utils/VolumeIntegrator.pyx":118
* return (bv + dd*dy*fit.idbin)
*
* cdef class TransferFunctionProxy: # <<<<<<<<<<<<<<
@@ -451,7 +451,7 @@
PyObject *my_field_tables;
};
-/* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/DepthFirstOctree.pyx":36
+/* "/Users/matthewturk/yt/yt/yt/_amr_utils/DepthFirstOctree.pyx":36
* self.refined_pos = 0
*
* cdef class OctreeGrid: # <<<<<<<<<<<<<<
@@ -469,7 +469,7 @@
int level;
};
-/* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/DepthFirstOctree.pyx":53
+/* "/Users/matthewturk/yt/yt/yt/_amr_utils/DepthFirstOctree.pyx":53
* self.level = level
*
* cdef class OctreeGridList: # <<<<<<<<<<<<<<
@@ -482,7 +482,7 @@
PyObject *grids;
};
-/* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/VolumeIntegrator.pyx":569
+/* "/Users/matthewturk/yt/yt/yt/_amr_utils/VolumeIntegrator.pyx":569
* return 1
*
* cdef class ProtoPrism: # <<<<<<<<<<<<<<
@@ -501,7 +501,7 @@
int parent_grid_id;
};
-/* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/DepthFirstOctree.pyx":30
+/* "/Users/matthewturk/yt/yt/yt/_amr_utils/DepthFirstOctree.pyx":30
* cimport cython
*
* cdef class position: # <<<<<<<<<<<<<<
@@ -515,7 +515,7 @@
int refined_pos;
};
-/* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/VolumeIntegrator.pyx":537
+/* "/Users/matthewturk/yt/yt/yt/_amr_utils/VolumeIntegrator.pyx":537
* tf.eval_transfer(dt, self.dvs, rgba, grad)
*
* cdef class GridFace: # <<<<<<<<<<<<<<
@@ -532,7 +532,7 @@
__pyx_t_5numpy_float64_t right_edge[3];
};
-/* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/QuadTree.pyx":99
+/* "/Users/matthewturk/yt/yt/yt/_amr_utils/QuadTree.pyx":99
* free(node)
*
* cdef class QuadTree: # <<<<<<<<<<<<<<
@@ -549,7 +549,7 @@
__pyx_t_5numpy_int64_t top_grid_dims[2];
};
-/* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/VolumeIntegrator.pyx":74
+/* "/Users/matthewturk/yt/yt/yt/_amr_utils/VolumeIntegrator.pyx":74
* np.float64_t *data, np.float64_t *grad)
*
* cdef class VectorPlane # <<<<<<<<<<<<<<
@@ -581,7 +581,7 @@
__pyx_t_5numpy_float64_t *y_vec;
};
-/* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/VolumeIntegrator.pyx":299
+/* "/Users/matthewturk/yt/yt/yt/_amr_utils/VolumeIntegrator.pyx":299
* tv[offset + k] = fv[k]
*
* cdef class PartitionedGrid: # <<<<<<<<<<<<<<
@@ -607,7 +607,7 @@
};
-/* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/VolumeIntegrator.pyx":537
+/* "/Users/matthewturk/yt/yt/yt/_amr_utils/VolumeIntegrator.pyx":537
* tf.eval_transfer(dt, self.dvs, rgba, grad)
*
* cdef class GridFace: # <<<<<<<<<<<<<<
@@ -621,7 +621,7 @@
static struct __pyx_vtabstruct_2yt_9amr_utils_GridFace *__pyx_vtabptr_2yt_9amr_utils_GridFace;
-/* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/VolumeIntegrator.pyx":118
+/* "/Users/matthewturk/yt/yt/yt/_amr_utils/VolumeIntegrator.pyx":118
* return (bv + dd*dy*fit.idbin)
*
* cdef class TransferFunctionProxy: # <<<<<<<<<<<<<<
@@ -635,7 +635,7 @@
static struct __pyx_vtabstruct_2yt_9amr_utils_TransferFunctionProxy *__pyx_vtabptr_2yt_9amr_utils_TransferFunctionProxy;
-/* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/VolumeIntegrator.pyx":569
+/* "/Users/matthewturk/yt/yt/yt/_amr_utils/VolumeIntegrator.pyx":569
* return 1
*
* cdef class ProtoPrism: # <<<<<<<<<<<<<<
@@ -649,7 +649,7 @@
static struct __pyx_vtabstruct_2yt_9amr_utils_ProtoPrism *__pyx_vtabptr_2yt_9amr_utils_ProtoPrism;
-/* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/QuadTree.pyx":99
+/* "/Users/matthewturk/yt/yt/yt/_amr_utils/QuadTree.pyx":99
* free(node)
*
* cdef class QuadTree: # <<<<<<<<<<<<<<
@@ -666,7 +666,7 @@
static struct __pyx_vtabstruct_2yt_9amr_utils_QuadTree *__pyx_vtabptr_2yt_9amr_utils_QuadTree;
-/* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/VolumeIntegrator.pyx":222
+/* "/Users/matthewturk/yt/yt/yt/_amr_utils/VolumeIntegrator.pyx":222
* #rgba[i+3] += trgba[i] * (1.0 - rgba[i+3])*dt*trgba[i+3]
*
* cdef class VectorPlane: # <<<<<<<<<<<<<<
@@ -682,7 +682,7 @@
static struct __pyx_vtabstruct_2yt_9amr_utils_VectorPlane *__pyx_vtabptr_2yt_9amr_utils_VectorPlane;
-/* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/VolumeIntegrator.pyx":299
+/* "/Users/matthewturk/yt/yt/yt/_amr_utils/VolumeIntegrator.pyx":299
* tv[offset + k] = fv[k]
*
* cdef class PartitionedGrid: # <<<<<<<<<<<<<<
@@ -1748,7 +1748,7 @@
static PyObject *__pyx_int_neg_1;
static PyObject *__pyx_int_15;
-/* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/DepthFirstOctree.pyx":32
+/* "/Users/matthewturk/yt/yt/yt/_amr_utils/DepthFirstOctree.pyx":32
* cdef class position:
* cdef public int output_pos, refined_pos
* def __cinit__(self): # <<<<<<<<<<<<<<
@@ -1764,7 +1764,7 @@
__Pyx_RaiseArgtupleInvalid("__cinit__", 1, 0, 0, PyTuple_GET_SIZE(__pyx_args)); return -1;}
if (unlikely(__pyx_kwds) && unlikely(PyDict_Size(__pyx_kwds) > 0) && unlikely(!__Pyx_CheckKeywordStrings(__pyx_kwds, "__cinit__", 0))) return -1;
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/DepthFirstOctree.pyx":33
+ /* "/Users/matthewturk/yt/yt/yt/_amr_utils/DepthFirstOctree.pyx":33
* cdef public int output_pos, refined_pos
* def __cinit__(self):
* self.output_pos = 0 # <<<<<<<<<<<<<<
@@ -1773,7 +1773,7 @@
*/
((struct __pyx_obj_2yt_9amr_utils_position *)__pyx_v_self)->output_pos = 0;
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/DepthFirstOctree.pyx":34
+ /* "/Users/matthewturk/yt/yt/yt/_amr_utils/DepthFirstOctree.pyx":34
* def __cinit__(self):
* self.output_pos = 0
* self.refined_pos = 0 # <<<<<<<<<<<<<<
@@ -1787,7 +1787,7 @@
return __pyx_r;
}
-/* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/DepthFirstOctree.pyx":39
+/* "/Users/matthewturk/yt/yt/yt/_amr_utils/DepthFirstOctree.pyx":39
* cdef public object child_indices, fields, left_edges, dimensions, dx
* cdef public int level
* def __cinit__(self, # <<<<<<<<<<<<<<
@@ -1947,7 +1947,7 @@
__pyx_bstride_0_dx = __pyx_bstruct_dx.strides[0];
__pyx_bshape_0_dx = __pyx_bstruct_dx.shape[0];
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/DepthFirstOctree.pyx":46
+ /* "/Users/matthewturk/yt/yt/yt/_amr_utils/DepthFirstOctree.pyx":46
* np.ndarray[np.float64_t, ndim=1] dx,
* int level):
* self.child_indices = child_indices # <<<<<<<<<<<<<<
@@ -1960,7 +1960,7 @@
__Pyx_DECREF(((struct __pyx_obj_2yt_9amr_utils_OctreeGrid *)__pyx_v_self)->child_indices);
((struct __pyx_obj_2yt_9amr_utils_OctreeGrid *)__pyx_v_self)->child_indices = ((PyObject *)__pyx_v_child_indices);
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/DepthFirstOctree.pyx":47
+ /* "/Users/matthewturk/yt/yt/yt/_amr_utils/DepthFirstOctree.pyx":47
* int level):
* self.child_indices = child_indices
* self.fields = fields # <<<<<<<<<<<<<<
@@ -1973,7 +1973,7 @@
__Pyx_DECREF(((struct __pyx_obj_2yt_9amr_utils_OctreeGrid *)__pyx_v_self)->fields);
((struct __pyx_obj_2yt_9amr_utils_OctreeGrid *)__pyx_v_self)->fields = ((PyObject *)__pyx_v_fields);
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/DepthFirstOctree.pyx":48
+ /* "/Users/matthewturk/yt/yt/yt/_amr_utils/DepthFirstOctree.pyx":48
* self.child_indices = child_indices
* self.fields = fields
* self.left_edges = left_edges # <<<<<<<<<<<<<<
@@ -1986,7 +1986,7 @@
__Pyx_DECREF(((struct __pyx_obj_2yt_9amr_utils_OctreeGrid *)__pyx_v_self)->left_edges);
((struct __pyx_obj_2yt_9amr_utils_OctreeGrid *)__pyx_v_self)->left_edges = ((PyObject *)__pyx_v_left_edges);
- /* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/DepthFirstOctree.pyx":49
+ /* "/Users/matthewturk/yt/yt/yt/_amr_utils/DepthFirstOctree.pyx":49
* self.fields = fields
* self.left_edges = left_edges
* self.dimensions = dimensions # <<<<<<<<<<<<<<
More information about the yt-svn
mailing list