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

[commits-noreply at bitbucket.org]

4 new commits in yt:

https://bitbucket.org/yt_analysis/yt/commits/424264c85f72/
Changeset:   424264c85f72
Branch:      yt
User:        ngoldbaum
Date:        2016-06-30 20:00:07+00:00
Summary:     Generalize Enzo IO routines to work correctly with 1D data
Affected #:  1 file

diff -r 428dd2f17465075a90ab4ebf40db69e4f619f7ab -r 424264c85f72c6dc6e6f8e3724fa7206f0aa8d5a yt/frontends/enzo/io.py
--- a/yt/frontends/enzo/io.py
+++ b/yt/frontends/enzo/io.py
@@ -158,7 +158,7 @@
                 self._misses += 1
                 ftype, fname = field
                 if fname in gds:
-                    rv[(ftype, fname)] = gds.get(fname).value.swapaxes(0,2)
+                    rv[(ftype, fname)] = gds.get(fname).value.swapaxes(0, -1)
                 else:
                     rv[(ftype, fname)] = np.zeros(g.ActiveDimensions)
             if self._cache_on:
@@ -187,7 +187,7 @@
                     fid = h5py.h5f.open(b(g.filename), h5py.h5f.ACC_RDONLY)
                 gf = self._cached_fields.get(g.id, {})
                 data = np.empty(g.ActiveDimensions[::-1], dtype=h5_type)
-                data_view = data.swapaxes(0,2)
+                data_view = data.swapaxes(0, -1)
                 nd = 0
                 for field in fields:
                     if field in gf:
@@ -278,7 +278,7 @@
                 fid = h5py.h5f.open(b(g.filename), h5py.h5f.ACC_RDONLY)
                 fn = g.filename
             data = np.empty(g.ActiveDimensions[::-1], dtype=h5_type)
-            data_view = data.swapaxes(0,2)
+            data_view = data.swapaxes(0, -1)
             for field in fluid_fields:
                 if field in gf:
                     self._hits += 1


https://bitbucket.org/yt_analysis/yt/commits/3e8db5ae9c73/
Changeset:   3e8db5ae9c73
Branch:      yt
User:        ngoldbaum
Date:        2016-06-30 20:00:27+00:00
Summary:     transpose 2D data being read in for grid selection
Affected #:  1 file

diff -r 424264c85f72c6dc6e6f8e3724fa7206f0aa8d5a -r 3e8db5ae9c73d5d6e9f753246667f9c03e86d2e0 yt/frontends/enzo/io.py
--- a/yt/frontends/enzo/io.py
+++ b/yt/frontends/enzo/io.py
@@ -440,7 +440,8 @@
             f = h5py.File(g.filename, 'r')
             gds = f.get("/Grid%08i" % g.id)
             for ftype, fname in fields:
-                rv[(ftype, fname)] = np.atleast_3d(gds.get(fname).value)
+                rv[(ftype, fname)] = np.atleast_3d(
+                    gds.get(fname).value.transpose())
             f.close()
             return rv
         if size is None:


https://bitbucket.org/yt_analysis/yt/commits/12ede936a04e/
Changeset:   12ede936a04e
Branch:      yt
User:        ngoldbaum
Date:        2016-06-30 20:18:38+00:00
Summary:     Add new answer tests for 1D and 2D enzo data
Affected #:  1 file

diff -r 3e8db5ae9c73d5d6e9f753246667f9c03e86d2e0 -r 12ede936a04ef8ada13bdc21310e2cd9ae73b617 yt/frontends/enzo/tests/test_outputs.py
--- a/yt/frontends/enzo/tests/test_outputs.py
+++ b/yt/frontends/enzo/tests/test_outputs.py
@@ -38,7 +38,8 @@
 ecp = "enzo_cosmology_plus/DD0046/DD0046"
 g30 = "IsolatedGalaxy/galaxy0030/galaxy0030"
 enzotiny = "enzo_tiny_cosmology/DD0046/DD0046"
-
+toro1d = "ToroShockTube/DD0001/data0001"
+kh2d = "EnzoKelvinHelmholtz/DD0011/DD0011"
 
 def check_color_conservation(ds):
     species_names = ds.field_info.species_names
@@ -85,6 +86,22 @@
         yield test
     assert_equal(ds.particle_type_counts, {'io': 1124453})
 
+ at requires_ds(toro1d)
+def test_toro1d():
+    ds = data_dir_load(toro1d)
+    assert_equal(str(ds), 'data0001')
+    for test in small_patch_amr(ds, ds.field_list):
+        test_toro1d.__name__ = test.description
+        yield test
+
+ at requires_ds(kh2d)
+def test_kh2d():
+    ds = data_dir_load(kh2d)
+    assert_equal(str(ds), 'DD0011')
+    for test in small_patch_amr(ds, ds.field_list):
+        test_toro1d.__name__ = test.description
+        yield test
+
 @requires_ds(enzotiny)
 def test_simulated_halo_mass_function():
     ds = data_dir_load(enzotiny)


https://bitbucket.org/yt_analysis/yt/commits/d7f213e1752e/
Changeset:   d7f213e1752e
Branch:      yt
User:        ngoldbaum
Date:        2016-06-30 21:14:41+00:00
Summary:     increment enzo answer number
Affected #:  1 file

diff -r 12ede936a04ef8ada13bdc21310e2cd9ae73b617 -r d7f213e1752e7db1bc4ae5b37c1b9acdaa080a48 tests/tests.yaml
--- a/tests/tests.yaml
+++ b/tests/tests.yaml
@@ -8,7 +8,7 @@
   local_chombo_000:
     - yt/frontends/chombo/tests/test_outputs.py
 
-  local_enzo_000:
+  local_enzo_001:
     - yt/frontends/enzo
 
   local_fits_000:

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.