Unverified Commit 447a6c33 authored by Steve Plimpton's avatar Steve Plimpton Committed by GitHub
Browse files

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

Silence  USER-CGSD warnings
parents 40e7ea83 03654b2b

src/USER-CGSDK/lj_sdk_common.h

+2 −0
Original line number Diff line number Diff line
@@ -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};

src/USER-CGSDK/pair_lj_sdk.cpp

+1 −0
Original line number Diff line number Diff line
@@ -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;

src/USER-CGSDK/pair_lj_sdk_coul_long.cpp

+1 −0
Original line number Diff line number Diff line
@@ -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;

CRA Git | Maintained and supported by SUSTech CRA and CCSE