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

Merge branch 'master' into symbolic-atom-constants

Browse Source
This commit is contained in:
Axel Kohlmeyer
2020-09-15 17:44:31 -04:00
parent 618b08dcfc cebf6d33ba
commit 0f6a34775c
1186 changed files with 8448 additions and 8360 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/GPU/fix_gpu.cpp
View File

@ -118,7 +118,7 @@ FixGPU::FixGPU(LAMMPS *lmp, int narg, char **arg) :
int newtonflag = 0;
int threads_per_atom = -1;
double binsize = 0.0;
char *opencl_flags = NULL;
char *opencl_flags = nullptr;
int block_pair = -1;
int iarg = 4;
@ -232,7 +232,7 @@ void FixGPU::init()
// make sure fdotr virial is not accumulated multiple times
if (force->pair_match("^hybrid",0) != NULL) {
if (force->pair_match("^hybrid",0) != nullptr) {
PairHybrid *hybrid = (PairHybrid *) force->pair;
for (int i = 0; i < hybrid->nstyles; i++)
if (!utils::strmatch(hybrid->keywords[i],"/gpu$"))