ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/OpenMD/trunk/src/io/NonBondedInteractionsSectionParser.cpp
(Generate patch)

Comparing:
branches/development/src/io/NonBondedInteractionsSectionParser.cpp (file contents), Revision 1665 by gezelter, Tue Nov 22 20:38:56 2011 UTC vs.
trunk/src/io/NonBondedInteractionsSectionParser.cpp (file contents), Revision 1879 by gezelter, Sun Jun 16 15:15:42 2013 UTC

# Line 35 | Line 35
35   *                                                                      
36   * [1]  Meineke, et al., J. Comp. Chem. 26, 252-271 (2005).            
37   * [2]  Fennell & Gezelter, J. Chem. Phys. 124, 234104 (2006).          
38 < * [3]  Sun, Lin & Gezelter, J. Chem. Phys. 128, 24107 (2008).          
38 > * [3]  Sun, Lin & Gezelter, J. Chem. Phys. 128, 234107 (2008).          
39   * [4]  Kuang & Gezelter,  J. Chem. Phys. 133, 164101 (2010).
40   * [5]  Vardeman, Stocker & Gezelter, J. Chem. Theory Comput. 7, 834 (2011).
41   */
# Line 46 | Line 46
46   #include "types/MAWInteractionType.hpp"
47   #include "types/LennardJonesInteractionType.hpp"
48   #include "types/RepulsivePowerInteractionType.hpp"
49 < #include "UseTheForce/ForceField.hpp"
49 > #include "brains/ForceField.hpp"
50   #include "utils/simError.h"
51   namespace OpenMD {
52  
# Line 63 | Line 63 | namespace OpenMD {
63    
64    void NonBondedInteractionsSectionParser::parseLine(ForceField& ff,const std::string& line, int lineNo){
65      StringTokenizer tokenizer(line);
66 –    NonBondedInteractionType* nbiType = NULL;
66      int nTokens = tokenizer.countTokens();
67      
68      if (nTokens < 3) {

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines