[yt-svn] commit/yt: 5 new changesets
commits-noreply at bitbucket.org
commits-noreply at bitbucket.org
Mon Oct 16 13:22:44 PDT 2017
5 new commits in yt:
https://bitbucket.org/yt_analysis/yt/commits/7b303c7808fc/
Changeset: 7b303c7808fc
User: brittonsmith
Date: 2017-09-22 16:03:40+00:00
Summary: Fix typo and make sure attributes are set correctly for reloaded arbitrary grids.
Affected #: 1 file
diff -r fccca1fb4d585d705867a553e7fd5ec94ac7181d -r 7b303c7808fccf074d107d2ba064c3c94a53145e yt/frontends/ytdata/data_structures.py
--- a/yt/frontends/ytdata/data_structures.py
+++ b/yt/frontends/ytdata/data_structures.py
@@ -68,7 +68,7 @@
from yt.data_objects.data_containers import \
GenerationInProgress
-_grid_data_containers = ["abritrary_grid",
+_grid_data_containers = ["arbitrary_grid",
"covering_grid",
"smoothed_covering_grid"]
@@ -472,12 +472,17 @@
self.base_domain_right_edge = self.domain_right_edge
self.base_domain_dimensions = self.domain_dimensions
if self.container_type in _grid_data_containers:
- dx = (self.domain_right_edge - self.domain_left_edge) / \
- (self.domain_dimensions *
- self.refine_by**self.parameters["level"])
self.domain_left_edge = self.parameters["left_edge"]
- self.domain_right_edge = self.domain_left_edge + \
- self.parameters["ActiveDimensions"] * dx
+ if "level" in self.parameters["con_args"]:
+ dx = (self.domain_right_edge - self.domain_left_edge) / \
+ (self.domain_dimensions *
+ self.refine_by**self.parameters["level"])
+ self.domain_right_edge = self.domain_left_edge + \
+ self.parameters["ActiveDimensions"] * dx
+ else:
+ self.domain_right_edge = self.parameters["right_edge"]
+ dx = (self.domain_right_edge - self.domain_left_edge) / \
+ self.parameters["ActiveDimensions"]
self.domain_dimensions = self.parameters["ActiveDimensions"]
self.periodicity = \
np.abs(self.domain_left_edge -
https://bitbucket.org/yt_analysis/yt/commits/a415ce44a8df/
Changeset: a415ce44a8df
User: brittonsmith
Date: 2017-09-22 16:16:30+00:00
Summary: Add arbritrary grid test.
Affected #: 1 file
diff -r 7b303c7808fccf074d107d2ba064c3c94a53145e -r a415ce44a8df425e296e61717ad4e55c94deff21 yt/frontends/ytdata/tests/test_outputs.py
--- a/yt/frontends/ytdata/tests/test_outputs.py
+++ b/yt/frontends/ytdata/tests/test_outputs.py
@@ -120,15 +120,26 @@
curdir = os.getcwd()
os.chdir(tmpdir)
ds = data_dir_load(enzotiny)
+
cg = ds.covering_grid(level=0, left_edge=[0.25]*3, dims=[16]*3)
fn = cg.save_as_dataset(fields=["density", "particle_mass"])
full_fn = os.path.join(tmpdir, fn)
cg_ds = load(full_fn)
compare_unit_attributes(ds, cg_ds)
assert isinstance(cg_ds, YTGridDataset)
-
yield YTDataFieldTest(full_fn, ("grid", "density"))
yield YTDataFieldTest(full_fn, ("all", "particle_mass"))
+
+ ag = ds.arbitrary_grid(left_edge=[0.25]*3, right_edge=[0.75]*3,
+ dims=[16]*3)
+ fn = ag.save_as_dataset(fields=["density", "particle_mass"])
+ full_fn = os.path.join(tmpdir, fn)
+ ag_ds = load(full_fn)
+ compare_unit_attributes(ds, ag_ds)
+ assert isinstance(ag_ds, YTGridDataset)
+ yield YTDataFieldTest(full_fn, ("grid", "density"))
+ yield YTDataFieldTest(full_fn, ("all", "particle_mass"))
+
my_proj = ds.proj("density", "x", weight_field="density")
frb = my_proj.to_frb(1.0, (800, 800))
fn = frb.save_as_dataset(fields=["density"])
https://bitbucket.org/yt_analysis/yt/commits/b52b74ad707a/
Changeset: b52b74ad707a
User: brittonsmith
Date: 2017-10-03 00:16:50+00:00
Summary: Fix logic for covering grids and add some blank lines to make more readable.
Affected #: 1 file
diff -r a415ce44a8df425e296e61717ad4e55c94deff21 -r b52b74ad707acbf3b3d401264ec2c71c44472093 yt/frontends/ytdata/data_structures.py
--- a/yt/frontends/ytdata/data_structures.py
+++ b/yt/frontends/ytdata/data_structures.py
@@ -471,25 +471,33 @@
self.base_domain_left_edge = self.domain_left_edge
self.base_domain_right_edge = self.domain_right_edge
self.base_domain_dimensions = self.domain_dimensions
+
if self.container_type in _grid_data_containers:
self.domain_left_edge = self.parameters["left_edge"]
+
if "level" in self.parameters["con_args"]:
- dx = (self.domain_right_edge - self.domain_left_edge) / \
+ dx = (self.base_domain_right_edge -
+ self.base_domain_left_edge) / \
(self.domain_dimensions *
self.refine_by**self.parameters["level"])
self.domain_right_edge = self.domain_left_edge + \
self.parameters["ActiveDimensions"] * dx
+ self.domain_dimensions = \
+ ((self.domain_right_edge -
+ self.domain_left_edge) / dx).astype(int)
else:
self.domain_right_edge = self.parameters["right_edge"]
+ self.domain_dimensions = self.parameters["ActiveDimensions"]
dx = (self.domain_right_edge - self.domain_left_edge) / \
- self.parameters["ActiveDimensions"]
- self.domain_dimensions = self.parameters["ActiveDimensions"]
+ self.domain_dimensions
+
self.periodicity = \
np.abs(self.domain_left_edge -
self.base_domain_left_edge) < 0.5 * dx
self.periodicity &= \
np.abs(self.domain_right_edge -
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.]])
https://bitbucket.org/yt_analysis/yt/commits/97e42568a192/
Changeset: 97e42568a192
User: brittonsmith
Date: 2017-10-03 16:21:48+00:00
Summary: Incrementing test answers.
Affected #: 1 file
diff -r b52b74ad707acbf3b3d401264ec2c71c44472093 -r 97e42568a192adbfa5dde802576166df6a42a29a tests/tests.yaml
--- a/tests/tests.yaml
+++ b/tests/tests.yaml
@@ -100,7 +100,7 @@
local_ramses_001:
- yt/frontends/ramses/tests/test_outputs.py
- local_ytdata_002:
+ local_ytdata_003:
- yt/frontends/ytdata
local_absorption_spectrum_005:
https://bitbucket.org/yt_analysis/yt/commits/d66dc7438508/
Changeset: d66dc7438508
User: ngoldbaum
Date: 2017-10-16 20:22:31+00:00
Summary: Merge pull request #1569 from brittonsmith/arb_grid
[bugfix] properly set attributes for reloaded arbitrary grids
Affected #: 3 files
diff -r 6822b5ab984f0a2c1426eeec6421aeb3bf2ee818 -r d66dc7438508dbf225eaa337cd83dab8eda662d8 tests/tests.yaml
--- a/tests/tests.yaml
+++ b/tests/tests.yaml
@@ -101,7 +101,7 @@
local_ramses_001:
- yt/frontends/ramses/tests/test_outputs.py
- local_ytdata_002:
+ local_ytdata_003:
- yt/frontends/ytdata
local_absorption_spectrum_005:
diff -r 6822b5ab984f0a2c1426eeec6421aeb3bf2ee818 -r d66dc7438508dbf225eaa337cd83dab8eda662d8 yt/frontends/ytdata/data_structures.py
--- a/yt/frontends/ytdata/data_structures.py
+++ b/yt/frontends/ytdata/data_structures.py
@@ -68,7 +68,7 @@
from yt.data_objects.data_containers import \
GenerationInProgress
-_grid_data_containers = ["abritrary_grid",
+_grid_data_containers = ["arbitrary_grid",
"covering_grid",
"smoothed_covering_grid"]
@@ -471,20 +471,33 @@
self.base_domain_left_edge = self.domain_left_edge
self.base_domain_right_edge = self.domain_right_edge
self.base_domain_dimensions = self.domain_dimensions
+
if self.container_type in _grid_data_containers:
- dx = (self.domain_right_edge - self.domain_left_edge) / \
- (self.domain_dimensions *
- self.refine_by**self.parameters["level"])
self.domain_left_edge = self.parameters["left_edge"]
- self.domain_right_edge = self.domain_left_edge + \
- self.parameters["ActiveDimensions"] * dx
- self.domain_dimensions = self.parameters["ActiveDimensions"]
+
+ if "level" in self.parameters["con_args"]:
+ dx = (self.base_domain_right_edge -
+ self.base_domain_left_edge) / \
+ (self.domain_dimensions *
+ self.refine_by**self.parameters["level"])
+ self.domain_right_edge = self.domain_left_edge + \
+ self.parameters["ActiveDimensions"] * dx
+ self.domain_dimensions = \
+ ((self.domain_right_edge -
+ self.domain_left_edge) / dx).astype(int)
+ else:
+ self.domain_right_edge = self.parameters["right_edge"]
+ self.domain_dimensions = self.parameters["ActiveDimensions"]
+ dx = (self.domain_right_edge - self.domain_left_edge) / \
+ self.domain_dimensions
+
self.periodicity = \
np.abs(self.domain_left_edge -
self.base_domain_left_edge) < 0.5 * dx
self.periodicity &= \
np.abs(self.domain_right_edge -
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.]])
diff -r 6822b5ab984f0a2c1426eeec6421aeb3bf2ee818 -r d66dc7438508dbf225eaa337cd83dab8eda662d8 yt/frontends/ytdata/tests/test_outputs.py
--- a/yt/frontends/ytdata/tests/test_outputs.py
+++ b/yt/frontends/ytdata/tests/test_outputs.py
@@ -121,15 +121,26 @@
curdir = os.getcwd()
os.chdir(tmpdir)
ds = data_dir_load(enzotiny)
+
cg = ds.covering_grid(level=0, left_edge=[0.25]*3, dims=[16]*3)
fn = cg.save_as_dataset(fields=["density", "particle_mass"])
full_fn = os.path.join(tmpdir, fn)
cg_ds = load(full_fn)
compare_unit_attributes(ds, cg_ds)
assert isinstance(cg_ds, YTGridDataset)
-
yield YTDataFieldTest(full_fn, ("grid", "density"))
yield YTDataFieldTest(full_fn, ("all", "particle_mass"))
+
+ ag = ds.arbitrary_grid(left_edge=[0.25]*3, right_edge=[0.75]*3,
+ dims=[16]*3)
+ fn = ag.save_as_dataset(fields=["density", "particle_mass"])
+ full_fn = os.path.join(tmpdir, fn)
+ ag_ds = load(full_fn)
+ compare_unit_attributes(ds, ag_ds)
+ assert isinstance(ag_ds, YTGridDataset)
+ yield YTDataFieldTest(full_fn, ("grid", "density"))
+ yield YTDataFieldTest(full_fn, ("all", "particle_mass"))
+
my_proj = ds.proj("density", "x", weight_field="density")
frb = my_proj.to_frb(1.0, (800, 800))
fn = frb.save_as_dataset(fields=["density"])
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