From d1e51c4359b3ec4d0c4fec02fb8b8c64800951e1 Mon Sep 17 00:00:00 2001 From: sjplimp Date: Wed, 27 Aug 2014 16:16:07 +0000 Subject: [PATCH] git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12364 f3b2605a-c512-4ea7-a41b-209d697bcdaa --- src/atom.cpp | 2 +- src/atom_vec_hybrid.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/atom.cpp b/src/atom.cpp index 006538bc85..d328f0975f 100644 --- a/src/atom.cpp +++ b/src/atom.cpp @@ -414,7 +414,7 @@ AtomVec *Atom::new_avec(const char *style, int trysuffix, int &sflag) } if (lmp->suffix2) { - sflag = 1; + sflag = 2; char estyle[256]; sprintf(estyle,"%s/%s",style,lmp->suffix2); diff --git a/src/atom_vec_hybrid.cpp b/src/atom_vec_hybrid.cpp index 9514145d4c..63e7dd15e8 100644 --- a/src/atom_vec_hybrid.cpp +++ b/src/atom_vec_hybrid.cpp @@ -66,7 +66,7 @@ void AtomVecHybrid::process_args(int narg, char **arg) for (i = 0; i < nstyles; i++) if (strcmp(arg[iarg],keywords[i]) == 0) error->all(FLERR,"Atom style hybrid cannot use same atom style twice"); - styles[nstyles] = atom->new_avec(arg[iarg],NULL,dummy); + styles[nstyles] = atom->new_avec(arg[iarg],1,dummy); keywords[nstyles] = new char[strlen(arg[iarg])+1]; strcpy(keywords[nstyles],arg[iarg]); jarg = iarg + 1;