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

Comparing branches/new_design/OOPSE-4/src/io/AtomTypesSectionParser.cpp (file contents):
Revision 1765 by tim, Mon Nov 22 20:55:52 2004 UTC vs.
Revision 1789 by tim, Mon Nov 29 15:27:43 2004 UTC

# Line 24 | Line 24
24   */
25  
26   #include "io/AtomTypesSectionParser.hpp"
27 <
27 > #include "types/AtomType.hpp"
28 > #include "UseTheForce/ForceField.hpp"
29   namespace oopse {
30  
31   AtomTypesSectionParser::AtomTypesSectionParser() {
# Line 42 | Line 43 | void AtomTypesSectionParser::parseLine(ForceField& ff,
43      } else {
44  
45          std::string atomTypeName = tokenizer.nextToken();    
46 <        AtomType* atomType = ff ->getAtomType(atomTypeName);
46 >        AtomType* atomType = ff.getAtomType(atomTypeName);
47  
48          if (atomType == NULL) {
49              atomType = new AtomType();
50              int ident = ff.getNAtomType() + 1;
51              atomType->setIdent(ident);
52              atomType->setName(atomTypeName);
53 <            ff.addAtomType(atomTypeName, atomType)
53 >            ff.addAtomType(atomTypeName, atomType);
54          }
55          
56          double mass = tokenizer.nextTokenAsDouble();              

Diff Legend

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