From 1af7b06052fdbf30ac4402716a887d11d27b1f0b Mon Sep 17 00:00:00 2001 From: sjplimp Date: Fri, 12 Dec 2014 00:20:19 +0000 Subject: [PATCH] git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@12827 f3b2605a-c512-4ea7-a41b-209d697bcdaa --- src/atom.cpp | 2 +- src/atom_vec_body.cpp | 2 +- src/domain.cpp | 4 ++-- src/force.cpp | 12 ++++++------ src/modify.cpp | 4 ++-- src/output.cpp | 2 +- src/read_dump.cpp | 2 +- src/write_dump.cpp | 2 +- 8 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/atom.cpp b/src/atom.cpp index 9d494b35db..42304c2b77 100644 --- a/src/atom.cpp +++ b/src/atom.cpp @@ -438,7 +438,7 @@ AtomVec *Atom::new_avec(const char *style, int trysuffix, int &sflag) #include "style_atom.h" #undef ATOM_CLASS - else error->all(FLERR,"Invalid atom style"); + else error->all(FLERR,"Unknown atom style"); return NULL; } diff --git a/src/atom_vec_body.cpp b/src/atom_vec_body.cpp index d407d5e8c8..efe6bd1200 100644 --- a/src/atom_vec_body.cpp +++ b/src/atom_vec_body.cpp @@ -92,7 +92,7 @@ void AtomVecBody::process_args(int narg, char **arg) #undef BodyStyle #undef BODY_CLASS - else error->all(FLERR,"Invalid body style"); + else error->all(FLERR,"Unknown body style"); bptr->avec = this; icp = bptr->icp; diff --git a/src/domain.cpp b/src/domain.cpp index 378a25264f..7df81f7e61 100644 --- a/src/domain.cpp +++ b/src/domain.cpp @@ -1424,7 +1424,7 @@ void Domain::add_region(int narg, char **arg) // create the Region - if (strcmp(arg[1],"none") == 0) error->all(FLERR,"Invalid region style"); + if (strcmp(arg[1],"none") == 0) error->all(FLERR,"Unknown region style"); #define REGION_CLASS #define RegionStyle(key,Class) \ @@ -1433,7 +1433,7 @@ void Domain::add_region(int narg, char **arg) #include "style_region.h" #undef REGION_CLASS - else error->all(FLERR,"Invalid region style"); + else error->all(FLERR,"Unknown region style"); // initialize any region variables via init() // in case region is used between runs, e.g. to print a variable diff --git a/src/force.cpp b/src/force.cpp index dc0b1bad60..71eb0add9d 100644 --- a/src/force.cpp +++ b/src/force.cpp @@ -173,7 +173,7 @@ Pair *Force::new_pair(const char *style, int trysuffix, int &sflag) return pair_creator(lmp); } - error->all(FLERR,"Invalid pair style"); + error->all(FLERR,"Unknown pair style"); return NULL; } @@ -288,7 +288,7 @@ Bond *Force::new_bond(const char *style, int trysuffix, int &sflag) #include "style_bond.h" #undef BOND_CLASS - else error->all(FLERR,"Invalid bond style"); + else error->all(FLERR,"Unknown bond style"); return NULL; } @@ -368,7 +368,7 @@ Angle *Force::new_angle(const char *style, int trysuffix, int &sflag) #include "style_angle.h" #undef ANGLE_CLASS - else error->all(FLERR,"Invalid angle style"); + else error->all(FLERR,"Unknown angle style"); return NULL; } @@ -434,7 +434,7 @@ Dihedral *Force::new_dihedral(const char *style, int trysuffix, int &sflag) #undef DihedralStyle #undef DIHEDRAL_CLASS - else error->all(FLERR,"Invalid dihedral style"); + else error->all(FLERR,"Unknown dihedral style"); return NULL; } @@ -499,7 +499,7 @@ Improper *Force::new_improper(const char *style, int trysuffix, int &sflag) #include "style_improper.h" #undef IMPROPER_CLASS - else error->all(FLERR,"Invalid improper style"); + else error->all(FLERR,"Unknown improper style"); return NULL; } @@ -583,7 +583,7 @@ KSpace *Force::new_kspace(int narg, char **arg, int trysuffix, int &sflag) #include "style_kspace.h" #undef KSPACE_CLASS - else error->all(FLERR,"Invalid kspace style"); + else error->all(FLERR,"Unknown kspace style"); return NULL; } diff --git a/src/modify.cpp b/src/modify.cpp index 865ff48e42..1562cac48b 100644 --- a/src/modify.cpp +++ b/src/modify.cpp @@ -759,7 +759,7 @@ void Modify::add_fix(int narg, char **arg, int trysuffix) fix[ifix] = fix_creator(lmp,narg,arg); } - if (fix[ifix] == NULL) error->all(FLERR,"Invalid fix style"); + if (fix[ifix] == NULL) error->all(FLERR,"Unknown fix style"); // check if Fix is in restart_global list // if yes, pass state info to the Fix so it can reset itself @@ -930,7 +930,7 @@ void Modify::add_compute(int narg, char **arg, int trysuffix) compute[ncompute] = compute_creator(lmp,narg,arg); } - if (compute[ncompute] == NULL) error->all(FLERR,"Invalid compute style"); + if (compute[ncompute] == NULL) error->all(FLERR,"Unknown compute style"); ncompute++; } diff --git a/src/output.cpp b/src/output.cpp index 6a9223604e..ce561e3489 100644 --- a/src/output.cpp +++ b/src/output.cpp @@ -571,7 +571,7 @@ void Output::add_dump(int narg, char **arg) #include "style_dump.h" #undef DUMP_CLASS - else error->all(FLERR,"Invalid dump style"); + else error->all(FLERR,"Unknown dump style"); every_dump[ndump] = force->inumeric(FLERR,arg[3]); if (every_dump[ndump] <= 0) error->all(FLERR,"Illegal dump command"); diff --git a/src/read_dump.cpp b/src/read_dump.cpp index bbe1b4cd71..14b208e994 100644 --- a/src/read_dump.cpp +++ b/src/read_dump.cpp @@ -199,7 +199,7 @@ void ReadDump::setup_reader(int narg, char **arg) // unrecognized style - else error->all(FLERR,"Invalid dump reader style"); + else error->all(FLERR,"Unknown dump reader style"); // pass any arguments to reader diff --git a/src/write_dump.cpp b/src/write_dump.cpp index c9b6db53ac..e4810cea12 100644 --- a/src/write_dump.cpp +++ b/src/write_dump.cpp @@ -62,7 +62,7 @@ void WriteDump::command(int narg, char **arg) #include "style_dump.h" #undef DUMP_CLASS - else error->all(FLERR,"Invalid dump style"); + else error->all(FLERR,"Unknown dump style"); if (modindex < narg) dump->modify_params(narg-modindex-1,&arg[modindex+1]);