37 |
|
#include "integrators/NPT.hpp" |
38 |
|
namespace oopse { |
39 |
|
|
40 |
< |
class NPTf : public T{ |
40 |
> |
class NPTf : public NPT{ |
41 |
> |
public: |
42 |
|
|
43 |
< |
public: |
43 |
> |
NPTf ( SimInfo* info); |
44 |
> |
virtual ~NPTf(); |
45 |
|
|
46 |
< |
NPTf ( SimInfo *theInfo, ForceFields* the_ff); |
45 |
< |
virtual ~NPTf(); |
46 |
> |
protected: |
47 |
|
|
48 |
< |
virtual double getConservedQuantity(void); |
48 |
< |
virtual string getAdditionalParameters(void); |
49 |
< |
virtual void resetIntegrator(void); |
48 |
> |
Mat3x3d eta; |
49 |
|
|
50 |
< |
protected: |
50 |
> |
private: |
51 |
|
|
52 |
< |
virtual void evolveEtaA(void); |
53 |
< |
virtual void evolveEtaB(void); |
52 |
> |
virtual void evolveEtaA(); |
53 |
> |
virtual void evolveEtaB(); |
54 |
|
|
55 |
< |
virtual bool etaConverged( void ); |
55 |
> |
virtual bool etaConverged(); |
56 |
|
|
57 |
< |
virtual void scaleSimBox( void ); |
57 |
> |
virtual void getVelScaleA(Vector3d& sc, const Vector3d& vel); |
58 |
> |
virtual void getVelScaleB(Vector3d& sc, int index ); |
59 |
> |
virtual void getPosScale(const Vector3d& pos, const Vector3d& COM, |
60 |
> |
int index, Vector3d& sc); |
61 |
|
|
62 |
< |
virtual void getVelScaleA( double sc[3], double vel[3] ); |
63 |
< |
virtual void getVelScaleB( double sc[3], int index ); |
64 |
< |
virtual void getPosScale(double pos[3], double COM[3], |
65 |
< |
int index, double sc[3]); |
62 |
> |
virtual void calcVelScale(); |
63 |
> |
|
64 |
> |
virtual void scaleSimBox(); |
65 |
> |
virtual double calcConservedQuantity(); |
66 |
|
|
67 |
< |
virtual void calcVelScale( void ); |
68 |
< |
|
69 |
< |
double eta[3][3]; |
68 |
< |
double oldEta[3][3]; |
69 |
< |
double prevEta[3][3]; |
70 |
< |
double vScale[3][3]; |
67 |
> |
Mat3x3d oldEta; |
68 |
> |
Mat3x3d prevEta; |
69 |
> |
Mat3x3d vScale; |
70 |
|
}; |
71 |
|
|
72 |
|
}//end namespace oopse |