diff --git a/doc/src/fix_langevin_drude.txt b/doc/src/fix_langevin_drude.txt index afc9c5f257..c85ff24c96 100644 --- a/doc/src/fix_langevin_drude.txt +++ b/doc/src/fix_langevin_drude.txt @@ -154,7 +154,7 @@ Note: The temperature thermostating the core-Drude particle pairs should be chosen low enough, so as to mimic as closely as possible the self-consistent minimization. It must however be high enough, so that the dipoles can follow the local electric field exerted by the -neighbouring atoms. The optimal value probably depends on the +neighboring atoms. The optimal value probably depends on the temperature of the centers of mass and on the mass of the Drude particles. diff --git a/doc/src/pair_kolmogorov_crespi_z.txt b/doc/src/pair_kolmogorov_crespi_z.txt index c7e005a591..97f132eacd 100644 --- a/doc/src/pair_kolmogorov_crespi_z.txt +++ b/doc/src/pair_kolmogorov_crespi_z.txt @@ -38,7 +38,7 @@ This shift is achieved by the last term in the equation for {Vij} above. This potential is intended for interactions between two layers of graphene. Therefore, to avoid interaction between layers in multi-layered materials, each layer should have a separate atom type and interactions should only -be computed between atom types of neighbouring layers. +be computed between atom types of neighboring layers. The parameter file (e.g. CC.KC), is intended for use with metal "units"_units.html, with energies in meV. An additional parameter, {S}, diff --git a/src/USER-CGDNA/bond_oxdna_fene.cpp b/src/USER-CGDNA/bond_oxdna_fene.cpp index da1eb38e76..47d8d8f60b 100644 --- a/src/USER-CGDNA/bond_oxdna_fene.cpp +++ b/src/USER-CGDNA/bond_oxdna_fene.cpp @@ -242,7 +242,7 @@ void BondOxdnaFene::coeff(int narg, char **arg) void BondOxdnaFene::init_style() { /* special bonds have to be lj = 0 1 1 and coul = 1 1 1 to exclude - the ss excluded volume interaction between nearest neighbours */ + the ss excluded volume interaction between nearest neighbors */ force->special_lj[1] = 0.0; force->special_lj[2] = 1.0; diff --git a/src/USER-CGDNA/pair_oxdna2_coaxstk.cpp b/src/USER-CGDNA/pair_oxdna2_coaxstk.cpp index 3a80de436a..151e752692 100644 --- a/src/USER-CGDNA/pair_oxdna2_coaxstk.cpp +++ b/src/USER-CGDNA/pair_oxdna2_coaxstk.cpp @@ -157,7 +157,7 @@ void PairOxdna2Coaxstk::compute(int eflag, int vflag) numneigh = list->numneigh; firstneigh = list->firstneigh; - // loop over pair interaction neighbours of my atoms + // loop over pair interaction neighbors of my atoms for (ia = 0; ia < anum; ia++) { @@ -183,7 +183,7 @@ void PairOxdna2Coaxstk::compute(int eflag, int vflag) for (ib = 0; ib < bnum; ib++) { b = blist[ib]; - factor_lj = special_lj[sbmask(b)]; // = 0 for nearest neighbours + factor_lj = special_lj[sbmask(b)]; // = 0 for nearest neighbors b &= NEIGHMASK; btype = type[b]; diff --git a/src/USER-CGDNA/pair_oxdna2_dh.cpp b/src/USER-CGDNA/pair_oxdna2_dh.cpp index f4f78685b7..974ade89c1 100644 --- a/src/USER-CGDNA/pair_oxdna2_dh.cpp +++ b/src/USER-CGDNA/pair_oxdna2_dh.cpp @@ -122,7 +122,7 @@ void PairOxdna2Dh::compute(int eflag, int vflag) numneigh = list->numneigh; firstneigh = list->firstneigh; - // loop over pair interaction neighbours of my atoms + // loop over pair interaction neighbors of my atoms for (ia = 0; ia < anum; ia++) { @@ -145,7 +145,7 @@ void PairOxdna2Dh::compute(int eflag, int vflag) for (ib = 0; ib < bnum; ib++) { b = blist[ib]; - factor_lj = special_lj[sbmask(b)]; // = 0 for nearest neighbours + factor_lj = special_lj[sbmask(b)]; // = 0 for nearest neighbors b &= NEIGHMASK; btype = type[b]; @@ -186,7 +186,7 @@ void PairOxdna2Dh::compute(int eflag, int vflag) } - // knock out nearest-neighbour interaction between adjacent backbone sites + // knock out nearest-neighbor interaction between adjacent backbone sites fpair *= factor_lj; evdwl *= factor_lj; diff --git a/src/USER-CGDNA/pair_oxdna_coaxstk.cpp b/src/USER-CGDNA/pair_oxdna_coaxstk.cpp index 11689df738..0eb75fbb43 100644 --- a/src/USER-CGDNA/pair_oxdna_coaxstk.cpp +++ b/src/USER-CGDNA/pair_oxdna_coaxstk.cpp @@ -163,7 +163,7 @@ void PairOxdnaCoaxstk::compute(int eflag, int vflag) numneigh = list->numneigh; firstneigh = list->firstneigh; - // loop over pair interaction neighbours of my atoms + // loop over pair interaction neighbors of my atoms for (ia = 0; ia < anum; ia++) { @@ -189,7 +189,7 @@ void PairOxdnaCoaxstk::compute(int eflag, int vflag) for (ib = 0; ib < bnum; ib++) { b = blist[ib]; - factor_lj = special_lj[sbmask(b)]; // = 0 for nearest neighbours + factor_lj = special_lj[sbmask(b)]; // = 0 for nearest neighbors b &= NEIGHMASK; btype = type[b]; diff --git a/src/USER-CGDNA/pair_oxdna_excv.cpp b/src/USER-CGDNA/pair_oxdna_excv.cpp index 31762018a3..e2b8334078 100644 --- a/src/USER-CGDNA/pair_oxdna_excv.cpp +++ b/src/USER-CGDNA/pair_oxdna_excv.cpp @@ -152,7 +152,7 @@ void PairOxdnaExcv::compute(int eflag, int vflag) numneigh = list->numneigh; firstneigh = list->firstneigh; - // loop over pair interaction neighbours of my atoms + // loop over pair interaction neighbors of my atoms for (ia = 0; ia < anum; ia++) { @@ -179,7 +179,7 @@ void PairOxdnaExcv::compute(int eflag, int vflag) for (ib = 0; ib < bnum; ib++) { b = blist[ib]; - factor_lj = special_lj[sbmask(b)]; // = 0 for nearest neighbours + factor_lj = special_lj[sbmask(b)]; // = 0 for nearest neighbors b &= NEIGHMASK; btype = type[b]; @@ -222,7 +222,7 @@ void PairOxdnaExcv::compute(int eflag, int vflag) evdwl = F3(rsq_ss,cutsq_ss_ast[atype][btype],cut_ss_c[atype][btype],lj1_ss[atype][btype], lj2_ss[atype][btype],epsilon_ss[atype][btype],b_ss[atype][btype],fpair); - // knock out nearest-neighbour interaction between ss + // knock out nearest-neighbor interaction between ss fpair *= factor_lj; evdwl *= factor_lj; diff --git a/src/USER-CGDNA/pair_oxdna_hbond.cpp b/src/USER-CGDNA/pair_oxdna_hbond.cpp index 3d3ba9b456..ce1bfe036a 100644 --- a/src/USER-CGDNA/pair_oxdna_hbond.cpp +++ b/src/USER-CGDNA/pair_oxdna_hbond.cpp @@ -168,7 +168,7 @@ void PairOxdnaHbond::compute(int eflag, int vflag) numneigh = list->numneigh; firstneigh = list->firstneigh; - // loop over pair interaction neighbours of my atoms + // loop over pair interaction neighbors of my atoms for (ia = 0; ia < anum; ia++) { @@ -188,7 +188,7 @@ void PairOxdnaHbond::compute(int eflag, int vflag) for (ib = 0; ib < bnum; ib++) { b = blist[ib]; - factor_lj = special_lj[sbmask(b)]; // = 0 for nearest neighbours + factor_lj = special_lj[sbmask(b)]; // = 0 for nearest neighbors b &= NEIGHMASK; btype = type[b]; diff --git a/src/USER-CGDNA/pair_oxdna_xstk.cpp b/src/USER-CGDNA/pair_oxdna_xstk.cpp index d456c0117c..e5b9de81c0 100644 --- a/src/USER-CGDNA/pair_oxdna_xstk.cpp +++ b/src/USER-CGDNA/pair_oxdna_xstk.cpp @@ -160,7 +160,7 @@ void PairOxdnaXstk::compute(int eflag, int vflag) numneigh = list->numneigh; firstneigh = list->firstneigh; - // loop over pair interaction neighbours of my atoms + // loop over pair interaction neighbors of my atoms for (ia = 0; ia < anum; ia++) { @@ -180,7 +180,7 @@ void PairOxdnaXstk::compute(int eflag, int vflag) for (ib = 0; ib < bnum; ib++) { b = blist[ib]; - factor_lj = special_lj[sbmask(b)]; // = 0 for nearest neighbours + factor_lj = special_lj[sbmask(b)]; // = 0 for nearest neighbors b &= NEIGHMASK; btype = type[b]; diff --git a/src/USER-QUIP/pair_quip.cpp b/src/USER-QUIP/pair_quip.cpp index f8968bfda2..3bf12d19d2 100644 --- a/src/USER-QUIP/pair_quip.cpp +++ b/src/USER-QUIP/pair_quip.cpp @@ -303,7 +303,7 @@ void PairQUIP::init_style() if (force->newton_pair != 1) error->all(FLERR,"Pair style quip requires newton pair on"); - // Initialise neighbour list + // Initialise neighbor list int irequest_full = neighbor->request(this); neighbor->requests[irequest_full]->id = 1; neighbor->requests[irequest_full]->half = 0;