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

Comparing branches/new_design/OOPSE-4/src/UseTheForce/EAM.cpp (file contents):
Revision 1916 by tim, Thu Dec 16 17:27:47 2004 UTC vs.
Revision 1917 by tim, Tue Jan 11 15:53:14 2005 UTC

# Line 90 | Line 90 | double EAM::getRcutFromAtomType(AtomType* at){
90  
91  
92   double EAM::getRcutFromAtomType(AtomType* at){
93 <    
93 >    double rcut = 0.0;    
94      if (at->isEAM()) {
95          GenericData* data = at->getPropertyByName("EAM");
96          if (data != NULL) {
# Line 99 | Line 99 | double EAM::getRcutFromAtomType(AtomType* at){
99              if (eamData != NULL) {
100  
101                  EAMParam& eamParam = eamData->getData();
102 <                return eamParam.rcut;
102 >                rcut =  eamParam.rcut;
103              } else {
104                      sprintf( painCave.errMsg,
105                             "Can not cast GenericData to EAMParam\n");
# Line 114 | Line 114 | double EAM::getRcutFromAtomType(AtomType* at){
114              simError();          
115          }
116      }    else {
117 <        return ForceField::getRcutFromAtomType(at);
117 >        rcut = ForceField::getRcutFromAtomType(at);
118      }
119 <    
119 >  
120 >    return rcut;    
121   }
122  
123   } //end namespace oopse

Diff Legend

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