Unverified Commit 8b49cac8 authored by Axel Kohlmeyer's avatar Axel Kohlmeyer
Browse files

correct dimensionality of cut_coul property in Pair::extract()

parent 3e93881e

src/CLASS2/pair_lj_class2_coul_cut.cpp

+1 −2
Original line number Original line Diff line number Diff line
@@ -473,9 +473,8 @@ double PairLJClass2CoulCut::single(int i, int j, int itype, int jtype, 




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

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

{

{

  dim = 0;

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

  dim = 2;

  dim = 2;

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

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

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

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

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

  return NULL;

  return NULL;

src/MISC/pair_nm_cut_coul_cut.cpp

+1 −2
Original line number Original line Diff line number Diff line
@@ -487,9 +487,8 @@ double PairNMCutCoulCut::single(int i, int j, int itype, int jtype, 




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

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

{

{

  dim = 0;

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

  dim = 2;

  dim = 2;

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

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

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

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

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

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

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

src/pair_coul_cut.cpp

+1 −0
Original line number Original line Diff line number Diff line
@@ -303,6 +303,7 @@ double PairCoulCut::single(int i, int j, int /*itype*/, int /*jtype*/, 
void *PairCoulCut::extract(const char *str, int &dim)

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

{

{

  dim = 2;

  dim = 2;

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

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

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

  return NULL;

  return NULL;

}
 
}

src/pair_lj_cut_coul_cut.cpp

+1 −2
Original line number Original line Diff line number Diff line
@@ -461,9 +461,8 @@ double PairLJCutCoulCut::single(int i, int j, int itype, int jtype, 




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

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

{

{

  dim = 0;

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

  dim = 2;

  dim = 2;

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

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

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

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

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

  return NULL;

  return NULL;

CRA Git | Maintained and supported by SUSTech CRA and CCSE