[yt-svn] commit/yt-3.0: 4 new changesets

commits-noreply at bitbucket.org commits-noreply at bitbucket.org
Mon Jun 10 07:52:38 PDT 2013


4 new commits in yt-3.0:

https://bitbucket.org/yt_analysis/yt-3.0/commits/81b64de38898/
Changeset:   81b64de38898
Branch:      yt-3.0
User:        ngoldbaum
Date:        2013-06-07 03:21:13
Summary:     Adding some autogenerated c routines to hgignore.
Affected #:  1 file

diff -r 443f359e25980fe2574652a4c873b5ca9a702169 -r 81b64de38898d9a05f08f5fd110da51c511316f1 .hgignore
--- a/.hgignore
+++ b/.hgignore
@@ -10,7 +10,9 @@
 yt/analysis_modules/halo_finding/rockstar/rockstar_interface.c
 yt/frontends/ramses/_ramses_reader.cpp
 yt/frontends/sph/smoothing_kernel.c
+yt/geometry/fake_octree.c
 yt/geometry/oct_container.c
+yt/geometry/particle_deposit.c
 yt/geometry/selection_routines.c
 yt/utilities/amr_utils.c
 yt/utilities/kdtree/forthonf2c.h


https://bitbucket.org/yt_analysis/yt-3.0/commits/9066c985be06/
Changeset:   9066c985be06
Branch:      yt-3.0
User:        ngoldbaum
Date:        2013-06-07 03:21:42
Summary:     Patching the off axis velocity callback.  Closes #587.
Affected #:  1 file

diff -r 81b64de38898d9a05f08f5fd110da51c511316f1 -r 9066c985be063b09e5691e94ba08155985c9f093 yt/data_objects/universal_fields.py
--- a/yt/data_objects/universal_fields.py
+++ b/yt/data_objects/universal_fields.py
@@ -884,9 +884,9 @@
     bulk_velocity = data.get_field_parameter("bulk_velocity")
     if bulk_velocity == None:
         bulk_velocity = np.zeros(3)
