Merge pull request #1085 from akohlmey/silence-user-cgsdk-warnings

Silence  USER-CGSD warnings
This commit is contained in:
Steve Plimpton 2018-08-29 07:50:11 -06:00 committed by GitHub
commit 447a6c3373
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 0 deletions

View File

@ -27,6 +27,7 @@ namespace LJSDKParms {
// LJ type flags. list of supported LJ exponent combinations
enum {LJ_NOT_SET=0, LJ9_6, LJ12_4, LJ12_6, NUM_LJ_TYPES};
#if defined(LMP_NEED_SDK_FIND_LJ_TYPE)
static int find_lj_type(const char *label,
const char * const * const list) {
for (int i=0; i < NUM_LJ_TYPES; ++i)
@ -34,6 +35,7 @@ namespace LJSDKParms {
return LJ_NOT_SET;
}
#endif
static const char * const lj_type_list[] = {"none", "lj9_6", "lj12_4", "lj12_6"};
static const double lj_prefact[] = {0.0, 6.75, 2.59807621135332, 4.0};

View File

@ -33,6 +33,7 @@
#include "memory.h"
#include "error.h"
#define LMP_NEED_SDK_FIND_LJ_TYPE 1
#include "lj_sdk_common.h"
using namespace LAMMPS_NS;

View File

@ -34,6 +34,7 @@
#include "memory.h"
#include "error.h"
#define LMP_NEED_SDK_FIND_LJ_TYPE 1
#include "lj_sdk_common.h"
using namespace LAMMPS_NS;