[yt-svn] commit/yt: MatthewTurk: Merging development into experimental

[commits-noreply at bitbucket.org]

1 new commit in yt:

https://bitbucket.org/yt_analysis/yt/commits/47cca121fc80/
Changeset:   47cca121fc80
Branch:      yt-3.0
User:        MatthewTurk
Date:        2014-04-14 20:06:18
Summary:     Merging development into experimental
Affected #:  6 files

diff -r 1b0f0f8c680e39274550c91f00dd4c1367a32166 -r 47cca121fc80b321c75546cfc39673e1b0feb366 .hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -5160,3 +5160,4 @@
 954d1ffcbf04c3d1b394c2ea05324d903a9a07cf yt-3.0a2
 f4853999c2b5b852006d6628719c882cddf966df yt-3.0a3
 079e456c38a87676472a458210077e2be325dc85 last_gplv3
+f327552a6ede406b82711fb800ebcd5fe692d1cb yt-3.0a4

diff -r 1b0f0f8c680e39274550c91f00dd4c1367a32166 -r 47cca121fc80b321c75546cfc39673e1b0feb366 yt/data_objects/construction_data_containers.py
--- a/yt/data_objects/construction_data_containers.py
+++ b/yt/data_objects/construction_data_containers.py
@@ -427,11 +427,11 @@
         self.left_edge = self.pf.arr(left_edge, 'code_length')
         self.level = level
 
+        self.ActiveDimensions = np.array(dims, dtype='int32')
         rdx = self.pf.domain_dimensions*self.pf.relative_refinement(0, level)
         rdx[np.where(np.array(dims) - 2 * num_ghost_zones <= 1)] = 1   # issue 602
         self.base_dds = self.pf.domain_width / self.pf.domain_dimensions
         self.dds = self.pf.domain_width / rdx.astype("float64")
-        self.ActiveDimensions = np.array(dims, dtype='int32')
         self.right_edge = self.left_edge + self.ActiveDimensions*self.dds
         self._num_ghost_zones = num_ghost_zones
         self._use_pbar = use_pbar

diff -r 1b0f0f8c680e39274550c91f00dd4c1367a32166 -r 47cca121fc80b321c75546cfc39673e1b0feb366 yt/data_objects/profiles.py
--- a/yt/data_objects/profiles.py
+++ b/yt/data_objects/profiles.py
@@ -27,6 +27,7 @@
     new_bin_profile3d
 from yt.utilities.parallel_tools.parallel_analysis_interface import \
     ParallelAnalysisInterface, parallel_objects
+from yt.utilities.exceptions import YTEmptyProfileData
 
 def preserve_source_parameters(func):
     def save_state(*args, **kwargs):

diff -r 1b0f0f8c680e39274550c91f00dd4c1367a32166 -r 47cca121fc80b321c75546cfc39673e1b0feb366 yt/visualization/image_writer.py
--- a/yt/visualization/image_writer.py
+++ b/yt/visualization/image_writer.py
@@ -17,6 +17,7 @@
 import numpy as np
 
 from yt.funcs import *
+from yt.utilities.exceptions import YTNotInsideNotebook
 import _colormap_data as cmd
 import yt.utilities.lib.image_utilities as au
 import yt.utilities.png_writer as pw

diff -r 1b0f0f8c680e39274550c91f00dd4c1367a32166 -r 47cca121fc80b321c75546cfc39673e1b0feb366 yt/visualization/profile_plotter.py
--- a/yt/visualization/profile_plotter.py
+++ b/yt/visualization/profile_plotter.py
@@ -14,6 +14,7 @@
 #-----------------------------------------------------------------------------
 
 
+import __builtin__
 import base64
 import types
 
@@ -30,13 +31,15 @@
     ImagePlotContainer, \
     log_transform, linear_transform
 from yt.data_objects.profiles import \
-    create_profile
+     create_profile
+from yt.utilities.exceptions import \
+     YTNotInsideNotebook
 from yt.utilities.logger import ytLogger as mylog
 import _mpl_imports as mpl
 from yt.funcs import \
-    ensure_list, \
-    get_image_suffix, \
-    get_ipython_api_version
+     ensure_list, \
+     get_image_suffix, \
+     get_ipython_api_version
 
 def get_canvas(name):
     suffix = get_image_suffix(name)

diff -r 1b0f0f8c680e39274550c91f00dd4c1367a32166 -r 47cca121fc80b321c75546cfc39673e1b0feb366 yt/visualization/volume_rendering/camera.py
--- a/yt/visualization/volume_rendering/camera.py
+++ b/yt/visualization/volume_rendering/camera.py
@@ -19,6 +19,7 @@
 from yt.funcs import *
 from yt.utilities.math_utils import *
 from yt.units.yt_array import YTArray
+from yt.utilities.exceptions import YTNotInsideNotebook
 from copy import deepcopy
 
 from .transfer_functions import ProjectionTransferFunction

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.