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

Comparing branches/new_design/OOPSE-4/src/io/ElectrostaticAtomTypesSectionParser.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 27 | Line 27
27  
28   #include "types/AtomType.hpp"
29   #include "types/DirectionalAtomType.hpp"
30 + #include "UseTheForce/ForceField.hpp"
31  
32   namespace oopse {
33  
# Line 64 | Line 65 | void ElectrostaticAtomTypesSectionParser::parseLine(Fo
65  
66          }
67          
68 <        AtomType* atomType = ff ->getAtomType(atomTypeName);
68 >        AtomType* atomType = ff.getAtomType(atomTypeName);
69  
70          if (atomType != NULL) {
71              //parse charge
72              double charge = tokenizer.nextTokenAsDouble();
73 <            atomType.addProperty(new DoubleGenericData("Charge", charge));
73 >            atomType->addProperty(new DoubleGenericData("Charge", charge));
74              atomType->setCharge();
75  
76              //parse dipole
77              DirectionalAtomType* dAtomType = dynamic_cast<DirectionalAtomType*>(atomType);            
78              if (dAtomType != NULL) {
79 <                double dipole = tokenizer.nextToken();
79 >                double dipole = tokenizer.nextTokenAsDouble();
80                  dAtomType->addProperty(new DoubleGenericData("Dipole", dipole));
81                  dAtomType->setDipole();
82              } else {

Diff Legend

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