jianmu
/
lammps
forked from lijiext/lammps
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

replace variable length arrays in fix rx of USER-DPD with new/delete

This commit is contained in:
Axel Kohlmeyer 2018-05-04 19:36:57 -04:00
parent 1b31b4899a
commit 9a389c946c
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/USER-DPD/fix_rx.cpp
View File

@ -260,6 +260,7 @@ void FixRX::post_constructor()
error->all(FLERR,"fix rx cannot be combined with fix property/atom");
char **tmpspecies = new char*[maxspecies];
int tmpmaxstrlen = 0;
for(int jj=0; jj < maxspecies; jj++)
tmpspecies[jj] = NULL;
@ -320,6 +321,7 @@ void FixRX::post_constructor()
error->all(FLERR,"Exceeded the maximum number of species permitted in fix rx.");
tmpspecies[nUniqueSpecies] = new char[strlen(word)+1];
strcpy(tmpspecies[nUniqueSpecies],word);
tmpmaxstrlen = MAX(tmpmaxstrlen,strlen(word));
nUniqueSpecies++;
}
word = strtok(NULL, " \t\n\r\f");
@ -354,9 +356,9 @@ void FixRX::post_constructor()
newarg2[0] = id_fix_species_old;
newarg2[1] = group->names[igroup];
newarg2[2] = (char *) "property/atom";
char *str1 = new char[tmpmaxstrlen+3];
char *str2 = new char[tmpmaxstrlen+6];
for(int ii=0; ii<nspecies; ii++){
char str1[2+strlen(tmpspecies[ii])+1];
char str2[2+strlen(tmpspecies[ii])+4];
strcpy(str1,"d_");
strcpy(str2,"d_");
strncat(str1,tmpspecies[ii],strlen(tmpspecies[ii]));
@ -367,6 +369,8 @@ void FixRX::post_constructor()
strcpy(newarg[ii+3],str1);
strcpy(newarg2[ii+3],str2);
}
delete[] str1;
delete[] str2;
newarg[nspecies+3] = (char *) "ghost";
newarg[nspecies+4] = (char *) "yes";
newarg2[nspecies+3] = (char *) "ghost";