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

Browse Source
This commit is contained in:
sjplimp
2016-07-29 14:34:36 +00:00
parent 642c01a150
commit 3297fbeb26
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/thermo.cpp
View File

@ -573,7 +573,7 @@ void Thermo::allocate()
int n = nfield_initial + 1; int n = nfield_initial + 1;
keyword = new char*[n]; keyword = new char*[n];
for (int i = 0; i < n; i++) keyword[i] = NULL; for (int i = 0; i < n; i++) keyword[i] = new char[32];
vfunc = new FnPtr[n]; vfunc = new FnPtr[n];
vtype = new int[n]; vtype = new int[n];
@ -821,6 +821,7 @@ void Thermo::parse_fields(char *str)
// compute value = c_ID, fix value = f_ID, variable value = v_ID // compute value = c_ID, fix value = f_ID, variable value = v_ID
// count trailing [] and store int arguments // count trailing [] and store int arguments
// copy = at most 8 chars of ID to pass to addfield
} else if ((strncmp(word,"c_",2) == 0) || (strncmp(word,"f_",2) == 0) || } else if ((strncmp(word,"c_",2) == 0) || (strncmp(word,"f_",2) == 0) ||
(strncmp(word,"v_",2) == 0)) { (strncmp(word,"v_",2) == 0)) {
@ -828,6 +829,9 @@ void Thermo::parse_fields(char *str)
int n = strlen(word); int n = strlen(word);
char *id = new char[n]; char *id = new char[n];
strcpy(id,&word[2]); strcpy(id,&word[2]);
char copy[9];
strncpy(copy,id,8);
copy[8] = '\0';
// parse zero or one or two trailing brackets from ID // parse zero or one or two trailing brackets from ID
// argindex1,argindex2 = int inside each bracket pair, 0 if no bracket // argindex1,argindex2 = int inside each bracket pair, 0 if no bracket
@ -874,7 +878,7 @@ void Thermo::parse_fields(char *str)
field2index[nfield] = add_compute(id,VECTOR); field2index[nfield] = add_compute(id,VECTOR);
else else
field2index[nfield] = add_compute(id,ARRAY); field2index[nfield] = add_compute(id,ARRAY);
addfield(word,&Thermo::compute_compute,FLOAT); addfield(copy,&Thermo::compute_compute,FLOAT);
} else if (word[0] == 'f') { } else if (word[0] == 'f') {
n = modify->find_fix(id); n = modify->find_fix(id);
@ -899,7 +903,7 @@ void Thermo::parse_fields(char *str)
} }
field2index[nfield] = add_fix(id); field2index[nfield] = add_fix(id);
addfield(word,&Thermo::compute_fix,FLOAT); addfield(copy,&Thermo::compute_fix,FLOAT);
} else if (word[0] == 'v') { } else if (word[0] == 'v') {
n = input->variable->find(id); n = input->variable->find(id);
@ -915,7 +919,7 @@ void Thermo::parse_fields(char *str)
error->all(FLERR,"Thermo custom variable cannot have two indices"); error->all(FLERR,"Thermo custom variable cannot have two indices");
field2index[nfield] = add_variable(id); field2index[nfield] = add_variable(id);
addfield(word,&Thermo::compute_variable,FLOAT); addfield(copy,&Thermo::compute_variable,FLOAT);
} }
delete [] id; delete [] id;
@ -932,8 +936,6 @@ void Thermo::parse_fields(char *str)
void Thermo::addfield(const char *key, FnPtr func, int typeflag) void Thermo::addfield(const char *key, FnPtr func, int typeflag)
{ {
int n = strlen(key) + 1;
keyword[nfield] = new char[n];
strcpy(keyword[nfield],key); strcpy(keyword[nfield],key);
vfunc[nfield] = func; vfunc[nfield] = func;
vtype[nfield] = typeflag; vtype[nfield] = typeflag;