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

revert broken changes to compute reduce

Browse Source
This commit is contained in:
Axel Kohlmeyer
2019-02-14 16:22:52 -05:00
parent 34d4209197
commit e8d56d3ea6
1 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/compute_reduce.cpp
View File

@ -27,7 +27,6 @@
#include "variable.h" #include "variable.h"
#include "memory.h" #include "memory.h"
#include "error.h" #include "error.h"
#include "utils.h"
using namespace LAMMPS_NS; using namespace LAMMPS_NS;
@ -88,7 +87,6 @@ ComputeReduce::ComputeReduce(LAMMPS *lmp, int narg, char **arg) :
// parse values until one isn't recognized // parse values until one isn't recognized
char *suffix = NULL;
which = new int[nargnew]; which = new int[nargnew];
argindex = new int[nargnew]; argindex = new int[nargnew];
flavor = new int[nargnew]; flavor = new int[nargnew];
@ -134,18 +132,26 @@ ComputeReduce::ComputeReduce(LAMMPS *lmp, int narg, char **arg) :
which[nvalues] = F; which[nvalues] = F;
argindex[nvalues++] = 2; argindex[nvalues++] = 2;
} else if ((which[nvalues] = utils::cfvarg("cfv",arg[iarg],suffix)) } else if (strncmp(arg[iarg],"c_",2) == 0 ||
!= utils::NONE ) { strncmp(arg[iarg],"f_",2) == 0 ||
strncmp(arg[iarg],"v_",2) == 0) {
if (arg[iarg][0] == 'c') which[nvalues] = COMPUTE;
else if (arg[iarg][0] == 'f') which[nvalues] = FIX;
else if (arg[iarg][0] == 'v') which[nvalues] = VARIABLE;
int n = strlen(arg[iarg]);
char *suffix = new char[n];
strcpy(suffix,&arg[iarg][2]);
char *ptr = strchr(suffix,'['); char *ptr = strchr(suffix,'[');
if (ptr) { if (ptr) {
if (!utils::strmatch(suffix,"\\[[0-9]+\\]$")) if (suffix[strlen(suffix)-1] != ']')
error->all(FLERR,"Illegal compute reduce command"); error->all(FLERR,"Illegal compute reduce command");
argindex[nvalues] = atoi(ptr+1); argindex[nvalues] = atoi(ptr+1);
*ptr = '\0'; *ptr = '\0';
} else argindex[nvalues] = 0; } else argindex[nvalues] = 0;
int n = strlen(suffix) + 1; n = strlen(suffix) + 1;
ids[nvalues] = new char[n]; ids[nvalues] = new char[n];
strcpy(ids[nvalues],suffix); strcpy(ids[nvalues],suffix);
nvalues++; nvalues++;