[yt-svn] commit/yt: ngoldbaum: Merged in aaron_smith/yt-aaron (pull request #1320)
commits-noreply at bitbucket.org
commits-noreply at bitbucket.org
Tue Dec 2 12:20:01 PST 2014
1 new commit in yt:
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.
More information about the yt-svn
mailing list