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

Comparing branches/development/src/utils/MoLocator.hpp (file contents):
Revision 1465 by chuckv, Fri Jul 9 23:08:25 2010 UTC vs.
Revision 1808 by gezelter, Mon Oct 22 20:42:10 2012 UTC

# Line 36 | Line 36
36   * [1]  Meineke, et al., J. Comp. Chem. 26, 252-271 (2005).            
37   * [2]  Fennell & Gezelter, J. Chem. Phys. 124, 234104 (2006).          
38   * [3]  Sun, Lin & Gezelter, J. Chem. Phys. 128, 24107 (2008).          
39 < * [4]  Vardeman & Gezelter, in progress (2009).                        
39 > * [4]  Kuang & Gezelter,  J. Chem. Phys. 133, 164101 (2010).
40 > * [5]  Vardeman, Stocker & Gezelter, J. Chem. Theory Comput. 7, 834 (2011).
41   */
42  
43   #ifndef UTILS_MOLOCATOR_HPP
43
44   #define UTILS_MOLOCATOR_HPP
45  
46   #include <vector>
# Line 51 | Line 51
51   #include "primitives/Molecule.hpp"
52   #include "math/SquareMatrix3.hpp"
53   #include "math/Vector3.hpp"
54 < #include "UseTheForce/ForceField.hpp"
54 > #include "brains/ForceField.hpp"
55 >
56   namespace OpenMD {
57 <  //convert lattice vector to rotation matrix
57 <  RealType getAtomMass(const std::string& at, ForceField* myFF);
58 <  RealType getMolMass(MoleculeStamp *molStamp, ForceField *myFF);
59 <  RotMat3x3d latVec2RotMat(const Vector3d& lv);
57 >
58    class MoLocator{
59    public:
60      MoLocator( MoleculeStamp* theStamp, ForceField* theFF);
61      void placeMol( const Vector3d& offset, const Vector3d& ort, Molecule* mol);
62 +    static RealType getMolMass(MoleculeStamp *molStamp, ForceField *myFF);
63 +
64    private:
65      void calcRef( void );
66 +    static RealType getAtomMass(const std::string& at, ForceField* myFF);
67 +    RotMat3x3d latVec2RotMat(const Vector3d& lv); ///< convert lattice vector to rotation matrix
68 +    
69      MoleculeStamp* myStamp;
70  
71      ForceField* myFF;
72      std::vector<Vector3d> refCoords;
73      int nIntegrableObjects;
71
74    };
73
75   }
76   #endif
77  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines