Merge pull request #352 from akohlmey/fix-skip-with-ghost-issue (868d95f0) · Commits · 郑智淋 / lammps

src/USER-OMP/npair_skip_omp.h

+8 −1

Original line number	Diff line number	Diff line
		@@ -18,7 +18,8 @@

		NPairStyle(skip/omp,
		NPairSkip,
		NP_SKIP \| NP_HALF \| NP_FULL \| NP_NSQ \| NP_BIN \| NP_MULTI \|
		NP_SKIP \| NP_HALF \| NP_FULL \| NP_HALFFULL \|
		NP_NSQ \| NP_BIN \| NP_MULTI \|
		NP_NEWTON \| NP_NEWTOFF \| NP_ORTHO \| NP_TRI \| NP_OMP)

		NPairStyle(skip/half/respa/omp,
		@@ -44,6 +45,12 @@ NPairStyle(skip/size/off2on/oneside/omp,
		NP_NSQ \| NP_BIN \| NP_MULTI \| NP_NEWTON \| NP_NEWTOFF \|
		NP_ORTHO \| NP_TRI \| NP_OMP)

		NPairStyle(skip/ghost/omp,
		NPairSkip,
		NP_SKIP \| NP_HALF \| NP_FULL \| NP_HALFFULL \|
		NP_NSQ \| NP_BIN \| NP_MULTI \|
		NP_NEWTON \| NP_NEWTOFF \| NP_ORTHO \| NP_TRI \| NP_OMP \| NP_GHOST)

		#endif

		/* ERROR/WARNING messages:

+7 −1

Original line number	Diff line number	Diff line
		@@ -19,6 +19,12 @@ NPairStyle(skip,
		NP_NSQ \| NP_BIN \| NP_MULTI \|
		NP_NEWTON \| NP_NEWTOFF \| NP_ORTHO \| NP_TRI)

		NPairStyle(skip/ghost,
		NPairSkip,
		NP_SKIP \| NP_HALF \| NP_FULL \| NP_HALFFULL \|
		NP_NSQ \| NP_BIN \| NP_MULTI \|
		NP_NEWTON \| NP_NEWTOFF \| NP_ORTHO \| NP_TRI \| NP_GHOST)

		#else

		#ifndef LMP_NPAIR_SKIP_H