do not mix class and struct for functors: use class consistently (dc484f06) · Commits · 郑智淋 / lammps

src/KOKKOS/fix_enforce2d_kokkos.h

+2 −1

Original line number	Diff line number	Diff line
		@@ -56,7 +56,8 @@ class FixEnforce2DKokkos : public FixEnforce2D {


		template <class DeviceType, int omega_flag, int angmom_flag, int torque_flag>
		struct FixEnforce2DKokkosPostForceFunctor {
		class FixEnforce2DKokkosPostForceFunctor {
		public:
		typedef DeviceType device_type;
		FixEnforce2DKokkos<DeviceType> c;

+10 −6

Original line number	Diff line number	Diff line
		@@ -152,7 +152,8 @@ namespace LAMMPS_NS {
		};

		template <class DeviceType>
		struct FixLangevinKokkosInitialIntegrateFunctor {
		class FixLangevinKokkosInitialIntegrateFunctor {
		public:
		typedef DeviceType device_type ;
		FixLangevinKokkos<DeviceType> c;

		@@ -168,8 +169,8 @@ namespace LAMMPS_NS {

		template <class DeviceType,int Tp_TSTYLEATOM, int Tp_GJF, int Tp_TALLY,
		int Tp_BIAS, int Tp_RMASS, int Tp_ZERO>
		struct FixLangevinKokkosPostForceFunctor {

		class FixLangevinKokkosPostForceFunctor {
		public:
		typedef DeviceType device_type;
		typedef FSUM value_type;
		FixLangevinKokkos<DeviceType> c;
		@@ -208,7 +209,8 @@ namespace LAMMPS_NS {
		};

		template <class DeviceType>
		struct FixLangevinKokkosZeroForceFunctor {
		class FixLangevinKokkosZeroForceFunctor {
		public:
		typedef DeviceType device_type ;
		FixLangevinKokkos<DeviceType> c;

		@@ -222,7 +224,8 @@ namespace LAMMPS_NS {
		};

		template<class DeviceType>
		struct FixLangevinKokkosTallyEnergyFunctor {
		class FixLangevinKokkosTallyEnergyFunctor {
		public:
		typedef DeviceType device_type ;
		FixLangevinKokkos<DeviceType> c;
		typedef double value_type;
		@@ -245,7 +248,8 @@ namespace LAMMPS_NS {
		};

		template <class DeviceType, int RMass>
		struct FixLangevinKokkosEndOfStepFunctor {
		class FixLangevinKokkosEndOfStepFunctor {
		public:
		typedef DeviceType device_type ;
		FixLangevinKokkos<DeviceType> c;

+4 −2

Original line number	Diff line number	Diff line
		@@ -67,7 +67,8 @@ class FixNVEKokkos : public FixNVE {
		};

		template <class DeviceType, int RMass>
		struct FixNVEKokkosInitialIntegrateFunctor {
		class FixNVEKokkosInitialIntegrateFunctor {
		public:
		typedef DeviceType device_type ;
		FixNVEKokkos<DeviceType> c;

		@@ -81,7 +82,8 @@ struct FixNVEKokkosInitialIntegrateFunctor {
		};

		template <class DeviceType, int RMass>
		struct FixNVEKokkosFinalIntegrateFunctor {
		class FixNVEKokkosFinalIntegrateFunctor {
		public:
		typedef DeviceType device_type ;
		FixNVEKokkos<DeviceType> c;

+4 −2

Original line number	Diff line number	Diff line
		@@ -54,7 +54,8 @@ class FixNVESphereKokkos : public FixNVESphere {
		};

		template <class DeviceType>
		struct FixNVESphereKokkosInitialIntegrateFunctor {
		class FixNVESphereKokkosInitialIntegrateFunctor {
		public:
		FixNVESphereKokkos<DeviceType> c;
		FixNVESphereKokkosInitialIntegrateFunctor(FixNVESphereKokkos<DeviceType> c_ptr): c(c_ptr) { c.cleanup_copy(); }
		KOKKOS_INLINE_FUNCTION
		@@ -64,7 +65,8 @@ struct FixNVESphereKokkosInitialIntegrateFunctor {
		};

		template <class DeviceType>
		struct FixNVESphereKokkosFinalIntegrateFunctor {
		class FixNVESphereKokkosFinalIntegrateFunctor {
		public:
		FixNVESphereKokkos<DeviceType> c;
		FixNVESphereKokkosFinalIntegrateFunctor(FixNVESphereKokkos<DeviceType> c_ptr): c(c_ptr) { c.cleanup_copy(); }
		KOKKOS_INLINE_FUNCTION