[Yt-svn] commit/yt: 5 new changesets
Bitbucket
commits-noreply at bitbucket.org
Thu Aug 25 08:59:35 PDT 2011
5 new changesets in yt:
http://bitbucket.org/yt_analysis/yt/changeset/ae6122b6166e/
changeset: ae6122b6166e
branch: yt
user: samskillman
date: 2011-08-24 17:46:40
summary: Making sure that kdtree domain lies on a root-grid cell boundary. Otherwise will lead to errors when only building on a subdomain.
affected #: 1 file (223 bytes)
--- a/yt/utilities/amr_kdtree/amr_kdtree.py Tue Aug 23 16:00:06 2011 -0400
+++ b/yt/utilities/amr_kdtree/amr_kdtree.py Wed Aug 24 09:46:40 2011 -0600
@@ -295,12 +295,16 @@
else:
self.domain_right_edge = na.clip(na.array(re),pf.domain_left_edge, pf.domain_right_edge)
+ root_grids = pf.hierarchy.get_levels().next()
+ rgdds = root_grids[0].dds
+ self.domain_left_edge = (self.domain_left_edge/rgdds).astype('int64')*rgdds
+ self.domain_left_edge = ((self.domain_left_edge/rgdds).astype('int64')+1)*rgdds
+
self.my_l_corner = self.domain_left_edge
self.my_r_corner = self.domain_right_edge
mylog.info('Making kd tree from le %s to %s'% (self.domain_left_edge, self.domain_right_edge))
- root_grids = pf.hierarchy.get_levels().next()
-
+
root_l_data = na.array([grid.LeftEdge for grid in root_grids])
root_r_data = na.array([grid.RightEdge for grid in root_grids])
root_we_want = na.all(root_l_data < self.my_r_corner,axis=1)*\
http://bitbucket.org/yt_analysis/yt/changeset/9ef3accda105/
changeset: 9ef3accda105
branch: yt
user: samskillman
date: 2011-08-24 19:32:36
summary: left != right. copy-paste fail.
affected #: 1 file (2 bytes)
--- a/yt/utilities/amr_kdtree/amr_kdtree.py Wed Aug 24 09:46:40 2011 -0600
+++ b/yt/utilities/amr_kdtree/amr_kdtree.py Wed Aug 24 11:32:36 2011 -0600
@@ -298,7 +298,7 @@
root_grids = pf.hierarchy.get_levels().next()
rgdds = root_grids[0].dds
self.domain_left_edge = (self.domain_left_edge/rgdds).astype('int64')*rgdds
- self.domain_left_edge = ((self.domain_left_edge/rgdds).astype('int64')+1)*rgdds
+ self.domain_right_edge = ((self.domain_right_edge/rgdds).astype('int64')+1)*rgdds
self.my_l_corner = self.domain_left_edge
self.my_r_corner = self.domain_right_edge
http://bitbucket.org/yt_analysis/yt/changeset/8c9f4d69c05e/
changeset: 8c9f4d69c05e
branch: yt
user: samskillman
date: 2011-08-24 19:44:06
summary: Need to clip against domain edges after adjusting.
affected #: 1 file (111 bytes)
--- a/yt/utilities/amr_kdtree/amr_kdtree.py Wed Aug 24 11:32:36 2011 -0600
+++ b/yt/utilities/amr_kdtree/amr_kdtree.py Wed Aug 24 11:44:06 2011 -0600
@@ -289,16 +289,19 @@
if le is None:
self.domain_left_edge = pf.domain_left_edge
else:
- self.domain_left_edge = na.clip(na.array(le),pf.domain_left_edge, pf.domain_right_edge)
+ self.domain_left_edge = na.array(le)
if re is None:
self.domain_right_edge = pf.domain_right_edge
else:
- self.domain_right_edge = na.clip(na.array(re),pf.domain_left_edge, pf.domain_right_edge)
+ self.domain_right_edge = na.array(re)
root_grids = pf.hierarchy.get_levels().next()
rgdds = root_grids[0].dds
self.domain_left_edge = (self.domain_left_edge/rgdds).astype('int64')*rgdds
self.domain_right_edge = ((self.domain_right_edge/rgdds).astype('int64')+1)*rgdds
+
+ self.domain_left_edge = na.clip(self.domain_left_edge,pf.domain_left_edge, pf.domain_right_edge)
+ self.domain_right_edge = na.clip(self.domain_right_edge,pf.domain_left_edge, pf.domain_right_edge)
self.my_l_corner = self.domain_left_edge
self.my_r_corner = self.domain_right_edge
http://bitbucket.org/yt_analysis/yt/changeset/ba69410515b0/
changeset: ba69410515b0
branch: yt
user: samskillman
date: 2011-08-25 17:57:22
summary: Fixing array issues when reading enzo parameter files for 1d simulations.
affected #: 1 file (241 bytes)
--- a/yt/frontends/enzo/data_structures.py Thu Aug 25 08:06:53 2011 -0400
+++ b/yt/frontends/enzo/data_structures.py Thu Aug 25 09:57:22 2011 -0600
@@ -684,9 +684,9 @@
self._hierarchy_class = EnzoHierarchy1D
self._fieldinfo_class = Enzo1DFieldContainer
self.domain_left_edge = \
- na.concatenate([self["DomainLeftEdge"], [0.0, 0.0]])
+ na.concatenate([[self.domain_left_edge], [0.0, 0.0]])
self.domain_right_edge = \
- na.concatenate([self["DomainRightEdge"], [1.0, 1.0]])
+ na.concatenate([[self.domain_right_edge], [1.0, 1.0]])
def _setup_2d(self):
self._hierarchy_class = EnzoHierarchy2D
@@ -796,8 +796,13 @@
self.refine_by = self.parameters["RefineBy"]
self.dimensionality = self.parameters["TopGridRank"]
self.domain_dimensions = self.parameters["TopGridDimensions"]
- self.domain_left_edge = self.parameters["DomainLeftEdge"].copy()
- self.domain_right_edge = self.parameters["DomainRightEdge"].copy()
+ if self.dimensionality > 1:
+ self.domain_left_edge = na.array(self.parameters["DomainLeftEdge"]).copy()
+ self.domain_right_edge = na.array(self.parameters["DomainRightEdge"]).copy()
+ else:
+ self.domain_left_edge = na.array(self.parameters["DomainLeftEdge"])
+ self.domain_right_edge = na.array(self.parameters["DomainRightEdge"])
+
self.current_time = self.parameters["InitialTime"]
# To be enabled when we can break old pickles:
#if "MetaDataSimulationUUID" in self.parameters:
@@ -835,7 +840,7 @@
self._setup_nounits_units()
self.time_units['1'] = 1
self.units['1'] = 1
- self.units['unitary'] = 1.0 / (self["DomainRightEdge"] - self["DomainLeftEdge"]).max()
+ self.units['unitary'] = 1.0 / (self.domain_right_edge - self.domain_left_edge).max()
seconds = self["Time"]
self.time_units['years'] = seconds / (365*3600*24.0)
self.time_units['days'] = seconds / (3600*24.0)
http://bitbucket.org/yt_analysis/yt/changeset/ee2b2ea82c0d/
changeset: ee2b2ea82c0d
branch: yt
user: samskillman
date: 2011-08-25 17:58:54
summary: Merging heads.
affected #: 1 file (336 bytes)
--- a/yt/utilities/amr_kdtree/amr_kdtree.py Thu Aug 25 09:57:22 2011 -0600
+++ b/yt/utilities/amr_kdtree/amr_kdtree.py Thu Aug 25 09:58:54 2011 -0600
@@ -289,18 +289,25 @@
if le is None:
self.domain_left_edge = pf.domain_left_edge
else:
- self.domain_left_edge = na.clip(na.array(le),pf.domain_left_edge, pf.domain_right_edge)
+ self.domain_left_edge = na.array(le)
if re is None:
self.domain_right_edge = pf.domain_right_edge
else:
- self.domain_right_edge = na.clip(na.array(re),pf.domain_left_edge, pf.domain_right_edge)
+ self.domain_right_edge = na.array(re)
+ root_grids = pf.hierarchy.get_levels().next()
+ rgdds = root_grids[0].dds
+ self.domain_left_edge = (self.domain_left_edge/rgdds).astype('int64')*rgdds
+ self.domain_right_edge = ((self.domain_right_edge/rgdds).astype('int64')+1)*rgdds
+
+ self.domain_left_edge = na.clip(self.domain_left_edge,pf.domain_left_edge, pf.domain_right_edge)
+ self.domain_right_edge = na.clip(self.domain_right_edge,pf.domain_left_edge, pf.domain_right_edge)
+
self.my_l_corner = self.domain_left_edge
self.my_r_corner = self.domain_right_edge
mylog.info('Making kd tree from le %s to %s'% (self.domain_left_edge, self.domain_right_edge))
- root_grids = pf.hierarchy.get_levels().next()
-
+
root_l_data = na.array([grid.LeftEdge for grid in root_grids])
root_r_data = na.array([grid.RightEdge for grid in root_grids])
root_we_want = na.all(root_l_data < self.my_r_corner,axis=1)*\
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