Merge branch 'master' into reset-invalid-image-flags

This commit is contained in:
Axel Kohlmeyer
2020-11-11 16:15:11 -05:00
1902 changed files with 74950 additions and 66033 deletions

View File

@ -1,6 +1,6 @@
/* ----------------------------------------------------------------------
LAMMPS - Large-scale Atomic/Molecular Massively Parallel Simulator
http://lammps.sandia.gov, Sandia National Laboratories
https://lammps.sandia.gov/, Sandia National Laboratories
Steve Plimpton, sjplimp@sandia.gov
Copyright (2003) Sandia Corporation. Under the terms of Contract
@ -1913,7 +1913,7 @@ void Atom::add_molecule_atom(Molecule *onemol, int iatom,
onemol->avec_body->set_quat(ilocal,onemol->quat_external);
}
if (molecular != 1) return;
if (molecular != Atom::MOLECULAR) return;
// add bond topology info
// for molecular atom styles, but not atom style template