reorder initialization (63575829) · Commits · 郑智淋 / lammps

src/KOKKOS/npair_kokkos.h

+6 −8

Original line number	Diff line number	Diff line
		@@ -265,7 +265,12 @@ class NeighborKokkosExecute
		const typename ArrayTypes<LMPHostType>::t_int_scalar _h_resize,
		const typename AT::t_int_scalar _new_maxneighs,
		const typename ArrayTypes<LMPHostType>::t_int_scalar _h_new_maxneighs):
		neigh_list(_neigh_list), cutneighsq(_cutneighsq),mbins(_mbins),
		neigh_list(_neigh_list), cutneighsq(_cutneighsq),exclude(_exclude),
		nex_type(_nex_type),ex1_type(_ex1_type),ex2_type(_ex2_type),
		ex_type(_ex_type),nex_group(_nex_group),ex1_group(_ex1_group),
		ex2_group(_ex2_group),ex1_bit(_ex1_bit),ex2_bit(_ex2_bit),
		nex_mol(_nex_mol),ex_mol_group(_ex_mol_group),ex_mol_bit(_ex_mol_bit),
		ex_mol_intra(_ex_mol_intra),mbins(_mbins),
		bincount(_bincount),c_bincount(_bincount),bins(_bins),c_bins(_bins),
		atom2bin(_atom2bin),c_atom2bin(_atom2bin),
		nstencil(_nstencil),d_stencil(_d_stencil),d_stencilxyz(_d_stencilxyz),
		@@ -276,13 +281,6 @@ class NeighborKokkosExecute
		mbinxlo(_mbinxlo),mbinylo(_mbinylo),mbinzlo(_mbinzlo),
		bininvx(_bininvx),bininvy(_bininvy),bininvz(_bininvz),
		nlocal(_nlocal),
		exclude(_exclude),nex_type(_nex_type),
		ex1_type(_ex1_type),ex2_type(_ex2_type),ex_type(_ex_type),
		nex_group(_nex_group),
		ex1_group(_ex1_group),ex2_group(_ex2_group),
		ex1_bit(_ex1_bit),ex2_bit(_ex2_bit),nex_mol(_nex_mol),
		ex_mol_group(_ex_mol_group),ex_mol_bit(_ex_mol_bit),
		ex_mol_intra(_ex_mol_intra),
		xperiodic(_xperiodic),yperiodic(_yperiodic),zperiodic(_zperiodic),
		xprd_half(_xprd_half),yprd_half(_yprd_half),zprd_half(_zprd_half),
		skin(_skin),resize(_resize),h_resize(_h_resize),

src/KOKKOS/npair_ssa_kokkos.h

+7 −7

Original line number	Diff line number	Diff line
		@@ -240,6 +240,13 @@ class NPairSSAKokkosExecute
		const int & _xperiodic, const int & _yperiodic, const int & _zperiodic,
		const int & _xprd_half, const int & _yprd_half, const int & _zprd_half):
		neigh_list(_neigh_list), cutneighsq(_cutneighsq),
		exclude(_exclude),nex_type(_nex_type),
		ex1_type(_ex1_type),ex2_type(_ex2_type),ex_type(_ex_type),
		nex_group(_nex_group),
		ex1_group(_ex1_group),ex2_group(_ex2_group),
		ex1_bit(_ex1_bit),ex2_bit(_ex2_bit),nex_mol(_nex_mol),
		ex_mol_group(_ex_mol_group),ex_mol_bit(_ex_mol_bit),
		ex_mol_intra(_ex_mol_intra),
		bincount(_bincount),c_bincount(_bincount),bins(_bins),c_bins(_bins),
		gbincount(_gbincount),c_gbincount(_gbincount),gbins(_gbins),c_gbins(_gbins),
		lbinxlo(_lbinxlo),lbinxhi(_lbinxhi),
		@@ -263,13 +270,6 @@ class NPairSSAKokkosExecute
		mbinx(_mbinx),mbiny(_mbiny),mbinz(_mbinz),
		mbinxlo(_mbinxlo),mbinylo(_mbinylo),mbinzlo(_mbinzlo),
		bininvx(_bininvx),bininvy(_bininvy),bininvz(_bininvz),
		exclude(_exclude),nex_type(_nex_type),
		ex1_type(_ex1_type),ex2_type(_ex2_type),ex_type(_ex_type),
		nex_group(_nex_group),
		ex1_group(_ex1_group),ex2_group(_ex2_group),
		ex1_bit(_ex1_bit),ex2_bit(_ex2_bit),nex_mol(_nex_mol),
		ex_mol_group(_ex_mol_group),ex_mol_bit(_ex_mol_bit),
		ex_mol_intra(_ex_mol_intra),
		xperiodic(_xperiodic),yperiodic(_yperiodic),zperiodic(_zperiodic),
		xprd_half(_xprd_half),yprd_half(_yprd_half),zprd_half(_zprd_half) {

Admin message