[yt-svn] commit/yt: ngoldbaum: Field parameters need to have units.

[commits-noreply at bitbucket.org]

1 new commit in yt:

https://bitbucket.org/yt_analysis/yt/commits/816e624eefe0/
Changeset:   816e624eefe0
Branch:      yt-3.0
User:        ngoldbaum
Date:        2014-07-24 00:32:14
Summary:     Field parameters need to have units.

This was incorrectly ported from 2.x.
Affected #:  2 files

diff -r e97899b530819bec400dbe2127aba867d227dc0b -r 816e624eefe07e7b3fd08cdb4185ab76c78fccec yt/data_objects/construction_data_containers.py
--- a/yt/data_objects/construction_data_containers.py
+++ b/yt/data_objects/construction_data_containers.py
@@ -226,7 +226,8 @@
         self._set_center(center)
         if data_source is None: data_source = self.ds.all_data()
         for k, v in data_source.field_parameters.items():
-            if k not in self.field_parameters or self._is_default_field_parameter(k):
+            if k not in self.field_parameters or \
+              self._is_default_field_parameter(k):
                 self.set_field_parameter(k, v)
         self.data_source = data_source
         self.weight_field = weight_field

diff -r e97899b530819bec400dbe2127aba867d227dc0b -r 816e624eefe07e7b3fd08cdb4185ab76c78fccec yt/data_objects/data_containers.py
--- a/yt/data_objects/data_containers.py
+++ b/yt/data_objects/data_containers.py
@@ -108,9 +108,9 @@
         mylog.debug("Appending object to %s (type: %s)", self.ds, type(self))
         self.field_data = YTFieldData()
         self._default_field_parameters = {
-            'center': np.zeros(3, dtype='float64'),
-            'bulk_velocity': np.zeros(3, dtype='float64'),
-            'normal': np.zeros(3, dtype='float64'),
+            'center': self.ds.arr(np.zeros(3, dtype='float64'), 'cm'),
+            'bulk_velocity': self.ds.arr(np.zeros(3, dtype='float64'), 'cm/s'),
+            'normal': self.ds.arr(np.zeros(3, dtype='float64'), ''),
         }
         if field_parameters is None:
             self.field_parameters = {}
@@ -140,7 +140,8 @@
     def _is_default_field_parameter(self, parameter):
         if parameter not in self._default_field_parameters:
             return False
-        return self._default_field_parameters[parameter] is self.field_parameters[parameter]
+        return self._default_field_parameters[parameter] is \
+          self.field_parameters[parameter]
 
     def apply_units(self, arr, units):
         return self.ds.arr(arr, input_units = 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.