lijiext
/
lammps
mirror of https://github.com/lammps/lammps.git
1
0
Fork 1
Code Issues Packages Projects Releases Wiki Activity

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

This commit is contained in:
sjplimp 2011-06-20 16:43:12 +00:00
parent f62b317d37
commit 472a7e2e5f
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/cuda/fix_nh_cuda.cu
View File

@ -39,6 +39,7 @@ void Cuda_FixNHCuda_UpdateNmax(cuda_shared_data* sdata)
cudaMemcpyToSymbol(MY_CONST(nlocal) , & sdata->atom.nlocal , sizeof(int) );
cudaMemcpyToSymbol(MY_CONST(nmax) , & sdata->atom.nmax , sizeof(int) );
cudaMemcpyToSymbol(MY_CONST(rmass) , & sdata->atom.rmass.dev_data, sizeof(V_FLOAT*) );
cudaMemcpyToSymbol(MY_CONST(mass) , & sdata->atom.mass.dev_data, sizeof(V_FLOAT*) );
cudaMemcpyToSymbol(MY_CONST(type) , & sdata->atom.type .dev_data, sizeof(int*) );
cudaMemcpyToSymbol(MY_CONST(v) , & sdata->atom.v .dev_data, sizeof(V_FLOAT*) );
cudaMemcpyToSymbol(MY_CONST(x) , & sdata->atom.x .dev_data, sizeof(X_FLOAT*) );
@ -67,7 +68,6 @@ void Cuda_FixNHCuda_UpdateBuffer(cuda_shared_data* sdata)
void Cuda_FixNHCuda_Init(cuda_shared_data* sdata, X_FLOAT dtv, V_FLOAT dtf)
{
if(sdata->atom.mass_host)
cudaMemcpyToSymbol(MY_CONST(mass) , & sdata->atom.mass.dev_data , sizeof(V_FLOAT*) );
cudaMemcpyToSymbol(MY_CONST(dtf) , & dtf , sizeof(V_FLOAT) );
cudaMemcpyToSymbol(MY_CONST(dtv) , & dtv , sizeof(X_FLOAT) );
@ -119,6 +119,7 @@ void Cuda_FixNHCuda_nh_v_press_and_nve_v_NoBias(cuda_shared_data* sdata, int gro
int3 layout=getgrid(mynlocal);
dim3 threads(layout.z, 1, 1);
dim3 grid(layout.x, layout.y, 1);
CUT_CHECK_ERROR("FixNHCuda: fix nh v_press pre Kernel execution failed");
FixNHCuda_nh_v_press_and_nve_v_NoBias_Kernel<<<grid, threads>>> (groupbit,factor,p_triclinic,factor2);
cudaThreadSynchronize();
CUT_CHECK_ERROR("FixNHCuda: fix nh v_press Kernel execution failed");

3
lib/cuda/fix_nve_cuda.cu
View File

@ -55,6 +55,7 @@ void Cuda_FixNVECuda_UpdateNmax(cuda_shared_data* sdata)
cudaMemcpyToSymbol(MY_CONST(nlocal) , & sdata->atom.nlocal , sizeof(int) );
cudaMemcpyToSymbol(MY_CONST(nmax) , & sdata->atom.nmax , sizeof(int) );
cudaMemcpyToSymbol(MY_CONST(rmass) , & sdata->atom.rmass.dev_data, sizeof(V_FLOAT*) );
cudaMemcpyToSymbol(MY_CONST(mass) , & sdata->atom.mass.dev_data , sizeof(V_FLOAT*) );
cudaMemcpyToSymbol(MY_CONST(type) , & sdata->atom.type .dev_data, sizeof(int*) );
cudaMemcpyToSymbol(MY_CONST(v) , & sdata->atom.v .dev_data, sizeof(V_FLOAT*) );
cudaMemcpyToSymbol(MY_CONST(x) , & sdata->atom.x .dev_data, sizeof(X_FLOAT*) );
@ -85,8 +86,6 @@ void Cuda_FixNVECuda_UpdateBuffer(cuda_shared_data* sdata)
void Cuda_FixNVECuda_Init(cuda_shared_data* sdata, X_FLOAT dtv, V_FLOAT dtf)
{
if(sdata->atom.mass_host)
cudaMemcpyToSymbol(MY_CONST(mass) , & sdata->atom.mass.dev_data , sizeof(V_FLOAT*) );
cudaMemcpyToSymbol(MY_CONST(dtf) , & dtf , sizeof(V_FLOAT) );
cudaMemcpyToSymbol(MY_CONST(dtv) , & dtv , sizeof(X_FLOAT) );