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

4
src/reader_xyz.cpp
View File

@ -115,7 +115,7 @@ void ReaderXYZ::skip()
only called by proc 0
------------------------------------------------------------------------- */
bigint ReaderXYZ::read_header(double /*box*/[3][3], int &triclinic,
bigint ReaderXYZ::read_header(double /*box*/[3][3], int &boxinfo, int &/*triclinic*/,
int fieldinfo, int nfield,
int *fieldtype, char **/*fieldlabel*/,
int scaleflag, int wrapflag, int &fieldflag,
@ -126,7 +126,7 @@ bigint ReaderXYZ::read_header(double /*box*/[3][3], int &triclinic,
// signal that we have no box info at all
triclinic = -1;
boxinfo = 0;
// if no field info requested, just return