apply new convention for virtual functions and disable single() functions (for now)

This commit is contained in:
Axel Kohlmeyer
2022-02-16 06:50:26 -05:00
parent 47bb5f5ccd
commit 78b123fa4d
5 changed files with 16 additions and 14 deletions

View File

@ -27,15 +27,15 @@ namespace LAMMPS_NS {
class PairILPGrapheneHBN : public Pair {
public:
PairILPGrapheneHBN(class LAMMPS *);
virtual ~PairILPGrapheneHBN();
~PairILPGrapheneHBN() override;
virtual void compute(int, int);
virtual void settings(int, char **);
void coeff(int, char **);
double init_one(int, int);
void init_style();
void compute(int, int) override;
void settings(int, char **) override;
void coeff(int, char **) override;
double init_one(int, int) override;
void init_style() override;
void calc_FvdW(int, int);
double single(int, int, int, int, double, double, double, double &);
double single(int, int, int, int, double, double, double, double &) override;
static constexpr int NPARAMS_PER_LINE = 13;

View File

@ -59,6 +59,7 @@ static const char cite_ilp_tmd[] = "ilp/tmd potential doi/10.1021/acs.jctc.1c007
PairILPTMD::PairILPTMD(LAMMPS *lmp) : PairILPGrapheneHBN(lmp)
{
variant = ILP_TMD;
single_enable = 0;
// for TMD, each atom have six neighbors
Nnei = 6;
@ -228,7 +229,7 @@ void PairILPTMD::calc_FRep(int eflag, int /* vflag */)
}
/* ----------------------------------------------------------------------
create ILP neighbor list from main neighbor list to calcualte normals
create ILP neighbor list from main neighbor list to calculate normals
------------------------------------------------------------------------- */
void PairILPTMD::ILP_neigh()

View File

@ -29,10 +29,10 @@ class PairILPTMD : public PairILPGrapheneHBN {
PairILPTMD(class LAMMPS *);
protected:
void settings(int, char **);
void ILP_neigh();
void calc_normal();
void calc_FRep(int, int);
void settings(int, char **) override;
void ILP_neigh() override;
void calc_normal() override;
void calc_FRep(int, int) override;
/**************************************************************/
/* modulo operation with cycling around range */

View File

@ -55,6 +55,7 @@ static const char cite_saip[] =
PairSAIPMETAL::PairSAIPMETAL(LAMMPS *lmp) : PairILPGrapheneHBN(lmp)
{
variant = SAIP_METAL;
single_enable = 0;
if (lmp->citeme) lmp->citeme->add(cite_saip);
}

View File

@ -29,8 +29,8 @@ class PairSAIPMETAL : public PairILPGrapheneHBN {
PairSAIPMETAL(class LAMMPS *);
protected:
void settings(int, char **);
void calc_FRep(int, int);
void settings(int, char **) override;
void calc_FRep(int, int) override;
};
} // namespace LAMMPS_NS