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

[commits-noreply at bitbucket.org]

3 new commits in yt:

https://bitbucket.org/yt_analysis/yt/commits/9d427c43c0ab/
Changeset:   9d427c43c0ab
User:        brittonsmith
Date:        2018-01-06 00:38:59+00:00
Summary:     Keep units when setting domain edges for frb datasets.
Affected #:  2 files

diff -r bcd6d24d0a4fd33e60a5d3bef5d4538ca2383317 -r 9d427c43c0abe43cf84d3cea3b0d02216ae81bc6 yt/frontends/ytdata/data_structures.py
--- a/yt/frontends/ytdata/data_structures.py
+++ b/yt/frontends/ytdata/data_structures.py
@@ -499,10 +499,12 @@
                    self.base_domain_right_edge) < 0.5 * dx
 
         elif self.data_type == "yt_frb":
-            self.domain_left_edge = \
-              np.concatenate([self.parameters["left_edge"], [0.]])
-            self.domain_right_edge = \
-              np.concatenate([self.parameters["right_edge"], [1.]])
+            dle = self.domain_left_edge
+            left = self.parameters["left_edge"].to(dle.units)
+            dle[0:2] = left
+            dre = self.domain_right_edge
+            right = self.parameters["right_edge"].to(dre.units)
+            dre[0:2] = right
             self.domain_dimensions = \
               np.concatenate([self.parameters["ActiveDimensions"], [1]])
 

diff -r bcd6d24d0a4fd33e60a5d3bef5d4538ca2383317 -r 9d427c43c0abe43cf84d3cea3b0d02216ae81bc6 yt/frontends/ytdata/tests/test_outputs.py
--- a/yt/frontends/ytdata/tests/test_outputs.py
+++ b/yt/frontends/ytdata/tests/test_outputs.py
@@ -25,6 +25,7 @@
     YTProfileDataset, \
     save_as_dataset
 from yt.testing import \
+    assert_array_equal, \
     assert_allclose_units, \
     assert_equal, \
     assert_fname, \
@@ -145,6 +146,7 @@
     frb = my_proj.to_frb(1.0, (800, 800))
     fn = frb.save_as_dataset(fields=["density"])
     frb_ds = load(fn)
+    assert_array_equal(frb["density"], frb_ds.data["density"])
     compare_unit_attributes(ds, frb_ds)
     assert isinstance(frb_ds, YTGridDataset)
     yield YTDataFieldTest(full_fn, "density", geometric=False)


https://bitbucket.org/yt_analysis/yt/commits/04fc33aaf613/
Changeset:   04fc33aaf613
User:        brittonsmith
Date:        2018-01-09 19:16:35+00:00
Summary:     Set array with uconcatenate.
Affected #:  1 file

diff -r 9d427c43c0abe43cf84d3cea3b0d02216ae81bc6 -r 04fc33aaf6130788ea93dd60c12100cc76fa2fbe yt/frontends/ytdata/data_structures.py
--- a/yt/frontends/ytdata/data_structures.py
+++ b/yt/frontends/ytdata/data_structures.py
@@ -52,6 +52,7 @@
 from yt.units.unit_registry import \
     UnitRegistry
 from yt.units.yt_array import \
+    uconcatenate, \
     YTQuantity
 from yt.utilities.logger import \
     ytLogger as mylog
@@ -500,11 +501,11 @@
 
         elif self.data_type == "yt_frb":
             dle = self.domain_left_edge
-            left = self.parameters["left_edge"].to(dle.units)
-            dle[0:2] = left
+            self.domain_left_edge = uconcatenate(
+                [self.parameters["left_edge"].to(dle.units), [0] * dle.uq])
             dre = self.domain_right_edge
-            right = self.parameters["right_edge"].to(dre.units)
-            dre[0:2] = right
+            self.domain_right_edge = uconcatenate(
+                [self.parameters["right_edge"].to(dre.units), [1] * dre.uq])
             self.domain_dimensions = \
               np.concatenate([self.parameters["ActiveDimensions"], [1]])
 


https://bitbucket.org/yt_analysis/yt/commits/206bbd4f69d6/
Changeset:   206bbd4f69d6
User:        ngoldbaum
Date:        2018-01-19 17:27:46+00:00
Summary:     Merge pull request #1659 from brittonsmith/ytfrb

[bugfix] Keep units when setting domain edges for frb datasets.
Affected #:  2 files

diff -r 8d3c124f9f475a6acc435cb31895b985bb3abfb0 -r 206bbd4f69d6986982c1797aeda441ff57c25a04 yt/frontends/ytdata/data_structures.py
--- a/yt/frontends/ytdata/data_structures.py
+++ b/yt/frontends/ytdata/data_structures.py
@@ -52,6 +52,7 @@
 from yt.units.unit_registry import \
     UnitRegistry
 from yt.units.yt_array import \
+    uconcatenate, \
     YTQuantity
 from yt.utilities.logger import \
     ytLogger as mylog
@@ -499,10 +500,12 @@
                    self.base_domain_right_edge) < 0.5 * dx
 
         elif self.data_type == "yt_frb":
-            self.domain_left_edge = \
-              np.concatenate([self.parameters["left_edge"], [0.]])
-            self.domain_right_edge = \
-              np.concatenate([self.parameters["right_edge"], [1.]])
+            dle = self.domain_left_edge
+            self.domain_left_edge = uconcatenate(
+                [self.parameters["left_edge"].to(dle.units), [0] * dle.uq])
+            dre = self.domain_right_edge
+            self.domain_right_edge = uconcatenate(
+                [self.parameters["right_edge"].to(dre.units), [1] * dre.uq])
             self.domain_dimensions = \
               np.concatenate([self.parameters["ActiveDimensions"], [1]])
 

diff -r 8d3c124f9f475a6acc435cb31895b985bb3abfb0 -r 206bbd4f69d6986982c1797aeda441ff57c25a04 yt/frontends/ytdata/tests/test_outputs.py
--- a/yt/frontends/ytdata/tests/test_outputs.py
+++ b/yt/frontends/ytdata/tests/test_outputs.py
@@ -25,6 +25,7 @@
     YTProfileDataset, \
     save_as_dataset
 from yt.testing import \
+    assert_array_equal, \
     assert_allclose_units, \
     assert_equal, \
     assert_fname, \
@@ -145,6 +146,7 @@
     frb = my_proj.to_frb(1.0, (800, 800))
     fn = frb.save_as_dataset(fields=["density"])
     frb_ds = load(fn)
+    assert_array_equal(frb["density"], frb_ds.data["density"])
     compare_unit_attributes(ds, frb_ds)
     assert isinstance(frb_ds, YTGridDataset)
     yield YTDataFieldTest(full_fn, "density", geometric=False)

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.