ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/group/branches/new_design/OOPSE-4/src/io/StickyAtomTypesSectionParser.cpp
(Generate patch)

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

# Line 26 | Line 26
26   #include "io/StickyAtomTypesSectionParser.hpp"
27   #include "types/AtomType.hpp"
28   #include "types/DirectionalAtomType.hpp"
29 + #include "UseTheForce/ForceField.hpp"
30  
31   namespace oopse {
32  
# Line 44 | Line 45 | void StickyAtomTypesSectionParser::parseLine(ForceFiel
45      } else {
46  
47          std::string atomTypeName = tokenizer.nextToken();    
48 <        AtomType* atomType = ff ->getAtomType(atomTypeName);
48 >        AtomType* atomType = ff.getAtomType(atomTypeName);
49  
50          if (atomType != NULL) {
51              DirectionalAtomType* dAtomType = dynamic_cast<DirectionalAtomType*>(atomType);
# Line 59 | Line 60 | void StickyAtomTypesSectionParser::parseLine(ForceFiel
60                  sticky.rlp = tokenizer.nextTokenAsDouble();
61                  sticky.rup = tokenizer.nextTokenAsDouble();  
62                  
63 <                dAtomType->addProperty(new DoubleGenericData("Sticky", sticky));
63 >                dAtomType->addProperty(new StickyParamGenericData("Sticky", sticky));
64                  dAtomType->setSticky();
65              } else {
66                  std::cerr << "StickyAtomTypesSectionParser Warning:" << std::endl;

Diff Legend

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