Skip to content
Snippets Groups Projects
Commit b9144d63 authored by Dan Ibanez's avatar Dan Ibanez
Browse files

Revert "move enum to pair.h"

This reverts commit aebc8ea8.
parent 267f05e5
No related branches found
No related tags found
No related merge requests found
...@@ -43,6 +43,8 @@ ...@@ -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;
......
...@@ -32,8 +32,6 @@ class Pair : protected Pointers { ...@@ -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
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment