diff --git a/src/KOKKOS/pppm_kokkos.cpp b/src/KOKKOS/pppm_kokkos.cpp
index 5ec454f783d64458847dde0ea070200d2d9b428b..7a02e973b1dac132bbbfeceedfa76e7844cd6e2c 100644
--- a/src/KOKKOS/pppm_kokkos.cpp
+++ b/src/KOKKOS/pppm_kokkos.cpp
@@ -202,7 +202,7 @@ void PPPMKokkos<DeviceType>::init()
if (!atomKK->q_flag) error->all(FLERR,"Kspace style requires atomKK attribute q");
if (slabflag == 0 && domain->nonperiodic > 0)
- error->all(FLERR,"Cannot use nonperiodic boundaries with PPPM");
+ error->all(FLERR,"Cannot use non-periodic boundaries with PPPM");
if (slabflag) {
if (domain->xperiodic != 1 || domain->yperiodic != 1 ||
domain->boundary[2][0] != 1 || domain->boundary[2][1] != 1)
@@ -371,7 +371,7 @@ void PPPMKokkos<DeviceType>::setup()
// perform some checks to avoid illegal boundaries with read_data
if (slabflag == 0 && domain->nonperiodic > 0)
- error->all(FLERR,"Cannot use nonperiodic boundaries with PPPM");
+ error->all(FLERR,"Cannot use non-periodic boundaries with PPPM");
if (slabflag) {
if (domain->xperiodic != 1 || domain->yperiodic != 1 ||
domain->boundary[2][0] != 1 || domain->boundary[2][1] != 1)
diff --git a/src/KOKKOS/pppm_kokkos.h b/src/KOKKOS/pppm_kokkos.h
index db5b8f7ae6d3e5941f167b8dc9c1023315cccf72..21896eb7149291ec2f5a2ad03ba21726d61a6a97 100644
--- a/src/KOKKOS/pppm_kokkos.h
+++ b/src/KOKKOS/pppm_kokkos.h
@@ -454,7 +454,7 @@ E: Kspace style requires atomKK attribute q
UNDOCUMENTED
-E: Cannot use nonperiodic boundaries with PPPM
+E: Cannot use non-periodic boundaries with PPPM
For kspace style pppm, all 3 dimensions must have periodic boundaries
unless you use the kspace_modify command to define a 2d slab with a
diff --git a/src/KSPACE/ewald.cpp b/src/KSPACE/ewald.cpp
index c9c10ab73855099da1e31442acd62dd1be7466cd..a24e3e123db7e38baab99999c062710e0a6bb681 100644
--- a/src/KSPACE/ewald.cpp
+++ b/src/KSPACE/ewald.cpp
@@ -105,7 +105,7 @@ void Ewald::init()
if (!atom->q_flag) error->all(FLERR,"Kspace style requires atom attribute q");
if (slabflag == 0 && domain->nonperiodic > 0)
- error->all(FLERR,"Cannot use nonperiodic boundaries with Ewald");
+ error->all(FLERR,"Cannot use non-periodic boundaries with Ewald");
if (slabflag) {
if (domain->xperiodic != 1 || domain->yperiodic != 1 ||
domain->boundary[2][0] != 1 || domain->boundary[2][1] != 1)
diff --git a/src/KSPACE/ewald.h b/src/KSPACE/ewald.h
index 7d520b3ab05455b22000229263bd6ac58e3179fd..ef7ff05675f416e7d6a5a386a67e8c0b69b3a406 100644
--- a/src/KSPACE/ewald.h
+++ b/src/KSPACE/ewald.h
@@ -99,7 +99,7 @@ E: Kspace style requires atom attribute q
The atom style defined does not have these attributes.
-E: Cannot use nonperiodic boundaries with Ewald
+E: Cannot use non-periodic boundaries with Ewald
For kspace style ewald, all 3 dimensions must have periodic boundaries
unless you use the kspace_modify command to define a 2d slab with a
diff --git a/src/KSPACE/ewald_disp.cpp b/src/KSPACE/ewald_disp.cpp
index 0ff8acff6ef18de48162d6bae802ca207997368f..4cbdf7b9cb3612fd43d6284d75fba71df9cf8425 100644
--- a/src/KSPACE/ewald_disp.cpp
+++ b/src/KSPACE/ewald_disp.cpp
@@ -100,7 +100,7 @@ void EwaldDisp::init()
if (domain->dimension == 2)
error->all(FLERR,"Cannot use EwaldDisp with 2d simulation");
if (slabflag == 0 && domain->nonperiodic > 0)
- error->all(FLERR,"Cannot use nonperiodic boundaries with EwaldDisp");
+ error->all(FLERR,"Cannot use non-periodic boundaries with EwaldDisp");
if (slabflag == 1) {
if (domain->xperiodic != 1 || domain->yperiodic != 1 ||
domain->boundary[2][0] != 1 || domain->boundary[2][1] != 1)
diff --git a/src/KSPACE/ewald_disp.h b/src/KSPACE/ewald_disp.h
index a8dfb5bb20d60338f3ce32c7ffd5379fa2fd7e79..77b03a1ff703cedfb6b29a30da7f9fe36b74fad4 100644
--- a/src/KSPACE/ewald_disp.h
+++ b/src/KSPACE/ewald_disp.h
@@ -108,7 +108,7 @@ E: Cannot use EwaldDisp with 2d simulation
This is a current restriction of this command.
-E: Cannot use nonperiodic boundaries with EwaldDisp
+E: Cannot use non-periodic boundaries with EwaldDisp
For kspace style ewald/disp, all 3 dimensions must have periodic
boundaries unless you use the kspace_modify command to define a 2d
diff --git a/src/KSPACE/msm.cpp b/src/KSPACE/msm.cpp
index ed4abcf077de17b04d9cc73b9a8f5797a3ea373f..d8964ffa670e897a09ac6e3ad83b20726ce0f9fd 100644
--- a/src/KSPACE/msm.cpp
+++ b/src/KSPACE/msm.cpp
@@ -533,7 +533,7 @@ void MSM::compute(int eflag, int vflag)
restriction(n);
}
- // compute direct interation for top grid level for nonperiodic
+ // compute direct interation for top grid level for non-periodic
// and for second from top grid level for periodic
if (active_flag[levels-1]) {
@@ -1120,7 +1120,7 @@ void MSM::set_grid_global()
if (nx_msm[0] >= OFFSET || ny_msm[0] >= OFFSET || nz_msm[0] >= OFFSET)
error->all(FLERR,"MSM grid is too large");
- // compute number of extra grid points needed for nonperiodic boundary conditions
+ // compute number of extra grid points needed for non-periodic boundary conditions
if (domain->nonperiodic) {
alpha[0] = -(order/2 - 1);
@@ -1254,7 +1254,7 @@ void MSM::set_grid_local()
nzlo_out[n] = nlo - order;
nzhi_out[n] = nhi + MAX(order,nzhi_direct);
- // add extra grid points for nonperiodic boundary conditions
+ // add extra grid points for non-periodic boundary conditions
if (domain->nonperiodic) {
diff --git a/src/KSPACE/msm_cg.cpp b/src/KSPACE/msm_cg.cpp
index 1139ce495755577f40b7566fc0fbc3eb2fbd7efc..55435e5a6e36cef5a9991273bdcab5472bb18dca 100644
--- a/src/KSPACE/msm_cg.cpp
+++ b/src/KSPACE/msm_cg.cpp
@@ -199,7 +199,7 @@ void MSMCG::compute(int eflag, int vflag)
}
- // compute direct interation for top grid level for nonperiodic
+ // compute direct interation for top grid level for non-periodic
// and for second from top grid level for periodic
if (active_flag[levels-1]) {
diff --git a/src/KSPACE/pppm.cpp b/src/KSPACE/pppm.cpp
index 57e030f2558f4901a8f866b162172436ac2d9017..8fd74d00dcc8fc3f08b21c061f418682ac7c31ad 100644
--- a/src/KSPACE/pppm.cpp
+++ b/src/KSPACE/pppm.cpp
@@ -214,7 +214,7 @@ void PPPM::init()
if (!atom->q_flag) error->all(FLERR,"Kspace style requires atom attribute q");
if (slabflag == 0 && domain->nonperiodic > 0)
- error->all(FLERR,"Cannot use nonperiodic boundaries with PPPM");
+ error->all(FLERR,"Cannot use non-periodic boundaries with PPPM");
if (slabflag) {
if (domain->xperiodic != 1 || domain->yperiodic != 1 ||
domain->boundary[2][0] != 1 || domain->boundary[2][1] != 1)
@@ -411,7 +411,7 @@ void PPPM::setup()
// perform some checks to avoid illegal boundaries with read_data
if (slabflag == 0 && domain->nonperiodic > 0)
- error->all(FLERR,"Cannot use nonperiodic boundaries with PPPM");
+ error->all(FLERR,"Cannot use non-periodic boundaries with PPPM");
if (slabflag) {
if (domain->xperiodic != 1 || domain->yperiodic != 1 ||
domain->boundary[2][0] != 1 || domain->boundary[2][1] != 1)
diff --git a/src/KSPACE/pppm.h b/src/KSPACE/pppm.h
index 20ba7c3ff18c9843aded2aa0a09e9f187a0e255b..c9190d9fcabbdbc5a262d63d48913f3b981e090d 100644
--- a/src/KSPACE/pppm.h
+++ b/src/KSPACE/pppm.h
@@ -235,7 +235,7 @@ E: Kspace style requires atom attribute q
The atom style defined does not have these attributes.
-E: Cannot use nonperiodic boundaries with PPPM
+E: Cannot use non-periodic boundaries with PPPM
For kspace style pppm, all 3 dimensions must have periodic boundaries
unless you use the kspace_modify command to define a 2d slab with a
diff --git a/src/KSPACE/pppm_disp.cpp b/src/KSPACE/pppm_disp.cpp
index 9fcfb7d76967aa997fb6fa9feff9cbd5059f10d6..687ea0b3f92baf3497e23b0b6334086b6b59502a 100644
--- a/src/KSPACE/pppm_disp.cpp
+++ b/src/KSPACE/pppm_disp.cpp
@@ -269,7 +269,7 @@ void PPPMDisp::init()
"comm_style brick");
if (slabflag == 0 && domain->nonperiodic > 0)
- error->all(FLERR,"Cannot use nonperiodic boundaries with PPPMDisp");
+ error->all(FLERR,"Cannot use non-periodic boundaries with PPPMDisp");
if (slabflag == 1) {
if (domain->xperiodic != 1 || domain->yperiodic != 1 ||
domain->boundary[2][0] != 1 || domain->boundary[2][1] != 1)
@@ -657,7 +657,7 @@ void PPPMDisp::setup()
{
if (slabflag == 0 && domain->nonperiodic > 0)
- error->all(FLERR,"Cannot use nonperiodic boundaries with PPPMDisp");
+ error->all(FLERR,"Cannot use non-periodic boundaries with PPPMDisp");
if (slabflag == 1) {
if (domain->xperiodic != 1 || domain->yperiodic != 1 ||
domain->boundary[2][0] != 1 || domain->boundary[2][1] != 1)
diff --git a/src/KSPACE/pppm_disp.h b/src/KSPACE/pppm_disp.h
index 8a3fb700e6a763d45d4c4bb650b94bbdfbbd6387..786a865978f5887ddc6580884b40addd9f18a2a8 100644
--- a/src/KSPACE/pppm_disp.h
+++ b/src/KSPACE/pppm_disp.h
@@ -390,7 +390,7 @@ E: PPPMDisp can only currently be used with comm_style brick
This is a current restriction in LAMMPS.
-E: Cannot use nonperiodic boundaries with PPPMDisp
+E: Cannot use non-periodic boundaries with PPPMDisp
For kspace style pppm/disp, all 3 dimensions must have periodic
boundaries unless you use the kspace_modify command to define a 2d
diff --git a/src/MISC/fix_ttm.cpp b/src/MISC/fix_ttm.cpp
index 4e155813778c7f165575b5150501a6d8f86e5fdf..170103b0d0798772f15543069bd59b0619eb984a 100644
--- a/src/MISC/fix_ttm.cpp
+++ b/src/MISC/fix_ttm.cpp
@@ -199,7 +199,7 @@ void FixTTM::init()
if (domain->dimension == 2)
error->all(FLERR,"Cannot use fix ttm with 2d simulation");
if (domain->nonperiodic != 0)
- error->all(FLERR,"Cannot use nonperiodic boundares with fix ttm");
+ error->all(FLERR,"Cannot use non-periodic boundares with fix ttm");
if (domain->triclinic)
error->all(FLERR,"Cannot use fix ttm with triclinic box");
diff --git a/src/MISC/fix_ttm.h b/src/MISC/fix_ttm.h
index 57d18bcb3ac971ff2fbcdfaad81fb64a5abfec44..9fbae2a418624842d21384e974fe542be24f8fe0 100644
--- a/src/MISC/fix_ttm.h
+++ b/src/MISC/fix_ttm.h
@@ -130,7 +130,7 @@ E: Cannot use fix ttm with 2d simulation
This is a current restriction of this fix due to the grid it creates.
-E: Cannot use nonperiodic boundares with fix ttm
+E: Cannot use non-periodic boundares with fix ttm
This fix requires a fully periodic simulation box.
diff --git a/src/SRD/fix_srd.h b/src/SRD/fix_srd.h
index e14652e526996f8075e99069158e45882b4097e2..b86b3d9f9bdda119913d68a840cc7b497e9a8ae7 100644
--- a/src/SRD/fix_srd.h
+++ b/src/SRD/fix_srd.h
@@ -373,7 +373,7 @@ This may indicate a problem with your simulation parameters.
E: Big particle in fix srd cannot be point particle
-Big particles must be extended spheriods or ellipsoids.
+Big particles must be extended spheroids or ellipsoids.
E: Cannot use lines with fix srd unless overlap is set
diff --git a/src/USER-MISC/fix_ttm_mod.cpp b/src/USER-MISC/fix_ttm_mod.cpp
index a423b510e5b5c3995aa44133d0e65f2cf92c3ffa..423ec788c560d2c57445641c06cbce71e12186cc 100644
--- a/src/USER-MISC/fix_ttm_mod.cpp
+++ b/src/USER-MISC/fix_ttm_mod.cpp
@@ -325,7 +325,7 @@ void FixTTMMod::init()
if (domain->dimension == 2)
error->all(FLERR,"Cannot use fix ttm/mod with 2d simulation");
if (domain->nonperiodic != 0)
- error->all(FLERR,"Cannot use nonperiodic boundares with fix ttm/mod");
+ error->all(FLERR,"Cannot use non-periodic boundares with fix ttm/mod");
if (domain->triclinic)
error->all(FLERR,"Cannot use fix ttm/mod with triclinic box");
// set force prefactors
diff --git a/src/USER-NETCDF/dump_netcdf.cpp b/src/USER-NETCDF/dump_netcdf.cpp
index c08bc89d04fd86215be6ecce3f6355a504fbad4a..e4c0115793482efc11e54bd784f664bea89293d9 100644
--- a/src/USER-NETCDF/dump_netcdf.cpp
+++ b/src/USER-NETCDF/dump_netcdf.cpp
@@ -785,7 +785,7 @@ void DumpNetCDF::write_header(bigint n)
cell_angles[2] = acos(cosgamma)*180.0/MY_PI;
}
- // Recent AMBER conventions say that nonperiodic boundaries should have
+ // Recent AMBER conventions say that non-periodic boundaries should have
// 'cell_lengths' set to zero.
for (int dim = 0; dim < 3; dim++) {
if (!domain->periodicity[dim])
diff --git a/src/USER-NETCDF/dump_netcdf_mpiio.cpp b/src/USER-NETCDF/dump_netcdf_mpiio.cpp
index 0a292d4721b5e5c909375b3e56b7ac991ee01795..733fae10f33d1c536d7ea79e451bb4d856785434 100644
--- a/src/USER-NETCDF/dump_netcdf_mpiio.cpp
+++ b/src/USER-NETCDF/dump_netcdf_mpiio.cpp
@@ -803,7 +803,7 @@ void DumpNetCDFMPIIO::write_time_and_cell()
cell_angles[2] = acos(cosgamma)*180.0/MY_PI;
}
- // Recent AMBER conventions say that nonperiodic boundaries should have
+ // Recent AMBER conventions say that non-periodic boundaries should have
// 'cell_lengths' set to zero.
for (int dim = 0; dim < 3; dim++) {
if (!domain->periodicity[dim])
diff --git a/src/USER-OMP/msm_cg_omp.cpp b/src/USER-OMP/msm_cg_omp.cpp
index eaff37374206e93883c7f3852acb8cd805f33af6..dee9fd85b61b2d27893e8f8472033ea35d789509 100644
--- a/src/USER-OMP/msm_cg_omp.cpp
+++ b/src/USER-OMP/msm_cg_omp.cpp
@@ -199,7 +199,7 @@ void MSMCGOMP::compute(int eflag, int vflag)
}
- // compute direct interation for top grid level for nonperiodic
+ // compute direct interation for top grid level for non-periodic
// and for second from top grid level for periodic
if (active_flag[levels-1]) {
diff --git a/src/change_box.cpp b/src/change_box.cpp
index 93dff387c47ddceb622f20168deaca3c93ca5f83..b7d3cb245fc479aba50080b710a5976d171e9985 100644
--- a/src/change_box.cpp
+++ b/src/change_box.cpp
@@ -272,7 +272,7 @@ void ChangeBox::command(int narg, char **arg)
if (domain->dimension == 2 && domain->zperiodic == 0)
error->all(FLERR,
"Cannot change box z boundary to "
- "nonperiodic for a 2d simulation");
+ "non-periodic for a 2d simulation");
domain->set_initial_box();
domain->set_global_box();
domain->set_local_box();
diff --git a/src/change_box.h b/src/change_box.h
index d9152b7fb0d71b8556235679a219231a6ec09328..d8a057f9a6063ab66f47bdd6a81434df03120219 100644
--- a/src/change_box.h
+++ b/src/change_box.h
@@ -97,7 +97,7 @@ E: Cannot change box tilt factors for orthogonal box
Cannot use tilt factors unless the simulation box is non-orthogonal.
-E: Cannot change box z boundary to nonperiodic for a 2d simulation
+E: Cannot change box z boundary to non-periodic for a 2d simulation
Self-explanatory.
diff --git a/src/create_box.h b/src/create_box.h
index 2d94b80d82a3913e302ab39792dc67f8de8f3be8..740769b4de5106d28a00a18bafbe6b551ff7eab8 100644
--- a/src/create_box.h
+++ b/src/create_box.h
@@ -47,7 +47,7 @@ E: Cannot create_box after simulation box is defined
A simulation box can only be defined once.
-E: Cannot run 2d simulation with nonperiodic Z dimension
+E: Cannot run 2d simulation with non-periodic Z dimension
Use the boundary command to make the z dimension periodic in order to
run a 2d simulation.
diff --git a/src/input.h b/src/input.h
index be320a41ecc45096c813d7dcab4ec6705b1cb6b9..080accc1ce7d797cdf0b79122fa42ca1c002ca33 100644
--- a/src/input.h
+++ b/src/input.h
@@ -337,7 +337,7 @@ after a read_data, read_restart, or create_box command.
E: Package command after simulation box is defined
-The package command cannot be used afer a read_data, read_restart, or
+The package command cannot be used after a read_data, read_restart, or
create_box command.
E: Package gpu command without GPU package installed
diff --git a/src/pair.cpp b/src/pair.cpp
index 18d561bdb55230ef2f63f6fc01f600916bcad8ab..cc066713c95b951790f8f445f9bd6df359331357 100644
--- a/src/pair.cpp
+++ b/src/pair.cpp
@@ -195,7 +195,7 @@ void Pair::init()
if (tail_flag && domain->dimension == 2)
error->all(FLERR,"Cannot use pair tail corrections with 2d simulations");
if (tail_flag && domain->nonperiodic && comm->me == 0)
- error->warning(FLERR,"Using pair tail corrections with nonperiodic system");
+ error->warning(FLERR,"Using pair tail corrections with non-periodic system");
if (!compute_flag && tail_flag && comm->me == 0)
error->warning(FLERR,"Using pair tail corrections with "
"pair_modify compute no");
diff --git a/src/pair.h b/src/pair.h
index c1a9e6eef8df3c181a2284f0770ea602266a48cb..27b6d41eef17ec96c4d7dc03c9e2032721ee0c16 100644
--- a/src/pair.h
+++ b/src/pair.h
@@ -272,7 +272,7 @@ E: Cannot use pair tail corrections with 2d simulations
The correction factors are only currently defined for 3d systems.
-W: Using pair tail corrections with nonperiodic system
+W: Using pair tail corrections with non-periodic system
This is probably a bogus thing to do, since tail corrections are
computed by integrating the density of a periodic system out to
diff --git a/src/read_data.h b/src/read_data.h
index 9dce8cfcf581c20a145b3684b1b42f14dde214ef..7d011c710a09b6b966545a153af412d4d704f04b 100644
--- a/src/read_data.h
+++ b/src/read_data.h
@@ -160,7 +160,7 @@ E: Fix ID for read_data does not exist
Self-explanatory.
-E: Cannot run 2d simulation with nonperiodic Z dimension
+E: Cannot run 2d simulation with non-periodic Z dimension
Use the boundary command to make the z dimension periodic in order to
run a 2d simulation.
diff --git a/src/read_restart.cpp b/src/read_restart.cpp
index 6b9ea8d77316b867bb193bc2264ee9b392e51b00..82028d831636827a03a4a8fd7459f43bc8c12ef3 100644
--- a/src/read_restart.cpp
+++ b/src/read_restart.cpp
@@ -715,7 +715,7 @@ void ReadRestart::header(int incompatible)
domain->dimension = dimension;
if (domain->dimension == 2 && domain->zperiodic == 0)
error->all(FLERR,
- "Cannot run 2d simulation with nonperiodic Z dimension");
+ "Cannot run 2d simulation with non-periodic Z dimension");
// read nprocs from restart file, warn if different
diff --git a/src/read_restart.h b/src/read_restart.h
index 8d2547fb1055673945e77b650b7004e6f0f01720..4cee62a1cf4dfab60d6cd9ed32a940e3585f2e19 100644
--- a/src/read_restart.h
+++ b/src/read_restart.h
@@ -141,7 +141,7 @@ E: Bigint setting in lmptype.h is not compatible
Format of bigint stored in restart file is not consistent with LAMMPS
version you are running. See the settings in src/lmptype.h
-E: Cannot run 2d simulation with nonperiodic Z dimension
+E: Cannot run 2d simulation with non-periodic Z dimension
Use the boundary command to make the z dimension periodic in order to
run a 2d simulation.