[yt-svn] commit/yt: xarthisius: Merged in jzuhone/yt (pull request #2353)

[commits-noreply at bitbucket.org]

1 new commit in yt:

https://bitbucket.org/yt_analysis/yt/commits/0186541d072b/
Changeset:   0186541d072b
Branch:      yt
User:        xarthisius
Date:        2016-09-07 15:04:50+00:00
Summary:     Merged in jzuhone/yt (pull request #2353)

[bugfix-ish] Don't error out if the FLASH particle file and the plot file have different times
Affected #:  1 file

diff -r b5e56b85e6bb69e4357739cc9e62fb11061e96f1 -r 0186541d072bb907697b79d9e0bbae1867354339 yt/frontends/flash/data_structures.py
--- a/yt/frontends/flash/data_structures.py
+++ b/yt/frontends/flash/data_structures.py
@@ -214,7 +214,9 @@
             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))
+                self._particle_handle = self._handle
+                mylog.warning('%s and %s are not at the same time. ' % (self.particle_filename, filename) +
+                              'This particle file will not be used.')
 
         # These should be explicitly obtained from the file, but for now that
         # will wait until a reorganization of the source tree and better

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.