[yt-svn] commit/yt: 2 new changesets
Bitbucket
commits-noreply at bitbucket.org
Fri Jan 18 08:57:25 PST 2013
2 new commits in yt:
https://bitbucket.org/yt_analysis/yt/commits/968503a73ffb/
changeset: 968503a73ffb
branch: yt
user: Astrodude87
date: 2013-01-17 19:13:47
summary: Fixed Elliptical container and halo load
affected #: 2 files
diff -r 213e0441991554ca0392e7e8a7905114cf06842b -r 968503a73ffbddd69cb361b6efece1cf5ce40f07 yt/analysis_modules/halo_finding/halo_objects.py
--- a/yt/analysis_modules/halo_finding/halo_objects.py
+++ b/yt/analysis_modules/halo_finding/halo_objects.py
@@ -835,6 +835,9 @@
self.bin_count = None
self.overdensity = None
self.indices = np.array([]) # Never used for a LoadedHalo.
+ self._saved_fields = {}
+ self._ds_sort = None
+ self._particle_mask = None
# A supplementary data dict.
if supp is None:
self.supp = {}
diff -r 213e0441991554ca0392e7e8a7905114cf06842b -r 968503a73ffbddd69cb361b6efece1cf5ce40f07 yt/data_objects/data_containers.py
--- a/yt/data_objects/data_containers.py
+++ b/yt/data_objects/data_containers.py
@@ -3674,7 +3674,13 @@
Inside = np.zeros(grid["x"].shape, dtype = 'float64')
dim = grid["x"].shape
# need this to take into account non-cube root grid tiles
- dot_evec = np.zeros([3, dim[0], dim[1], dim[2]])
+ if (len(dim) == 1):
+ dot_evec = np.zeros([3, dim[0]])
+ elif (len(dim) == 2):
+ dot_evec = np.zeros([3, dim[0], dim[1]])
+ elif (len(dim) == 3):
+ dot_evec = np.zeros([3, dim[0], dim[1], dim[2]])
+
for i, ax in enumerate('xyz'):
# distance to center
ar = grid[ax]-self.center[i]
https://bitbucket.org/yt_analysis/yt/commits/f4347686c434/
changeset: f4347686c434
branch: yt
user: sskory
date: 2013-01-18 17:57:22
summary: Merged in Astrodude87/yt_fixellipseparticlemass (pull request #402)
Fixed Elliptical container and halo load
affected #: 2 files
diff -r 3ada654fee2301991b5ef56fff645f5adb3b59fe -r f4347686c4344898fa9a75da6a8d0df312b92752 yt/analysis_modules/halo_finding/halo_objects.py
--- a/yt/analysis_modules/halo_finding/halo_objects.py
+++ b/yt/analysis_modules/halo_finding/halo_objects.py
@@ -835,6 +835,9 @@
self.bin_count = None
self.overdensity = None
self.indices = np.array([]) # Never used for a LoadedHalo.
+ self._saved_fields = {}
+ self._ds_sort = None
+ self._particle_mask = None
# A supplementary data dict.
if supp is None:
self.supp = {}
diff -r 3ada654fee2301991b5ef56fff645f5adb3b59fe -r f4347686c4344898fa9a75da6a8d0df312b92752 yt/data_objects/data_containers.py
--- a/yt/data_objects/data_containers.py
+++ b/yt/data_objects/data_containers.py
@@ -3674,7 +3674,13 @@
Inside = np.zeros(grid["x"].shape, dtype = 'float64')
dim = grid["x"].shape
# need this to take into account non-cube root grid tiles
- dot_evec = np.zeros([3, dim[0], dim[1], dim[2]])
+ if (len(dim) == 1):
+ dot_evec = np.zeros([3, dim[0]])
+ elif (len(dim) == 2):
+ dot_evec = np.zeros([3, dim[0], dim[1]])
+ elif (len(dim) == 3):
+ dot_evec = np.zeros([3, dim[0], dim[1], dim[2]])
+
for i, ax in enumerate('xyz'):
# distance to center
ar = grid[ax]-self.center[i]
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