diff --git a/src/dihedral_hybrid.cpp b/src/dihedral_hybrid.cpp index 48d879d435..752b1818a5 100644 --- a/src/dihedral_hybrid.cpp +++ b/src/dihedral_hybrid.cpp @@ -286,6 +286,16 @@ void DihedralHybrid::coeff(int narg, char **arg) if (m == nstyles) { if (strcmp(arg[1],"none") == 0) none = 1; else if (strcmp(arg[1],"skip") == 0) none = skip = 1; + else if (strcmp(arg[1],"mbt") == 0) + error->all(FLERR,"MiddleBondTorsion coeff for hybrid dihedral has invalid format"); + else if (strcmp(arg[1],"ebt") == 0) + error->all(FLERR,"EndBondTorsion coeff for hybrid dihedral has invalid format"); + else if (strcmp(arg[1],"at") == 0) + error->all(FLERR,"AngleTorsion coeff for hybrid dihedral has invalid format"); + else if (strcmp(arg[1],"aat") == 0) + error->all(FLERR,"AngleAngleTorsion coeff for hybrid dihedral has invalid format"); + else if (strcmp(arg[1],"bb13") == 0) + error->all(FLERR,"BondBond13 coeff for hybrid dihedral has invalid format"); else error->all(FLERR,"Dihedral coeff for hybrid has invalid style"); } diff --git a/src/improper_hybrid.cpp b/src/improper_hybrid.cpp index ed1a8075a9..ffee2e2fc8 100644 --- a/src/improper_hybrid.cpp +++ b/src/improper_hybrid.cpp @@ -283,15 +283,19 @@ void ImproperHybrid::coeff(int narg, char **arg) utils::bounds(FLERR,arg[0],1,atom->nimpropertypes,ilo,ihi,error); // 2nd arg = improper sub-style name - // allow for "none" as valid sub-style name + // allow for "none" or "skip" as valid sub-style name int m; for (m = 0; m < nstyles; m++) if (strcmp(arg[1],keywords[m]) == 0) break; int none = 0; + int skip = 0; if (m == nstyles) { if (strcmp(arg[1],"none") == 0) none = 1; + else if (strcmp(arg[1],"skip") == 0) none = skip = 1; + else if (strcmp(arg[1],"aa") == 0) + error->all(FLERR,"AngleAngle coeff for hybrid improper has invalid format"); else error->all(FLERR,"Improper coeff for hybrid has invalid style"); }