| 24 |
|
// |
| 25 |
|
// Hoover, W. G., 1986, Phys. Rev. A, 34, 2499. |
| 26 |
|
|
| 27 |
< |
template<typename T> NPT<T>::NPT ( SimInfo *theInfo, ForceFields* the_ff): |
| 28 |
< |
T( theInfo, the_ff ) |
| 27 |
> |
NPT::NPT ( SimInfo *theInfo, ForceFields* the_ff): |
| 28 |
> |
Integrator( theInfo, the_ff ) |
| 29 |
|
{ |
| 30 |
|
GenericData* data; |
| 31 |
|
DoubleData * chiValue; |
| 32 |
|
DoubleData * integralOfChidtValue; |
| 33 |
< |
|
| 33 |
> |
|
| 34 |
|
chiValue = NULL; |
| 35 |
|
integralOfChidtValue = NULL; |
| 36 |
< |
|
| 36 |
> |
|
| 37 |
|
chi = 0.0; |
| 38 |
|
integralOfChidt = 0.0; |
| 39 |
|
have_tau_thermostat = 0; |
| 72 |
|
|
| 73 |
|
} |
| 74 |
|
|
| 75 |
< |
template<typename T> NPT<T>::~NPT() { |
| 75 |
> |
NPT::~NPT() { |
| 76 |
|
delete[] oldPos; |
| 77 |
|
delete[] oldVel; |
| 78 |
|
delete[] oldJi; |
| 79 |
|
} |
| 80 |
|
|
| 81 |
< |
template<typename T> void NPT<T>::moveA() { |
| 81 |
> |
void NPT::moveA() { |
| 82 |
|
|
| 83 |
|
//new version of NPT |
| 84 |
|
int i, j, k; |
| 180 |
|
this->scaleSimBox(); |
| 181 |
|
} |
| 182 |
|
|
| 183 |
< |
template<typename T> void NPT<T>::moveB( void ){ |
| 183 |
> |
void NPT::moveB( void ){ |
| 184 |
|
|
| 185 |
|
//new version of NPT |
| 186 |
|
int i, j, k; |
| 268 |
|
|
| 269 |
|
} |
| 270 |
|
|
| 271 |
< |
template<typename T> void NPT<T>::resetIntegrator() { |
| 271 |
> |
void NPT::resetIntegrator() { |
| 272 |
|
chi = 0.0; |
| 273 |
< |
T::resetIntegrator(); |
| 273 |
> |
Integrator::resetIntegrator(); |
| 274 |
|
} |
| 275 |
|
|
| 276 |
< |
template<typename T> void NPT<T>::evolveChiA() { |
| 276 |
> |
void NPT::evolveChiA() { |
| 277 |
|
chi += dt2 * ( instaTemp / targetTemp - 1.0) / tt2; |
| 278 |
|
oldChi = chi; |
| 279 |
|
} |
| 280 |
|
|
| 281 |
< |
template<typename T> void NPT<T>::evolveChiB() { |
| 281 |
> |
void NPT::evolveChiB() { |
| 282 |
|
|
| 283 |
|
prevChi = chi; |
| 284 |
|
chi = oldChi + dt2 * ( instaTemp / targetTemp - 1.0) / tt2; |
| 285 |
|
} |
| 286 |
|
|
| 287 |
< |
template<typename T> bool NPT<T>::chiConverged() { |
| 287 |
> |
bool NPT::chiConverged() { |
| 288 |
|
|
| 289 |
|
return ( fabs( prevChi - chi ) <= chiTolerance ); |
| 290 |
|
} |
| 291 |
|
|
| 292 |
< |
template<typename T> int NPT<T>::readyCheck() { |
| 292 |
> |
int NPT::readyCheck() { |
| 293 |
|
|
| 294 |
|
//check parent's readyCheck() first |
| 295 |
< |
if (T::readyCheck() == -1) |
| 295 |
> |
if (Integrator::readyCheck() == -1) |
| 296 |
|
return -1; |
| 297 |
|
|
| 298 |
|
// First check to see if we have a target temperature. |
