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

[commits-noreply at bitbucket.org]

2 new commits in yt:

https://bitbucket.org/yt_analysis/yt/commits/71d9df9c629d/
Changeset:   71d9df9c629d
User:        brittonsmith
Date:        2017-10-14 00:54:30+00:00
Summary:     Reassign parents correctly when intermediate clumps are removed.
Affected #:  1 file

diff -r 0faca88b46a92ce153a5fac58b654fbd7e6fcc5c -r 71d9df9c629ddfdb55f297875a8f1fbfde9296cc yt/analysis_modules/level_sets/clump_handling.py
--- a/yt/analysis_modules/level_sets/clump_handling.py
+++ b/yt/analysis_modules/level_sets/clump_handling.py
@@ -87,9 +87,6 @@
         if parent is not None:
             self.data.parent = self.parent.data
 
-        if parent is not None:
-            self.data.parent = self.parent.data
-
         if validators is None:
             validators = []
         self.validators = validators
@@ -457,6 +454,9 @@
                         "children to parent.") % 
                         (len(these_children),len(clump.children)))
             clump.children = these_children[0].children
+            for child in clump.children:
+                child.parent = clump
+                child.data.parent = clump.data
         else:
             mylog.info("%d of %d children survived, erasing children." %
                        (len(these_children),len(clump.children)))


https://bitbucket.org/yt_analysis/yt/commits/698974169a44/
Changeset:   698974169a44
User:        ngoldbaum
Date:        2017-10-14 15:26:52+00:00
Summary:     Merge pull request #1587 from brittonsmith/clump

[bugfix] fix clump-finding corner case
Affected #:  1 file

diff -r 4cbd343c7782c682f00b96fd19ee774a2da28642 -r 698974169a44f83921dc5e76be66d6b9ce0c19da yt/analysis_modules/level_sets/clump_handling.py
--- a/yt/analysis_modules/level_sets/clump_handling.py
+++ b/yt/analysis_modules/level_sets/clump_handling.py
@@ -87,9 +87,6 @@
         if parent is not None:
             self.data.parent = self.parent.data
 
-        if parent is not None:
-            self.data.parent = self.parent.data
-
         if validators is None:
             validators = []
         self.validators = validators
@@ -461,6 +458,9 @@
                         "children to parent.") % 
                         (len(these_children),len(clump.children)))
             clump.children = these_children[0].children
+            for child in clump.children:
+                child.parent = clump
+                child.data.parent = clump.data
         else:
             mylog.info("%d of %d children survived, erasing children." %
                        (len(these_children),len(clump.children)))

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.