From 06b7d56e168f03b5baff289a50ce0fd0ddf01e2f Mon Sep 17 00:00:00 2001
From: sjplimp <sjplimp@f3b2605a-c512-4ea7-a41b-209d697bcdaa>
Date: Wed, 7 Sep 2016 17:17:53 +0000
Subject: [PATCH] git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@15560
f3b2605a-c512-4ea7-a41b-209d697bcdaa
---
src/MANYBODY/pair_vashishta.cpp | 2 +-
src/MANYBODY/pair_vashishta.h | 14 +++++++-------
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/src/MANYBODY/pair_vashishta.cpp b/src/MANYBODY/pair_vashishta.cpp
index aa030540f4..19f6017907 100755
--- a/src/MANYBODY/pair_vashishta.cpp
+++ b/src/MANYBODY/pair_vashishta.cpp
@@ -541,7 +541,7 @@ void PairVashishta::setup_params()
/* ---------------------------------------------------------------------- */
void PairVashishta::twobody(Param *param, double rsq, double &fforce,
- int eflag, double &eng)
+ int eflag, double &eng)
{
double r,rinvsq,r4inv,r6inv,reta,lam1r,lam4r,vc2,vc3;
diff --git a/src/MANYBODY/pair_vashishta.h b/src/MANYBODY/pair_vashishta.h
index cdd2da3471..87077011e6 100755
--- a/src/MANYBODY/pair_vashishta.h
+++ b/src/MANYBODY/pair_vashishta.h
@@ -17,8 +17,8 @@ PairStyle(vashishta,PairVashishta)
#else
-#ifndef LMP_PAIR_Vashishta_H
-#define LMP_PAIR_Vashishta_H
+#ifndef LMP_PAIR_VASHISHITA_H
+#define LMP_PAIR_VASHISHITA_H
#include "pair.h"
@@ -29,10 +29,10 @@ class PairVashishta : public Pair {
PairVashishta(class LAMMPS *);
virtual ~PairVashishta();
virtual void compute(int, int);
- void settings(int, char **);
+ virtual void settings(int, char **);
void coeff(int, char **);
- virtual double init_one(int, int);
- virtual void init_style();
+ double init_one(int, int);
+ void init_style();
protected:
struct Param {
@@ -55,9 +55,9 @@ class PairVashishta : public Pair {
int maxparam; // max # of parameter sets
Param *params; // parameter set for an I-J-K interaction
- virtual void allocate();
+ void allocate();
void read_file(char *);
- void setup_params();
+ virtual void setup_params();
void twobody(Param *, double, double &, int, double &);
void threebody(Param *, Param *, Param *, double, double, double *, double *,
double *, double *, int, double &);
--
GitLab