use american spelling of neighbor consistently in docs and code comments (ecfe5c83) · Commits · 郑智淋 / lammps

doc/src/fix_langevin_drude.txt

+1 −1

Original line number	Diff line number	Diff line
		@@ -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.

+1 −1

Original line number	Diff line number	Diff line
		@@ -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},

+1 −1

Original line number	Diff line number	Diff line
		@@ -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;

+2 −2

Original line number	Diff line number	Diff line
		@@ -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];

+3 −3

Original line number	Diff line number	Diff line
		@@ -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;