[Yt-svn] yt: 5 new changesets
hg at spacepope.org
hg at spacepope.org
Tue Aug 10 15:56:24 PDT 2010
hg Repository: yt
details: yt/rev/9495637048f9
changeset: 1934:9495637048f9
user: mturk
date:
Sun Jul 25 20:24:29 2010 -0700
description:
[svn r1801] Importing opengl_widgets directory from hg
hg Repository: yt
details: yt/rev/96af05db3a96
changeset: 1935:96af05db3a96
user: mturk
date:
Mon Jul 26 10:14:27 2010 -0700
description:
[svn r1802] Updating MIP viewer to be aware of different domain sizes.
hg Repository: yt
details: yt/rev/f785b20f62f4
changeset: 1936:f785b20f62f4
user: mturk
date:
Wed Jul 28 13:52:20 2010 -0700
description:
[svn r1803] This rename got missed somehow on the filesystem end, but not in the updating
import names end.
hg Repository: yt
details: yt/rev/12cd4b2e070c
changeset: 1937:12cd4b2e070c
user: mturk
date:
Thu Jul 29 17:18:35 2010 -0700
description:
[svn r1804] Fixed the bug in volume rendering where iv_dir[i] was always the inverse of
v_dir[0].
hg Repository: yt
details: yt/rev/bf152c98eae1
changeset: 1938:bf152c98eae1
user: Matthew Turk <matthewturk at gmail.com>
date:
Tue Aug 10 15:56:15 2010 -0700
description:
Merging from trunk
diffstat:
.hgignore | 3 +
CREDITS | 7 +-
yt/_amr_utils/VolumeIntegrator.pyx | 10 +-
yt/amr_utils.c | 10846 ++++++++++++--------
yt/arraytypes.py | 11 +
yt/command_line.py | 1 +
yt/extensions/EnzoSimulation.py | 527 -
yt/extensions/enzo_simulation.py | 527 +
yt/extensions/eps_writer.py | 17 +-
yt/extensions/kdtree/fKD.f90 | 2 +-
yt/extensions/light_ray.py | 372 +
yt/extensions/mods.py | 2 +-
yt/extensions/opengl_image_viewer.py | 2 -
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 | 452 +
yt/extensions/opengl_widgets/rendering_contexts.py | 88 +
yt/extensions/setup.py | 1 +
yt/extensions/volume_rendering/grid_partitioner.py | 26 +-
yt/extensions/volume_rendering/multi_texture.py | 302 +
yt/fido/share_data.py | 83 +
yt/lagos/BaseDataTypes.py | 2 +-
yt/lagos/BaseGridType.py | 170 +-
yt/lagos/Clump.py | 290 -
yt/lagos/DataReadingFuncs.py | 69 +-
yt/lagos/FLASHFields.py | 97 +
yt/lagos/HierarchyType.py | 384 +-
yt/lagos/OutputTypes.py | 238 +-
yt/lagos/RAMSESFields.py | 52 +
yt/lagos/__init__.py | 2 +
yt/mods.py | 8 +-
yt/ramses_headers/FortranUnformatted_IO.hh | 291 +
yt/ramses_headers/RAMSES_amr_data.hh | 970 +
yt/ramses_headers/RAMSES_hydro_data.hh | 666 +
yt/ramses_headers/RAMSES_info.hh | 334 +
yt/ramses_headers/RAMSES_particle_data.hh | 650 +
yt/ramses_headers/RAMSES_poisson_data.hh | 249 +
yt/ramses_headers/RAMSES_typedefs.h | 21 +
yt/ramses_headers/README | 9 +
yt/ramses_headers/data_iterators.hh | 74 +
yt/ramses_reader.cpp | 11701 +++++++++++++++++++++
yt/ramses_reader.pyx | 804 +
yt/raven/Callbacks.py | 75 +
yt/reason/plot_editors.py | 10 +-
yt/reason/reason_v2.py | 7 +-
yt/reason/tvtk_interface.py | 26 +-
yt/setup.py | 6 +
49 files changed, 25313 insertions(+), 5393 deletions(-)
diffs (truncated from 42548 to 300 lines):
diff -r a14e2ba06397 -r bf152c98eae1 .hgignore
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/.hgignore Tue Aug 10 15:56:15 2010 -0700
@@ -0,0 +1,3 @@
+syntax: glob
+*.pyc
+.*.swp
diff -r a14e2ba06397 -r bf152c98eae1 CREDITS
--- a/CREDITS Fri Jul 23 15:39:37 2010 -0700
+++ b/CREDITS Tue Aug 10 15:56:15 2010 -0700
@@ -8,10 +8,15 @@
Devin Silvia (devin.silvia at gmail.com)
John Wise (jwise at astro.princeton.edu)
David Collins (dcollins at physics.ucsd.edu)
+ Christopher Moody (cemoody at ucsc.edu)
+ Oliver Hahn (ohahn at stanford.edu)
+ John ZuHone (jzuhone at cfa.harvard.edu)
We also include the Delaunay Triangulation module written by Robert Kern of
Enthought, the cmdln.py module by Trent Mick, and the progressbar module by
Nilton Volpato. The PasteBin interface code (as well as the PasteBin itself)
-was written by the Pocoo collective (pocoo.org).
+was written by the Pocoo collective (pocoo.org). The RamsesRead++ library was
+developed by Oliver Hahn. Large parts of this code were guided by discussions
+with Tom Abel, Ralf Kaehler, Mike Norman and Greg Bryan.
Thanks to everyone for all your contributions!
diff -r a14e2ba06397 -r bf152c98eae1 yt/_amr_utils/VolumeIntegrator.pyx
--- a/yt/_amr_utils/VolumeIntegrator.pyx Fri Jul 23 15:39:37 2010 -0700
+++ b/yt/_amr_utils/VolumeIntegrator.pyx Tue Aug 10 15:56:15 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:
@@ -411,11 +411,17 @@
for i in range(3):
if (v_dir[i] < 0):
step[i] = -1
+ elif (v_dir[i] == 0):
+ step[i] = 1
+ tmax[i] = 1e60
+ iv_dir[i] = 1e60
+ tdelta[i] = 1e-60
+ continue
else:
step[i] = 1
x = (i+1) % 3
y = (i+2) % 3
- iv_dir[i] = 1.0/v_dir[0]
+ iv_dir[i] = 1.0/v_dir[i]
tl = (self.left_edge[i] - v_pos[i])*iv_dir[i]
temp_x = (v_pos[x] + tl*v_dir[x])
temp_y = (v_pos[y] + tl*v_dir[y])
diff -r a14e2ba06397 -r bf152c98eae1 yt/amr_utils.c
--- a/yt/amr_utils.c Fri Jul 23 15:39:37 2010 -0700
+++ b/yt/amr_utils.c Tue Aug 10 15:56:15 2010 -0700
@@ -1,18 +1,39 @@
-/* Generated by Cython 0.12.1 on Thu Jun 24 08:38:56 2010 */
+/* Generated by Cython 0.13.beta0 on Mon Aug 2 07:18:26 2010 */
#define PY_SSIZE_T_CLEAN
#include "Python.h"
-#include "structmember.h"
#ifndef Py_PYTHON_H
#error Python headers needed to compile C extensions, please install development version of Python.
#else
+#include <stddef.h> /* For offsetof */
+#ifndef offsetof
+#define offsetof(type, member) ( (size_t) & ((type*)0) -> member )
+#endif
+
+#if !defined(WIN32) && !defined(MS_WINDOWS)
+ #ifndef __stdcall
+ #define __stdcall
+ #endif
+ #ifndef __cdecl
+ #define __cdecl
+ #endif
+ #ifndef __fastcall
+ #define __fastcall
+ #endif
+#endif
+
+#ifndef DL_IMPORT
+ #define DL_IMPORT(t) t
+#endif
+#ifndef DL_EXPORT
+ #define DL_EXPORT(t) t
+#endif
+
#ifndef PY_LONG_LONG
#define PY_LONG_LONG LONG_LONG
#endif
-#ifndef DL_EXPORT
- #define DL_EXPORT(t) t
-#endif
+
#if PY_VERSION_HEX < 0x02040000
#define METH_COEXIST 0
#define PyDict_CheckExact(op) (Py_TYPE(op) == &PyDict_Type)
@@ -82,11 +103,35 @@
#if PY_MAJOR_VERSION >= 3
#define PyBaseString_Type PyUnicode_Type
+ #define PyStringObject PyUnicodeObject
#define PyString_Type PyUnicode_Type
+ #define PyString_Check PyUnicode_Check
#define PyString_CheckExact PyUnicode_CheckExact
-#else
+#endif
+
+#if PY_VERSION_HEX < 0x02060000
+ #define PyBytesObject PyStringObject
#define PyBytes_Type PyString_Type
+ #define PyBytes_Check PyString_Check
#define PyBytes_CheckExact PyString_CheckExact
+ #define PyBytes_FromString PyString_FromString
+ #define PyBytes_FromStringAndSize PyString_FromStringAndSize
+ #define PyBytes_FromFormat PyString_FromFormat
+ #define PyBytes_DecodeEscape PyString_DecodeEscape
+ #define PyBytes_AsString PyString_AsString
+ #define PyBytes_AsStringAndSize PyString_AsStringAndSize
+ #define PyBytes_Size PyString_Size
+ #define PyBytes_AS_STRING PyString_AS_STRING
+ #define PyBytes_GET_SIZE PyString_GET_SIZE
+ #define PyBytes_Repr PyString_Repr
+ #define PyBytes_Concat PyString_Concat
+ #define PyBytes_ConcatAndDel PyString_ConcatAndDel
+ #define PySet_Check(obj) PyObject_TypeCheck(obj, &PySet_Type)
+ #define PyFrozenSet_Check(obj) PyObject_TypeCheck(obj, &PyFrozenSet_Type)
+#endif
+
+#ifndef PySet_CheckExact
+# define PySet_CheckExact(obj) (Py_TYPE(obj) == &PySet_Type)
#endif
#if PY_MAJOR_VERSION >= 3
@@ -103,30 +148,18 @@
#define PyInt_AsSsize_t PyLong_AsSsize_t
#define PyInt_AsUnsignedLongMask PyLong_AsUnsignedLongMask
#define PyInt_AsUnsignedLongLongMask PyLong_AsUnsignedLongLongMask
+#endif
+
+#if PY_MAJOR_VERSION >= 3
#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
#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
- #endif
- #ifndef __cdecl
- #define __cdecl
- #endif
- #ifndef __fastcall
- #define __fastcall
- #endif
-#else
- #define _USE_MATH_DEFINES
+ #define PyMethod_New(func, self, klass) ((self) ? PyMethod_New(func, self) : PyInstanceMethod_New(func))
#endif
#if PY_VERSION_HEX < 0x02050000
@@ -146,115 +179,66 @@
#define __Pyx_NAMESTR(n) (n)
#define __Pyx_DOCSTR(n) (n)
#endif
+
#ifdef __cplusplus
#define __PYX_EXTERN_C extern "C"
#else
#define __PYX_EXTERN_C extern
#endif
+
+#if defined(WIN32) || defined(MS_WINDOWS)
+#define _USE_MATH_DEFINES
+#endif
#include <math.h>
#define __PYX_HAVE_API__yt__amr_utils
+#include "stdio.h"
#include "stdlib.h"
-#include "stdio.h"
#include "numpy/arrayobject.h"
#include "numpy/ufuncobject.h"
#include "math.h"
#include "FixedInterpolator.h"
#include "png.h"
+/* inline attribute */
#ifndef CYTHON_INLINE
#if defined(__GNUC__)
#define CYTHON_INLINE __inline__
#elif defined(_MSC_VER)
#define CYTHON_INLINE __inline
+ #elif defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L
+ #define CYTHON_INLINE inline
#else
#define CYTHON_INLINE
#endif
#endif
+/* unused attribute */
+#ifndef CYTHON_UNUSED
+# if defined(__GNUC__)
+# if !(defined(__cplusplus)) || (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4))
+# define CYTHON_UNUSED __attribute__ ((__unused__))
+# else
+# define CYTHON_UNUSED
+# endif
+# elif defined(__ICC) || defined(__INTEL_COMPILER)
+# define CYTHON_UNUSED __attribute__ ((__unused__))
+# else
+# define CYTHON_UNUSED
+# 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*/
/* Type Conversion Predeclarations */
-#if PY_MAJOR_VERSION < 3
-#define __Pyx_PyBytes_FromString PyString_FromString
-#define __Pyx_PyBytes_FromStringAndSize PyString_FromStringAndSize
-#define __Pyx_PyBytes_AsString PyString_AsString
-#else
-#define __Pyx_PyBytes_FromString PyBytes_FromString
-#define __Pyx_PyBytes_FromStringAndSize PyBytes_FromStringAndSize
-#define __Pyx_PyBytes_AsString PyBytes_AsString
-#endif
-
-#define __Pyx_PyBytes_FromUString(s) __Pyx_PyBytes_FromString((char*)s)
-#define __Pyx_PyBytes_AsUString(s) ((unsigned char*) __Pyx_PyBytes_AsString(s))
+#define __Pyx_PyBytes_FromUString(s) PyBytes_FromString((char*)s)
+#define __Pyx_PyBytes_AsUString(s) ((unsigned char*) 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);
-#if !defined(T_PYSSIZET)
-#if PY_VERSION_HEX < 0x02050000
-#define T_PYSSIZET T_INT
-#elif !defined(T_LONGLONG)
-#define T_PYSSIZET \
- ((sizeof(Py_ssize_t) == sizeof(int)) ? T_INT : \
- ((sizeof(Py_ssize_t) == sizeof(long)) ? T_LONG : -1))
-#else
-#define T_PYSSIZET \
- ((sizeof(Py_ssize_t) == sizeof(int)) ? T_INT : \
- ((sizeof(Py_ssize_t) == sizeof(long)) ? T_LONG : \
- ((sizeof(Py_ssize_t) == sizeof(PY_LONG_LONG)) ? T_LONGLONG : -1)))
-#endif
-#endif
-
-
-#if !defined(T_ULONGLONG)
-#define __Pyx_T_UNSIGNED_INT(x) \
- ((sizeof(x) == sizeof(unsigned char)) ? T_UBYTE : \
- ((sizeof(x) == sizeof(unsigned short)) ? T_USHORT : \
- ((sizeof(x) == sizeof(unsigned int)) ? T_UINT : \
- ((sizeof(x) == sizeof(unsigned long)) ? T_ULONG : -1))))
-#else
-#define __Pyx_T_UNSIGNED_INT(x) \
- ((sizeof(x) == sizeof(unsigned char)) ? T_UBYTE : \
- ((sizeof(x) == sizeof(unsigned short)) ? T_USHORT : \
- ((sizeof(x) == sizeof(unsigned int)) ? T_UINT : \
- ((sizeof(x) == sizeof(unsigned long)) ? T_ULONG : \
- ((sizeof(x) == sizeof(unsigned PY_LONG_LONG)) ? T_ULONGLONG : -1)))))
-#endif
-#if !defined(T_LONGLONG)
-#define __Pyx_T_SIGNED_INT(x) \
- ((sizeof(x) == sizeof(char)) ? T_BYTE : \
- ((sizeof(x) == sizeof(short)) ? T_SHORT : \
- ((sizeof(x) == sizeof(int)) ? T_INT : \
- ((sizeof(x) == sizeof(long)) ? T_LONG : -1))))
-#else
-#define __Pyx_T_SIGNED_INT(x) \
- ((sizeof(x) == sizeof(char)) ? T_BYTE : \
- ((sizeof(x) == sizeof(short)) ? T_SHORT : \
- ((sizeof(x) == sizeof(int)) ? T_INT : \
- ((sizeof(x) == sizeof(long)) ? T_LONG : \
- ((sizeof(x) == sizeof(PY_LONG_LONG)) ? T_LONGLONG : -1)))))
More information about the yt-svn
mailing list