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