[Yt-svn] yt: 7 new changesets
hg at spacepope.org
hg at spacepope.org
Sun Jul 25 20:22:18 PDT 2010
hg Repository: yt
details: yt/rev/b4fff9df5a05
changeset: 1881:b4fff9df5a05
user: mturk
date:
Wed Jul 07 17:27:21 2010 -0700
description:
[svn r1796] Adding set_center to image panner
hg Repository: yt
details: yt/rev/88a323b3a632
changeset: 1882:88a323b3a632
user: mturk
date:
Wed Jul 07 21:16:42 2010 -0700
description:
[svn r1797] Backporting set_width on image panner to trunk
hg Repository: yt
details: yt/rev/d0fd374a8e0a
changeset: 1883:d0fd374a8e0a
user: mturk
date:
Tue Jul 20 08:49:40 2010 -0700
description:
[svn r1798] This line should prevent race conditions with creating the .yt files
hg Repository: yt
details: yt/rev/8f8dcd684c8b
changeset: 1884:8f8dcd684c8b
user: Matthew Turk <matthewturk at gmail.com>
date:
Tue Jul 20 10:30:09 2010 -0700
description:
Merging from trunk
hg Repository: yt
details: yt/rev/1a694d8026cc
changeset: 1885:1a694d8026cc
user: mturk
date:
Tue Jul 20 10:31:03 2010 -0700
description:
[svn r1799] Backporting ShapeMismatch from hg
hg Repository: yt
details: yt/rev/a14e2ba06397
changeset: 1886:a14e2ba06397
user: mturk
date:
Fri Jul 23 15:39:37 2010 -0700
description:
[svn r1800] Adding this catch for not having _type_name on a FieldDetector
hg Repository: yt
details: yt/rev/95375c341450
changeset: 1887:95375c341450
user: Matthew Turk <matthewturk at gmail.com>
date:
Sun Jul 25 20:22:10 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/VolumeIntegrator.pyx | 2 +-
yt/amr_utils.c | 2292 +++++++++++-----------
yt/arraytypes.py | 11 +
yt/command_line.py | 1 +
yt/extensions/enzo_test/output_tests.py | 11 +
yt/extensions/image_panner/vm_panner.py | 28 +
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/volume_rendering/multi_texture.py | 302 +++
yt/fido/share_data.py | 83 +
yt/lagos/BaseDataTypes.py | 1 -
yt/lagos/Clump.py | 290 --
yt/lagos/HierarchyType.py | 2 +
yt/lagos/field_info_container.py | 1 +
yt/reason/plot_editors.py | 10 +-
yt/reason/reason_v2.py | 7 +-
yt/reason/tvtk_interface.py | 26 +-
29 files changed, 2774 insertions(+), 1455 deletions(-)
diffs (truncated from 12325 to 300 lines):
diff -r 741339fedac1 -r 95375c341450 .hgignore
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/.hgignore Sun Jul 25 20:22:10 2010 -0700
@@ -0,0 +1,3 @@
+syntax: glob
+*.pyc
+.*.swp
diff -r 741339fedac1 -r 95375c341450 scripts/fbranch
--- a/scripts/fbranch Wed Jul 07 13:01:17 2010 -0700
+++ b/scripts/fbranch Sun Jul 25 20:22:10 2010 -0700
@@ -1,1 +1,4 @@
-basic.py
\ No newline at end of file
+#!python2.5
+import yt.fido
+
+yt.fido.runAction()
diff -r 741339fedac1 -r 95375c341450 scripts/fbury
--- a/scripts/fbury Wed Jul 07 13:01:17 2010 -0700
+++ b/scripts/fbury Sun Jul 25 20:22:10 2010 -0700
@@ -1,1 +1,4 @@
-basic.py
\ No newline at end of file
+#!python2.5
+import yt.fido
+
+yt.fido.runAction()
diff -r 741339fedac1 -r 95375c341450 scripts/fdigup
--- a/scripts/fdigup Wed Jul 07 13:01:17 2010 -0700
+++ b/scripts/fdigup Sun Jul 25 20:22:10 2010 -0700
@@ -1,1 +1,4 @@
-basic.py
\ No newline at end of file
+#!python2.5
+import yt.fido
+
+yt.fido.runAction()
diff -r 741339fedac1 -r 95375c341450 scripts/fido
--- a/scripts/fido Wed Jul 07 13:01:17 2010 -0700
+++ b/scripts/fido Sun Jul 25 20:22:10 2010 -0700
@@ -1,1 +1,4 @@
-basic.py
\ No newline at end of file
+#!python2.5
+from yt.mods import *
+
+fido.runAction()
diff -r 741339fedac1 -r 95375c341450 scripts/fimport
--- a/scripts/fimport Wed Jul 07 13:01:17 2010 -0700
+++ b/scripts/fimport Sun Jul 25 20:22:10 2010 -0700
@@ -1,1 +1,4 @@
-basic.py
\ No newline at end of file
+#!python2.5
+from yt.mods import *
+
+fido.runAction()
diff -r 741339fedac1 -r 95375c341450 yt/_amr_utils/VolumeIntegrator.pyx
--- a/yt/_amr_utils/VolumeIntegrator.pyx Wed Jul 07 13:01:17 2010 -0700
+++ b/yt/_amr_utils/VolumeIntegrator.pyx Sun Jul 25 20:22:10 2010 -0700
@@ -106,9 +106,9 @@
cdef np.float64_t bv, dy, dd, tf
cdef int bin_id
if fit.pass_through == 1: return dvs[fit.field_id]
+ if dvs[fit.field_id] > fit.bounds[1] or dvs[fit.field_id] < fit.bounds[0]: return 0.0
bin_id = <int> ((dvs[fit.field_id] - fit.bounds[0]) * fit.idbin)
dd = dvs[fit.field_id] - (fit.bounds[0] + bin_id * fit.dbin) # x - x0
- if bin_id > fit.nbins - 2 or bin_id < 0: return 0.0
bv = fit.values[bin_id]
dy = fit.values[bin_id + 1] - bv
if fit.weight_field_id != -1:
diff -r 741339fedac1 -r 95375c341450 yt/amr_utils.c
--- a/yt/amr_utils.c Wed Jul 07 13:01:17 2010 -0700
+++ b/yt/amr_utils.c Sun Jul 25 20:22:10 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 Mon Jul 19 22:35:35 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);
More information about the yt-svn
mailing list