From 468ef144d4504d56e4a73e6299cf509e331a0f00 Mon Sep 17 00:00:00 2001 From: sjplimp Date: Mon, 15 Feb 2016 16:10:43 +0000 Subject: [PATCH] git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14602 f3b2605a-c512-4ea7-a41b-209d697bcdaa --- src/BODY/compute_temp_body.h | 4 ---- src/GRANULAR/pair_gran_hooke_history.cpp | 2 +- src/GRANULAR/pair_gran_hooke_history.h | 2 +- src/KOKKOS/kokkos.h | 8 ++++---- src/KOKKOS/pair_buck_kokkos.h | 2 +- src/KOKKOS/pair_lj_cut_coul_cut_kokkos.h | 2 +- src/KOKKOS/pair_lj_cut_coul_dsf_kokkos.h | 2 +- src/KOKKOS/pair_lj_cut_coul_long_kokkos.h | 2 +- src/KOKKOS/pair_lj_cut_kokkos.h | 2 +- src/KOKKOS/pair_lj_sdk_kokkos.h | 2 +- src/MANYBODY/pair_polymorphic.cpp | 2 +- src/XTC/dump_xtc.h | 3 +-- src/atom.h | 2 +- src/dump.h | 3 +-- src/dump_dcd.h | 3 +-- src/info.h | 6 +++--- src/molecule.cpp | 4 ++-- src/pair_hybrid.h | 2 +- 18 files changed, 23 insertions(+), 30 deletions(-) diff --git a/src/BODY/compute_temp_body.h b/src/BODY/compute_temp_body.h index a623fe5898..33fdb13ec8 100755 --- a/src/BODY/compute_temp_body.h +++ b/src/BODY/compute_temp_body.h @@ -89,8 +89,4 @@ E: Temperature compute degrees of freedom < 0 This should not happen if you are calculating the temperature on a valid set of atoms. -U: Compute temp/asphere requires atom style ellipsoid - -Self-explanatory. - */ diff --git a/src/GRANULAR/pair_gran_hooke_history.cpp b/src/GRANULAR/pair_gran_hooke_history.cpp index 05fee0c8d6..c5cca38290 100644 --- a/src/GRANULAR/pair_gran_hooke_history.cpp +++ b/src/GRANULAR/pair_gran_hooke_history.cpp @@ -394,7 +394,7 @@ void PairGranHookeHistory::init_style() // error and warning checks if (!atom->radius_flag || !atom->rmass_flag) - error->all(FLERR,"Pair granular requires atom atributes radius, rmass"); + error->all(FLERR,"Pair granular requires atom attributes radius, rmass"); if (comm->ghost_velocity == 0) error->all(FLERR,"Pair granular requires ghost atoms store velocity"); diff --git a/src/GRANULAR/pair_gran_hooke_history.h b/src/GRANULAR/pair_gran_hooke_history.h index 1e58ad48e0..ecd52f3535 100644 --- a/src/GRANULAR/pair_gran_hooke_history.h +++ b/src/GRANULAR/pair_gran_hooke_history.h @@ -83,7 +83,7 @@ E: Incorrect args for pair coefficients Self-explanatory. Check the input script or data file. -E: Pair granular requires atom atrributes radius, rmass +E: Pair granular requires atom attributes radius, rmass The atom style defined does not have these attributes. diff --git a/src/KOKKOS/kokkos.h b/src/KOKKOS/kokkos.h index ffac06e874..c03d2ff43f 100644 --- a/src/KOKKOS/kokkos.h +++ b/src/KOKKOS/kokkos.h @@ -55,14 +55,14 @@ E: Kokkos has been compiled for CUDA but no GPUs are requested One or more GPUs must be used when Kokkos is compiled for CUDA. -E: Must use Kokkos half/thread or full neighbor list with threads or GPUs - -Using Kokkos half-neighbor lists with threading is not allowed. - E: Illegal ... command Self-explanatory. Check the input script syntax and compare to the documentation for the command. You can use -echo screen as a command-line option when running LAMMPS to see the offending line. +E: Must use Kokkos half/thread or full neighbor list with threads or GPUs + +Using Kokkos half-neighbor lists with threading is not allowed. + */ diff --git a/src/KOKKOS/pair_buck_kokkos.h b/src/KOKKOS/pair_buck_kokkos.h index 217bca7b34..23ba049f9d 100755 --- a/src/KOKKOS/pair_buck_kokkos.h +++ b/src/KOKKOS/pair_buck_kokkos.h @@ -120,7 +120,7 @@ class PairBuckKokkos : public PairBuck { E: Cannot use Kokkos pair style with rRESPA inner/middle -rRESPA inner/middle options are not yet supported by Kokkos. +Self-explanatory. E: Cannot use chosen neighbor list style with buck/kk diff --git a/src/KOKKOS/pair_lj_cut_coul_cut_kokkos.h b/src/KOKKOS/pair_lj_cut_coul_cut_kokkos.h index a73af32b8d..20b2de2b8e 100644 --- a/src/KOKKOS/pair_lj_cut_coul_cut_kokkos.h +++ b/src/KOKKOS/pair_lj_cut_coul_cut_kokkos.h @@ -138,7 +138,7 @@ command-line option when running LAMMPS to see the offending line. E: Cannot use Kokkos pair style with rRESPA inner/middle -rRESPA inner/middle options are not yet supported by Kokkos. +Self-explanatory. E: Cannot use chosen neighbor list style with lj/cut/coul/cut/kk diff --git a/src/KOKKOS/pair_lj_cut_coul_dsf_kokkos.h b/src/KOKKOS/pair_lj_cut_coul_dsf_kokkos.h index 6272bfca35..dad5fd0b98 100644 --- a/src/KOKKOS/pair_lj_cut_coul_dsf_kokkos.h +++ b/src/KOKKOS/pair_lj_cut_coul_dsf_kokkos.h @@ -133,6 +133,6 @@ Self-explanatory. E: Cannot use chosen neighbor list style with lj/cut/coul/cut/kk -Self-explanatory. +That style is not supported by Kokkos. */ diff --git a/src/KOKKOS/pair_lj_cut_coul_long_kokkos.h b/src/KOKKOS/pair_lj_cut_coul_long_kokkos.h index a18797e1aa..9542853839 100644 --- a/src/KOKKOS/pair_lj_cut_coul_long_kokkos.h +++ b/src/KOKKOS/pair_lj_cut_coul_long_kokkos.h @@ -152,7 +152,7 @@ command-line option when running LAMMPS to see the offending line. E: Cannot use Kokkos pair style with rRESPA inner/middle -rRESPA inner/middle options are not yet supported by Kokkos. +Self-explanatory. E: Cannot use chosen neighbor list style with lj/cut/coul/long/kk diff --git a/src/KOKKOS/pair_lj_cut_kokkos.h b/src/KOKKOS/pair_lj_cut_kokkos.h index 88e13ea9ad..16efd3d2ef 100644 --- a/src/KOKKOS/pair_lj_cut_kokkos.h +++ b/src/KOKKOS/pair_lj_cut_kokkos.h @@ -129,7 +129,7 @@ command-line option when running LAMMPS to see the offending line. E: Cannot use Kokkos pair style with rRESPA inner/middle -rRESPA inner/middle options are not yet supported by Kokkos. +Self-explanatory. E: Cannot use chosen neighbor list style with lj/cut/kk diff --git a/src/KOKKOS/pair_lj_sdk_kokkos.h b/src/KOKKOS/pair_lj_sdk_kokkos.h index f5ffdd8520..090b9aa562 100644 --- a/src/KOKKOS/pair_lj_sdk_kokkos.h +++ b/src/KOKKOS/pair_lj_sdk_kokkos.h @@ -127,7 +127,7 @@ command-line option when running LAMMPS to see the offending line. E: Cannot use Kokkos pair style with rRESPA inner/middle -rRESPA inner/middle options are not yet supported by Kokkos. +Self-explanatory. E: Cannot use chosen neighbor list style with lj/sdk/kk diff --git a/src/MANYBODY/pair_polymorphic.cpp b/src/MANYBODY/pair_polymorphic.cpp index 110c86ab39..5c3ffd6516 100755 --- a/src/MANYBODY/pair_polymorphic.cpp +++ b/src/MANYBODY/pair_polymorphic.cpp @@ -764,7 +764,7 @@ void PairPolymorphic::setup_params() // for debugging, call write_tables() to check the tabular functions // if (comm->me == 0) { // write_tables(51); -// error->Xall(FLERR,"Test potential tables"); +// errorX->all(FLERR,"Test potential tables"); // } } diff --git a/src/XTC/dump_xtc.h b/src/XTC/dump_xtc.h index 44c444d120..9be66ca21d 100644 --- a/src/XTC/dump_xtc.h +++ b/src/XTC/dump_xtc.h @@ -101,8 +101,7 @@ The frequency of writing dump xtc snapshots cannot be changed. E: Cannot open dump file -The output file for the dump command cannot be opened. Check that the -path and name are correct. +Self-explanatory. E: Too big a timestep for dump xtc diff --git a/src/atom.h b/src/atom.h index d5e3ba10a3..f2415e1db5 100644 --- a/src/atom.h +++ b/src/atom.h @@ -397,7 +397,7 @@ the atom style. E: Invalid atom type in Atoms section of data file -Atom types can be no larger than defined Ntypes. +Atom types must range from 1 to specified # of types. E: Incorrect velocity format in data file diff --git a/src/dump.h b/src/dump.h index 940dc828f4..a504f3dbad 100644 --- a/src/dump.h +++ b/src/dump.h @@ -171,8 +171,7 @@ files through a pipeline to the gzip program with -DLAMMPS_GZIP. E: Cannot open dump file -The output file for the dump command cannot be opened. Check that the -path and name are correct. +Self-explanatory. E: Illegal ... command diff --git a/src/dump_dcd.h b/src/dump_dcd.h index c04c760a01..15f6faf4be 100644 --- a/src/dump_dcd.h +++ b/src/dump_dcd.h @@ -86,8 +86,7 @@ The frequency of writing dump dcd snapshots cannot be changed. E: Cannot open dump file -The output file for the dump command cannot be opened. Check that the -path and name are correct. +Self-explanatory. E: Dump dcd of non-matching # of atoms diff --git a/src/info.h b/src/info.h index 22906d0473..4a7388d186 100644 --- a/src/info.h +++ b/src/info.h @@ -58,15 +58,15 @@ E: Unknown name for info pair category Self-explanatory. -E: Unknown category info for is_active() +E: Unknown category for info is_active() Self-explanatory. -E: Unknown category info for is_available() +E: Unknown category for info is_available() Self-explanatory. -E: Unknown category info for is_defined() +E: Unknown category for info is_defined() Self-explanatory. diff --git a/src/molecule.cpp b/src/molecule.cpp index dc60b98e8b..64ebf2f4ae 100644 --- a/src/molecule.cpp +++ b/src/molecule.cpp @@ -1168,7 +1168,7 @@ void Molecule::special_generate() } if (!dedup) { if (count[i] >= maxspecial) - error->one(FLERR,""); + error->one(FLERR,"Molecule auto special bond generation overflow"); special[i][count[i]++] = special[special[i][m]-1][j]; nspecial[i][1]++; } @@ -1192,7 +1192,7 @@ void Molecule::special_generate() } if (!dedup) { if (count[i] >= maxspecial) - error->one(FLERR,""); + error->one(FLERR,"Molecule auto special bond generation overflow"); special[i][count[i]++] = special[special[i][m]-1][j]; nspecial[i][2]++; } diff --git a/src/pair_hybrid.h b/src/pair_hybrid.h index 56e0c5a7ae..4962fd4fbe 100644 --- a/src/pair_hybrid.h +++ b/src/pair_hybrid.h @@ -118,7 +118,7 @@ E: Pair hybrid sub-style is not used No pair_coeff command used a sub-style specified in the pair_style command. -E: Pair_modify special setting incompatible with global special_bonds setting +E: Pair_modify special setting for pair hybrid incompatible with global special_bonds setting Cannot override a setting of 0.0 or 1.0 or change a setting between 0.0 and 1.0.