[ViewVC] Diff of: group/branches/new_design/OOPSE-4/src/io/BondTypesSectionParser.cpp

Comparing branches/new_design/OOPSE-4/src/io/BondTypesSectionParser.cpp (file contents):
Revision 1784 by tim, Wed Nov 24 22:12:12 2004 UTC vs.
Revision 1790 by tim, Mon Nov 29 15:50:05 2004 UTC

#	Line 27 \| Line 27
27		#include "types/FixedBondType.hpp"
28		#include "types/HarmonicBondType.hpp"
29		#include "types/CubicBondType.hpp"
30	<	#include "types/QuadraticBondType.hpp"
30	>	#include "types/QuarticBondType.hpp"
31		#include "types/PolynomialBondType.hpp"
32
33		namespace oopse {
#	Line 100 \| Line 100 \| void BondTypesSectionParser::parseLine(ForceField& ff,
100		double k1 = tokenizer.nextTokenAsDouble();
101		double k0 = tokenizer.nextTokenAsDouble();
102
103	<	bondType = new QuadraticBondType(b0, k4, k3, k2, k1, k0);
103	>	bondType = new QuarticBondType(b0, k4, k3, k2, k1, k0);
104		}
105		break;
106

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