remove bogus single function and set single_enable = 0 (2d12260a) · Commits · 郑智淋 / lammps

src/USER-SDPD/pair_sdpd_taitwater_isothermal.cpp

+1 −9

Original line number	Diff line number	Diff line
		@@ -42,6 +42,7 @@ static const double sqrt_2_inv = std::sqrt(0.5);
		PairSDPDTaitwaterIsothermal::PairSDPDTaitwaterIsothermal (LAMMPS *lmp)
		: Pair (lmp) {
		restartinfo = 0;
		single_enable =0;
		}

		/* ---------------------------------------------------------------------- */
		@@ -309,12 +310,3 @@ double PairSDPDTaitwaterIsothermal::init_one (int i, int j) {
		return cut[i][j];
		}

		/* ---------------------------------------------------------------------- */

		double PairSDPDTaitwaterIsothermal::single (int /i/, int /j/, int /itype/,
		int /jtype/, double /rsq/, double /factor_coul/,
		double /factor_lj/, double &fforce) {
		fforce = 0.0;

		return 0.0;
		}

+1 −2

Original line number	Diff line number	Diff line
		@@ -36,7 +36,6 @@ class PairSDPDTaitwaterIsothermal : public Pair {
		void settings (int, char **);
		void coeff (int, char **);
		virtual double init_one (int, int);
		virtual double single (int, int, int, int, double, double, double, double &);

		protected:
		double viscosity, temperature;

+1 −9

Original line number	Diff line number	Diff line
		@@ -29,7 +29,7 @@ using namespace LAMMPS_NS;
		PairSPHTaitwater::PairSPHTaitwater(LAMMPS *lmp) : Pair(lmp)
		{
		restartinfo = 0;

		single_enable = 0;
		first = 1;
		}

		@@ -291,11 +291,3 @@ double PairSPHTaitwater::init_one(int i, int j) {
		return cut[i][j];
		}

		/* ---------------------------------------------------------------------- */

		double PairSPHTaitwater::single(int /i/, int /j/, int /itype/, int /jtype/,
		double /rsq/, double /factor_coul/, double /factor_lj/, double &fforce) {
		fforce = 0.0;

		return 0.0;
		}

+0 −1

Original line number	Diff line number	Diff line
		@@ -32,7 +32,6 @@ class PairSPHTaitwater : public Pair {
		void settings(int, char **);
		void coeff(int, char **);
		virtual double init_one(int, int);
		virtual double single(int, int, int, int, double, double, double, double &);

		protected:
		double rho0, soundspeed, *B;

+1 −8

Original line number	Diff line number	Diff line
		@@ -30,6 +30,7 @@ PairSPHTaitwaterMorris::PairSPHTaitwaterMorris(LAMMPS *lmp) : Pair(lmp)
		{
		restartinfo = 0;
		first = 1;
		single_enable = 0;
		}

		/* ---------------------------------------------------------------------- */
		@@ -287,11 +288,3 @@ double PairSPHTaitwaterMorris::init_one(int i, int j) {
		return cut[i][j];
		}

		/* ---------------------------------------------------------------------- */

		double PairSPHTaitwaterMorris::single(int /i/, int /j/, int /itype/, int /jtype/,
		double /rsq/, double /factor_coul/, double /factor_lj/, double &fforce) {
		fforce = 0.0;

		return 0.0;
		}