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

[commits-noreply at bitbucket.org]

3 new commits in yt:

https://bitbucket.org/yt_analysis/yt/commits/0c4bd11d2782/
Changeset:   0c4bd11d2782
Branch:      yt-3.0
User:        chummels
Date:        2014-07-18 01:04:08
Summary:     Making sure that recently deposited fields (e.g. from a particle filter) get added to the derived field list.
Affected #:  1 file

diff -r b58796ca19881fca5b1244e13152816ad2164200 -r 0c4bd11d27823567e9b5b8dc95edfe8596891a2e yt/data_objects/static_output.py
--- a/yt/data_objects/static_output.py
+++ b/yt/data_objects/static_output.py
@@ -431,7 +431,10 @@
         if available:
             self.particle_types += (filter.name,)
             self.filtered_particle_types.append(filter.name)
-            self._setup_particle_types([filter.name])
+            for fn in self._setup_particle_types([filter.name]):
+                if not fn in self.derived_field_list:
+                    self.derived_field_list.append(fn)
+            self.derived_field_list.sort() 
         return available
 
     def _setup_particle_types(self, ptypes = None):


https://bitbucket.org/yt_analysis/yt/commits/8e9aa00fd262/
Changeset:   8e9aa00fd262
Branch:      yt-3.0
User:        MatthewTurk
Date:        2014-07-18 05:27:25
Summary:     Don't allow NullFuncs to be filtered without change.
Affected #:  3 files

diff -r 0c4bd11d27823567e9b5b8dc95edfe8596891a2e -r 8e9aa00fd2627aeac2c47342c4e7ed40aae72149 yt/data_objects/particle_filters.py
--- a/yt/data_objects/particle_filters.py
+++ b/yt/data_objects/particle_filters.py
@@ -72,6 +72,8 @@
     def wrap_func(self, field_name, old_fi):
         new_fi = copy.copy(old_fi)
         new_fi.name = (self.filtered_type, field_name[1])
+        if old_fi._function == NullFunc:
+            new_fi._function = TranslationFunc(old_fi.name)
         return new_fi
 
 def add_particle_filter(name, function, requires = None, filtered_type = "all"):

diff -r 0c4bd11d27823567e9b5b8dc95edfe8596891a2e -r 8e9aa00fd2627aeac2c47342c4e7ed40aae72149 yt/data_objects/static_output.py
--- a/yt/data_objects/static_output.py
+++ b/yt/data_objects/static_output.py
@@ -431,10 +431,9 @@
         if available:
             self.particle_types += (filter.name,)
             self.filtered_particle_types.append(filter.name)
-            for fn in self._setup_particle_types([filter.name]):
-                if not fn in self.derived_field_list:
-                    self.derived_field_list.append(fn)
-            self.derived_field_list.sort() 
+            new_fields = self._setup_particle_types([filter.name])
+            deps, _ = self.field_info.check_derived_fields(new_fields)
+            self.field_dependencies.update(deps)
         return available
 
     def _setup_particle_types(self, ptypes = None):

diff -r 0c4bd11d27823567e9b5b8dc95edfe8596891a2e -r 8e9aa00fd2627aeac2c47342c4e7ed40aae72149 yt/fields/field_info_container.py
--- a/yt/fields/field_info_container.py
+++ b/yt/fields/field_info_container.py
@@ -75,11 +75,11 @@
                 output_units = str(u.get_cgs_equivalent())
             else:
                 output_units = units
+            if (ptype, f) not in self.field_list:
+                continue
             self.add_output_field((ptype, f),
                 units = units, particle_type = True, display_name = dn,
                 output_units = output_units)
-            if (ptype, f) not in self.field_list:
-                continue
             for alias in aliases:
                 self.alias((ptype, alias), (ptype, f), units = output_units)
 


https://bitbucket.org/yt_analysis/yt/commits/6c0273b42d19/
Changeset:   6c0273b42d19
Branch:      yt-3.0
User:        MatthewTurk
Date:        2014-07-18 14:20:54
Summary:     Merged in chummels/yt/yt-3.0 (pull request #1027)

Making sure that recently deposited fields (e.g. from a particle filter) get added to the derived field list.
Affected #:  3 files

diff -r 39a936c40774b7ed8646255a6cbcf05a361f02aa -r 6c0273b42d198d3ac270238feed0e5a5ace9899c yt/data_objects/particle_filters.py
--- a/yt/data_objects/particle_filters.py
+++ b/yt/data_objects/particle_filters.py
@@ -72,6 +72,8 @@
     def wrap_func(self, field_name, old_fi):
         new_fi = copy.copy(old_fi)
         new_fi.name = (self.filtered_type, field_name[1])
+        if old_fi._function == NullFunc:
+            new_fi._function = TranslationFunc(old_fi.name)
         return new_fi
 
 def add_particle_filter(name, function, requires = None, filtered_type = "all"):

diff -r 39a936c40774b7ed8646255a6cbcf05a361f02aa -r 6c0273b42d198d3ac270238feed0e5a5ace9899c yt/data_objects/static_output.py
--- a/yt/data_objects/static_output.py
+++ b/yt/data_objects/static_output.py
@@ -431,7 +431,9 @@
         if available:
             self.particle_types += (filter.name,)
             self.filtered_particle_types.append(filter.name)
-            self._setup_particle_types([filter.name])
+            new_fields = self._setup_particle_types([filter.name])
+            deps, _ = self.field_info.check_derived_fields(new_fields)
+            self.field_dependencies.update(deps)
         return available
 
     def _setup_particle_types(self, ptypes = None):

diff -r 39a936c40774b7ed8646255a6cbcf05a361f02aa -r 6c0273b42d198d3ac270238feed0e5a5ace9899c yt/fields/field_info_container.py
--- a/yt/fields/field_info_container.py
+++ b/yt/fields/field_info_container.py
@@ -75,11 +75,11 @@
                 output_units = str(u.get_cgs_equivalent())
             else:
                 output_units = units
+            if (ptype, f) not in self.field_list:
+                continue
             self.add_output_field((ptype, f),
                 units = units, particle_type = True, display_name = dn,
                 output_units = output_units)
-            if (ptype, f) not in self.field_list:
-                continue
             for alias in aliases:
                 self.alias((ptype, alias), (ptype, f), units = output_units)

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.