From 8ed9697a54d30c7a806c0eb639e47c434b50c7e5 Mon Sep 17 00:00:00 2001
From: Giovanni Bussi <giovanni.bussi@gmail.com>
Date: Wed, 27 Feb 2019 19:47:53 +0100
Subject: [PATCH] Removed duplicates keywords
Can be found with the following python snippet
import re
plumedDictionary={}
with open("/opt/local/lib/plumed/vim/syntax/plumed.vim") as fin:
for line in fin:
if re.match("^let b:plumedDictionary\[.*$",line):
line=re.sub("^let b:","",line)
exec(line,{'__builtins__': None},{'plumedDictionary':plumedDictionary})
for key in plumedDictionary.keys():
diction={}
for opt in plumedDictionary[key]:
if(opt['word'] in diction):
print(key,opt['word'])
diction[opt['word']]=1
---
src/adjmat/MatrixColumnSums.cpp | 2 +-
src/adjmat/MatrixRowSums.cpp | 2 +-
src/multicolvar/MultiColvarCombine.cpp | 2 +-
src/multicolvar/MultiColvarProduct.cpp | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/adjmat/MatrixColumnSums.cpp b/src/adjmat/MatrixColumnSums.cpp
index a294cad9c..4a7d62dc5 100644
--- a/src/adjmat/MatrixColumnSums.cpp
+++ b/src/adjmat/MatrixColumnSums.cpp
@@ -76,7 +76,7 @@ PLUMED_REGISTER_ACTION(MatrixColumnSums,"COLUMNSUMS")
void MatrixColumnSums::registerKeywords( Keywords& keys ) {
ActionWithInputMatrix::registerKeywords( keys );
- keys.use("ALT_MIN"); keys.use("LOWEST"); keys.use("HIGHEST"); keys.use("MEAN");
+ keys.use("ALT_MIN"); keys.use("LOWEST"); keys.use("HIGHEST");
keys.use("MEAN"); keys.use("MIN"); keys.use("MAX"); keys.use("LESS_THAN");
keys.use("MORE_THAN"); keys.use("BETWEEN"); keys.use("HISTOGRAM"); keys.use("MOMENTS");
}
diff --git a/src/adjmat/MatrixRowSums.cpp b/src/adjmat/MatrixRowSums.cpp
index a85f36f2f..fb60b8b31 100644
--- a/src/adjmat/MatrixRowSums.cpp
+++ b/src/adjmat/MatrixRowSums.cpp
@@ -76,7 +76,7 @@ PLUMED_REGISTER_ACTION(MatrixRowSums,"ROWSUMS")
void MatrixRowSums::registerKeywords( Keywords& keys ) {
ActionWithInputMatrix::registerKeywords( keys );
- keys.use("ALT_MIN"); keys.use("LOWEST"); keys.use("HIGHEST"); keys.use("MEAN");
+ keys.use("ALT_MIN"); keys.use("LOWEST"); keys.use("HIGHEST");
keys.use("MEAN"); keys.use("MIN"); keys.use("MAX"); keys.use("LESS_THAN");
keys.use("MORE_THAN"); keys.use("BETWEEN"); keys.use("HISTOGRAM"); keys.use("MOMENTS");
}
diff --git a/src/multicolvar/MultiColvarCombine.cpp b/src/multicolvar/MultiColvarCombine.cpp
index 833a9a89e..607ed6437 100644
--- a/src/multicolvar/MultiColvarCombine.cpp
+++ b/src/multicolvar/MultiColvarCombine.cpp
@@ -56,7 +56,7 @@ void MultiColvarCombine::registerKeywords( Keywords& keys ) {
MultiColvarBase::registerKeywords( keys );
keys.add("compulsory","DATA","the multicolvars you are calculating linear combinations for");
keys.add("compulsory","COEFFICIENTS","1.0","the coeficients to use for the various multicolvars");
- keys.use("MEAN"); keys.use("MORE_THAN"); keys.use("SUM"); keys.use("LESS_THAN"); keys.use("HISTOGRAM"); keys.use("HISTOGRAM");
+ keys.use("MEAN"); keys.use("MORE_THAN"); keys.use("SUM"); keys.use("LESS_THAN"); keys.use("HISTOGRAM");
keys.use("MIN"); keys.use("MAX"); keys.use("LOWEST"); keys.use("HIGHEST"); keys.use("ALT_MIN"); keys.use("BETWEEN"); keys.use("MOMENTS");
}
diff --git a/src/multicolvar/MultiColvarProduct.cpp b/src/multicolvar/MultiColvarProduct.cpp
index 18a0c1822..32748fed6 100644
--- a/src/multicolvar/MultiColvarProduct.cpp
+++ b/src/multicolvar/MultiColvarProduct.cpp
@@ -54,7 +54,7 @@ PLUMED_REGISTER_ACTION(MultiColvarProduct,"MCOLV_PRODUCT")
void MultiColvarProduct::registerKeywords( Keywords& keys ) {
MultiColvarBase::registerKeywords( keys );
keys.add("compulsory","DATA","the multicolvars you are calculating the product of");
- keys.use("MEAN"); keys.use("MORE_THAN"); keys.use("SUM"); keys.use("LESS_THAN"); keys.use("HISTOGRAM"); keys.use("HISTOGRAM");
+ keys.use("MEAN"); keys.use("MORE_THAN"); keys.use("SUM"); keys.use("LESS_THAN"); keys.use("HISTOGRAM");
keys.use("MIN"); keys.use("MAX"); keys.use("LOWEST"); keys.use("HIGHEST"); keys.use("ALT_MIN"); keys.use("BETWEEN"); keys.use("MOMENTS");
}
--
GitLab