ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/group/trunk/OOPSE/libmdtools/NPTi.cpp
(Generate patch)

Comparing trunk/OOPSE/libmdtools/NPTi.cpp (file contents):
Revision 611 by gezelter, Tue Jul 15 17:10:50 2003 UTC vs.
Revision 855 by mmeineke, Thu Nov 6 22:01:37 2003 UTC

# Line 1 | Line 1
1 < #include <cmath>
1 > #include <math.h>
2   #include "Atom.hpp"
3   #include "SRI.hpp"
4   #include "AbstractClasses.hpp"
# Line 7 | Line 7
7   #include "Thermo.hpp"
8   #include "ReadWrite.hpp"
9   #include "Integrator.hpp"
10 < #include "simError.h"
10 > #include "simError.h"
11  
12 + #ifdef IS_MPI
13 + #include "mpiSimulation.hpp"
14 + #endif
15  
16   // Basic isotropic thermostating and barostating via the Melchionna
17   // modification of the Hoover algorithm:
18   //
19   //    Melchionna, S., Ciccotti, G., and Holian, B. L., 1993,
20 < //       Molec. Phys., 78, 533.
20 > //       Molec. Phys., 78, 533.
21   //
22   //           and
23 < //
23 > //
24   //    Hoover, W. G., 1986, Phys. Rev. A, 34, 2499.
25  
26 < NPTi::NPTi ( SimInfo *theInfo, ForceFields* the_ff):
27 <  Integrator( theInfo, the_ff )
26 > template<typename T> NPTi<T>::NPTi ( SimInfo *theInfo, ForceFields* the_ff):
27 >  T( theInfo, the_ff )
28   {
29 <  chi = 0.0;
29 >  GenericData* data;
30 >  DoubleArrayData * etaValue;
31 >  vector<double> etaArray;
32 >
33    eta = 0.0;
34 <  have_tau_thermostat = 0;
35 <  have_tau_barostat = 0;
36 <  have_target_temp = 0;
37 <  have_target_pressure = 0;
34 >  oldEta = 0.0;
35 >
36 >  if( theInfo->useInitXSstate ){
37 >    // retrieve eta from simInfo if
38 >    data = info->getProperty(ETAVALUE_ID);
39 >    if(data){
40 >      etaValue = dynamic_cast<DoubleArrayData*>(data);
41 >      
42 >      if(etaValue){
43 >        etaArray = etaValue->getData();
44 >        eta = etaArray[0];
45 >        oldEta = eta;
46 >      }
47 >    }
48 >  }
49   }
50  
51 < void NPTi::moveA() {
52 <  
53 <  int i, j;
37 <  DirectionalAtom* dAtom;
38 <  double Tb[3], ji[3];
39 <  double A[3][3], I[3][3];
40 <  double angle, mass;
41 <  double vel[3], pos[3], frc[3];
51 > template<typename T> NPTi<T>::~NPTi() {
52 >  //nothing for now
53 > }
54  
55 <  double rj[3];
56 <  double instaTemp, instaPress, instaVol;
57 <  double tt2, tb2, scaleFactor;
55 > template<typename T> void NPTi<T>::resetIntegrator() {
56 >  eta = 0.0;
57 >  T::resetIntegrator();
58 > }
59  
60 <  tt2 = tauThermostat * tauThermostat;
61 <  tb2 = tauBarostat * tauBarostat;
49 <
50 <  instaTemp = tStats->getTemperature();
51 <  instaPress = tStats->getPressure();
52 <  instaVol = tStats->getVolume();
53 <  
54 <   // first evolve chi a half step
55 <  
56 <  chi += dt2 * ( instaTemp / targetTemp - 1.0) / tt2;
57 <  eta += dt2 * ( instaVol * (instaPress - targetPressure) /
60 > template<typename T> void NPTi<T>::evolveEtaA() {
61 >  eta += dt2 * ( instaVol * (instaPress - targetPressure) /
62                   (p_convert*NkBT*tb2));
63 +  oldEta = eta;
64 + }
65  
66 <  for( i=0; i<nAtoms; i++ ){
61 <    atoms[i]->getVel( vel );
62 <    atoms[i]->getPos( pos );
63 <    atoms[i]->getFrc( frc );
66 > template<typename T> void NPTi<T>::evolveEtaB() {
67  
68 <    mass = atoms[i]->getMass();
68 >  prevEta = eta;
69 >  eta = oldEta + dt2 * ( instaVol * (instaPress - targetPressure) /
70 >                 (p_convert*NkBT*tb2));
71 > }
72  
73 <    for (j=0; j < 3; j++) {
74 <      vel[j] += dt2 * ((frc[j] / mass ) * eConvert - vel[j]*(chi+eta));
69 <      rj[j] = pos[j];
70 <    }
73 > template<typename T> void NPTi<T>::getVelScaleA(double sc[3], double vel[3]) {
74 >  int i;
75  
76 <    atoms[i]->setVel( vel );
76 >  for(i=0; i<3; i++) sc[i] = vel[i] * ( chi + eta );
77 > }
78  
79 <    info->wrapVector(rj);
79 > template<typename T> void NPTi<T>::getVelScaleB(double sc[3], int index ){
80 >  int i;
81  
82 <    for (j = 0; j < 3; j++)
83 <      pos[j] += dt * (vel[j] + eta*rj[j]);
82 >  for(i=0; i<3; i++) sc[i] = oldVel[index*3 + i] * ( chi + eta );
83 > }
84  
85  
86 <    atoms[i]->setPos( pos );
86 > template<typename T> void NPTi<T>::getPosScale(double pos[3], double COM[3],
87 >                                               int index, double sc[3]){
88 >  int j;
89  
90 +  for(j=0; j<3; j++)
91 +    sc[j] = ( oldPos[index*3+j] + pos[j]) / 2.0 - COM[j];
92  
93 <    if( atoms[i]->isDirectional() ){
93 >  for(j=0; j<3; j++)
94 >    sc[j] *= eta;
95 > }
96  
97 <      dAtom = (DirectionalAtom *)atoms[i];
86 <          
87 <      // get and convert the torque to body frame
88 <      
89 <      dAtom->getTrq( Tb );
90 <      dAtom->lab2Body( Tb );
91 <      
92 <      // get the angular momentum, and propagate a half step
97 > template<typename T> void NPTi<T>::scaleSimBox( void ){
98  
99 <      dAtom->getJ( ji );
99 >  double scaleFactor;
100  
96 –      for (j=0; j < 3; j++)
97 –        ji[j] += dt2 * (Tb[j] * eConvert - ji[j]*chi);
98 –      
99 –      // use the angular velocities to propagate the rotation matrix a
100 –      // full time step
101 –
102 –      dAtom->getA(A);
103 –      dAtom->getI(I);
104 –    
105 –      // rotate about the x-axis      
106 –      angle = dt2 * ji[0] / I[0][0];
107 –      this->rotate( 1, 2, angle, ji, A );
108 –
109 –      // rotate about the y-axis
110 –      angle = dt2 * ji[1] / I[1][1];
111 –      this->rotate( 2, 0, angle, ji, A );
112 –      
113 –      // rotate about the z-axis
114 –      angle = dt * ji[2] / I[2][2];
115 –      this->rotate( 0, 1, angle, ji, A);
116 –      
117 –      // rotate about the y-axis
118 –      angle = dt2 * ji[1] / I[1][1];
119 –      this->rotate( 2, 0, angle, ji, A );
120 –      
121 –       // rotate about the x-axis
122 –      angle = dt2 * ji[0] / I[0][0];
123 –      this->rotate( 1, 2, angle, ji, A );
124 –      
125 –      dAtom->setJ( ji );
126 –      dAtom->setA( A  );    
127 –    }                
128 –
129 –  }
130 –
131 –  // Scale the box after all the positions have been moved:
132 –  
101    scaleFactor = exp(dt*eta);
102  
103 <  if (scaleFactor > 1.1 || scaleFactor < 0.9) {
103 >  if ((scaleFactor > 1.1) || (scaleFactor < 0.9)) {
104      sprintf( painCave.errMsg,
105               "NPTi error: Attempting a Box scaling of more than 10 percent"
106               " check your tauBarostat, as it is probably too small!\n"
# Line 140 | Line 108 | void NPTi::moveA() {
108               );
109      painCave.isFatal = 1;
110      simError();
111 <  } else {        
112 <    info->scaleBox(exp(dt*eta));      
111 >  } else {
112 >    info->scaleBox(scaleFactor);
113    }
114 +
115   }
116  
117 < void NPTi::moveB( void ){
117 > template<typename T> bool NPTi<T>::etaConverged() {
118  
119 <  int i, j;
120 <  DirectionalAtom* dAtom;
152 <  double Tb[3], ji[3];
153 <  double vel[3], frc[3];
154 <  double mass;
119 >  return ( fabs(prevEta - eta) <= etaTolerance );
120 > }
121  
122 <  double instaTemp, instaPress, instaVol;
157 <  double tt2, tb2;
158 <  
159 <  tt2 = tauThermostat * tauThermostat;
160 <  tb2 = tauBarostat * tauBarostat;
122 > template<typename T> double NPTi<T>::getConservedQuantity(void){
123  
124 <  instaTemp = tStats->getTemperature();
125 <  instaPress = tStats->getPressure();
126 <  instaVol = tStats->getVolume();
124 >  double conservedQuantity;
125 >  double Energy;
126 >  double thermostat_kinetic;
127 >  double thermostat_potential;
128 >  double barostat_kinetic;
129 >  double barostat_potential;
130  
131 <  chi += dt2 * ( instaTemp / targetTemp - 1.0) / tt2;
167 <  eta += dt2 * ( instaVol * (instaPress - targetPressure) /
168 <                 (p_convert*NkBT*tb2));
169 <  
170 <  for( i=0; i<nAtoms; i++ ){
131 >  Energy = tStats->getTotalE();
132  
133 <    atoms[i]->getVel( vel );
134 <    atoms[i]->getFrc( frc );
133 >  thermostat_kinetic = fkBT* tt2 * chi * chi /
134 >    (2.0 * eConvert);
135  
136 <    mass = atoms[i]->getMass();
136 >  thermostat_potential = fkBT* integralOfChidt / eConvert;
137  
177 –    // velocity half step
178 –    for (j=0; j < 3; j++)
179 –      vel[j] += dt2 * ((frc[j] / mass ) * eConvert - vel[j]*(chi+eta));
180 –    
181 –    atoms[i]->setVel( vel );
138  
139 <    if( atoms[i]->isDirectional() ){
139 >  barostat_kinetic = 3.0 * NkBT * tb2 * eta * eta /
140 >    (2.0 * eConvert);
141  
142 <      dAtom = (DirectionalAtom *)atoms[i];
142 >  barostat_potential = (targetPressure * tStats->getVolume() / p_convert) /
143 >    eConvert;
144  
145 <      // get and convert the torque to body frame      
145 >  conservedQuantity = Energy + thermostat_kinetic + thermostat_potential +
146 >    barostat_kinetic + barostat_potential;
147  
148 <      dAtom->getTrq( Tb );
149 <      dAtom->lab2Body( Tb );
148 > //   cout.width(8);
149 > //   cout.precision(8);
150  
151 <      // get the angular momentum, and propagate a half step
152 <
153 <      dAtom->getJ( ji );
154 <
196 <      for (j=0; j < 3; j++)
197 <        ji[j] += dt2 * (Tb[j] * eConvert - ji[j]*chi);    
198 <
199 <      dAtom->setJ( ji );
200 <    }
201 <  }
151 > //   cerr << info->getTime() << "\t" << Energy << "\t" << thermostat_kinetic <<
152 > //       "\t" << thermostat_potential << "\t" << barostat_kinetic <<
153 > //       "\t" << barostat_potential << "\t" << conservedQuantity << endl;
154 >  return conservedQuantity;
155   }
156  
157 < int NPTi::readyCheck() {
158 <
159 <  // First check to see if we have a target temperature.
160 <  // Not having one is fatal.
208 <  
209 <  if (!have_target_temp) {
210 <    sprintf( painCave.errMsg,
211 <             "NPTi error: You can't use the NPTi integrator\n"
212 <             "   without a targetTemp!\n"
213 <             );
214 <    painCave.isFatal = 1;
215 <    simError();
216 <    return -1;
217 <  }
157 > template<typename T> string NPTi<T>::getAdditionalParameters(void){
158 >  string parameters;
159 >  const int BUFFERSIZE = 2000; // size of the read buffer
160 >  char buffer[BUFFERSIZE];
161  
162 <  if (!have_target_pressure) {
163 <    sprintf( painCave.errMsg,
221 <             "NPTi error: You can't use the NPTi integrator\n"
222 <             "   without a targetPressure!\n"
223 <             );
224 <    painCave.isFatal = 1;
225 <    simError();
226 <    return -1;
227 <  }
228 <  
229 <  // We must set tauThermostat.
230 <  
231 <  if (!have_tau_thermostat) {
232 <    sprintf( painCave.errMsg,
233 <             "NPTi error: If you use the NPTi\n"
234 <             "   integrator, you must set tauThermostat.\n");
235 <    painCave.isFatal = 1;
236 <    simError();
237 <    return -1;
238 <  }    
162 >  sprintf(buffer,"\t%G\t%G;", chi, integralOfChidt);
163 >  parameters += buffer;
164  
165 <  // We must set tauBarostat.
166 <  
242 <  if (!have_tau_barostat) {
243 <    sprintf( painCave.errMsg,
244 <             "NPTi error: If you use the NPTi\n"
245 <             "   integrator, you must set tauBarostat.\n");
246 <    painCave.isFatal = 1;
247 <    simError();
248 <    return -1;
249 <  }    
165 >  sprintf(buffer,"\t%G\t0\t0;", eta);
166 >  parameters += buffer;
167  
168 <  // We need NkBT a lot, so just set it here:
168 >  sprintf(buffer,"\t0\t%G\t0;", eta);
169 >  parameters += buffer;
170  
171 <  NkBT = (double)info->ndf * kB * targetTemp;
171 >  sprintf(buffer,"\t0\t0\t%G;", eta);
172 >  parameters += buffer;
173  
174 <  return 1;
174 >  return parameters;
175 >
176   }

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines