From 21be6621d04850913006979e5ad58e48c5045c15 Mon Sep 17 00:00:00 2001 From: Giovanni Bussi <giovanni.bussi@gmail.com> Date: Wed, 7 Aug 2013 17:09:51 +0200 Subject: [PATCH] Fixes #22 --- regtest/basic/rt31/plumed.dat | 2 +- src/core/ActionWithValue.cpp | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/regtest/basic/rt31/plumed.dat b/regtest/basic/rt31/plumed.dat index 3308cba87..39f1c7fd0 100644 --- a/regtest/basic/rt31/plumed.dat +++ b/regtest/basic/rt31/plumed.dat @@ -1,4 +1,4 @@ TORSION ATOMS=2,5,6,7 LABEL=t1 TORSION ATOMS=5,6,7,9 LABEL=t2 PRINT ARG=t1,t2 STRIDE=1 FILE=colvar FMT=%8.4f -METAD ARG=t1,t2 SIGMA=0.01 ADAPTIVE=GEOM HEIGHT=1.0 PACE=10 LABEL=md FMT=%14.6f +METAD ARG=t1,t2 SIGMA=0.01 ADAPTIVE=GEOM HEIGHT=1.0 PACE=10 LABEL=bias FMT=%14.6f diff --git a/src/core/ActionWithValue.cpp b/src/core/ActionWithValue.cpp index 6178b09a4..91e492ebb 100644 --- a/src/core/ActionWithValue.cpp +++ b/src/core/ActionWithValue.cpp @@ -132,7 +132,6 @@ void ActionWithValue::addComponentWithDerivatives( const std::string& name ){ int ActionWithValue::getComponent( const std::string& name ) const { plumed_massert( !exists( getLabel() ), "You should not be calling this routine if you are using a value"); - plumed_massert(name!=getLabel(),"You should never be calling this routine to retrieve the value"); std::string thename; thename=getLabel() + "." + name; for(unsigned i=0;i<values.size();++i){ if (values[i]->name==thename) return i; -- GitLab