Skip to content
Snippets Groups Projects
Commit a925734a authored by athomps's avatar athomps
Browse files

Fixed problem with static const

git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6862 f3b2605a-c512-4ea7-a41b-209d697bcdaa
parent 2ac7e59b
No related branches found
No related tags found
No related merge requests found
...@@ -34,6 +34,15 @@ using namespace LAMMPS_NS; ...@@ -34,6 +34,15 @@ using namespace LAMMPS_NS;
#define MIN(a,b) ((a) < (b) ? (a) : (b)) #define MIN(a,b) ((a) < (b) ? (a) : (b))
#define MAX(a,b) ((a) > (b) ? (a) : (b)) #define MAX(a,b) ((a) > (b) ? (a) : (b))
// LJ quantities scaled by epsilon and rmin = sigma*2^1/6
const double PairLJCubic::rt6two = 1.1224621; // 2^1/6
const double PairLJCubic::s = 1.1086834; // inflection point = (13/7)^1/6
const double PairLJCubic::phis = -0.7869823; // energy at s
const double PairLJCubic::dphids = 2.6899009; // gradient at s
const double PairLJCubic::a3 = 27.93357; // cubic coefficient
const double PairLJCubic::sm = 1.5475375; // cubic cutoff = s*67/48
/* ---------------------------------------------------------------------- */ /* ---------------------------------------------------------------------- */
PairLJCubic::PairLJCubic(LAMMPS *lmp) : Pair(lmp) {} PairLJCubic::PairLJCubic(LAMMPS *lmp) : Pair(lmp) {}
......
...@@ -45,12 +45,12 @@ class PairLJCubic : public Pair { ...@@ -45,12 +45,12 @@ class PairLJCubic : public Pair {
// LJ quantities scaled by epsilon and rmin = sigma*2^1/6 // LJ quantities scaled by epsilon and rmin = sigma*2^1/6
static const double rt6two = 1.1224621; // 2^1/6 static const double rt6two; // 2^1/6
static const double s = 1.1086834; // inflection point = (13/7)^1/6 static const double s; // inflection point = (13/7)^1/6
static const double phis = -0.7869823; // energy at s static const double phis; // energy at s
static const double dphids = 2.6899009; // gradient at s static const double dphids; // gradient at s
static const double a3 = 27.93357; // cubic coefficient static const double a3; // cubic coefficient
static const double sm = 1.5475375; // cubic cutoff = s*67/48 static const double sm; // cubic cutoff = s*67/48
void allocate(); void allocate();
}; };
......
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