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@7003 f3b2605a-c512-4ea7-a41b-209d697bcdaa

Browse Source
This commit is contained in:
sjplimp
2011-09-23 18:06:55 +00:00
parent 2d99de131d
commit 19e8c92a90
468 changed files with 4628 additions and 5204 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/GPU/pair_morse_gpu.cpp
View File

@ -36,9 +36,6 @@
#include "string.h"
#include "gpu_extra.h"
#define MIN(a,b) ((a) < (b) ? (a) : (b))
#define MAX(a,b) ((a) > (b) ? (a) : (b))
// External functions from cuda library for atom decomposition
int mor_gpu_init(const int ntypes, double **cutsq, double **host_morse1,
@ -109,7 +106,7 @@ void PairMorseGPU::compute(int eflag, int vflag)
vflag_atom, host_start, cpu_time, success);
}
if (!success)
error->one("Out of memory on GPGPU");
error->one(FLERR,"Out of memory on GPGPU");
if (host_start<inum) {
cpu_time = MPI_Wtime();
@ -125,7 +122,7 @@ void PairMorseGPU::compute(int eflag, int vflag)
void PairMorseGPU::init_style()
{
if (force->newton_pair)
error->all("Cannot use newton pair with morse/gpu pair style");
error->all(FLERR,"Cannot use newton pair with morse/gpu pair style");
// Repeat cutsq calculation because done after call to init_style
double maxcut = -1.0;