-    v_vec = np.array([data["%s-velocity" % ax] for ax in 'xyz']) \
-                - bulk_velocity[...,np.newaxis]
-    return np.dot(x_vec, v_vec)
+    v_vec = np.array([data["%s-velocity" % ax] for ax in 'xyz']).transpose() \
+                - bulk_velocity[np.newaxis,...]
+    return np.sum(x_vec * v_vec, axis=-1)
 add_field("CuttingPlaneVelocityX", 
           function=_CuttingPlaneVelocityX,
           validators=[ValidateParameter("cp_%s_vec" % ax)
@@ -897,9 +897,9 @@
     bulk_velocity = data.get_field_parameter("bulk_velocity")
     if bulk_velocity == None:
         bulk_velocity = np.zeros(3)
-    v_vec = np.array([data["%s-velocity" % ax] for ax in 'xyz']) \
-                - bulk_velocity[...,np.newaxis]
-    return np.dot(y_vec, v_vec)
+    v_vec = np.array([data["%s-velocity" % ax] for ax in 'xyz']).transpose() \
+                - bulk_velocity[np.newaxis,...]
+    return np.sum(y_vec * v_vec, axis=-1)
 add_field("CuttingPlaneVelocityY", 
           function=_CuttingPlaneVelocityY,
           validators=[ValidateParameter("cp_%s_vec" % ax)


https://bitbucket.org/yt_analysis/yt-3.0/commits/c24c2883dd31/
Changeset:   c24c2883dd31
Branch:      yt-3.0
User:        ngoldbaum
Date:        2013-06-07 20:49:45
Summary:     Adjusting the velocity vector calculation to avoid a transpose.
Affected #:  1 file

diff -r 9066c985be063b09e5691e94ba08155985c9f093 -r c24c2883dd316ee2d125ca176dff1263aa5492fc yt/data_objects/universal_fields.py
--- a/yt/data_objects/universal_fields.py
+++ b/yt/data_objects/universal_fields.py
@@ -884,8 +884,8 @@
     bulk_velocity = data.get_field_parameter("bulk_velocity")
     if bulk_velocity == None:
         bulk_velocity = np.zeros(3)
-    v_vec = np.array([data["%s-velocity" % ax] for ax in 'xyz']).transpose() \
-                - bulk_velocity[np.newaxis,...]
+    v_vec = np.array([data["%s-velocity" % ax] - bv \
+                for ax, bv in zip('xyz', bulk_velocity)])
     return np.sum(x_vec * v_vec, axis=-1)
 add_field("CuttingPlaneVelocityX", 
           function=_CuttingPlaneVelocityX,
@@ -897,8 +897,8 @@
     bulk_velocity = data.get_field_parameter("bulk_velocity")
     if bulk_velocity == None:
         bulk_velocity = np.zeros(3)
-    v_vec = np.array([data["%s-velocity" % ax] for ax in 'xyz']).transpose() \
-                - bulk_velocity[np.newaxis,...]
+    v_vec = np.array([data["%s-velocity" % ax] - bv \
+                for ax, bv in zip('xyz', bulk_velocity)])
     return np.sum(y_vec * v_vec, axis=-1)
 add_field("CuttingPlaneVelocityY", 
           function=_CuttingPlaneVelocityY,


https://bitbucket.org/yt_analysis/yt-3.0/commits/790d2eccfd06/
Changeset:   790d2eccfd06
Branch:      yt-3.0
User:        MatthewTurk
Date:        2013-06-10 16:52:29
Summary:     Merged in ngoldbaum/yt-3.0 (pull request #45)

Patching the off axis velocity callback.
Affected #:  2 files

diff -r a392d0b00fa31a49aeb9e81c8e629ca64cdf8ca1 -r 790d2eccfd06764fe7f2e6ca5b749ff246da4390 .hgignore
--- a/.hgignore
+++ b/.hgignore
@@ -10,7 +10,9 @@
 yt/analysis_modules/halo_finding/rockstar/rockstar_interface.c
 yt/frontends/ramses/_ramses_reader.cpp
 yt/frontends/sph/smoothing_kernel.c
+yt/geometry/fake_octree.c
 yt/geometry/oct_container.c
+yt/geometry/particle_deposit.c
 yt/geometry/selection_routines.c
 yt/utilities/amr_utils.c
 yt/utilities/kdtree/forthonf2c.h

diff -r a392d0b00fa31a49aeb9e81c8e629ca64cdf8ca1 -r 790d2eccfd06764fe7f2e6ca5b749ff246da4390 yt/data_objects/universal_fields.py
--- a/yt/data_objects/universal_fields.py
+++ b/yt/data_objects/universal_fields.py
@@ -884,9 +884,9 @@
     bulk_velocity = data.get_field_parameter("bulk_velocity")
     if bulk_velocity == None:
         bulk_velocity = np.zeros(3)
-    v_vec = np.array([data["%s-velocity" % ax] for ax in 'xyz']) \
-                - bulk_velocity[...,np.newaxis]
-    return np.dot(x_vec, v_vec)
+    v_vec = np.array([data["%s-velocity" % ax] - bv \
+                for ax, bv in zip('xyz', bulk_velocity)])
+    return np.sum(x_vec * v_vec, axis=-1)
 add_field("CuttingPlaneVelocityX", 
           function=_CuttingPlaneVelocityX,
           validators=[ValidateParameter("cp_%s_vec" % ax)
@@ -897,9 +897,9 @@
     bulk_velocity = data.get_field_parameter("bulk_velocity")
     if bulk_velocity == None:
         bulk_velocity = np.zeros(3)
-    v_vec = np.array([data["%s-velocity" % ax] for ax in 'xyz']) \
-                - bulk_velocity[...,np.newaxis]
-    return np.dot(y_vec, v_vec)
+    v_vec = np.array([data["%s-velocity" % ax] - bv \
+                for ax, bv in zip('xyz', bulk_velocity)])
+    return np.sum(y_vec * v_vec, axis=-1)
 add_field("CuttingPlaneVelocityY", 
           function=_CuttingPlaneVelocityY,
           validators=[ValidateParameter("cp_%s_vec" % ax)

Repository URL: https://bitbucket.org/yt_analysis/yt-3.0/

--

This is a commit notification from bitbucket.org. You are receiving
this because you have the service enabled, addressing the recipient of
this email.



More information about the yt-svn mailing list