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

additional changes needed to merge with current master

Browse Source
This commit is contained in:
Steve Plimpton
2021-01-11 17:26:00 -07:00
parent 0b14770468
commit bddd26ba6c
3 changed files with 201 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/utils.cpp
View File

@ -13,6 +13,7 @@
#include "utils.h"
#include "atom.h"
#include "comm.h"
#include "compute.h"
#include "error.h"
@ -503,7 +504,7 @@ int utils::expand_args(const char *file, int line, int narg, char **arg,
} else if (arg[iarg][0] == 'i') {
*ptr1 = '\0';
int flag,cols;
int icustom = atom->find_custom(&arg[iarg][3],flag,cols);
int icustom = lmp->atom->find_custom(&arg[iarg][3],flag,cols);
*ptr1 = '[';
// check for custom per-atom integer array
@ -518,7 +519,7 @@ int utils::expand_args(const char *file, int line, int narg, char **arg,
} else if (arg[iarg][0] == 'd') {
*ptr1 = '\0';
int flag,cols;
int icustom = atom->find_custom(&arg[iarg][3],flag,cols);
int icustom = lmp->atom->find_custom(&arg[iarg][3],flag,cols);
*ptr1 = '[';
// check for custom per-atom floating point array