[ViewVC] Diff of: group/trunk/OOPSE-2.0/src/io/StickyAtomTypesSectionParser.cpp

Comparing trunk/OOPSE-2.0/src/io/StickyAtomTypesSectionParser.cpp (file contents):
Revision 1956 by gezelter, Wed Jan 12 22:41:40 2005 UTC vs.
Revision 1957 by tim, Tue Jan 25 17:45:23 2005 UTC

#	Line 43 \| Line 43
43		#include "types/AtomType.hpp"
44		#include "types/DirectionalAtomType.hpp"
45		#include "UseTheForce/ForceField.hpp"
46	<
46	>	#include "utils/simError.h"
47		namespace oopse {
48
49		StickyAtomTypesSectionParser::StickyAtomTypesSectionParser() {
#	Line 57 \| Line 57 \| void StickyAtomTypesSectionParser::parseLine(ForceFiel
57		//in AtomTypeSection, a line at least contains 8 tokens
58		//atomTypeName and 7 different sticky parameters
59		if (nTokens < 8) {
60	<
60	>	sprintf(painCave.errMsg, "StickyAtomTypesSectionParser Error: Not enough tokens at line %d\n",
61	>	lineNo);
62	>	painCave.isFatal = 1;
63	>	simError();
64		} else {
65
66		std::string atomTypeName = tokenizer.nextToken();
#	Line 79 \| Line 82 \| void StickyAtomTypesSectionParser::parseLine(ForceFiel
82		dAtomType->addProperty(new StickyParamGenericData("Sticky", sticky));
83		dAtomType->setSticky();
84		} else {
85	+	sprintf(painCave.errMsg, "StickyAtomTypesSectionParser Error: Not enough tokens at line %d\n",
86	+	lineNo);
87	+	painCave.isFatal = 1;
88	+	simError();
89		std::cerr << "StickyAtomTypesSectionParser Warning:" << std::endl;
90		}
91		} else {
92	<	std::cerr << "StickyAtomTypesSectionParser Error: Can not find matched AtomType " << atomTypeName << std::endl;
92	>	sprintf(painCave.errMsg, "StickyAtomTypesSectionParser Error: Can not find matched AtomType %s\n",
93	>	atomTypeName.c_str());
94	>	painCave.isFatal = 1;
95	>	simError();
96	>
97		}
98
99		}

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