git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12588 f3b2605a-c512-4ea7-a41b-209d697bcdaa

This commit is contained in:
sjplimp
2014-10-06 22:59:05 +00:00
parent 4bb43ca885
commit 621fa7d600
122 changed files with 1934 additions and 1929 deletions

View File

@ -21,10 +21,10 @@
This software is distributed under the GNU General Public License.
------------------------------------------------------------------------- */
extern __shared__ F_FLOAT sharedmem[];
extern __shared__ F_CFLOAT sharedmem[];
__global__ void Cuda_FixAddForceCuda_PostForce_Kernel(int groupbit, F_FLOAT xvalue, F_FLOAT yvalue, F_FLOAT zvalue)
__global__ void Cuda_FixAddForceCuda_PostForce_Kernel(int groupbit, F_CFLOAT xvalue, F_CFLOAT yvalue, F_CFLOAT zvalue)
{
int i = (blockIdx.x * gridDim.y + blockIdx.y) * blockDim.x + threadIdx.x;
@ -51,7 +51,7 @@ __global__ void Cuda_FixAddForceCuda_PostForce_Kernel(int groupbit, F_FLOAT xval
reduceBlock(&sharedmem[blockDim.x]);
reduceBlock(&sharedmem[2 * blockDim.x]);
reduceBlock(&sharedmem[3 * blockDim.x]);
F_FLOAT* buffer = (F_FLOAT*) _buffer;
F_CFLOAT* buffer = (F_CFLOAT*) _buffer;
if(threadIdx.x == 0) {
buffer[blockIdx.x * gridDim.y + blockIdx.y] = sharedmem[0];
@ -63,12 +63,12 @@ __global__ void Cuda_FixAddForceCuda_PostForce_Kernel(int groupbit, F_FLOAT xval
}
__global__ void reduce_foriginal(int n, F_FLOAT* foriginal)
__global__ void reduce_foriginal(int n, F_CFLOAT* foriginal)
{
int i = 0;
sharedmem[threadIdx.x] = 0;
F_FLOAT myforig = 0.0;
F_FLOAT* buf = (F_FLOAT*) _buffer;
F_CFLOAT myforig = 0.0;
F_CFLOAT* buf = (F_CFLOAT*) _buffer;
buf = &buf[blockIdx.x * n];
while(i < n) {