[ViewVC] Diff of: group/trunk/OOPSE-2.0/src/UseTheForce/SHAPES

Comparing trunk/OOPSE-2.0/src/UseTheForce/SHAPES_FF.cpp (file contents):
Revision 2211 by chrisfen, Thu Apr 21 14:12:19 2005 UTC vs.
Revision 2500 by chuckv, Wed Dec 7 23:10:53 2005 UTC

#	Line 43 \| Line 43
43		#include "UseTheForce/DarkSide/lj_interface.h"
44		#include "UseTheForce/DarkSide/sticky_interface.h"
45		#include "UseTheForce/ForceFieldFactory.hpp"
46	+	#include "io/OptionSectionParser.hpp"
47		#include "io/DirectionalAtomTypesSectionParser.hpp"
48		#include "io/AtomTypesSectionParser.hpp"
49		#include "io/LennardJonesAtomTypesSectionParser.hpp"
#	Line 76 \| Line 77 \| namespace oopse {
77		//DirectionalAtomTypesSectionParser and AtomTypesSectionParser. The order
78		//of BondTypesSectionParser, BendTypesSectionParser and
79		//TorsionTypesSectionParser are not important.
80	<
80	>	spMan_.push_back(new OptionSectionParser(forceFieldOptions_));
81		spMan_.push_back(new ShapeAtomTypesSectionParser());
82		spMan_.push_back(new DirectionalAtomTypesSectionParser());
83		spMan_.push_back(new AtomTypesSectionParser());
84	<	spMan_.push_back(new LennardJonesAtomTypesSectionParser());
84	>	spMan_.push_back(new LennardJonesAtomTypesSectionParser(forceFieldOptions_));
85		spMan_.push_back(new ChargeAtomTypesSectionParser());
86		spMan_.push_back(new MultipoleAtomTypesSectionParser());
87		spMan_.push_back(new StickyAtomTypesSectionParser());

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