<html><body>
<p>5 new commits in yt:</p>
<p><a href="https://bitbucket.org/yt_analysis/yt/commits/3b7077a3124f/">https://bitbucket.org/yt_analysis/yt/commits/3b7077a3124f/</a> Changeset: 3b7077a3124f Branch: yt User: yihaochen Date: 2016-03-04 23:31:35+00:00 Summary: Try to guess and load particle file for FLASH dataset Affected #: 1 file</p>
<p>diff -r 2d7b93e59428f2dc6d4cde5030cacc4b113c6ea4 -r 3b7077a3124f82c08823951b230074211c43f6a1 yt/frontends/flash/data_structures.py --- a/yt/frontends/flash/data_structures.py +++ b/yt/frontends/flash/data_structures.py @@ -192,7 +192,12 @@</p>
<pre> self.particle_filename = particle_filename
if self.particle_filename is None:</pre>
<ul><li><p>self._particle_handle = self._handle</p></li></ul>
<p>+ try: + self._particle_handle = HDF5FileHandler(filename.replace('plt_cnt', ‘part')) + self.particle_filename = filename.replace('plt_cnt’, ‘part’) + mylog.info('Particle File Found: %s' % self.particle_filename.split('/')[-1]) + except: + self._particle_handle = self._handle</p>
<pre> else:
try:
self._particle_handle = HDF5FileHandler(self.particle_filename)</pre>
<p><a href="https://bitbucket.org/yt_analysis/yt/commits/798c914a68be/">https://bitbucket.org/yt_analysis/yt/commits/798c914a68be/</a> Changeset: 798c914a68be Branch: yt User: yihaochen Date: 2016-04-29 22:10:28+00:00 Summary: check if the particle file has the same time as the plot file Affected #: 1 file</p>
<p>diff -r 3b7077a3124f82c08823951b230074211c43f6a1 -r 798c914a68beabbebc0b5551b7ce0d9dcefd8e27 yt/frontends/flash/data_structures.py --- a/yt/frontends/flash/data_structures.py +++ b/yt/frontends/flash/data_structures.py @@ -192,6 +192,7 @@</p>
<pre> self.particle_filename = particle_filename
if self.particle_filename is None:</pre>
<p>+ # try to guess the particle filename</p>
<pre>try:
self._particle_handle = HDF5FileHandler(filename.replace('plt_cnt', 'part'))
self.particle_filename = filename.replace('plt_cnt', 'part')</pre>
<p>@@ -199,10 +200,18 @@</p>
<pre>except:
self._particle_handle = self._handle
else:</pre>
<p>+ # particle_filename is specified by user</p>
<pre>try:
self._particle_handle = HDF5FileHandler(self.particle_filename)
except:
raise IOError(self.particle_filename)</pre>
<p>+ # Check if the particle file has the same time + if self._particle_handle != self._handle: + part_time = self._particle_handle.handle.get('real scalars')[0][1] + plot_time = self._handle.handle.get('real scalars')[0][1] + if part_time != plot_time: + raise IOError('%s and %s are not at the same time.' % (self.particle_filename, filename)) +</p>
<pre># These should be explicitly obtained from the file, but for now that
# will wait until a reorganization of the source tree and better
# generalization.</pre>
<p><a href="https://bitbucket.org/yt_analysis/yt/commits/9d4bd75250e8/">https://bitbucket.org/yt_analysis/yt/commits/9d4bd75250e8/</a> Changeset: 9d4bd75250e8 Branch: yt User: yihaochen Date: 2016-04-29 22:49:21+00:00 Summary: Use np.isclose to avoid floating-point comparison problem Affected #: 1 file</p>
<p>diff -r 798c914a68beabbebc0b5551b7ce0d9dcefd8e27 -r 9d4bd75250e8d7858b796f975b77e630f8a3f104 yt/frontends/flash/data_structures.py --- a/yt/frontends/flash/data_structures.py +++ b/yt/frontends/flash/data_structures.py @@ -196,7 +196,7 @@</p>
<pre>try:
self._particle_handle = HDF5FileHandler(filename.replace('plt_cnt', 'part'))
self.particle_filename = filename.replace('plt_cnt', 'part')</pre>
<ul><li><p>mylog.info('Particle File Found: %s' % self.particle_filename.split('/')[-1])</p></li></ul>
<p>+ mylog.info('Particle file found: %s' % self.particle_filename.split('/')[-1])</p>
<pre>except:
self._particle_handle = self._handle
else:</pre>
<p>@@ -209,7 +209,7 @@</p>
<pre> if self._particle_handle != self._handle:
part_time = self._particle_handle.handle.get('real scalars')[0][1]
plot_time = self._handle.handle.get('real scalars')[0][1]</pre>
<ul><li><p>if part_time != plot_time:</p></li></ul>
<p>+ if not np.isclose(part_time, plot_time):</p>
<pre> raise IOError('%s and %s are not at the same time.' % (self.particle_filename, filename))
# These should be explicitly obtained from the file, but for now that</pre>
<p><a href="https://bitbucket.org/yt_analysis/yt/commits/a9afd11b472e/">https://bitbucket.org/yt_analysis/yt/commits/a9afd11b472e/</a> Changeset: a9afd11b472e Branch: yt User: yihaochen Date: 2016-05-03 15:10:06+00:00 Summary: Catch IOError only Affected #: 1 file</p>
<p>diff -r 9d4bd75250e8d7858b796f975b77e630f8a3f104 -r a9afd11b472e1e5fbafd52342c8fb972b8858923 yt/frontends/flash/data_structures.py --- a/yt/frontends/flash/data_structures.py +++ b/yt/frontends/flash/data_structures.py @@ -197,7 +197,7 @@</p>
<pre>self._particle_handle = HDF5FileHandler(filename.replace('plt_cnt', 'part'))
self.particle_filename = filename.replace('plt_cnt', 'part')
mylog.info('Particle file found: %s' % self.particle_filename.split('/')[-1])</pre>
<ul><li><p>except:</p></li></ul>
<p>+ except IOError:</p>
<pre> self._particle_handle = self._handle
else:
# particle_filename is specified by user</pre>
<p><a href="https://bitbucket.org/yt_analysis/yt/commits/dedf4c47220e/">https://bitbucket.org/yt_analysis/yt/commits/dedf4c47220e/</a> Changeset: dedf4c47220e Branch: yt User: ngoldbaum Date: 2016-05-04 18:04:02+00:00 Summary: Merged in yihaochen/yt (pull request #2153)</p>
<p>Try to guess and load particle file for FLASH dataset. Closes #1179 Affected #: 1 file</p>
<p>diff -r 236cd5cc2b6a0b7b96ebe64a9a223f14bc86728e -r dedf4c47220e9551cf8ce24f10c9259da92f4361 yt/frontends/flash/data_structures.py --- a/yt/frontends/flash/data_structures.py +++ b/yt/frontends/flash/data_structures.py @@ -192,12 +192,26 @@</p>
<pre> self.particle_filename = particle_filename
if self.particle_filename is None:</pre>
<ul><li><p>self._particle_handle = self._handle</p></li></ul>
<p>+ # try to guess the particle filename + try: + self._particle_handle = HDF5FileHandler(filename.replace('plt_cnt', ‘part')) + self.particle_filename = filename.replace('plt_cnt’, ‘part’) + mylog.info('Particle file found: %s' % self.particle_filename.split('/')[-1]) + except IOError: + self._particle_handle = self._handle</p>
<pre>else:</pre>
<p>+ # particle_filename is specified by user</p>
<pre>try:
self._particle_handle = HDF5FileHandler(self.particle_filename)
except:
raise IOError(self.particle_filename)</pre>
<p>+ # Check if the particle file has the same time + if self._particle_handle != self._handle: + part_time = self._particle_handle.handle.get('real scalars')[0][1] + plot_time = self._handle.handle.get('real scalars')[0][1] + if not np.isclose(part_time, plot_time): + raise IOError('%s and %s are not at the same time.' % (self.particle_filename, filename)) +</p>
<pre># These should be explicitly obtained from the file, but for now that
# will wait until a reorganization of the source tree and better
# generalization.</pre>
<p>Repository URL: <a href="https://bitbucket.org/yt_analysis/yt/">https://bitbucket.org/yt_analysis/yt/</a></p>
<p>—</p>
<p>This is a commit notification from bitbucket.org. You are receiving this because you have the service enabled, addressing the recipient of this email.</p>
<img src="http://link.bitbucket.org/wf/open?upn=ll4ctv0L-2ByeRZFC1LslHcg6aJmnQ70VruLbmeLQr27DocS2ZWzS6afa7tIcAJmS-2Bxt2s4Cu-2Fa1S3Z-2BlD1h0HvdqvFELZwlq3SpfudWKyBNFKIkIDBQAtRY2kx1wpi4nB-2FgSzsGPDjKGtqGpV236Ig3N-2B2MHl6Jdpi7frJcAfnvXXDQFfUJV08ctDLbmd-2BuDcj3HnFbeL32dTQwE-2BgSGV1JPlJbbBkcpdy-2FoI0uN80rU-3D" alt="" width="1" height="1" border="0" style="height:1px !important;width:1px !important;border-width:0 !important;margin-top:0 !important;margin-bottom:0 !important;margin-right:0 !important;margin-left:0 !important;padding-top:0 !important;padding-bottom:0 !important;padding-right:0 !important;padding-left:0 !important;"/>
</body></html>