From e506467be5bef96c5bec2ea156cb3fe6a8f2503c Mon Sep 17 00:00:00 2001 From: pscrozi Date: Mon, 13 May 2013 17:17:58 +0000 Subject: [PATCH] git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9878 f3b2605a-c512-4ea7-a41b-209d697bcdaa --- src/KSPACE/pair_born_coul_msm.cpp | 2 +- src/KSPACE/pair_buck_coul_msm.cpp | 2 +- src/KSPACE/pair_coul_msm.cpp | 2 +- src/KSPACE/pair_lj_charmm_coul_msm.cpp | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/KSPACE/pair_born_coul_msm.cpp b/src/KSPACE/pair_born_coul_msm.cpp index a5c977fe43..a94b753bfd 100644 --- a/src/KSPACE/pair_born_coul_msm.cpp +++ b/src/KSPACE/pair_born_coul_msm.cpp @@ -193,6 +193,6 @@ double PairBornCoulMSM::single(int i, int j, int itype, int jtype, void *PairBornCoulMSM::extract(const char *str, int &dim) { dim = 0; - if (strcmp(str,"cut_msm") == 0) return (void *) &cut_coul; + if (strcmp(str,"cut_coul") == 0) return (void *) &cut_coul; return NULL; } diff --git a/src/KSPACE/pair_buck_coul_msm.cpp b/src/KSPACE/pair_buck_coul_msm.cpp index 22d3e1a64f..4a8febae5a 100644 --- a/src/KSPACE/pair_buck_coul_msm.cpp +++ b/src/KSPACE/pair_buck_coul_msm.cpp @@ -188,6 +188,6 @@ double PairBuckCoulMSM::single(int i, int j, int itype, int jtype, void *PairBuckCoulMSM::extract(const char *str, int &dim) { dim = 0; - if (strcmp(str,"cut_msm") == 0) return (void *) &cut_coul; + if (strcmp(str,"cut_coul") == 0) return (void *) &cut_coul; return NULL; } diff --git a/src/KSPACE/pair_coul_msm.cpp b/src/KSPACE/pair_coul_msm.cpp index 7e7ac3ecc6..b390fb3e15 100644 --- a/src/KSPACE/pair_coul_msm.cpp +++ b/src/KSPACE/pair_coul_msm.cpp @@ -200,7 +200,7 @@ double PairCoulMSM::single(int i, int j, int itype, int jtype, void *PairCoulMSM::extract(const char *str, int &dim) { - if (strcmp(str,"cut_msm") == 0) { + if (strcmp(str,"cut_coul") == 0) { dim = 0; return (void *) &cut_coul; } diff --git a/src/KSPACE/pair_lj_charmm_coul_msm.cpp b/src/KSPACE/pair_lj_charmm_coul_msm.cpp index fb81550a0b..1d3084764e 100644 --- a/src/KSPACE/pair_lj_charmm_coul_msm.cpp +++ b/src/KSPACE/pair_lj_charmm_coul_msm.cpp @@ -476,7 +476,7 @@ void *PairLJCharmmCoulMSM::extract(const char *str, int &dim) dim = 0; if (strcmp(str,"implicit") == 0) return (void *) &implicit; - if (strcmp(str,"cut_msm") == 0) return (void *) &cut_coul; + if (strcmp(str,"cut_coul") == 0) return (void *) &cut_coul; return NULL; }