Merge branch 'develop' into general-triclinic

# Conflicts: # src/atom.cpp
2024-02-06 19:21:50 -05:00
parent 7905e5d146 b9ec85427d
commit dbdcfc5c97
356 changed files with 8055 additions and 5135 deletions
--- a/src/atom_vec.cpp
+++ b/src/atom_vec.cpp
@ -1717,7 +1717,7 @@ void AtomVec::data_atom(double *coord, imageint imagetmp, const std::vector<std:

  // error checks applicable to all styles

-  if (tag[nlocal] <= 0)
+  if ((atom->tag_enable && (tag[nlocal] <= 0)) || (!atom->tag_enable && (tag[nlocal] != 0)))
    error->one(FLERR, "Invalid atom ID {} in line {} of Atoms section of data file", tag[nlocal],
               nlocal + 1);