forked from lijiext/lammps
remove bogus single function and set single_enable = 0
This commit is contained in:
parent
31277349c6
commit
2d12260ade
|
@ -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;
|
||||
}
|
||||
|
|
|
@ -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;
|
||||
|
@ -44,7 +43,7 @@ class PairSDPDTaitwaterIsothermal : public Pair {
|
|||
double **cut;
|
||||
|
||||
void allocate ();
|
||||
|
||||
|
||||
unsigned int seed;
|
||||
#ifdef USE_ZEST
|
||||
std::mt19937_64 generator;
|
||||
|
|
|
@ -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;
|
||||
}
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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;
|
||||
}
|
||||
|
|
|
@ -32,7 +32,6 @@ class PairSPHTaitwaterMorris : 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;
|
||||
|
|
Loading…
Reference in New Issue