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

Comparing branches/development/src/integrators/LangevinHullForceManager.hpp (file contents):
Revision 1857 by gezelter, Tue Apr 2 18:31:51 2013 UTC vs.
Revision 1858 by gezelter, Wed Apr 3 21:32:13 2013 UTC

# Line 51 | Line 51
51   #include "math/Triangle.hpp"
52   #include "math/SeqRandNumGen.hpp"
53  
54 + using namespace std;
55   namespace OpenMD {
56    
57    /**
58     * @class LangevinHullForceManager
59 <   * Force manager for NPT Langevin Hull Dynamics
60 <   * applying friction and random forces as well as torques.
61 <   * Stochasitc force is determined by area of surface triangles
62 <   * on the convex hull. See: Kohanoff et al. CHEMPHYSCHEM 2005, 6, 1848-1852.
59 >   * Force manager for NPT Langevin Hull Dynamics applying friction
60 >   * and random forces as well as torques.  Stochastic force is
61 >   * determined by the area of surface triangles on the convex hull.
62 >   * See: Vardeman, Stocker & Gezelter, J. Chem. Theory Comput. 7, 834 (2011),
63 >   *      and Kohanoff et al. CHEMPHYSCHEM 6, 1848-1852 (2005).
64     */
65    class LangevinHullForceManager : public ForceManager{
66      
# Line 69 | Line 71 | namespace OpenMD {
71      virtual void postCalculation();
72      
73    private:
74 <    std::vector<Vector3d> genTriangleForces(int nTriangles, RealType variance);
75 <
74 >    vector<Vector3d> genTriangleForces(int nTriangles, RealType variance);
75 >    
76      Globals* simParams;
77      SeqRandNumGen randNumGen_;    
78      Velocitizer* veloMunge;
79 <
79 >    
80      RealType dt_;
81      RealType targetTemp_;
82      RealType targetPressure_;
83      RealType viscosity_;
84 <
84 >    
85      RealType variance_;
86 <
87 <  enum HullTypeEnum {
86 >    
87 >    enum HullTypeEnum {
88        hullConvex,
89        hullAlphaShape,
90        hullUnknown
91      };
92      
93 <    std::map<std::string, HullTypeEnum> stringToEnumMap_;
93 >    map<string, HullTypeEnum> stringToEnumMap_;
94      HullTypeEnum hullType_;
95 <
95 >    
96      bool doThermalCoupling_;
97 +    bool doPressureCoupling_;
98      
99      Hull* surfaceMesh_;
100 <    std::vector<StuntDouble*> localSites_;
100 >    vector<StuntDouble*> localSites_;
101    };
102    
103   } //end namespace OpenMD

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines