ICODE-ADC/lammps
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "move enum to pair.h"

Browse Source 
This reverts commit aebc8ea826.
This commit is contained in:
Dan Ibanez
2017-01-05 20:22:15 -07:00
parent 267f05e5ca
commit b9144d6332
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/pair.cpp
View File

@ -43,6 +43,8 @@
using namespace LAMMPS_NS; using namespace LAMMPS_NS;
using namespace MathConst; using namespace MathConst;
enum{NONE,RLINEAR,RSQ,BMP};
// allocate space for static class instance variable and initialize it // allocate space for static class instance variable and initialize it
int Pair::instance_total = 0; int Pair::instance_total = 0;

2
src/pair.h
View File

@ -32,8 +32,6 @@ class Pair : protected Pointers {
friend class Info; friend class Info;
public: public:
enum{NONE,RLINEAR,RSQ,BMP};
static int instance_total; // # of Pair classes ever instantiated static int instance_total; // # of Pair classes ever instantiated
double eng_vdwl,eng_coul; // accumulated energies double eng_vdwl,eng_coul; // accumulated energies