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

Merge branch 'master' into improve-include-consistency

Browse Source 
# Conflicts:
#	src/USER-MESO/atom_vec_tdpd.cpp
This commit is contained in:
Axel Kohlmeyer
2019-07-09 14:50:00 -04:00
parent 31e19e0824 691fc357a4
commit 06dcc9e283
610 changed files with 39096 additions and 8292 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/reader_native.cpp
View File

@ -103,7 +103,7 @@ void ReaderNative::skip()
only called by proc 0
------------------------------------------------------------------------- */
bigint ReaderNative::read_header(double box[3][3], int &triclinic,
bigint ReaderNative::read_header(double box[3][3], int &boxinfo, int &triclinic,
int fieldinfo, int nfield,
int *fieldtype, char **fieldlabel,
int scaleflag, int wrapflag, int &fieldflag,
@ -113,6 +113,7 @@ bigint ReaderNative::read_header(double box[3][3], int &triclinic,
read_lines(2);
sscanf(line,BIGINT_FORMAT,&natoms);
boxinfo = 1;
triclinic = 0;
box[0][2] = box[1][2] = box[2][2] = 0.0;
read_lines(1);