[Yt-svn] yt: 8 new changesets
hg at spacepope.org
hg at spacepope.org
Mon Apr 12 12:26:52 PDT 2010
hg Repository: yt
details: yt/rev/6efe26e42985
changeset: 1551:6efe26e42985
user: mturk
date:
Fri Apr 09 14:13:12 2010 -0700
description:
[svn r1686] Fixing some import errors and packaging errors for the image panner
hg Repository: yt
details: yt/rev/481c17f0de4e
changeset: 1552:481c17f0de4e
user: mturk
date:
Fri Apr 09 14:55:58 2010 -0700
description:
[svn r1687] Fixing an unbound variable because of my own sloppiness
hg Repository: yt
details: yt/rev/0027d04b610d
changeset: 1553:0027d04b610d
user: mturk
date:
Fri Apr 09 16:07:22 2010 -0700
description:
[svn r1688] Supporting possibility for no field values to be above zero, and also adding an
editorial comment.
hg Repository: yt
details: yt/rev/bd703b1b4e46
changeset: 1554:bd703b1b4e46
user: Matthew Turk <matthewturk at gmail.com>
date:
Sat Apr 10 18:02:52 2010 -0700
description:
Merging from trunk
hg Repository: yt
details: yt/rev/998762efaf5e
changeset: 1555:998762efaf5e
user: mturk
date:
Sat Apr 10 21:06:27 2010 -0400
description:
[svn r1689] Backport from hg:
* Adding "projload" function to simply load a pre-generated projection into a
dictionary
* Some fixes for the image panner as well as the addition of a subset zoom
image panner
* John's fix for the problem of empty dictionaries in parallel jobs not being
passed around correctly
* Fixes for particle IO to keep particles out of memory unncessarily
* Guess the location of HDF5 if not explicitly told it
hg Repository: yt
details: yt/rev/d35babd181d2
changeset: 1556:d35babd181d2
user: Matthew Turk <matthewturk at gmail.com>
date:
Mon Apr 12 15:26:15 2010 -0400
description:
Adding save_image to the volume rendering object
hg Repository: yt
details: yt/rev/39d764dbd704
changeset: 1557:39d764dbd704
user: Matthew Turk <matthewturk at gmail.com>
date:
Mon Apr 12 15:26:31 2010 -0400
description:
Merge from trunk
hg Repository: yt
details: yt/rev/0e17e4e5a8ed
changeset: 1558:0e17e4e5a8ed
user: Matthew Turk <matthewturk at gmail.com>
date:
Mon Apr 12 15:26:41 2010 -0400
description:
Merge
diffstat:
.hgignore | 3 +
doc/install_script.sh | 2 +-
scripts/fbranch | 5 +-
scripts/fbury | 5 +-
scripts/fdigup | 5 +-
scripts/fido | 5 +-
scripts/fimport | 5 +-
yt/amr_utils.c | 16482 +++++++++++-------------
yt/arraytypes.py | 11 +
yt/convenience.py | 25 +
yt/extensions/EnzoSimulation.py | 21 +-
yt/extensions/MergerTree.py | 840 +
yt/extensions/StarAnalysis.py | 24 +-
yt/extensions/image_panner/pan_and_scan_widget.py | 79 +-
yt/extensions/image_panner/vm_panner.py | 6 +-
yt/extensions/kdtree/fKD.f90 | 27 +
yt/extensions/kdtree/fKD.v | 2 +
yt/extensions/setup.py | 1 +
yt/extensions/volume_rendering/__init__.py | 2 +-
yt/extensions/volume_rendering/software_sampler.py | 10 +
yt/fido/share_data.py | 83 +
yt/lagos/BaseDataTypes.py | 4 +-
yt/lagos/DerivedQuantities.py | 16 +-
yt/lagos/HDF5LightReader.c | 7 +-
yt/lagos/HaloFinding.py | 93 +-
yt/lagos/ParallelTools.py | 45 +
yt/lagos/ParticleIO.py | 25 +-
yt/lagos/StructureFunctionGenerator.py | 740 +
yt/lagos/__init__.py | 2 +
yt/lagos/kd.py | 2 +-
yt/lagos/parallelHOP/parallelHOP.py | 31 +-
yt/lagos/setup.py | 49 +-
yt/mods.py | 5 +-
yt/reason/plot_editors.py | 10 +-
yt/reason/reason_v2.py | 5 +-
yt/reason/tvtk_interface.py | 5 +-
36 files changed, 9728 insertions(+), 8954 deletions(-)
diffs (truncated from 30542 to 300 lines):
diff -r 6fa632b49bb5 -r 0e17e4e5a8ed .hgignore
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/.hgignore Mon Apr 12 15:26:41 2010 -0400
@@ -0,0 +1,3 @@
+syntax: glob
+*.pyc
+.*.swp
diff -r 6fa632b49bb5 -r 0e17e4e5a8ed doc/install_script.sh
--- a/doc/install_script.sh Thu Apr 08 20:05:43 2010 -0700
+++ b/doc/install_script.sh Mon Apr 12 15:26:41 2010 -0400
@@ -32,7 +32,7 @@
INST_ZLIB=1 # On some systems (Kraken) matplotlib has issues with
# the system zlib, which is compiled statically.
# If need be, you can turn this off.
-INST_TRAITS=0 # Experimental TraitsUI installation
+INST_TRAITS=1 # Experimental TraitsUI installation
INST_HG=1 # Install Mercurial or not?
# If you've got YT some other place, set this to point to it.
diff -r 6fa632b49bb5 -r 0e17e4e5a8ed scripts/fbranch
--- a/scripts/fbranch Thu Apr 08 20:05:43 2010 -0700
+++ b/scripts/fbranch Mon Apr 12 15:26:41 2010 -0400
@@ -1,1 +1,4 @@
-basic.py
\ No newline at end of file
+#!python2.5
+import yt.fido
+
+yt.fido.runAction()
diff -r 6fa632b49bb5 -r 0e17e4e5a8ed scripts/fbury
--- a/scripts/fbury Thu Apr 08 20:05:43 2010 -0700
+++ b/scripts/fbury Mon Apr 12 15:26:41 2010 -0400
@@ -1,1 +1,4 @@
-basic.py
\ No newline at end of file
+#!python2.5
+import yt.fido
+
+yt.fido.runAction()
diff -r 6fa632b49bb5 -r 0e17e4e5a8ed scripts/fdigup
--- a/scripts/fdigup Thu Apr 08 20:05:43 2010 -0700
+++ b/scripts/fdigup Mon Apr 12 15:26:41 2010 -0400
@@ -1,1 +1,4 @@
-basic.py
\ No newline at end of file
+#!python2.5
+import yt.fido
+
+yt.fido.runAction()
diff -r 6fa632b49bb5 -r 0e17e4e5a8ed scripts/fido
--- a/scripts/fido Thu Apr 08 20:05:43 2010 -0700
+++ b/scripts/fido Mon Apr 12 15:26:41 2010 -0400
@@ -1,1 +1,4 @@
-basic.py
\ No newline at end of file
+#!python2.5
+from yt.mods import *
+
+fido.runAction()
diff -r 6fa632b49bb5 -r 0e17e4e5a8ed scripts/fimport
--- a/scripts/fimport Thu Apr 08 20:05:43 2010 -0700
+++ b/scripts/fimport Mon Apr 12 15:26:41 2010 -0400
@@ -1,1 +1,4 @@
-basic.py
\ No newline at end of file
+#!python2.5
+from yt.mods import *
+
+fido.runAction()
diff -r 6fa632b49bb5 -r 0e17e4e5a8ed yt/amr_utils.c
--- a/yt/amr_utils.c Thu Apr 08 20:05:43 2010 -0700
+++ b/yt/amr_utils.c Mon Apr 12 15:26:41 2010 -0400
@@ -1,4 +1,4 @@
-/* Generated by Cython 0.12.1 on Wed Mar 17 11:33:49 2010 */
+/* Generated by Cython 0.11.3 on Thu Mar 11 12:24:36 2010 */
#define PY_SSIZE_T_CLEAN
#include "Python.h"
@@ -6,7 +6,6 @@
#ifndef Py_PYTHON_H
#error Python headers needed to compile C extensions, please install development version of Python.
#else
-
#ifndef PY_LONG_LONG
#define PY_LONG_LONG LONG_LONG
#endif
@@ -16,9 +15,7 @@
#if PY_VERSION_HEX < 0x02040000
#define METH_COEXIST 0
#define PyDict_CheckExact(op) (Py_TYPE(op) == &PyDict_Type)
- #define PyDict_Contains(d,o) PySequence_Contains(d,o)
-#endif
-
+#endif
#if PY_VERSION_HEX < 0x02050000
typedef int Py_ssize_t;
#define PY_SSIZE_T_MAX INT_MAX
@@ -28,9 +25,7 @@
#define PyInt_AsSsize_t(o) PyInt_AsLong(o)
#define PyNumber_Index(o) PyNumber_Int(o)
#define PyIndex_Check(o) PyNumber_Check(o)
- #define PyErr_WarnEx(category, message, stacklevel) PyErr_Warn(category, message)
-#endif
-
+#endif
#if PY_VERSION_HEX < 0x02060000
#define Py_REFCNT(ob) (((PyObject*)(ob))->ob_refcnt)
#define Py_TYPE(ob) (((PyObject*)(ob))->ob_type)
@@ -40,17 +35,17 @@
#define PyType_Modified(t)
typedef struct {
- void *buf;
- PyObject *obj;
- Py_ssize_t len;
- Py_ssize_t itemsize;
- int readonly;
- int ndim;
- char *format;
- Py_ssize_t *shape;
- Py_ssize_t *strides;
- Py_ssize_t *suboffsets;
- void *internal;
+ void *buf;
+ PyObject *obj;
+ Py_ssize_t len;
+ Py_ssize_t itemsize;
+ int readonly;
+ int ndim;
+ char *format;
+ Py_ssize_t *shape;
+ Py_ssize_t *strides;
+ Py_ssize_t *suboffsets;
+ void *internal;
} Py_buffer;
#define PyBUF_SIMPLE 0
@@ -64,32 +59,22 @@
#define PyBUF_INDIRECT (0x0100 | PyBUF_STRIDES)
#endif
-
#if PY_MAJOR_VERSION < 3
#define __Pyx_BUILTIN_MODULE_NAME "__builtin__"
#else
#define __Pyx_BUILTIN_MODULE_NAME "builtins"
#endif
-
#if PY_MAJOR_VERSION >= 3
#define Py_TPFLAGS_CHECKTYPES 0
#define Py_TPFLAGS_HAVE_INDEX 0
#endif
-
#if (PY_VERSION_HEX < 0x02060000) || (PY_MAJOR_VERSION >= 3)
#define Py_TPFLAGS_HAVE_NEWBUFFER 0
#endif
-
#if PY_MAJOR_VERSION >= 3
#define PyBaseString_Type PyUnicode_Type
- #define PyString_Type PyUnicode_Type
- #define PyString_CheckExact PyUnicode_CheckExact
-#else
- #define PyBytes_Type PyString_Type
- #define PyBytes_CheckExact PyString_CheckExact
-#endif
-
-#if PY_MAJOR_VERSION >= 3
+ #define PyString_Type PyBytes_Type
+ #define PyString_CheckExact PyBytes_CheckExact
#define PyInt_Type PyLong_Type
#define PyInt_Check(op) PyLong_Check(op)
#define PyInt_CheckExact(op) PyLong_CheckExact(op)
@@ -104,17 +89,13 @@
#define PyInt_AsUnsignedLongMask PyLong_AsUnsignedLongMask
#define PyInt_AsUnsignedLongLongMask PyLong_AsUnsignedLongLongMask
#define __Pyx_PyNumber_Divide(x,y) PyNumber_TrueDivide(x,y)
- #define __Pyx_PyNumber_InPlaceDivide(x,y) PyNumber_InPlaceTrueDivide(x,y)
#else
#define __Pyx_PyNumber_Divide(x,y) PyNumber_Divide(x,y)
- #define __Pyx_PyNumber_InPlaceDivide(x,y) PyNumber_InPlaceDivide(x,y)
-
-#endif
-
+ #define PyBytes_Type PyString_Type
+#endif
#if PY_MAJOR_VERSION >= 3
#define PyMethod_New(func, self, klass) PyInstanceMethod_New(func)
#endif
-
#if !defined(WIN32) && !defined(MS_WINDOWS)
#ifndef __stdcall
#define __stdcall
@@ -128,7 +109,6 @@
#else
#define _USE_MATH_DEFINES
#endif
-
#if PY_VERSION_HEX < 0x02050000
#define __Pyx_GetAttrString(o,n) PyObject_GetAttrString((o),((char *)(n)))
#define __Pyx_SetAttrString(o,n,a) PyObject_SetAttrString((o),((char *)(n)),(a))
@@ -138,7 +118,6 @@
#define __Pyx_SetAttrString(o,n,a) PyObject_SetAttrString((o),(n),(a))
#define __Pyx_DelAttrString(o,n) PyObject_DelAttrString((o),(n))
#endif
-
#if PY_VERSION_HEX < 0x02050000
#define __Pyx_NAMESTR(n) ((char *)(n))
#define __Pyx_DOCSTR(n) ((char *)(n))
@@ -156,21 +135,24 @@
#include "stdlib.h"
#include "stdio.h"
#include "numpy/arrayobject.h"
-#include "numpy/ufuncobject.h"
#include "math.h"
#include "FixedInterpolator.h"
-
-#ifndef CYTHON_INLINE
- #if defined(__GNUC__)
- #define CYTHON_INLINE __inline__
- #elif defined(_MSC_VER)
- #define CYTHON_INLINE __inline
- #else
- #define CYTHON_INLINE
- #endif
-#endif
-
-typedef struct {PyObject **p; char *s; const long n; const char* encoding; const char is_unicode; const char is_str; const char intern; } __Pyx_StringTabEntry; /*proto*/
+#define __PYX_USE_C99_COMPLEX defined(_Complex_I)
+
+
+#ifdef __GNUC__
+#define INLINE __inline__
+#elif _WIN32
+#define INLINE __inline
+#else
+#define INLINE
+#endif
+
+typedef struct {PyObject **p; char *s; long n; char is_unicode; char intern; char is_identifier;} __Pyx_StringTabEntry; /*proto*/
+
+
+
+static int __pyx_skip_dispatch = 0;
/* Type Conversion Predeclarations */
@@ -189,8 +171,8 @@
#define __Pyx_PyBytes_AsUString(s) ((unsigned char*) __Pyx_PyBytes_AsString(s))
#define __Pyx_PyBool_FromLong(b) ((b) ? (Py_INCREF(Py_True), Py_True) : (Py_INCREF(Py_False), Py_False))
-static CYTHON_INLINE int __Pyx_PyObject_IsTrue(PyObject*);
-static CYTHON_INLINE PyObject* __Pyx_PyNumber_Int(PyObject* x);
+static INLINE int __Pyx_PyObject_IsTrue(PyObject*);
+static INLINE PyObject* __Pyx_PyNumber_Int(PyObject* x);
#if !defined(T_PYSSIZET)
#if PY_VERSION_HEX < 0x02050000
@@ -254,9 +236,9 @@
#endif
#endif
-static CYTHON_INLINE Py_ssize_t __Pyx_PyIndex_AsSsize_t(PyObject*);
-static CYTHON_INLINE PyObject * __Pyx_PyInt_FromSize_t(size_t);
-static CYTHON_INLINE size_t __Pyx_PyInt_AsSize_t(PyObject*);
+static INLINE Py_ssize_t __Pyx_PyIndex_AsSsize_t(PyObject*);
+static INLINE PyObject * __Pyx_PyInt_FromSize_t(size_t);
+static INLINE size_t __Pyx_PyInt_AsSize_t(PyObject*);
#define __pyx_PyFloat_AsDouble(x) (PyFloat_CheckExact(x) ? PyFloat_AS_DOUBLE(x) : PyFloat_AsDouble(x))
@@ -285,29 +267,593 @@
static const char *__pyx_filename;
static const char **__pyx_f;
-
-#if !defined(CYTHON_CCOMPLEX)
- #if defined(__cplusplus)
- #define CYTHON_CCOMPLEX 1
- #elif defined(_Complex_I)
- #define CYTHON_CCOMPLEX 1
- #else
- #define CYTHON_CCOMPLEX 0
- #endif
-#endif
-
-#if CYTHON_CCOMPLEX
- #ifdef __cplusplus
- #include <complex>
- #else
- #include <complex.h>
- #endif
-#endif
-
-#if CYTHON_CCOMPLEX && !defined(__cplusplus) && defined(__sun__) && defined(__GNUC__)
- #undef _Complex_I
- #define _Complex_I 1.0fj
-#endif
+static char __pyx_mdoc[] = "\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";
+
+
More information about the yt-svn
mailing list