[yt-svn] commit/yt: 2 new changesets
Bitbucket
commits-noreply at bitbucket.org
Thu Apr 12 19:45:25 PDT 2012
2 new commits in yt:
https://bitbucket.org/yt_analysis/yt/changeset/e744c861ba65/
changeset: e744c861ba65
branch: yt
user: ngoldbaum
date: 2012-04-13 04:37:07
summary: Adding a north_vector keyword argument to off_axis_projection()
affected #: 1 file
diff -r bf87a4e87601ced2eefc754d521314de1f2bf5f9 -r e744c861ba65522fa189c5e7adff9b016a338ed0 yt/visualization/volume_rendering/camera.py
--- a/yt/visualization/volume_rendering/camera.py
+++ b/yt/visualization/volume_rendering/camera.py
@@ -1270,7 +1270,8 @@
return R
def off_axis_projection(pf, center, normal_vector, width, resolution,
- field, weight = None, volume = None, no_ghost = True):
+ field, weight = None, volume = None, no_ghost = True,
+ north_vector = None):
r"""Project through a parameter file, off-axis, and return the image plane.
This function will accept the necessary items to integrate through a volume
@@ -1337,7 +1338,8 @@
cam = pf.h.camera(center, normal_vector, width, resolution, tf,
fields = fields,
log_fields = [False] * len(fields),
- volume = volume, no_ghost = no_ghost)
+ volume = volume, no_ghost = no_ghost,
+ north_vector = north_vector)
vals = cam.snapshot()
image = vals[:,:,0]
if weight is None:
https://bitbucket.org/yt_analysis/yt/changeset/bd4626280c0c/
changeset: bd4626280c0c
branch: yt
user: ngoldbaum
date: 2012-04-13 04:38:24
summary: Merging in yt_analysis/yt
affected #: 5 files
diff -r e744c861ba65522fa189c5e7adff9b016a338ed0 -r bd4626280c0c4a0a2f84d42f92a4510563e8bdcf doc/install_script.sh
--- a/doc/install_script.sh
+++ b/doc/install_script.sh
@@ -375,18 +375,16 @@
echo '57fa5e57dfb98154a42d2d477f29401c2260ae7ad3a8128a4098b42ee3b35c54367b1a3254bc76b9b3b14b4aab7c3e1135858f68abc5636daedf2f01f9b8a3cf tornado-2.2.tar.gz' > tornado-2.2.tar.gz.sha512
# Individual processes
-if [ -z "$HDF5_DIR" ]
-then
- echo "Downloading HDF5"
- get_enzotools hdf5-1.8.7.tar.gz
-fi
-
+[ -z "$HDF5_DIR" ] && get_enzotools hdf5-1.8.7.tar.gz
[ $INST_ZLIB -eq 1 ] && get_enzotools zlib-1.2.3.tar.bz2
[ $INST_BZLIB -eq 1 ] && get_enzotools bzip2-1.0.5.tar.gz
[ $INST_PNG -eq 1 ] && get_enzotools libpng-1.2.43.tar.gz
[ $INST_FTYPE -eq 1 ] && get_enzotools freetype-2.4.4.tar.gz
[ $INST_SQLITE3 -eq 1 ] && get_enzotools sqlite-autoconf-3070500.tar.gz
[ $INST_PYX -eq 1 ] && get_enzotools PyX-0.11.1.tar.gz
+[ $INST_0MQ -eq 1 ] && get_enzotools zeromq-2.2.0.tar.gz
+[ $INST_0MQ -eq 1 ] && get_enzotools pyzmq-2.1.11.tar.gz
+[ $INST_0MQ -eq 1 ] && get_enzotools tornado-2.2.tar.gz
get_enzotools Python-2.7.2.tgz
get_enzotools numpy-1.6.1.tar.gz
get_enzotools matplotlib-1.1.0.tar.gz
@@ -616,9 +614,6 @@
# Now we do our IPython installation, which has two optional dependencies.
if [ $INST_0MQ -eq 1 ]
then
- get_enzotools zeromq-2.2.0.tar.gz
- get_enzotools pyzmq-2.1.11.tar.gz
- get_enzotools tornado-2.2.tar.gz
if [ ! -e zeromq-2.2.0/done ]
then
[ ! -e zeromq-2.2.0 ] && tar xfz zeromq-2.2.0.tar.gz
diff -r e744c861ba65522fa189c5e7adff9b016a338ed0 -r bd4626280c0c4a0a2f84d42f92a4510563e8bdcf yt/analysis_modules/two_point_functions/two_point_functions.py
--- a/yt/analysis_modules/two_point_functions/two_point_functions.py
+++ b/yt/analysis_modules/two_point_functions/two_point_functions.py
@@ -23,6 +23,7 @@
along with this program. If not, see <http://www.gnu.org/licenses/>.
"""
+import h5py
from yt.mods import *
#from yt.utilities.math_utils import *
from yt.utilities.performance_counters import yt_counters, time_function
diff -r e744c861ba65522fa189c5e7adff9b016a338ed0 -r bd4626280c0c4a0a2f84d42f92a4510563e8bdcf yt/data_objects/data_containers.py
--- a/yt/data_objects/data_containers.py
+++ b/yt/data_objects/data_containers.py
@@ -849,7 +849,7 @@
for field in temp_data.keys():
self[field] = temp_data[field]
- def to_frb(self, width, resolution, center = None):
+ def to_frb(self, width, resolution, center=None, height=None):
r"""This function returns a FixedResolutionBuffer generated from this
object.
@@ -864,6 +864,8 @@
This can either be a floating point value, in the native domain
units of the simulation, or a tuple of the (value, unit) style.
This will be the width of the FRB.
+ height : height specifier
+ This will be the height of the FRB, by default it is equal to width.
resolution : int or tuple of ints
The number of pixels on a side of the final FRB.
center : array-like of floats, optional
@@ -890,13 +892,18 @@
if iterable(width):
w, u = width
width = w/self.pf[u]
+ if height is None:
+ height = width
+ elif iterable(height):
+ h, u = height
+ height = h/self.pf[u]
if not iterable(resolution):
resolution = (resolution, resolution)
from yt.visualization.fixed_resolution import FixedResolutionBuffer
xax = x_dict[self.axis]
yax = y_dict[self.axis]
- bounds = (center[xax] - width/2.0, center[xax] + width/2.0,
- center[yax] - width/2.0, center[yax] + width/2.0)
+ bounds = (center[xax] - width*0.5, center[xax] + width*0.5,
+ center[yax] - height*0.5, center[yax] + height*0.5)
frb = FixedResolutionBuffer(self, bounds, resolution)
return frb
@@ -1311,7 +1318,7 @@
return "%s/c%s_L%s" % \
(self._top_node, cen_name, L_name)
- def to_frb(self, width, resolution):
+ def to_frb(self, width, resolution, height=None):
r"""This function returns an ObliqueFixedResolutionBuffer generated
from this object.
@@ -1329,6 +1336,8 @@
This can either be a floating point value, in the native domain
units of the simulation, or a tuple of the (value, unit) style.
This will be the width of the FRB.
+ height : height specifier
+ This will be the height of the FRB, by default it is equal to width.
resolution : int or tuple of ints
The number of pixels on a side of the final FRB.
@@ -1350,10 +1359,15 @@
if iterable(width):
w, u = width
width = w/self.pf[u]
+ if height is None:
+ height = width
+ elif iterable(height):
+ h, u = height
+ height = h/self.pf[u]
if not iterable(resolution):
resolution = (resolution, resolution)
from yt.visualization.fixed_resolution import ObliqueFixedResolutionBuffer
- bounds = (-width/2.0, width/2.0, -width/2.0, width/2.0)
+ bounds = (-width/2.0, width/2.0, -height/2.0, height/2.0)
frb = ObliqueFixedResolutionBuffer(self, bounds, resolution)
return frb
diff -r e744c861ba65522fa189c5e7adff9b016a338ed0 -r bd4626280c0c4a0a2f84d42f92a4510563e8bdcf yt/data_objects/hierarchy.py
--- a/yt/data_objects/hierarchy.py
+++ b/yt/data_objects/hierarchy.py
@@ -326,9 +326,9 @@
return None
full_name = "%s/%s" % (node, name)
- try:
+ if len(self._data_file[full_name].shape) > 0:
return self._data_file[full_name][:]
- except TypeError:
+ else:
return self._data_file[full_name]
def _close_data_file(self):
@@ -337,18 +337,6 @@
del self._data_file
self._data_file = None
- def _deserialize_hierarchy(self, harray):
- # THIS IS BROKEN AND NEEDS TO BE FIXED
- mylog.debug("Cached entry found.")
- self.gridDimensions[:] = harray[:,0:3]
- self.gridStartIndices[:] = harray[:,3:6]
- self.gridEndIndices[:] = harray[:,6:9]
- self.gridLeftEdge[:] = harray[:,9:12]
- self.gridRightEdge[:] = harray[:,12:15]
- self.gridLevels[:] = harray[:,15:16]
- self.gridTimes[:] = harray[:,16:17]
- self.gridNumberOfParticles[:] = harray[:,17:18]
-
def get_smallest_dx(self):
"""
Returns (in code units) the smallest cell size in the simulation.
diff -r e744c861ba65522fa189c5e7adff9b016a338ed0 -r bd4626280c0c4a0a2f84d42f92a4510563e8bdcf yt/frontends/enzo/data_structures.py
--- a/yt/frontends/enzo/data_structures.py
+++ b/yt/frontends/enzo/data_structures.py
@@ -354,6 +354,11 @@
f = h5py.File(self.hierarchy_filename[:-9] + "harrays")
except:
return False
+ hash = f["/"].attrs.get("hash", None)
+ if hash != self.parameter_file._hash():
+ mylog.info("Binary hierarchy does not match: recreating")
+ f.close()
+ return False
self.grid_dimensions[:] = f["/ActiveDimensions"][:]
self.grid_left_edge[:] = f["/LeftEdges"][:]
self.grid_right_edge[:] = f["/RightEdges"][:]
@@ -390,6 +395,7 @@
f = h5py.File(self.hierarchy_filename[:-9] + "harrays", "w")
except IOError:
return
+ f["/"].attrs["hash"] = self.parameter_file._hash()
f.create_dataset("/LeftEdges", data=self.grid_left_edge)
f.create_dataset("/RightEdges", data=self.grid_right_edge)
parents, procs, levels = [], [], []
Repository URL: https://bitbucket.org/yt_analysis/yt/
--
This is a commit notification from bitbucket.org. You are receiving
this because you have the service enabled, addressing the recipient of
this email.
More information about the yt-svn
mailing list