Commit d2d80446e904f58044deb149306fa69eed9f75dc
Merge branch 'master' of https://github.com/dmayerich/stim
Showing
9 changed files
with
1 additions
and
2 deletions
Show diff stats
math/field.cuh
| @@ -120,7 +120,6 @@ protected: | @@ -120,7 +120,6 @@ protected: | ||
| 120 | } | 120 | } |
| 121 | 121 | ||
| 122 | //retrieve the maximum value for this slice and store it in the maxVal array | 122 | //retrieve the maximum value for this slice and store it in the maxVal array |
| 123 | - std::cout<<X[n]<<std::endl; | ||
| 124 | HANDLE_ERROR(cudaMemcpy(&result, X[n] + index, sizeof(T), cudaMemcpyDeviceToHost)); | 123 | HANDLE_ERROR(cudaMemcpy(&result, X[n] + index, sizeof(T), cudaMemcpyDeviceToHost)); |
| 125 | return result; | 124 | return result; |
| 126 | } | 125 | } |
math/function.h
| @@ -85,7 +85,7 @@ public: | @@ -85,7 +85,7 @@ public: | ||
| 85 | //i currently holds the ceiling | 85 | //i currently holds the ceiling |
| 86 | 86 | ||
| 87 | //if the wavelength is past the end of the list, return the last sample point | 87 | //if the wavelength is past the end of the list, return the last sample point |
| 88 | - if(i == N) return Y[N]; | 88 | + if(i == N) return Y.back(); |
| 89 | //if the wavelength is before the beginning of the list, return the front | 89 | //if the wavelength is before the beginning of the list, return the front |
| 90 | else if(i == 0) return Y[0]; | 90 | else if(i == 0) return Y[0]; |
| 91 | //otherwise interpolate | 91 | //otherwise interpolate |