Unverified Commit 8cc593fe authored by Axel Kohlmeyer's avatar Axel Kohlmeyer Committed by GitHub
Browse files

Merge pull request #1308 from agiliopadua/master 

Fix in extract() method of pair_thole
parents fb30d2d0 f7bb4810

src/USER-DRUDE/pair_lj_cut_thole_long.cpp

+1 −1
Original line number Diff line number Diff line
@@ -683,7 +683,7 @@ void *PairLJCutTholeLong::extract(const char *str, int &dim) 
{

  dim = 0;

  if (strcmp(str,"cut_coul") == 0) return (void *) &cut_coul;

  dim = 6;

  dim = 2;

  if (strcmp(str,"epsilon") == 0) return (void *) epsilon;

  if (strcmp(str,"sigma") == 0) return (void *) sigma;

  if (strcmp(str,"scale") == 0) return (void *) scale;

src/USER-DRUDE/pair_thole.cpp

+1 −1
Original line number Diff line number Diff line
@@ -414,7 +414,7 @@ double PairThole::single(int i, int j, int itype, int jtype, 


void *PairThole::extract(const char *str, int &dim)

{

  dim = 4;

  dim = 2;

  if (strcmp(str,"scale") == 0) return (void *) scale;

  if (strcmp(str,"polar") == 0) return (void *) polar;

  if (strcmp(str,"thole") == 0) return (void *) thole;

CRA Git | Maintained and supported by SUSTech CRA and CCSE