--- branches/development/src/io/NonBondedInteractionsSectionParser.cpp 2011/11/22 20:38:56 1665 +++ trunk/src/io/NonBondedInteractionsSectionParser.cpp 2013/06/16 15:15:42 1879 @@ -35,7 +35,7 @@ * * [1] Meineke, et al., J. Comp. Chem. 26, 252-271 (2005). * [2] Fennell & Gezelter, J. Chem. Phys. 124, 234104 (2006). - * [3] Sun, Lin & Gezelter, J. Chem. Phys. 128, 24107 (2008). + * [3] Sun, Lin & Gezelter, J. Chem. Phys. 128, 234107 (2008). * [4] Kuang & Gezelter, J. Chem. Phys. 133, 164101 (2010). * [5] Vardeman, Stocker & Gezelter, J. Chem. Theory Comput. 7, 834 (2011). */ @@ -46,7 +46,7 @@ #include "types/MAWInteractionType.hpp" #include "types/LennardJonesInteractionType.hpp" #include "types/RepulsivePowerInteractionType.hpp" -#include "UseTheForce/ForceField.hpp" +#include "brains/ForceField.hpp" #include "utils/simError.h" namespace OpenMD { @@ -63,7 +63,6 @@ namespace OpenMD { void NonBondedInteractionsSectionParser::parseLine(ForceField& ff,const std::string& line, int lineNo){ StringTokenizer tokenizer(line); - NonBondedInteractionType* nbiType = NULL; int nTokens = tokenizer.countTokens(); if (nTokens < 3) {