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

Comparing trunk/src/integrators/LDForceManager.hpp (file contents):
Revision 895 by tim, Mon Mar 13 22:42:40 2006 UTC vs.
Revision 983 by gezelter, Tue Jun 6 17:43:28 2006 UTC

# Line 45 | Line 45
45   #include "brains/ForceManager.hpp"
46   #include "primitives/Molecule.hpp"
47   #include "math/SeqRandNumGen.hpp"
48 + #include "hydrodynamics/Shape.hpp"
49 + #include "integrators/Velocitizer.hpp"
50  
51   namespace oopse {
52 <
53 < struct HydroProp{
54 <    Vector3d cod;
55 <    Mat3x3d Ddtt;
56 <    Mat3x3d Ddtr;
57 <    Mat3x3d Ddrr;
56 <    Mat3x3d Xidtt;
57 <    Mat3x3d Xidrt;
58 <    Mat3x3d Xidtr;
59 <    Mat3x3d Xidrr;
60 <
61 < };
62 <
52 >  
53 >  struct SDShape{
54 >    StuntDouble* sd;
55 >    Shape* shape;
56 >  };
57 >    
58    /**
59     * @class LDForceManager
60 <   * Force manager for Lagevin Dynamics applying friction and random forces as well as torques.
60 >   * Force manager for Lagevin Dynamics applying friction and random
61 >   * forces as well as torques.
62     */
63 < class LDForceManager : public ForceManager{
64 <
63 >  class LDForceManager : public ForceManager{
64 >    
65    public:
66      LDForceManager(SimInfo * info);
67 <
67 >    
68    protected:
69      virtual void postCalculation();
70 <
70 >    
71    private:
72 <    std::map<std::string, HydroProp> parseFrictionFile(const std::string& filename);    
73 <    void genRandomForceAndTorque(Vector3d& force, Vector3d& torque, unsigned int index, double variance);
74 <    std::vector<HydroProp> hydroProps_;
72 >    std::map<std::string, HydroProp*> parseFrictionFile(const std::string& filename);    
73 >    void genRandomForceAndTorque(Vector3d& force, Vector3d& torque, unsigned int index, RealType variance);
74 >    std::vector<HydroProp*> hydroProps_;
75      SeqRandNumGen randNumGen_;    
76 <    double variance_;
77 < };
78 <
76 >    RealType variance_;
77 >    RealType langevinBufferRadius_;
78 >    RealType frozenBufferRadius_;
79 >    bool sphericalBoundaryConditions_;
80 >    Globals* simParams;
81 >    Velocitizer* veloMunge;
82 >  };
83 >  
84   } //end namespace oopse
85   #endif //BRAINS_FORCEMANAGER_HPP
86  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines