Put constant in a namespace

git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6869 f3b2605a-c512-4ea7-a41b-209d697bcdaa
This commit is contained in:
athomps 2011-08-31 16:10:01 +00:00
parent dc6ff70f91
commit 2a3f4729f8
2 changed files with 14 additions and 9 deletions

View File

@ -30,15 +30,7 @@
#include "error.h"
using namespace LAMMPS_NS;
// LJ quantities scaled by epsilon and rmin = sigma*2^1/6
#define RT6TWO 1.1224621 // 2^1/6
#define SS 1.1086834 // inflection point (13/7)^1/6
#define PHIS -0.7869823 // energy at s
#define DPHIDS 2.6899009 // gradient at s
#define A3 27.93357 // cubic coefficient
#define SM 1.5475375 // cubic cutoff = s*67/48
using namespace PairLJCubicConstants;
#define MIN(a,b) ((a) < (b) ? (a) : (b))
#define MAX(a,b) ((a) > (b) ? (a) : (b))

View File

@ -46,6 +46,19 @@ class PairLJCubic : public Pair {
void allocate();
};
namespace PairLJCubicConstants {
// LJ quantities scaled by epsilon and rmin = sigma*2^1/6
static const double RT6TWO = 1.1224621; // 2^1/6
static const double SS = 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
}
}
#endif