From a925734a2bf03381e96045d81439713f1f1560c5 Mon Sep 17 00:00:00 2001
From: athomps <athomps@f3b2605a-c512-4ea7-a41b-209d697bcdaa>
Date: Tue, 30 Aug 2011 20:46:40 +0000
Subject: [PATCH] Fixed problem with static const
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6862 f3b2605a-c512-4ea7-a41b-209d697bcdaa
---
src/pair_lj_cubic.cpp | 9 +++++++++
src/pair_lj_cubic.h | 12 ++++++------
2 files changed, 15 insertions(+), 6 deletions(-)
diff --git a/src/pair_lj_cubic.cpp b/src/pair_lj_cubic.cpp
index 97f82b39c3..13f6e479e4 100644
--- a/src/pair_lj_cubic.cpp
+++ b/src/pair_lj_cubic.cpp
@@ -34,6 +34,15 @@ using namespace LAMMPS_NS;
#define MIN(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) {}
diff --git a/src/pair_lj_cubic.h b/src/pair_lj_cubic.h
index 25b8d90344..f8afb8e02c 100644
--- a/src/pair_lj_cubic.h
+++ b/src/pair_lj_cubic.h
@@ -45,12 +45,12 @@ class PairLJCubic : public Pair {
// LJ quantities scaled by epsilon and rmin = sigma*2^1/6
- static const double rt6two = 1.1224621; // 2^1/6
- static const double s = 1.1086834; // inflection point = (13/7)^1/6
- static const double phis = -0.7869823; // energy at s
- static const double dphids = 2.6899009; // gradient at s
- static const double a3 = 27.93357; // cubic coefficient
- static const double sm = 1.5475375; // cubic cutoff = s*67/48
+ static const double rt6two; // 2^1/6
+ static const double s; // inflection point = (13/7)^1/6
+ static const double phis; // energy at s
+ static const double dphids; // gradient at s
+ static const double a3; // cubic coefficient
+ static const double sm; // cubic cutoff = s*67/48
void allocate();
};
--
GitLab