pulled a lot of the photon propagation code out of src/kernel.cu into src/photon.h so that photon propagation by propagate() in kernel.cu and the hybrid monte carlo ray tracing use the same code. instead of a single state, photons now carry the history of the processes they've undergone. this history is stored as a bitmask; see src/photon.h. start_node and first_node of the mesh are now stored as global variables in mesh.h instead of being passed to kernel functions.

1 files changed, 6 insertions, 3 deletions

diff --git a/geometry.py b/geometry.py
index 2d11f62..875d403 100644
--- a/geometry.py
+++ b/geometry.py
@@ -449,9 +449,12 @@ class Geometry(object):
         print format_array('node_length', self.node_length)
         print '%-15s %6s %6s' % ('total', '', format_size(vertices.nbytes + triangles.nbytes + self.lower_bounds.nbytes + self.upper_bounds.nbytes + self.node_map.nbytes + self.node_length.nbytes))
 
-        set_pointer = module.get_function('set_pointer')
-        set_pointer(self.triangles_gpu, self.vertices_gpu, 
-                    block=(1,1,1), grid=(1,1))
+        #set_pointer = module.get_function('set_pointer')
+        #set_pointer(self.triangles_gpu, self.vertices_gpu, 
+        #            block=(1,1,1), grid=(1,1))
+
+        set_global_mesh_variables = module.get_function('set_global_mesh_variables')
+        set_global_mesh_variables(self.triangles_gpu, self.vertices_gpu, np.int32(self.node_map.size-1), np.int32(self.first_node), block=(1,1,1), grid=(1,1))
 
         self.lower_bounds_tex = module.get_texref('lower_bounds')
         self.upper_bounds_tex = module.get_texref('upper_bounds')