ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/group/trunk/OOPSE-1.0/utils/sysbuilder/MoLocator.hpp
(Generate patch)

Comparing trunk/OOPSE-1.0/utils/sysbuilder/MoLocator.hpp (file contents):
Revision 1334 by gezelter, Fri Jul 16 18:58:03 2004 UTC vs.
Revision 1435 by tim, Thu Jul 29 18:16:16 2004 UTC

# Line 1 | Line 1
1   #ifndef __MOLOCATOR_H__
2   #define __MOLOCATOR_H__
3  
4 + #include <vector>
5   #include "Atom.hpp"
6   #include "DirectionalAtom.hpp"
7   #include "MoleculeStamp.hpp"
8 < #include "SimState.hpp"
8 > #include "Molecule.hpp"
9 > #include "Vector3d.hpp"
10 > #include "ForceFields.hpp"
11 > using namespace std;
12  
13 + //convert lattice vector to rotation matrix
14 + void latVec2RotMat(const Vector3d& lv, double rotMat[3][3]);
15 +
16   class MoLocator{
17    
18   public:
19    
20 <  MoLocator( MoleculeStamp* theStamp );
14 <  ~MoLocator();
20 >  MoLocator( MoleculeStamp* theStamp, ForceFields* theFF);
21  
22 <  void placeMol( double pos[3], double ornt[3][3], Atom** atomArray,
17 <                 int atomIndex, SimState* myConfig );
18 <  double getMaxLength( void ) { return maxLength; }
22 >  void placeMol( const Vector3d& offset, const Vector3d& ort, Molecule* mol);
23  
24   private:
25    
26    void calcRefCoords( void );
27 <  void rotMe( double r[3], double A[3][3] );
24 <
27 >  
28    MoleculeStamp* myStamp;
29 <  double *myCoords;
27 <  double maxLength;
28 <  int nAtoms;
29 >  ForceFields* myFF;
30  
31 +  vector<Vector3d> refCoords;
32 +  int nIntegrableObjects;
33   };
34  
32 extern void getRandomRot( double rot[3][3] );
33 extern void getEulerRot( double theta, double phi, double psi,
34                         double rot[3][3] );
35
35   #endif

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines