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

Browse Source
This commit is contained in:
sjplimp
2011-03-26 00:50:29 +00:00
parent fbb475b9cd
commit 1f2a7add78
131 changed files with 1278 additions and 1496 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/read_data.cpp
View File

@ -1001,7 +1001,8 @@ void ReadData::scan(int &bond_per_atom, int &angle_per_atom,
// will grow via reallocate() if atom IDs > natoms
int cmax = natoms + 1;
int *count = (int *) memory->smalloc(cmax*sizeof(int),"read_data:count");
int *count;
memory->create(count,cmax,"read_data:count");
while (strlen(keyword)) {
@ -1229,7 +1230,7 @@ void ReadData::scan(int &bond_per_atom, int &angle_per_atom,
// free topology counting vector
memory->sfree(count);
memory->destroy(count);
// error check that topology was specified in file
@ -1248,8 +1249,7 @@ void ReadData::scan(int &bond_per_atom, int &angle_per_atom,
int ReadData::reallocate(int **pcount, int cmax, int amax)
{
int *count = *pcount;
count = (int *)
memory->srealloc(count,(amax+1)*sizeof(int),"read_data:count");
memory->grow(count,amax+1,"read_data:count");
for (int i = cmax; i <= amax; i++) count[i] = 0;
*pcount = count;
return amax+1;