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

Comparing trunk/src/primitives/RigidBody.cpp (file contents):
Revision 646 by tim, Wed Oct 5 19:12:02 2005 UTC vs.
Revision 770 by tim, Fri Dec 2 15:38:03 2005 UTC

# Line 173 | Line 173 | namespace oopse {
173        IAtom(0, 0) += mtmp * r2;
174        IAtom(1, 1) += mtmp * r2;
175        IAtom(2, 2) += mtmp * r2;
176 +      Itmp += IAtom;
177  
178        //project the inertial moment of directional atoms into this rigid body
179        if (atoms_[i]->isDirectional()) {
179        //IAtom += atoms_[i]->getI();
180        Itmp += IAtom;
180          Itmp += refOrients_[i].transpose() * atoms_[i]->getI() * refOrients_[i];
181 <      } else {
183 <        Itmp += IAtom;
184 <      }
181 >      }
182      }
183  
184 <    std::cout << Itmp <<std::endl;
184 >    //    std::cout << Itmp << std::endl;
185 >
186      //diagonalize
187      Vector3d evals;
188      Mat3x3d::diagonalize(Itmp, evals, sU_);
# Line 485 | Line 483 | namespace oopse {
483                 "RigidBody error.\n"
484                 "\tAtom %s does not have a position specified.\n"
485                 "\tThis means RigidBody cannot set up reference coordinates.\n",
486 <               ats->getType() );
486 >               ats->getType().c_str() );
487        painCave.isFatal = 1;
488        simError();
489      }
# Line 505 | Line 503 | namespace oopse {
503                   "RigidBody error.\n"
504                   "\tAtom %s does not have an orientation specified.\n"
505                   "\tThis means RigidBody cannot set up reference orientations.\n",
506 <                 ats->getType() );
506 >                 ats->getType().c_str() );
507          painCave.isFatal = 1;
508          simError();
509        }    

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines