[yt-svn] commit/yt: 3 new changesets

[commits-noreply at bitbucket.org]

3 new commits in yt:

https://bitbucket.org/yt_analysis/yt/commits/234a8a64761b/
Changeset:   234a8a64761b
Branch:      yt-3.0
User:        atmyers
Date:        2014-06-06 23:37:47
Summary:     Depending on the type of output function called from Chombo, "max_level" may not exist in the data dump. "num_levels" will, however.
Affected #:  1 file

diff -r 3d6f253ca3ec2e3b9f13f98984b72097d3135485 -r 234a8a64761bf3e703ab2777e53a67cb220d1d81 yt/frontends/chombo/data_structures.py
--- a/yt/frontends/chombo/data_structures.py
+++ b/yt/frontends/chombo/data_structures.py
@@ -162,7 +162,7 @@
 
     def _parse_index(self):
         f = self._handle # shortcut
-        self.max_level = f.attrs['max_level']
+        self.max_level = f.attrs['num_levels'] - 1
 
         grids = []
         self.dds_list = []


https://bitbucket.org/yt_analysis/yt/commits/a58e24a1bef2/
Changeset:   a58e24a1bef2
Branch:      yt-3.0
User:        atmyers
Date:        2014-06-06 23:39:28
Summary:     fixing an issue with c / fortran array ordering in the Chombo frontend
Affected #:  1 file

diff -r 234a8a64761bf3e703ab2777e53a67cb220d1d81 -r a58e24a1bef277113cb0f9030fa8124f8a6b4059 yt/frontends/chombo/io.py
--- a/yt/frontends/chombo/io.py
+++ b/yt/frontends/chombo/io.py
@@ -171,7 +171,7 @@
             return np.array([], dtype=np.float64)
 
         data = self._handle[lev]['particles:data'][offsets[lo]:offsets[hi]]
-        return data[field_index::items_per_particle]
+        return np.asarray(data[field_index::items_per_particle], dtype=np.float64, order='F')
 
 class IOHandlerChombo2DHDF5(IOHandlerChomboHDF5):
     _dataset_type = "chombo2d_hdf5"


https://bitbucket.org/yt_analysis/yt/commits/a83501174991/
Changeset:   a83501174991
Branch:      yt-3.0
User:        ngoldbaum
Date:        2014-06-10 19:38:43
Summary:     Merged in atmyers/yt-fixes/yt-3.0 (pull request #938)

Fixing two bugs in the Chombo frontend
Affected #:  2 files

diff -r 968ecd473b98ac9e38514f844d013ffb46881f92 -r a83501174991ae2fae2b7a4aa4f9234296976cf3 yt/frontends/chombo/data_structures.py
--- a/yt/frontends/chombo/data_structures.py
+++ b/yt/frontends/chombo/data_structures.py
@@ -162,7 +162,7 @@
 
     def _parse_index(self):
         f = self._handle # shortcut
-        self.max_level = f.attrs['max_level']
+        self.max_level = f.attrs['num_levels'] - 1
 
         grids = []
         self.dds_list = []

diff -r 968ecd473b98ac9e38514f844d013ffb46881f92 -r a83501174991ae2fae2b7a4aa4f9234296976cf3 yt/frontends/chombo/io.py
--- a/yt/frontends/chombo/io.py
+++ b/yt/frontends/chombo/io.py
@@ -171,7 +171,7 @@
             return np.array([], dtype=np.float64)
 
         data = self._handle[lev]['particles:data'][offsets[lo]:offsets[hi]]
-        return data[field_index::items_per_particle]
+        return np.asarray(data[field_index::items_per_particle], dtype=np.float64, order='F')
 
 class IOHandlerChombo2DHDF5(IOHandlerChomboHDF5):
     _dataset_type = "chombo2d_hdf5"

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.