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

[Bitbucket]

2 new commits in yt:


https://bitbucket.org/yt_analysis/yt/changeset/1d54070f489e/
changeset:   1d54070f489e
branch:      yt
user:        ngoldbaum
date:        2012-03-15 03:38:41
summary:     Added a check for a universal orion parameter.
affected #:  2 files

diff -r c604391a080887d0fb9d573ab685b2f28a0f984e -r 1d54070f489eff8af820e061032efdf23ceda449 yt/frontends/flash/data_structures.py
--- a/yt/frontends/flash/data_structures.py
+++ b/yt/frontends/flash/data_structures.py
@@ -379,7 +379,7 @@
     def _is_valid(self, *args, **kwargs):
         try:
             fileh = h5py.File(args[0],'r')
-            if "bounding box" in fileh["/"].keys():
+            if "integer scalars" in fileh["/"].keys():
                 fileh.close()
                 return True
             fileh.close()


diff -r c604391a080887d0fb9d573ab685b2f28a0f984e -r 1d54070f489eff8af820e061032efdf23ceda449 yt/frontends/orion/data_structures.py
--- a/yt/frontends/orion/data_structures.py
+++ b/yt/frontends/orion/data_structures.py
@@ -502,7 +502,8 @@
         castro = any(("castro." in line for line in open(pfn)))
         nyx = any(("nyx." in line for line in open(pfn)))
         maestro = os.path.exists(os.path.join(pname, "job_info"))
-        orion = (not castro) and (not maestro) and (not nyx)
+        really_orion = any(("geometry.prob_lo" in line for line in open(pfn)))
+        orion = (not castro) and (not maestro) and (not nyx) and really_orion
         return orion
         
     def _parse_parameter_file(self):



https://bitbucket.org/yt_analysis/yt/changeset/0f2f745da003/
changeset:   0f2f745da003
branch:      yt
user:        ngoldbaum
date:        2012-03-15 03:41:33
summary:     Backing out a change that accidentally made it into a PR.
affected #:  1 file

diff -r 1d54070f489eff8af820e061032efdf23ceda449 -r 0f2f745da00316d18cc96164415565187a6feb36 yt/frontends/flash/data_structures.py
--- a/yt/frontends/flash/data_structures.py
+++ b/yt/frontends/flash/data_structures.py
@@ -379,7 +379,7 @@
     def _is_valid(self, *args, **kwargs):
         try:
             fileh = h5py.File(args[0],'r')
-            if "integer scalars" in fileh["/"].keys():
+            if "bounding box" in fileh["/"].keys():
                 fileh.close()
                 return True
             fileh.close()

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.