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

Merge branch 'lammps:master' into type-labels

Browse Source
This commit is contained in:
Jacob Gissinger
2021-09-30 09:44:18 -04:00
committed by GitHub
parent f7bd07b3e6 4d84ceb822
commit 67ae6eb7b6
1396 changed files with 36153 additions and 25022 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/read_data.cpp
View File

@ -1389,7 +1389,7 @@ void ReadData::bonds(int firstpass)
int *count = nullptr;
if (firstpass) {
memory->create(count,nlocal,"read_data:count");
memset(count,0,nlocal*sizeof(int));
if (count) memset(count,0,nlocal*sizeof(int));
}
// read and process bonds
@ -1467,7 +1467,7 @@ void ReadData::angles(int firstpass)
int *count = nullptr;
if (firstpass) {
memory->create(count,nlocal,"read_data:count");
memset(count,0,nlocal*sizeof(int));
if (count) memset(count,0,nlocal*sizeof(int));
}
// read and process angles
@ -1545,7 +1545,7 @@ void ReadData::dihedrals(int firstpass)
int *count = nullptr;
if (firstpass) {
memory->create(count,nlocal,"read_data:count");
memset(count,0,nlocal*sizeof(int));
if (count) memset(count,0,nlocal*sizeof(int));
}
// read and process dihedrals
@ -1623,7 +1623,7 @@ void ReadData::impropers(int firstpass)
int *count = nullptr;
if (firstpass) {
memory->create(count,nlocal,"read_data:count");
memset(count,0,nlocal*sizeof(int));
if (count) memset(count,0,nlocal*sizeof(int));
}
// read and process impropers