ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/group/trunk/OOPSE-4/src/integrators/LDForceManager.hpp
(Generate patch)

Comparing trunk/OOPSE-4/src/integrators/LDForceManager.hpp (file contents):
Revision 2759 by tim, Wed May 17 21:51:42 2006 UTC vs.
Revision 2787 by gezelter, Mon Jun 5 18:24:45 2006 UTC

# Line 53 | Line 53 | namespace oopse {
53      StuntDouble* sd;
54      Shape* shape;
55    };
56 <  
57 <  struct HydroProp{
58 <    Vector3d cor;
59 <    Mat3x3d Xirtt;
60 <    Mat3x3d Xirrt; //Xirrt == Xirtr
61 <    Mat3x3d Xirtr;
62 <    Mat3x3d Xirrr;
63 <    Mat6x6d S;
64 <  };
65 <  
56 >    
57    /**
58     * @class LDForceManager
59     * Force manager for Lagevin Dynamics applying friction and random
# Line 77 | Line 68 | namespace oopse {
68      virtual void postCalculation();
69      
70    private:
71 <    std::map<std::string, HydroProp> parseFrictionFile(const std::string& filename);    
71 >    std::map<std::string, HydroProp*> parseFrictionFile(const std::string& filename);    
72      void genRandomForceAndTorque(Vector3d& force, Vector3d& torque, unsigned int index, RealType variance);
73 <    std::vector<HydroProp> hydroProps_;
73 >    std::vector<HydroProp*> hydroProps_;
74      SeqRandNumGen randNumGen_;    
75      RealType variance_;
76      RealType langevinBufferRadius_;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines