[Yt-svn] yt: 4 new changesets
hg at spacepope.org
hg at spacepope.org
Sun Apr 25 20:36:11 PDT 2010
hg Repository: yt
details: yt/rev/0196df11bcf3
changeset: 1604:0196df11bcf3
user: mturk
date:
Sun Apr 25 17:58:54 2010 -0700
description:
[svn r1698] Adding image_line callback
hg Repository: yt
details: yt/rev/896c1fded091
changeset: 1605:896c1fded091
user: mturk
date:
Sun Apr 25 19:46:00 2010 -0700
description:
[svn r1699] Fixing a mistake in the image_line callback. Need to feed in xs and ys, not
(x1, y1) and (x2, y2).
hg Repository: yt
details: yt/rev/a297eadec0c5
changeset: 1606:a297eadec0c5
user: mturk
date:
Sun Apr 25 20:35:12 2010 -0700
description:
[svn r1700] I missed adding these during the big backport.
hg Repository: yt
details: yt/rev/f3df0e2354c6
changeset: 1607:f3df0e2354c6
user: Matthew Turk <matthewturk at gmail.com>
date:
Sun Apr 25 20:36:03 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 | 2451 +++++++++++----------------
yt/arraytypes.py | 11 +
yt/extensions/EnzoSimulation.py | 65 +-
yt/extensions/MergerTree.py | 840 +++++++++
yt/extensions/StarAnalysis.py | 24 +-
yt/extensions/_colormap_data.py | 797 +++++++++
yt/extensions/image_writer.py | 77 +
yt/extensions/kdtree/fKD.f90 | 27 +
yt/extensions/kdtree/fKD.v | 2 +
yt/extensions/volume_rendering/UBVRI.py | 105 +
yt/extensions/volume_rendering/multi_texture.py | 302 +++
yt/fido/share_data.py | 83 +
yt/lagos/BaseDataTypes.py | 1 -
yt/lagos/HaloFinding.py | 93 +-
yt/lagos/StructureFunctionGenerator.py | 746 ++++++++
yt/lagos/__init__.py | 2 +
yt/lagos/kd.py | 2 +-
yt/lagos/parallelHOP/parallelHOP.py | 31 +-
yt/lagos/setup.py | 4 +-
yt/mods.py | 2 +-
yt/raven/Callbacks.py | 33 +
yt/reason/plot_editors.py | 10 +-
yt/reason/reason_v2.py | 5 +-
yt/reason/tvtk_interface.py | 5 +-
30 files changed, 4218 insertions(+), 1528 deletions(-)
diffs (truncated from 13289 to 300 lines):
diff -r 609855779aa9 -r f3df0e2354c6 .hgignore
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/.hgignore Sun Apr 25 20:36:03 2010 -0700
@@ -0,0 +1,3 @@
+syntax: glob
+*.pyc
+.*.swp
diff -r 609855779aa9 -r f3df0e2354c6 scripts/fbranch
--- a/scripts/fbranch Sun Apr 25 10:01:12 2010 -0700
+++ b/scripts/fbranch Sun Apr 25 20:36:03 2010 -0700
@@ -1,1 +1,4 @@
-basic.py
\ No newline at end of file
+#!python2.5
+import yt.fido
+
+yt.fido.runAction()
diff -r 609855779aa9 -r f3df0e2354c6 scripts/fbury
--- a/scripts/fbury Sun Apr 25 10:01:12 2010 -0700
+++ b/scripts/fbury Sun Apr 25 20:36:03 2010 -0700
@@ -1,1 +1,4 @@
-basic.py
\ No newline at end of file
+#!python2.5
+import yt.fido
+
+yt.fido.runAction()
diff -r 609855779aa9 -r f3df0e2354c6 scripts/fdigup
--- a/scripts/fdigup Sun Apr 25 10:01:12 2010 -0700
+++ b/scripts/fdigup Sun Apr 25 20:36:03 2010 -0700
@@ -1,1 +1,4 @@
-basic.py
\ No newline at end of file
+#!python2.5
+import yt.fido
+
+yt.fido.runAction()
diff -r 609855779aa9 -r f3df0e2354c6 scripts/fido
--- a/scripts/fido Sun Apr 25 10:01:12 2010 -0700
+++ b/scripts/fido Sun Apr 25 20:36:03 2010 -0700
@@ -1,1 +1,4 @@
-basic.py
\ No newline at end of file
+#!python2.5
+from yt.mods import *
+
+fido.runAction()
diff -r 609855779aa9 -r f3df0e2354c6 scripts/fimport
--- a/scripts/fimport Sun Apr 25 10:01:12 2010 -0700
+++ b/scripts/fimport Sun Apr 25 20:36:03 2010 -0700
@@ -1,1 +1,4 @@
-basic.py
\ No newline at end of file
+#!python2.5
+from yt.mods import *
+
+fido.runAction()
diff -r 609855779aa9 -r f3df0e2354c6 yt/amr_utils.c
--- a/yt/amr_utils.c Sun Apr 25 10:01:12 2010 -0700
+++ b/yt/amr_utils.c Sun Apr 25 20:36:03 2010 -0700
@@ -1,4 +1,4 @@
-/* Generated by Cython 0.12.1 on Sun Apr 25 10:00:53 2010 */
+/* Generated by Cython 0.12.1 on Fri Apr 23 15:21:52 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/VolumeIntegrator.pyx":118
+/* "/Users/matthewturk/yt/yt/yt/_amr_utils/VolumeIntegrator.pyx":118
* return (bv + dd*dy*fit.idbin)
*
* cdef class TransferFunctionProxy: # <<<<<<<<<<<<<<
@@ -434,7 +434,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: # <<<<<<<<<<<<<<
@@ -452,7 +452,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: # <<<<<<<<<<<<<<
@@ -465,7 +465,7 @@
PyObject *grids;
};
-/* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/VolumeIntegrator.pyx":547
+/* "/Users/matthewturk/yt/yt/yt/_amr_utils/VolumeIntegrator.pyx":547
* return 1
*
* cdef class ProtoPrism: # <<<<<<<<<<<<<<
@@ -484,7 +484,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: # <<<<<<<<<<<<<<
@@ -498,7 +498,7 @@
int refined_pos;
};
-/* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/VolumeIntegrator.pyx":515
+/* "/Users/matthewturk/yt/yt/yt/_amr_utils/VolumeIntegrator.pyx":515
* tf.eval_transfer(dt, self.dvs, rgba, grad)
*
* cdef class GridFace: # <<<<<<<<<<<<<<
@@ -515,7 +515,7 @@
__pyx_t_5numpy_float64_t right_edge[3];
};
-/* "/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 # <<<<<<<<<<<<<<
@@ -546,7 +546,7 @@
__pyx_t_5numpy_float64_t *y_vec;
};
-/* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/VolumeIntegrator.pyx":294
+/* "/Users/matthewturk/yt/yt/yt/_amr_utils/VolumeIntegrator.pyx":294
* tv[offset + k] = fv[k]
*
* cdef class PartitionedGrid: # <<<<<<<<<<<<<<
@@ -572,7 +572,7 @@
};
-/* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/VolumeIntegrator.pyx":547
+/* "/Users/matthewturk/yt/yt/yt/_amr_utils/VolumeIntegrator.pyx":547
* return 1
*
* cdef class ProtoPrism: # <<<<<<<<<<<<<<
@@ -586,7 +586,7 @@
static struct __pyx_vtabstruct_2yt_9amr_utils_ProtoPrism *__pyx_vtabptr_2yt_9amr_utils_ProtoPrism;
-/* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/VolumeIntegrator.pyx":223
+/* "/Users/matthewturk/yt/yt/yt/_amr_utils/VolumeIntegrator.pyx":223
* #rgba[i+3] += trgba[i] * (1.0 - rgba[i+3])*dt*trgba[i+3]
*
* cdef class VectorPlane: # <<<<<<<<<<<<<<
@@ -602,7 +602,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":294
+/* "/Users/matthewturk/yt/yt/yt/_amr_utils/VolumeIntegrator.pyx":294
* tv[offset + k] = fv[k]
*
* cdef class PartitionedGrid: # <<<<<<<<<<<<<<
@@ -618,7 +618,7 @@
static struct __pyx_vtabstruct_2yt_9amr_utils_PartitionedGrid *__pyx_vtabptr_2yt_9amr_utils_PartitionedGrid;
-/* "/Users/matthewturk/Development/yt/trunk/yt/_amr_utils/VolumeIntegrator.pyx":515
+/* "/Users/matthewturk/yt/yt/yt/_amr_utils/VolumeIntegrator.pyx":515
* tf.eval_transfer(dt, self.dvs, rgba, grad)
*
* cdef class GridFace: # <<<<<<<<<<<<<<
@@ -632,7 +632,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: # <<<<<<<<<<<<<<
@@ -1188,16 +1188,15 @@
static char __pyx_k_4[] = "corresponds to";
static char __pyx_k_5[] = "(Weighted with ";
static char __pyx_k_6[] = ")";
-static char __pyx_k_7[] = "VALUE CONTRIBUTION";
-static char __pyx_k_8[] = "ndarray is not C contiguous";
-static char __pyx_k_9[] = "ndarray is not Fortran contiguous";
-static char __pyx_k_10[] = "Non-native byte order not supported";
-static char __pyx_k_11[] = "unknown dtype code in numpy.pxd (%d)";
-static char __pyx_k_12[] = "Format string allocated too short, see comment in numpy.pxd";
-static char __pyx_k_13[] = "Format string allocated too short.";
-static char __pyx_k_14[] = "\nContainer file to hold all our Cython routines. This is to avoid problems with\nstatic linking.\n\nAuthor: Matthew Turk <matthewturk at gmail.com>\nAffiliation: KIPAC/SLAC/Stanford\nHomepage: http://yt.enzotools.org/\nLicense:\n Copyright (C) 2008 Matthew Turk. All Rights Reserved.\n\n This file is part of yt.\n\n yt is free software; you can redistribute it and/or modify\n it under the terms of the GNU General Public License as published by\n the Free Software Foundation; either version 3 of the License, or\n (at your option) any later version.\n\n This program is distributed in the hope that it will be useful,\n but WITHOUT ANY WARRANTY; without even the implied warranty of\n MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n GNU General Public License for more details.\n\n You should have received a copy of the GNU General Public License\n along with this program. If not, see <http://www.gnu.org/licenses/>.\n";
-static char __pyx_k_15[] = "Transfer3D (line 36)";
-static char __pyx_k_16[] = "TransferShells (line 74)";
+static char __pyx_k_7[] = "ndarray is not C contiguous";
+static char __pyx_k_8[] = "ndarray is not Fortran contiguous";
+static char __pyx_k_9[] = "Non-native byte order not supported";
+static char __pyx_k_10[] = "unknown dtype code in numpy.pxd (%d)";
+static char __pyx_k_11[] = "Format string allocated too short, see comment in numpy.pxd";
+static char __pyx_k_12[] = "Format string allocated too short.";
+static char __pyx_k_13[] = "\nContainer file to hold all our Cython routines. This is to avoid problems with\nstatic linking.\n\nAuthor: Matthew Turk <matthewturk at gmail.com>\nAffiliation: KIPAC/SLAC/Stanford\nHomepage: http://yt.enzotools.org/\nLicense:\n Copyright (C) 2008 Matthew Turk. All Rights Reserved.\n\n This file is part of yt.\n\n yt is free software; you can redistribute it and/or modify\n it under the terms of the GNU General Public License as published by\n the Free Software Foundation; either version 3 of the License, or\n (at your option) any later version.\n\n This program is distributed in the hope that it will be useful,\n but WITHOUT ANY WARRANTY; without even the implied warranty of\n MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n GNU General Public License for more details.\n\n You should have received a copy of the GNU General Public License\n along with this program. If not, see <http://www.gnu.org/licenses/>.\n";
+static char __pyx_k_14[] = "Transfer3D (line 36)";
+static char __pyx_k_15[] = "TransferShells (line 74)";
static char __pyx_k__B[] = "B";
static char __pyx_k__F[] = "F";
static char __pyx_k__H[] = "H";
@@ -1231,9 +1230,6 @@
static char __pyx_k__np[] = "np";
static char __pyx_k__ns[] = "ns";
static char __pyx_k__nv[] = "nv";
-static char __pyx_k__pv[] = "pv";
-static char __pyx_k__px[] = "px";
-static char __pyx_k__py[] = "py";
static char __pyx_k__rb[] = "rb";
static char __pyx_k__tf[] = "tf";
static char __pyx_k__ug[] = "ug";
@@ -1425,15 +1421,14 @@
static PyObject *__pyx_kp_u_10;
static PyObject *__pyx_kp_u_11;
static PyObject *__pyx_kp_u_12;
-static PyObject *__pyx_kp_u_13;
+static PyObject *__pyx_kp_u_14;
static PyObject *__pyx_kp_u_15;
-static PyObject *__pyx_kp_u_16;
static PyObject *__pyx_n_s_2;
static PyObject *__pyx_kp_s_3;
static PyObject *__pyx_kp_s_4;
static PyObject *__pyx_kp_s_5;
static PyObject *__pyx_kp_s_6;
-static PyObject *__pyx_kp_s_7;
+static PyObject *__pyx_kp_u_7;
static PyObject *__pyx_kp_u_8;
static PyObject *__pyx_kp_u_9;
static PyObject *__pyx_n_s__Channel;
@@ -1584,9 +1579,6 @@
static PyObject *__pyx_n_s__posy;
static PyObject *__pyx_n_s__posz;
static PyObject *__pyx_n_s__proj_overlap;
-static PyObject *__pyx_n_s__pv;
-static PyObject *__pyx_n_s__px;
-static PyObject *__pyx_n_s__py;
static PyObject *__pyx_n_s__range;
static PyObject *__pyx_n_s__readonly;
static PyObject *__pyx_n_s__red;
@@ -1647,7 +1639,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): # <<<<<<<<<<<<<<
@@ -1663,7 +1655,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 # <<<<<<<<<<<<<<
@@ -1672,7 +1664,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 # <<<<<<<<<<<<<<
@@ -1686,7 +1678,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
More information about the yt-svn
mailing list