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

[commits-noreply at bitbucket.org]

2 new commits in yt:

https://bitbucket.org/yt_analysis/yt/commits/b9b28ee2d6b7/
Changeset:   b9b28ee2d6b7
User:        jzuhone
Date:        2017-05-26 15:20:16+00:00
Summary:     update_field_names does something that unitify_data also does
Affected #:  1 file

diff -r 795a34ed60c0658469eefa15b8845e2ec5f28ead -r b9b28ee2d6b7a6e4c7a305208a08d53b68e1c060 yt/frontends/stream/data_structures.py
--- a/yt/frontends/stream/data_structures.py
+++ b/yt/frontends/stream/data_structures.py
@@ -387,22 +387,6 @@
         fields = list(set(fields))
         return fields
 
-def update_field_names(data):
-    orig_names = list(data.keys())
-    for k in orig_names:
-        if isinstance(k, tuple):
-            continue
-        s = getattr(data[k], "shape", ())
-        if len(s) == 1:
-            field = ("io", k)
-        elif len(s) == 3:
-            field = ("stream", k)
-        elif len(s) == 0:
-            continue
-        else:
-            raise NotImplementedError
-        data[field] = data.pop(k)
-
 def set_particle_types(data):
     particle_types = {}
     for key in data.keys():
@@ -683,7 +667,6 @@
                 pdata[field] = data.pop(key)
     else:
         particle_types = {}
-    update_field_names(data)
 
     if nprocs > 1:
         temp = {}
@@ -858,7 +841,6 @@
         if "number_of_particles" in g:
             number_of_particles[i,:] = g.pop("number_of_particles")
         field_units, data = unitify_data(g)
-        update_field_names(data)
         sfh[i] = data
 
     # We now reconstruct our parent ids, so that our particle assignment can
@@ -1144,7 +1126,6 @@
         pdata[field] = data[key]
         sfh._additional_fields += (field,)
     data = pdata # Drop reference count
-    update_field_names(data)
     particle_types = set_particle_types(data)
     sfh.update({'stream_file':data})
     grid_left_edges = domain_left_edge
@@ -1603,7 +1584,6 @@
     domain_left_edge = np.array(bbox[:, 0], 'float64')
     domain_right_edge = np.array(bbox[:, 1], 'float64')
     grid_levels = np.zeros(nprocs, dtype='int32').reshape((nprocs,1))
-    update_field_names(data)
 
     field_units, data = unitify_data(data)
     sfh = StreamDictFieldHandler()


https://bitbucket.org/yt_analysis/yt/commits/2848c2031acc/
Changeset:   2848c2031acc
User:        ngoldbaum
Date:        2017-06-02 17:59:46+00:00
Summary:     Merge pull request #1426 from jzuhone/remove_update_field_names

Remove update_field_names from stream frontend
Affected #:  1 file

diff -r f2925547d940ca97bca52843c31b0293cf35453c -r 2848c2031acc2b429d4effd45c4abf70d215cc80 yt/frontends/stream/data_structures.py
--- a/yt/frontends/stream/data_structures.py
+++ b/yt/frontends/stream/data_structures.py
@@ -387,22 +387,6 @@
         fields = list(set(fields))
         return fields
 
-def update_field_names(data):
-    orig_names = list(data.keys())
-    for k in orig_names:
-        if isinstance(k, tuple):
-            continue
-        s = getattr(data[k], "shape", ())
-        if len(s) == 1:
-            field = ("io", k)
-        elif len(s) == 3:
-            field = ("stream", k)
-        elif len(s) == 0:
-            continue
-        else:
-            raise NotImplementedError
-        data[field] = data.pop(k)
-
 def set_particle_types(data):
     particle_types = {}
     for key in data.keys():
@@ -683,7 +667,6 @@
                 pdata[field] = data.pop(key)
     else:
         particle_types = {}
-    update_field_names(data)
 
     if nprocs > 1:
         temp = {}
@@ -858,7 +841,6 @@
         if "number_of_particles" in g:
             number_of_particles[i,:] = g.pop("number_of_particles")
         field_units, data = unitify_data(g)
-        update_field_names(data)
         sfh[i] = data
 
     # We now reconstruct our parent ids, so that our particle assignment can
@@ -1144,7 +1126,6 @@
         pdata[field] = data[key]
         sfh._additional_fields += (field,)
     data = pdata # Drop reference count
-    update_field_names(data)
     particle_types = set_particle_types(data)
     sfh.update({'stream_file':data})
     grid_left_edges = domain_left_edge
@@ -1603,7 +1584,6 @@
     domain_left_edge = np.array(bbox[:, 0], 'float64')
     domain_right_edge = np.array(bbox[:, 1], 'float64')
     grid_levels = np.zeros(nprocs, dtype='int32').reshape((nprocs,1))
-    update_field_names(data)
 
     field_units, data = unitify_data(data)
     sfh = StreamDictFieldHandler()

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.