[ViewVC] Diff of: OpenMD/branches/development/src/io/NonBondedInteractionsSectionParser.cpp

Comparing branches/development/src/io/NonBondedInteractionsSectionParser.cpp (file contents):
Revision 1664 by gezelter, Tue Nov 22 14:37:41 2011 UTC vs.
Revision 1825 by gezelter, Wed Jan 9 19:27:52 2013 UTC

#	Line 36 \| Line 36
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).
39	<	* [4] Vardeman & Gezelter, in progress (2009).
39	>	* [4] Kuang & Gezelter, J. Chem. Phys. 133, 164101 (2010).
40	>	* [5] Vardeman, Stocker & Gezelter, J. Chem. Theory Comput. 7, 834 (2011).
41		*/
42
43		#include "io/NonBondedInteractionsSectionParser.hpp"
#	Line 45 \| 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 62 \| Line 63 \| namespace OpenMD {
63
64		void NonBondedInteractionsSectionParser::parseLine(ForceField& ff,const std::string& line, int lineNo){
65		StringTokenizer tokenizer(line);
65	–	NonBondedInteractionType* nbiType = NULL;
66		int nTokens = tokenizer.countTokens();
67
68		if (nTokens < 3) {

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