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

Browse Source
This commit is contained in:
sjplimp
2014-02-12 00:34:30 +00:00
parent afe7343b37
commit b28ce4b3bb
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/lammps.cpp
View File

@ -418,6 +418,11 @@ LAMMPS::LAMMPS(int narg, char **arg, MPI_Comm communicator)
error->all(FLERR,"Small to big integers are not sized correctly");
#endif
// error check on accelerator packages
if (cudaflag && kokkosflag)
error->all(FLERR,"Cannot use -cuda on and -kokkos on");
// create Cuda class if USER-CUDA installed, unless explicitly switched off
// instantiation creates dummy Cuda class if USER-CUDA is not installed
@ -544,6 +549,7 @@ void LAMMPS::create()
// so that nthreads is defined when create_avec invokes grow()
if (cuda) comm = new CommCuda(this);
else if (kokkos) comm = new CommKokkos(this);
else comm = new Comm(this);
if (cuda) neighbor = new NeighborCuda(this);
@ -556,13 +562,15 @@ void LAMMPS::create()
else domain = new Domain(this);
#endif
atom = new Atom(this);
if (kokkos) atom = new AtomKokkos(this);
else atom = new Atom(this);
atom->create_avec("atomic",0,NULL,suffix);
group = new Group(this);
force = new Force(this); // must be after group, to create temperature
if (cuda) modify = new ModifyCuda(this);
else if (kokkos) modify = new ModifyKokkos(this);
else modify = new Modify(this);
output = new Output(this); // must be after group, so "all" exists