KOKKOS: fix a compile-time error caused by merge of patch 21Feb17 (0a751c59) · Commits · 郑智淋 / lammps

src/KOKKOS/pair_hybrid_overlay_kokkos.cpp

+0 −35

Original line number	Diff line number	Diff line
		@@ -105,38 +105,3 @@ void PairHybridOverlayKokkos::coeff(int narg, char **arg)

		if (count == 0) error->all(FLERR,"Incorrect args for pair coefficients");
		}

		/* ----------------------------------------------------------------------
		combine sub-style neigh list requests and create new ones if needed
		------------------------------------------------------------------------- */

		void PairHybridOverlayKokkos::modify_requests()
		{
		int i,j;
		NeighRequest irq,jrq;

		// loop over pair requests only
		// if a previous list is same kind with same skip attributes
		// then make this one a copy list of that one
		// works whether both lists are no-skip or yes-skip
		// will not point a list at a copy list, but at copy list's parent

		for (i = 0; i < neighbor->nrequest; i++) {
		if (!neighbor->requests[i]->pair) continue;

		irq = neighbor->requests[i];
		for (j = 0; j < i; j++) {
		if (!neighbor->requests[j]->pair) continue;
		jrq = neighbor->requests[j];
		if (irq->same_kind(jrq) && irq->same_skip(jrq)) {
		irq->copy = 1;
		irq->otherlist = j;
		break;
		}
		}
		}

		// perform same operations on skip lists as pair style = hybrid

		PairHybrid::modify_requests();
		}

+0 −3

Original line number	Diff line number	Diff line
		@@ -29,9 +29,6 @@ class PairHybridOverlayKokkos : public PairHybridKokkos {
		PairHybridOverlayKokkos(class LAMMPS *);
		virtual ~PairHybridOverlayKokkos() {}
		void coeff(int, char **);

		private:
		void modify_requests();
		};

		}