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

[Bitbucket]

4 new commits in yt:


https://bitbucket.org/yt_analysis/yt/changeset/881227d39ae8/
changeset:   881227d39ae8
branch:      yt
user:        jzuhone
date:        2012-11-14 21:42:05
summary:     Determining top-level domain dimensions in FLASH. PARAMESH uses nblockx, nblocky, nblockz to determine the number of blocks on a side. Uniform Grid uses iprocs, jprocs, kprocs. Previously we weren't checking for the latter possibility. The only way I can think of at the moment to distinguish between the two is to check for a parameter that would be part of PARAMESH and not Uniform Grid, such as 'lrefine_min'.
affected #:  2 files

diff -r e2d94c653c5ac243017f361ff4d20fb1c0522e57 -r 881227d39ae813b04ccca2c3a29b0100d14c586b setup.cfg
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,9 +1,3 @@
 [egg_info]
 #tag_build = .dev
 #tag_svn_revision = 1
-
-[nosetests]
-detailed-errors=1
-where=yt
-exclude=answer_testing
-with-xunit=1


diff -r e2d94c653c5ac243017f361ff4d20fb1c0522e57 -r 881227d39ae813b04ccca2c3a29b0100d14c586b yt/frontends/flash/data_structures.py
--- a/yt/frontends/flash/data_structures.py
+++ b/yt/frontends/flash/data_structures.py
@@ -397,9 +397,15 @@
             if dimensionality < 3:
                 mylog.warning("Guessing dimensionality as %s", dimensionality)
 
-        nblockx = self.parameters["nblockx"]
-        nblocky = self.parameters["nblocky"]
-        nblockz = self.parameters["nblockz"]
+        if 'lrefine_min' in self.parameters.keys() : # PARAMESH
+            nblockx = self.parameters["nblockx"]
+            nblocky = self.parameters["nblocky"]
+            nblockz = self.parameters["nblockz"]
+        else : # Uniform Grid
+            nblockx = self.parameters["iprocs"]
+            nblocky = self.parameters["jprocs"]
+            nblockz = self.parameters["kprocs"]
+                        
         self.dimensionality = dimensionality
         self.domain_dimensions = \
             np.array([nblockx*nxb,nblocky*nyb,nblockz*nzb])



https://bitbucket.org/yt_analysis/yt/changeset/93406bd39d0e/
changeset:   93406bd39d0e
branch:      yt
user:        jzuhone
date:        2012-11-14 21:43:54
summary:     Fixing unintentional edit of setup.cfg
affected #:  1 file

diff -r 881227d39ae813b04ccca2c3a29b0100d14c586b -r 93406bd39d0e2dce7a4ecfb80f30c36dd5b28062 setup.cfg
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,3 +1,9 @@
 [egg_info]
 #tag_build = .dev
 #tag_svn_revision = 1
+
+[nosetests]
+detailed-errors=1
+where=yt
+exclude=answer_testing
+with-xunit=1
\ No newline at end of file



https://bitbucket.org/yt_analysis/yt/changeset/8b9074656a51/
changeset:   8b9074656a51
branch:      yt
user:        jzuhone
date:        2012-11-14 21:44:46
summary:     Fixing unintentional edit of setup.cfg
affected #:  1 file

diff -r 93406bd39d0e2dce7a4ecfb80f30c36dd5b28062 -r 8b9074656a5119b90f3b2f8996b1ab172aa0d82e setup.cfg
--- a/setup.cfg
+++ b/setup.cfg
@@ -6,4 +6,4 @@
 detailed-errors=1
 where=yt
 exclude=answer_testing
-with-xunit=1
\ No newline at end of file
+with-xunit=1



https://bitbucket.org/yt_analysis/yt/changeset/917e70c630b3/
changeset:   917e70c630b3
branch:      yt
user:        MatthewTurk
date:        2012-11-14 21:49:53
summary:     Merged in jzuhone/yt-flash_fixes (pull request #341)
affected #:  2 files



diff -r 588ee216347993c8b57a2be32f5fa9f2c85e1eb9 -r 917e70c630b36db1f9a821023a3a26b4c9454ac9 yt/frontends/flash/data_structures.py
--- a/yt/frontends/flash/data_structures.py
+++ b/yt/frontends/flash/data_structures.py
@@ -397,9 +397,15 @@
             if dimensionality < 3:
                 mylog.warning("Guessing dimensionality as %s", dimensionality)
 
-        nblockx = self.parameters["nblockx"]
-        nblocky = self.parameters["nblocky"]
-        nblockz = self.parameters["nblockz"]
+        if 'lrefine_min' in self.parameters.keys() : # PARAMESH
+            nblockx = self.parameters["nblockx"]
+            nblocky = self.parameters["nblocky"]
+            nblockz = self.parameters["nblockz"]
+        else : # Uniform Grid
+            nblockx = self.parameters["iprocs"]
+            nblocky = self.parameters["jprocs"]
+            nblockz = self.parameters["kprocs"]
+                        
         self.dimensionality = dimensionality
         self.domain_dimensions = \
             np.array([nblockx*nxb,nblocky*nyb,nblockz*nzb])

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.