From 86f62f2ba09b7c8640f59c0957585267dcdda73f Mon Sep 17 00:00:00 2001 From: sjplimp Date: Sat, 8 Aug 2009 21:20:01 +0000 Subject: [PATCH] git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@3026 f3b2605a-c512-4ea7-a41b-209d697bcdaa --- src/pair_buck_coul_cut.cpp | 2 +- src/pair_buck_coul_cut.h | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/pair_buck_coul_cut.cpp b/src/pair_buck_coul_cut.cpp index 9bcec376ea..53c328a6f9 100644 --- a/src/pair_buck_coul_cut.cpp +++ b/src/pair_buck_coul_cut.cpp @@ -261,7 +261,7 @@ void PairBuckCoulCut::coeff(int narg, char **arg) void PairBuckCoulCut::init_style() { if (!atom->q_flag) - error->all("Pair style buck/coul/cut requires atom attribute q"); + error->all("Pair style buck/coul requires atom attribute q"); int irequest = neighbor->request(this); } diff --git a/src/pair_buck_coul_cut.h b/src/pair_buck_coul_cut.h index 5f137e688b..58d1f7068a 100644 --- a/src/pair_buck_coul_cut.h +++ b/src/pair_buck_coul_cut.h @@ -21,19 +21,19 @@ namespace LAMMPS_NS { class PairBuckCoulCut : public Pair { public: PairBuckCoulCut(class LAMMPS *); - ~PairBuckCoulCut(); - void compute(int, int); - void settings(int, char **); + virtual ~PairBuckCoulCut(); + virtual void compute(int, int); + virtual void settings(int, char **); void coeff(int, char **); - void init_style(); + virtual void init_style(); double init_one(int, int); void write_restart(FILE *); void read_restart(FILE *); - void write_restart_settings(FILE *); - void read_restart_settings(FILE *); - double single(int, int, int, int, double, double, double, double &); + virtual void write_restart_settings(FILE *); + virtual void read_restart_settings(FILE *); + virtual double single(int, int, int, int, double, double, double, double &); - private: + protected: double cut_lj_global,cut_coul_global; double **cut_lj,**cut_ljsq; double **cut_coul,**cut_coulsq;