[Yt-svn] yt: 4 new changesets

hg at spacepope.org hg at spacepope.org
Fri Jul 2 16:11:24 PDT 2010


hg Repository: yt
details:   yt/rev/2355a5f5bb30
changeset: 1867:2355a5f5bb30
user:      mturk
date:
Fri Jul 02 15:57:42 2010 -0700
description:
[svn r1790] Adding enzo_test to extensions

hg Repository: yt
details:   yt/rev/bec65ef53cc5
changeset: 1868:bec65ef53cc5
user:      mturk
date:
Fri Jul 02 16:04:59 2010 -0700
description:
[svn r1791] Adding __init__.py to enzo test

hg Repository: yt
details:   yt/rev/40e801d85ad4
changeset: 1869:40e801d85ad4
user:      mturk
date:
Fri Jul 02 16:10:47 2010 -0700
description:
[svn r1792] Compat for 2.5

hg Repository: yt
details:   yt/rev/7e0c68d88d98
changeset: 1870:7e0c68d88d98
user:      Matthew Turk <matthewturk at gmail.com>
date:
Fri Jul 02 16:11:20 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/command_line.py                                    |     3 +-
 yt/extensions/enzo_test/__init__.py                   |    29 +
 yt/extensions/enzo_test/runner.py                     |     2 +-
 yt/extensions/kdtree/fKD.f90                          |     2 +-
 yt/extensions/light_ray.py                            |   372 +++
 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/setup.py                                |     1 +
 yt/extensions/volume_rendering/multi_texture.py       |   302 +++
 yt/fido/share_data.py                                 |    83 +
 yt/lagos/BaseDataTypes.py                             |     1 -
 yt/lagos/Clump.py                                     |   290 --
 yt/reason/plot_editors.py                             |    10 +-
 yt/reason/reason_v2.py                                |     7 +-
 yt/reason/tvtk_interface.py                           |    26 +-
 27 files changed, 2738 insertions(+), 1431 deletions(-)

diffs (truncated from 12219 to 300 lines):

diff -r a5779138ae58 -r 7e0c68d88d98 .hgignore
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/.hgignore	Fri Jul 02 16:11:20 2010 -0700
@@ -0,0 +1,3 @@
+syntax: glob
+*.pyc
+.*.swp
diff -r a5779138ae58 -r 7e0c68d88d98 scripts/fbranch
--- a/scripts/fbranch	Fri Jul 02 14:22:25 2010 -0700
+++ b/scripts/fbranch	Fri Jul 02 16:11:20 2010 -0700
@@ -1,1 +1,4 @@
-basic.py
\ No newline at end of file
+#!python2.5
+import yt.fido
+
+yt.fido.runAction()
diff -r a5779138ae58 -r 7e0c68d88d98 scripts/fbury
--- a/scripts/fbury	Fri Jul 02 14:22:25 2010 -0700
+++ b/scripts/fbury	Fri Jul 02 16:11:20 2010 -0700
@@ -1,1 +1,4 @@
-basic.py
\ No newline at end of file
+#!python2.5
+import yt.fido
+
+yt.fido.runAction()
diff -r a5779138ae58 -r 7e0c68d88d98 scripts/fdigup
--- a/scripts/fdigup	Fri Jul 02 14:22:25 2010 -0700
+++ b/scripts/fdigup	Fri Jul 02 16:11:20 2010 -0700
@@ -1,1 +1,4 @@
-basic.py
\ No newline at end of file
+#!python2.5
+import yt.fido
+
+yt.fido.runAction()
diff -r a5779138ae58 -r 7e0c68d88d98 scripts/fido
--- a/scripts/fido	Fri Jul 02 14:22:25 2010 -0700
+++ b/scripts/fido	Fri Jul 02 16:11:20 2010 -0700
@@ -1,1 +1,4 @@
-basic.py
\ No newline at end of file
+#!python2.5
+from yt.mods import *
+
+fido.runAction()
diff -r a5779138ae58 -r 7e0c68d88d98 scripts/fimport
--- a/scripts/fimport	Fri Jul 02 14:22:25 2010 -0700
+++ b/scripts/fimport	Fri Jul 02 16:11:20 2010 -0700
@@ -1,1 +1,4 @@
-basic.py
\ No newline at end of file
+#!python2.5
+from yt.mods import *
+
+fido.runAction()
diff -r a5779138ae58 -r 7e0c68d88d98 yt/amr_utils.c
--- a/yt/amr_utils.c	Fri Jul 02 14:22:25 2010 -0700
+++ b/yt/amr_utils.c	Fri Jul 02 16:11:20 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