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

[commits-noreply at bitbucket.org]

3 new commits in yt:

https://bitbucket.org/yt_analysis/yt/commits/3ac086d03a77/
Changeset:   3ac086d03a77
Branch:      yt
User:        aaron_smith
Date:        2014-11-25 04:54:33+00:00
Summary:     OWLS bug fix for files with /path/to/dir.x.y/file.i.hdf5
Affected #:  3 files

diff -r a0944e034d1db25d5f5679ef7eb57f1dc5159d78 -r 3ac086d03a7721b4179e3b25b1cf587e11783d9e yt/frontends/gadget/data_structures.py
--- a/yt/frontends/gadget/data_structures.py
+++ b/yt/frontends/gadget/data_structures.py
@@ -309,7 +309,8 @@
         self.cosmological_simulation = 1
         self.periodicity = (True, True, True)
 
-        prefix = os.path.abspath(self.parameter_filename.split(".", 1)[0])
+        prefix = self.parameter_filename.rsplit("/", 1)
+        prefix = os.path.abspath(prefix[0]+"/"+prefix[-1].split(".", 1)[0])
         suffix = self.parameter_filename.rsplit(".", 1)[-1]
         self.filename_template = "%s.%%(num)i.%s" % (prefix, suffix)
         self.file_count = self.parameters["NumFilesPerSnapshot"]

diff -r a0944e034d1db25d5f5679ef7eb57f1dc5159d78 -r 3ac086d03a7721b4179e3b25b1cf587e11783d9e yt/frontends/owls/fields.py
--- a/yt/frontends/owls/fields.py
+++ b/yt/frontends/owls/fields.py
@@ -17,6 +17,8 @@
 import os
 import numpy as np
 
+from yt.funcs import \
+    mylog, download_file
 from yt.config import ytcfg
 from yt.fields.particle_fields import \
     add_volume_weighted_smoothed_field

diff -r a0944e034d1db25d5f5679ef7eb57f1dc5159d78 -r 3ac086d03a7721b4179e3b25b1cf587e11783d9e yt/frontends/owls/io.py
--- a/yt/frontends/owls/io.py
+++ b/yt/frontends/owls/io.py
@@ -16,6 +16,7 @@
 
 import h5py
 import numpy as np
+import os
 
 from yt.utilities.io_handler import \
     BaseIOHandler


https://bitbucket.org/yt_analysis/yt/commits/6d42393684d1/
Changeset:   6d42393684d1
Branch:      yt
User:        aaron_smith
Date:        2014-11-25 18:49:20+00:00
Summary:     Other instance of /path/to/file.x.y/data.i.hdf5
Affected #:  1 file

diff -r 3ac086d03a7721b4179e3b25b1cf587e11783d9e -r 6d42393684d1ee0c97b239f447e2de5f3783b956 yt/frontends/gadget/data_structures.py
--- a/yt/frontends/gadget/data_structures.py
+++ b/yt/frontends/gadget/data_structures.py
@@ -178,7 +178,9 @@
                        hvals["Time"], self.current_time)
         self.parameters = hvals
 
-        prefix = self.parameter_filename.split(".", 1)[0]
+        prefix = os.path.abspath(
+            os.path.join(os.path.dirname(self.parameter_filename),
+                         os.path.basename(self.parameter_filename).split(".", 1)[0]))
 
         if hvals["NumFiles"] > 1:
             self.filename_template = "%s.%%(num)s%s" % (prefix, self._suffix)
@@ -309,8 +311,10 @@
         self.cosmological_simulation = 1
         self.periodicity = (True, True, True)
 
-        prefix = self.parameter_filename.rsplit("/", 1)
-        prefix = os.path.abspath(prefix[0]+"/"+prefix[-1].split(".", 1)[0])
+        prefix = os.path.abspath(
+            os.path.join(os.path.dirname(self.parameter_filename),
+                         os.path.basename(self.parameter_filename).split(".", 1)[0]))
+
         suffix = self.parameter_filename.rsplit(".", 1)[-1]
         self.filename_template = "%s.%%(num)i.%s" % (prefix, suffix)
         self.file_count = self.parameters["NumFilesPerSnapshot"]


https://bitbucket.org/yt_analysis/yt/commits/56fb0a5ad8d5/
Changeset:   56fb0a5ad8d5
Branch:      yt
User:        ngoldbaum
Date:        2014-12-02 20:19:52+00:00
Summary:     Merged in aaron_smith/yt-aaron (pull request #1320)

OWLS bug fix for files with /path/to/dir.x.y/file.i.hdf5
Affected #:  3 files

diff -r 8d144ae1a0e76369339f08b4633a6ef7eb91e7fc -r 56fb0a5ad8d5bd9752cf2701324e357ec5490086 yt/frontends/gadget/data_structures.py
--- a/yt/frontends/gadget/data_structures.py
+++ b/yt/frontends/gadget/data_structures.py
@@ -178,7 +178,9 @@
                        hvals["Time"], self.current_time)
         self.parameters = hvals
 
-        prefix = self.parameter_filename.split(".", 1)[0]
+        prefix = os.path.abspath(
+            os.path.join(os.path.dirname(self.parameter_filename),
+                         os.path.basename(self.parameter_filename).split(".", 1)[0]))
 
         if hvals["NumFiles"] > 1:
             self.filename_template = "%s.%%(num)s%s" % (prefix, self._suffix)
@@ -309,7 +311,10 @@
         self.cosmological_simulation = 1
         self.periodicity = (True, True, True)
 
-        prefix = os.path.abspath(self.parameter_filename.split(".", 1)[0])
+        prefix = os.path.abspath(
+            os.path.join(os.path.dirname(self.parameter_filename),
+                         os.path.basename(self.parameter_filename).split(".", 1)[0]))
+
         suffix = self.parameter_filename.rsplit(".", 1)[-1]
         self.filename_template = "%s.%%(num)i.%s" % (prefix, suffix)
         self.file_count = self.parameters["NumFilesPerSnapshot"]

diff -r 8d144ae1a0e76369339f08b4633a6ef7eb91e7fc -r 56fb0a5ad8d5bd9752cf2701324e357ec5490086 yt/frontends/owls/fields.py
--- a/yt/frontends/owls/fields.py
+++ b/yt/frontends/owls/fields.py
@@ -17,6 +17,8 @@
 import os
 import numpy as np
 
+from yt.funcs import \
+    mylog, download_file
 from yt.config import ytcfg
 from yt.fields.particle_fields import \
     add_volume_weighted_smoothed_field

diff -r 8d144ae1a0e76369339f08b4633a6ef7eb91e7fc -r 56fb0a5ad8d5bd9752cf2701324e357ec5490086 yt/frontends/owls/io.py
--- a/yt/frontends/owls/io.py
+++ b/yt/frontends/owls/io.py
@@ -16,6 +16,7 @@
 
 import h5py
 import numpy as np
+import os
 
 from yt.utilities.io_handler import \
     BaseIOHandler

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.