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

[commits-noreply at bitbucket.org]

3 new commits in yt:

https://bitbucket.org/yt_analysis/yt/commits/574980daa9d7/
Changeset:   574980daa9d7
Branch:      yt
User:        jzuhone
Date:        2013-11-21 21:27:13
Summary:     Pass field parameters from projection data sources to their projections.
Affected #:  1 file

diff -r 93e915096200d39bba718b19153c1f3320c9b341 -r 574980daa9d7b39684cc1c013a9ee296af063e03 yt/data_objects/data_containers.py
--- a/yt/data_objects/data_containers.py
+++ b/yt/data_objects/data_containers.py
@@ -1739,6 +1739,10 @@
         if center is not None: self.set_field_parameter('center',center)
         self._node_name = node_name
         self._initialize_source(source)
+        if source.field_parameters is not None:
+            for k, v in source.field_parameters.items():
+                if k not in self.field_parameters:
+                    self.set_field_parameter(k,v)
         self._grids = self.source._grids
         if max_level == None:
             max_level = self.hierarchy.max_level
@@ -2080,6 +2084,10 @@
         if center is not None: self.set_field_parameter('center',center)
         self._node_name = node_name
         self._initialize_source(source)
+        if source.field_parameters is not None:
+            for k, v in source.field_parameters.items():
+                if k not in self.field_parameters:
+                    self.set_field_parameter(k,v)
         self._grids = self.source._grids
         if max_level == None:
             max_level = self.hierarchy.max_level


https://bitbucket.org/yt_analysis/yt/commits/86830ded2332/
Changeset:   86830ded2332
Branch:      yt
User:        jzuhone
Date:        2013-11-21 22:57:07
Summary:     This should have been done in here instead to avoid test suite failures
Affected #:  1 file

diff -r 574980daa9d7b39684cc1c013a9ee296af063e03 -r 86830ded233281c5d041083023f7ddbee4227554 yt/data_objects/data_containers.py
--- a/yt/data_objects/data_containers.py
+++ b/yt/data_objects/data_containers.py
@@ -1739,10 +1739,6 @@
         if center is not None: self.set_field_parameter('center',center)
         self._node_name = node_name
         self._initialize_source(source)
-        if source.field_parameters is not None:
-            for k, v in source.field_parameters.items():
-                if k not in self.field_parameters:
-                    self.set_field_parameter(k,v)
         self._grids = self.source._grids
         if max_level == None:
             max_level = self.hierarchy.max_level
@@ -1776,6 +1772,9 @@
             self._distributed = False
             self._okay_to_serialize = False
             self._check_region = True
+            for k, v in source.field_parameters.items():
+                if k not in self.field_parameters:
+                    self.set_field_parameter(k,v)
         self.source = source
         if self._field_cuts is not None:
             # Override if field cuts are around; we don't want to serialize!
@@ -2084,10 +2083,6 @@
         if center is not None: self.set_field_parameter('center',center)
         self._node_name = node_name
         self._initialize_source(source)
-        if source.field_parameters is not None:
-            for k, v in source.field_parameters.items():
-                if k not in self.field_parameters:
-                    self.set_field_parameter(k,v)
         self._grids = self.source._grids
         if max_level == None:
             max_level = self.hierarchy.max_level
@@ -2119,6 +2114,9 @@
             self._distributed = False
             self._okay_to_serialize = False
             self._check_region = True
+            for k, v in source.field_parameters.items():
+                if k not in self.field_parameters:
+                    self.set_field_parameter(k,v)
         self.source = source
         if self._field_cuts is not None:
             # Override if field cuts are around; we don't want to serialize!


https://bitbucket.org/yt_analysis/yt/commits/70f0fe3b81a4/
Changeset:   70f0fe3b81a4
Branch:      yt
User:        MatthewTurk
Date:        2013-11-22 01:05:33
Summary:     Merged in jzuhone/yt (pull request #647)

Pass field parameters from projection data sources to their projections.
Affected #:  1 file

diff -r 62015dd79bf524c1c3db6b623f0db0e4a91d18f7 -r 70f0fe3b81a4e89928f3f85cec20e1179b395c07 yt/data_objects/data_containers.py
--- a/yt/data_objects/data_containers.py
+++ b/yt/data_objects/data_containers.py
@@ -1772,6 +1772,9 @@
             self._distributed = False
             self._okay_to_serialize = False
             self._check_region = True
+            for k, v in source.field_parameters.items():
+                if k not in self.field_parameters:
+                    self.set_field_parameter(k,v)
         self.source = source
         if self._field_cuts is not None:
             # Override if field cuts are around; we don't want to serialize!
@@ -2111,6 +2114,9 @@
             self._distributed = False
             self._okay_to_serialize = False
             self._check_region = True
+            for k, v in source.field_parameters.items():
+                if k not in self.field_parameters:
+                    self.set_field_parameter(k,v)
         self.source = source
         if self._field_cuts is not None:
             # Override if field cuts are around; we don't want to serialize!

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.