diff --git a/src/atom.cpp b/src/atom.cpp index e819c13877..fe85b66e71 100644 --- a/src/atom.cpp +++ b/src/atom.cpp @@ -2060,14 +2060,13 @@ void Atom::add_molecule_atom(Molecule *onemol, int iatom, int ilocal, tagint off allocate space for type label map ------------------------------------------------------------------------- */ -void Atom::add_label_map(const std::string &mapID) +void Atom::add_label_map() { labelmapflag = 1; lmap = (LabelMap *) memory->srealloc(lmap,sizeof(LabelMap *), "atom::lmap"); lmap = new LabelMap(lmp); - if (mapID != "") lmap->id = mapID; lmap->natomtypes = ntypes; lmap->nbondtypes = nbondtypes; lmap->nangletypes = nangletypes; diff --git a/src/atom.h b/src/atom.h index 395f4986d5..12be0e8d68 100644 --- a/src/atom.h +++ b/src/atom.h @@ -355,7 +355,7 @@ class Atom : protected Pointers { int find_molecule(char *); void add_molecule_atom(class Molecule *, int, int, tagint); - void add_label_map(const std::string &mapID = ""); + void add_label_map(); void first_reorder(); virtual void sort(); diff --git a/src/input.cpp b/src/input.cpp index d4a0310211..df633b5ff7 100644 --- a/src/input.cpp +++ b/src/input.cpp @@ -1631,20 +1631,6 @@ void Input::labelmap() error->all(FLERR,"Labelmap command before simulation box is defined"); if (!atom->labelmapflag) atom->add_label_map(); - - std::string mapid; - for (int i = 1; i < narg; i++) { - if (strcmp(arg[i],"mapID") == 0) { - mapid = arg[i+1]; - if (narg > i+2) error->all(FLERR,"Illegal labelmap command"); - if (atom->lmap->id == "") atom->lmap->id == mapid; - else if (atom->lmap->id != mapid) - error->all(FLERR,"Labelmap ID {} does not match existing ID {}",mapid,atom->lmap->id); - narg = narg - 2; - break; - } - i++; - } atom->lmap->modify_lmap(narg,arg); } diff --git a/src/label_map.h b/src/label_map.h index 4e5582c170..524145f06a 100644 --- a/src/label_map.h +++ b/src/label_map.h @@ -23,7 +23,6 @@ namespace LAMMPS_NS { class LabelMap : protected Pointers { public: int natomtypes,nbondtypes,nangletypes,ndihedraltypes,nimpropertypes; - std::string id; std::vector typelabel,btypelabel,atypelabel; std::vector dtypelabel,itypelabel; std::unordered_map typelabel_map;