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

[commits-noreply at bitbucket.org]

3 new commits in yt:

https://bitbucket.org/yt_analysis/yt/commits/c97d50b63b2a/
Changeset:   c97d50b63b2a
Branch:      yt-3.0
User:        jzuhone
Date:        2014-03-13 05:34:08
Summary:     Fixing units of spherical and cylindrical lengths
Affected #:  1 file

diff -r 8a634d4fadbdc77566d5f06adb94e88c9d256724 -r c97d50b63b2a47121f7c9069d86be348fea1270d yt/fields/geometric_fields.py
--- a/yt/fields/geometric_fields.py
+++ b/yt/fields/geometric_fields.py
@@ -99,7 +99,7 @@
         coords[0,...] -= center[0]
         coords[1,...] -= center[1]
         coords[2,...] -= center[2]
-        return get_sph_r(coords)
+        return data.pf.arr(get_sph_r(coords), "cm")
 
     registry.add_field(("index", "spherical_r"),
              function=_spherical_r,
@@ -144,7 +144,7 @@
         coords[0,...] -= center[0]
         coords[1,...] -= center[1]
         coords[2,...] -= center[2]
-        return get_cyl_r(coords, normal)
+        return data.pf.arr(get_cyl_r(coords, normal), "cm")
 
     registry.add_field(("index", "cylindrical_r"),
              function=_cylindrical_r,
@@ -160,7 +160,7 @@
         coords[0,...] -= center[0]
         coords[1,...] -= center[1]
         coords[2,...] -= center[2]
-        return get_cyl_z(coords, normal)
+        return data.pf.arr(get_cyl_z(coords, normal), "cm")
 
     registry.add_field(("index", "cylindrical_z"),
              function=_cylindrical_z,


https://bitbucket.org/yt_analysis/yt/commits/96ad2c6fa6bc/
Changeset:   96ad2c6fa6bc
Branch:      yt-3.0
User:        jzuhone
Date:        2014-03-13 06:15:50
Summary:     Ok, so this _really_fixes the length units for these fields
Affected #:  1 file

diff -r c97d50b63b2a47121f7c9069d86be348fea1270d -r 96ad2c6fa6bc470b4062ea3997c9c86ba5cad23e yt/fields/geometric_fields.py
--- a/yt/fields/geometric_fields.py
+++ b/yt/fields/geometric_fields.py
@@ -95,11 +95,11 @@
     ### spherical coordinates: r (radius)
     def _spherical_r(field, data):
         center = data.get_field_parameter("center")
-        coords = obtain_rvec(data)
+        coords = data.pf.arr(obtain_rvec(data), "code_length")
         coords[0,...] -= center[0]
         coords[1,...] -= center[1]
         coords[2,...] -= center[2]
-        return data.pf.arr(get_sph_r(coords), "cm")
+        return get_sph_r(coords).in_cgs()
 
     registry.add_field(("index", "spherical_r"),
              function=_spherical_r,
@@ -140,11 +140,11 @@
     def _cylindrical_r(field, data):
         center = data.get_field_parameter("center")
         normal = data.get_field_parameter("normal")
-        coords = obtain_rvec(data)
+        coords = data.pf.arr(obtain_rvec(data), "code_length")
         coords[0,...] -= center[0]
         coords[1,...] -= center[1]
         coords[2,...] -= center[2]
-        return data.pf.arr(get_cyl_r(coords, normal), "cm")
+        return get_cyl_r(coords, normal).in_cgs()
 
     registry.add_field(("index", "cylindrical_r"),
              function=_cylindrical_r,
@@ -156,11 +156,11 @@
     def _cylindrical_z(field, data):
         center = data.get_field_parameter("center")
         normal = data.get_field_parameter("normal")
-        coords = obtain_rvec(data)
+        coords = data.pf.arr(obtain_rvec(data), "code_length")
         coords[0,...] -= center[0]
         coords[1,...] -= center[1]
         coords[2,...] -= center[2]
-        return data.pf.arr(get_cyl_z(coords, normal), "cm")
+        return get_cyl_z(coords, normal).in_cgs()
 
     registry.add_field(("index", "cylindrical_z"),
              function=_cylindrical_z,


https://bitbucket.org/yt_analysis/yt/commits/cc4e15d9f4d9/
Changeset:   cc4e15d9f4d9
Branch:      yt-3.0
User:        MatthewTurk
Date:        2014-03-13 16:40:04
Summary:     Merging from John
Affected #:  1 file

diff -r 3ec7ae320899bc4a90966451a575aef44d558cd4 -r cc4e15d9f4d95b558690cd94e4f74b30bed6a02b yt/fields/geometric_fields.py
--- a/yt/fields/geometric_fields.py
+++ b/yt/fields/geometric_fields.py
@@ -95,11 +95,11 @@
     ### spherical coordinates: r (radius)
     def _spherical_r(field, data):
         center = data.get_field_parameter("center")
-        coords = obtain_rvec(data)
+        coords = data.pf.arr(obtain_rvec(data), "code_length")
         coords[0,...] -= center[0]
         coords[1,...] -= center[1]
         coords[2,...] -= center[2]
-        return get_sph_r(coords)
+        return get_sph_r(coords).in_cgs()
 
     registry.add_field(("index", "spherical_r"),
              function=_spherical_r,
@@ -140,11 +140,11 @@
     def _cylindrical_r(field, data):
         center = data.get_field_parameter("center")
         normal = data.get_field_parameter("normal")
-        coords = obtain_rvec(data)
+        coords = data.pf.arr(obtain_rvec(data), "code_length")
         coords[0,...] -= center[0]
         coords[1,...] -= center[1]
         coords[2,...] -= center[2]
-        return get_cyl_r(coords, normal)
+        return get_cyl_r(coords, normal).in_cgs()
 
     registry.add_field(("index", "cylindrical_r"),
              function=_cylindrical_r,
@@ -156,11 +156,11 @@
     def _cylindrical_z(field, data):
         center = data.get_field_parameter("center")
         normal = data.get_field_parameter("normal")
-        coords = obtain_rvec(data)
+        coords = data.pf.arr(obtain_rvec(data), "code_length")
         coords[0,...] -= center[0]
         coords[1,...] -= center[1]
         coords[2,...] -= center[2]
-        return get_cyl_z(coords, normal)
+        return get_cyl_z(coords, normal).in_cgs()
 
     registry.add_field(("index", "cylindrical_z"),
              function=_cylindrical_z,

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.