ICODE-ADC/lammps
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
sjplimp
2012-08-28 22:59:06 +00:00
parent 05830a7cf8
commit ffcbbe98d4
2 changed files with 7 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
src/USER-CUDA/pppm_cuda.cpp
View File

@ -1382,52 +1382,19 @@ void PPPMCuda::fieldforce()
return;
}
/* ----------------------------------------------------------------------
perform and time the 4 FFTs required for N timesteps
------------------------------------------------------------------------- */
int PPPMCuda::timing(int n, double &time3d, double &time1d)
int PPPMCuda::timing_1d(int n, double &time1d)
{
time3d = cuda->shared_data.cuda_timings.pppm_poisson/update->nsteps*n;
time1d = cuda->shared_data.cuda_timings.pppm_poisson/update->nsteps/4*n;
return 4;
}
double time1,time2;
for (int i = 0; i < 2*nfft_both; i++) work1[i] = 0.0;
MPI_Barrier(world);
time1 = MPI_Wtime();
for (int i = 0; i < n; i++) {
fft1c->compute(work1,work1,1);
fft2c->compute(work1,work1,-1);
fft2c->compute(work1,work1,-1);
fft2c->compute(work1,work1,-1);
}
MPI_Barrier(world);
time2 = MPI_Wtime();
time3d = time2 - time1;
time1d = 0;
MPI_Barrier(world);
/*time1 = MPI_Wtime();
for (int i = 0; i < n; i++) {
fft1c->timing1d(work1,nfft_both,1);
fft2c->timing1d(work1,nfft_both,-1);
fft2c->timing1d(work1,nfft_both,-1);
fft2c->timing1d(work1,nfft_both,-1);
}
MPI_Barrier(world);
time2 = MPI_Wtime();
time1d = time2 - time1;*/
int PPPMCuda::timing_3d(int n, double &time3d)
{
time3d = cuda->shared_data.cuda_timings.pppm_poisson/update->nsteps*n;
return 4;
}

3
src/USER-CUDA/pppm_cuda.h
View File

@ -43,7 +43,8 @@ class PPPMCuda : public PPPMOld {
void init();
void setup();
void compute(int, int);
int timing(int, double &, double &);
int timing_1d(int, double &);
int timing_3d(int, double &);
double poissontime;