ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/OpenMD/branches/development/src/primitives/UreyBradleyBend.cpp
(Generate patch)

Comparing trunk/src/primitives/UreyBradleyBend.cpp (file contents):
Revision 246 by gezelter, Wed Jan 12 22:41:40 2005 UTC vs.
Revision 749 by tim, Wed Nov 16 23:10:02 2005 UTC

# Line 1 | Line 1
1 < /*
1 > /*
2   * Copyright (c) 2005 The University of Notre Dame. All Rights Reserved.
3   *
4   * The University of Notre Dame grants you ("Licensee") a
# Line 42 | Line 42 | namespace oopse {
42   #include "primitives/UreyBradleyBend.hpp"
43  
44   namespace oopse {
45 < UreyBradleyBend::UreyBradleyBend(Atom* atom1, Atom* atom2, Atom* atom3, UreyBradleyBendType* bt)
46 <                            : Bend(atom1, atom2, atom3, bt), bond_(NULL){
47 <    bond_ = new Bond(atom1, atom3, bt->getHarmonicBondType());
48 < }
45 >  UreyBradleyBend::UreyBradleyBend(Atom* atom1, Atom* atom2, Atom* atom3, UreyBradleyBendType* bt)
46 >    : Bend(atom1, atom2, atom3, bt), bond_(NULL){
47 >      bond_ = new Bond(atom1, atom3, bt->getHarmonicBondType());
48 >    }
49  
50 < UreyBradleyBend::~UreyBradleyBend() {
50 >  UreyBradleyBend::~UreyBradleyBend() {
51      delete bond_;
52 < }
52 >  }
53  
54 < void UreyBradleyBend::calcForce() {
55 <    Bend::calcForce();
54 >  void UreyBradleyBend::calcForce(double& angle) {
55 >    Bend::calcForce(angle);
56      bond_->calcForce();
57 < }
57 >  }
58  
59   } //end namespace oopse

Diff Legend

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