Fixing CUDA in develop for expressions

src/Vector/cuda/vector_dist_cuda_func_test.cu

@@ -8,7 +8,7 @@
 #include "Vector/cuda/vector_dist_cuda_funcs.cuh"
 #include "Vector/util/vector_dist_funcs.hpp"
 #include "Decomposition/CartDecomposition.hpp"
-#include "util/cuda/scan_cuda.cuh"
+//#include "util/cuda/scan_cuda.cuh"
 #include "Vector/vector_dist.hpp"
 #include "util/cuda/scan_ofp.cuh"
 

src/Vector/vector_dist_kernel.hpp

@@ -194,6 +194,11 @@ public:
 		return v_prp.template get<id>(vec_key.getKey());
 	}
 
+	__device__ __host__ int getOriginKey(int vec_key)
+	{
+		return vec_key;
+	}
+
 	/*! \brief Get the property of an element
 	 *
 	 * see the vector_dist iterator usage to get an element key