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

[commits-noreply at bitbucket.org]

3 new commits in yt:

https://bitbucket.org/yt_analysis/yt/commits/32ffb2d9f071/
Changeset:   32ffb2d9f071
Branch:      yt-3.0
User:        ngoldbaum
Date:        2014-05-17 15:40:38
Summary:     Raising error messages in region selectors instead of printing.

Since these error messages will normally occur at the bottom of very deep tracebacks, the print
statement will likely be missed.  This makes it easier to diagnose API mistakes (i.e. setting
right_edge < left_edge in a region data object).
Affected #:  1 file

diff -r 80b6a3399f45da6e13828a947813cbe0e057f63d -r 32ffb2d9f071ca92825f82471ac190a954409de4 yt/geometry/selection_routines.pyx
--- a/yt/geometry/selection_routines.pyx
+++ b/yt/geometry/selection_routines.pyx
@@ -627,8 +627,9 @@
             domain_width = DW[i]
 
             if region_width <= 0:
-                print "Error: region right edge < left edge", region_width
-                raise RuntimeError
+                raise RuntimeError(
+                    "Region right edge < left edge: width = %s" % region_width
+                    )
 
             if dobj.pf.periodicity[i]:
                 # shift so left_edge guaranteed in domain
@@ -641,9 +642,12 @@
             else:
                 if dobj.left_edge[i] < dobj.pf.domain_left_edge[i] or \
                    dobj.right_edge[i] > dobj.pf.domain_right_edge[i]:
-                    print "Error: bad Region in non-periodic domain:", dobj.left_edge[i], \
-                        dobj.pf.domain_left_edge[i], dobj.right_edge[i], dobj.pf.domain_right_edge[i]
-                    raise RuntimeError
+                    raise RuntimeError(
+                        "Error: bad Region in non-periodic domain along dimension %s. "
+                        "Region left edge = %s, Region right edge = %s"
+                        "Dataset left edge = %s, Dataset right edge = %s" % \
+                        (i, dobj.left_edge[i], dobj.right_edge[i],
+                         dobj.pf.domain_left_edge[i], dobj.pf.domain_right_edge[i])
                 
             # Already ensured in code
             self.left_edge[i] = dobj.left_edge[i]


https://bitbucket.org/yt_analysis/yt/commits/f1d100c3a9d8/
Changeset:   f1d100c3a9d8
Branch:      yt-3.0
User:        ngoldbaum
Date:        2014-05-17 15:48:57
Summary:     Fixing a syntax error.
Affected #:  1 file

diff -r 32ffb2d9f071ca92825f82471ac190a954409de4 -r f1d100c3a9d88cd18b074e378720308b55b96853 yt/geometry/selection_routines.pyx
--- a/yt/geometry/selection_routines.pyx
+++ b/yt/geometry/selection_routines.pyx
@@ -648,7 +648,7 @@
                         "Dataset left edge = %s, Dataset right edge = %s" % \
                         (i, dobj.left_edge[i], dobj.right_edge[i],
                          dobj.pf.domain_left_edge[i], dobj.pf.domain_right_edge[i])
-                
+                    )
             # Already ensured in code
             self.left_edge[i] = dobj.left_edge[i]
             self.right_edge[i] = dobj.right_edge[i]


https://bitbucket.org/yt_analysis/yt/commits/9ef0e11c216a/
Changeset:   9ef0e11c216a
Branch:      yt-3.0
User:        MatthewTurk
Date:        2014-05-18 22:28:11
Summary:     Merged in ngoldbaum/yt/yt-3.0 (pull request #907)

Raising error messages in region selectors instead of printing.
Affected #:  1 file

diff -r e36b5500ae24facd11fa6f62cfa2396e1f322633 -r 9ef0e11c216af78e74e28aa4003139d7ce76a653 yt/geometry/selection_routines.pyx
--- a/yt/geometry/selection_routines.pyx
+++ b/yt/geometry/selection_routines.pyx
@@ -627,8 +627,9 @@
             domain_width = DW[i]
 
             if region_width <= 0:
-                print "Error: region right edge < left edge", region_width
-                raise RuntimeError
+                raise RuntimeError(
+                    "Region right edge < left edge: width = %s" % region_width
+                    )
 
             if dobj.pf.periodicity[i]:
                 # shift so left_edge guaranteed in domain
@@ -641,10 +642,13 @@
             else:
                 if dobj.left_edge[i] < dobj.pf.domain_left_edge[i] or \
                    dobj.right_edge[i] > dobj.pf.domain_right_edge[i]:
-                    print "Error: bad Region in non-periodic domain:", dobj.left_edge[i], \
-                        dobj.pf.domain_left_edge[i], dobj.right_edge[i], dobj.pf.domain_right_edge[i]
-                    raise RuntimeError
-                
+                    raise RuntimeError(
+                        "Error: bad Region in non-periodic domain along dimension %s. "
+                        "Region left edge = %s, Region right edge = %s"
+                        "Dataset left edge = %s, Dataset right edge = %s" % \
+                        (i, dobj.left_edge[i], dobj.right_edge[i],
+                         dobj.pf.domain_left_edge[i], dobj.pf.domain_right_edge[i])
+                    )
             # Already ensured in code
             self.left_edge[i] = dobj.left_edge[i]
             self.right_edge[i] = dobj.right_edge[i]

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.