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

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 1793 by gezelter, Fri Aug 31 21:16:10 2012 UTC

#	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	>
67		int nTokens = tokenizer.countTokens();
68
69		if (nTokens < 3) {

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