From e83600eee360dcf916e2550c11847d54c29b1551 Mon Sep 17 00:00:00 2001
From: Axel Kohlmeyer <akohlmey@gmail.com>
Date: Thu, 24 Jan 2019 10:54:17 -0500
Subject: [PATCH] make naming of extract-able parameters consistent across
similar pair styles (a/b/cparm -> a/b/c)
---
doc/src/compute_fep.txt | 4 ++--
doc/src/fix_adapt_fep.txt | 4 ++--
src/USER-MISC/pair_buck_mdf.cpp | 4 ++--
src/USER-MISC/pair_lennard_mdf.cpp | 4 ++--
4 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/doc/src/compute_fep.txt b/doc/src/compute_fep.txt
index 9241e5b5a8..a46ab5b8d3 100644
--- a/doc/src/compute_fep.txt
+++ b/doc/src/compute_fep.txt
@@ -135,14 +135,14 @@ the meaning of these parameters:
"born"_pair_born.html: a,b,c: type pairs:
"buck"_pair_buck.html: a,c: type pairs:
-"buck/mdf"_pair_mdf.html: aparm,cparm: type pairs:
+"buck/mdf"_pair_mdf.html: a,c: type pairs:
"coul/cut"_pair_coul.html: scale: type pairs:
"coul/cut/soft"_pair_fep_soft.html: lambda: type pairs:
"coul/long, coul/msm"_pair_coul.html: scale: type pairs:
"coul/long/soft"_pair_fep_soft.html: scale, lambda: type pairs:
"eam"_pair_eam.html: scale: type pairs:
"gauss"_pair_gauss.html: a: type pairs:
-"lennard/mdf"_pair_mdf.html: aparm,bparm: type pairs:
+"lennard/mdf"_pair_mdf.html: a,b: type pairs:
"lj/class2"_pair_class2.html: epsilon,sigma: type pairs:
"lj/class2/coul/cut, lj/class2/coul/long"_pair_class2.html: epsilon,sigma: type pairs:
"lj/cut"_pair_lj.html: epsilon,sigma: type pairs:
diff --git a/doc/src/fix_adapt_fep.txt b/doc/src/fix_adapt_fep.txt
index 8f94a1a38c..9a9255db06 100644
--- a/doc/src/fix_adapt_fep.txt
+++ b/doc/src/fix_adapt_fep.txt
@@ -114,14 +114,14 @@ styles and their energy formulas for the meaning of these parameters:
"born"_pair_born.html: a,b,c: type pairs:
"buck"_pair_buck.html: a,c: type pairs:
-"buck/mdf"_pair_mdf.html: aparm,cparm: type pairs:
+"buck/mdf"_pair_mdf.html: a,c: type pairs:
"coul/cut"_pair_coul.html: scale: type pairs:
"coul/cut/soft"_pair_fep_soft.html: lambda: type pairs:
"coul/long, coul/msm"_pair_coul.html: scale: type pairs:
"coul/long/soft"_pair_fep_soft.html: scale, lambda: type pairs:
"eam"_pair_eam.html: scale: type pairs:
"gauss"_pair_gauss.html: a: type pairs:
-"lennard/mdf"_pair_mdf.html: aparm,bparm: type pairs:
+"lennard/mdf"_pair_mdf.html: a,b: type pairs:
"lj/class2"_pair_class2.html: epsilon,sigma: type pairs:
"lj/class2/coul/cut, lj/class2/coul/long"_pair_class2.html: epsilon,sigma: type pairs:
"lj/cut"_pair_lj.html: epsilon,sigma: type pairs:
diff --git a/src/USER-MISC/pair_buck_mdf.cpp b/src/USER-MISC/pair_buck_mdf.cpp
index 61d32892fc..38de1c7c50 100644
--- a/src/USER-MISC/pair_buck_mdf.cpp
+++ b/src/USER-MISC/pair_buck_mdf.cpp
@@ -427,7 +427,7 @@ double PairBuckMDF::single(int /*i*/, int /*j*/, int itype, int jtype,
void *PairBuckMDF::extract(const char *str, int &dim)
{
dim = 2;
- if (strcmp(str,"aparm") == 0) return (void *) a;
- if (strcmp(str,"cparm") == 0) return (void *) c;
+ if (strcmp(str,"a") == 0) return (void *) a;
+ if (strcmp(str,"c") == 0) return (void *) c;
return NULL;
}
diff --git a/src/USER-MISC/pair_lennard_mdf.cpp b/src/USER-MISC/pair_lennard_mdf.cpp
index 45d0da4d83..4bc2da23f8 100644
--- a/src/USER-MISC/pair_lennard_mdf.cpp
+++ b/src/USER-MISC/pair_lennard_mdf.cpp
@@ -389,7 +389,7 @@ double PairLJ_AB_MDF::single(int /*i*/, int /*j*/, int itype, int jtype,
void *PairLJ_AB_MDF::extract(const char *str, int &dim)
{
dim = 2;
- if (strcmp(str,"aparm") == 0) return (void *) aparm;
- if (strcmp(str,"bparm") == 0) return (void *) bparm;
+ if (strcmp(str,"a") == 0) return (void *) aparm;
+ if (strcmp(str,"b") == 0) return (void *) bparm;
return NULL;
}
--
GitLab