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

[Bitbucket]

2 new commits in yt:


https://bitbucket.org/yt_analysis/yt/changeset/8c6b73b1d0b1/
changeset:   8c6b73b1d0b1
branch:      yt
user:        MatthewTurk
date:        2011-11-25 06:11:05
summary:     Adding checks for dimensionality < 3 in FLASH files.
affected #:  2 files

diff -r 4ec73cabefb6bbf87f117ec671ecc21fa9eb7233 -r 8c6b73b1d0b10135bfd9a0330a565020925d9bfe yt/data_objects/data_containers.py
--- a/yt/data_objects/data_containers.py
+++ b/yt/data_objects/data_containers.py
@@ -1093,6 +1093,7 @@
             dv = dv[sl]
         mask = self.__cut_mask_child_mask(grid)[sl]
         dataVals = dv.ravel()[mask.ravel() == 1]
+        print 
         return dataVals
 
     def _gen_node_name(self):


diff -r 4ec73cabefb6bbf87f117ec671ecc21fa9eb7233 -r 8c6b73b1d0b10135bfd9a0330a565020925d9bfe yt/frontends/flash/data_structures.py
--- a/yt/frontends/flash/data_structures.py
+++ b/yt/frontends/flash/data_structures.py
@@ -136,14 +136,25 @@
         offset = 7
         ii = na.argsort(self.grid_levels.flat)
         gid = self._handle["/gid"][:]
+        first_ind = -(self.parameter_file.refine_by**self.parameter_file.dimensionality)
         for g in self.grids[ii].flat:
             gi = g.id - g._id_offset
             # FLASH uses 1-indexed group info
-            g.Children = [self.grids[i - 1] for i in gid[gi,7:] if i > -1]
+            g.Children = [self.grids[i - 1] for i in gid[gi,first_ind:] if i > -1]
             for g1 in g.Children:
                 g1.Parent = g
             g._prepare_grid()
             g._setup_dx()
+        if self.parameter_file.dimensionality < 3:
+            DD = (self.parameter_file.domain_right_edge[2] -
+                  self.parameter_file.domain_left_edge[2])
+            for g in self.grids:
+                g.dds[2] = DD
+        if self.parameter_file.dimensionality < 2:
+            DD = (self.parameter_file.domain_right_edge[1] -
+                  self.parameter_file.domain_left_edge[1])
+            for g in self.grids:
+                g.dds[1] = DD
         self.max_level = self.grid_levels.max()
 
     def _setup_derived_fields(self):
@@ -183,7 +194,6 @@
         # These should be explicitly obtained from the file, but for now that
         # will wait until a reorganization of the source tree and better
         # generalization.
-        self.dimensionality = 3
         self.refine_by = 2
         self.parameters["HydroMethod"] = 'flash' # always PPM DE
         self.parameters["Time"] = 1. # default unit is 1...
@@ -275,6 +285,8 @@
             [self._find_parameter("real", "%smin" % ax) for ax in 'xyz'])
         self.domain_right_edge = na.array(
             [self._find_parameter("real", "%smax" % ax) for ax in 'xyz'])
+        self.dimensionality = self._find_parameter("integer", "dimensionality",
+                                scalar = True)
 
         # Determine domain dimensions
         try:



https://bitbucket.org/yt_analysis/yt/changeset/cef38035d420/
changeset:   cef38035d420
branch:      yt
user:        MatthewTurk
date:        2011-11-30 15:21:55
summary:     Removing extraneous print
affected #:  1 file

diff -r 8c6b73b1d0b10135bfd9a0330a565020925d9bfe -r cef38035d4207712dbf0f61172cdbd8e03e85867 yt/data_objects/data_containers.py
--- a/yt/data_objects/data_containers.py
+++ b/yt/data_objects/data_containers.py
@@ -1093,7 +1093,6 @@
             dv = dv[sl]
         mask = self.__cut_mask_child_mask(grid)[sl]
         dataVals = dv.ravel()[mask.ravel() == 1]
-        print 
         return dataVals
 
     def _gen_node_name(self):

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.