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

Comparing:
trunk/OOPSE/libmdtools/NPTi.cpp (file contents), Revision 770 by gezelter, Fri Sep 19 14:55:41 2003 UTC vs.
branches/new-templateless/OOPSE/libmdtools/NPTi.cpp (file contents), Revision 850 by mmeineke, Mon Nov 3 22:07:17 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 –
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 < template<typename T> NPTi<T>::NPTi ( SimInfo *theInfo, ForceFields* the_ff):
27 <  T( theInfo, the_ff )
26 > NPTi::NPTi ( SimInfo *theInfo, ForceFields* the_ff):
27 >  NPT( theInfo, the_ff )
28   {
29 <  chi = 0.0;
29 >  GenericData* data;
30 >  double *etaArray;
31 >
32    eta = 0.0;
33 <  integralOfChidt = 0.0;
33 <  have_tau_thermostat = 0;
34 <  have_tau_barostat = 0;
35 <  have_target_temp = 0;
36 <  have_target_pressure = 0;
37 <  have_chi_tolerance = 0;
38 <  have_eta_tolerance = 0;
39 <  have_pos_iter_tolerance = 0;
33 >  oldEta = 0.0;
34  
35 <  oldPos = new double[3*nAtoms];
36 <  oldVel = new double[3*nAtoms];
37 <  oldJi = new double[3*nAtoms];
38 < #ifdef IS_MPI
39 <  Nparticles = mpiSim->getTotAtoms();
40 < #else
41 <  Nparticles = theInfo->n_atoms;
42 < #endif
35 >  // retrieve eta array from simInfo if it exists
36 >  data = info->getProperty(ETAVALUE_ID);
37 >  if(data != NULL){
38 >    
39 >    int test = data->getDarray(etaArray);
40 >    
41 >    if( test == 9 ){
42 >      
43 >      eta = etaArray[0];
44 >      }    
45 >      delete[] etaArray;
46 >    }
47 >    else
48 >      std::cerr << "NPTi error: etaArray is not length 9 (actual = " << test
49 >                << ").\n"
50 >                << "            Simulation wil proceed with eta = 0;\n";
51 >  }
52 > }
53  
54 + NPTi::~NPTi() {
55 +  //nothing for now
56   }
57  
58 < template<typename T> NPTi<T>::~NPTi() {
59 <  delete[] oldPos;
60 <  delete[] oldVel;
55 <  delete[] oldJi;
58 > void NPTi::resetIntegrator() {
59 >  eta = 0.0;
60 >  NPT::resetIntegrator();
61   }
62  
63 < template<typename T> void NPTi<T>::moveA() {
64 <
65 <  //new version of NPTi
66 <  int i, j, k;
67 <  DirectionalAtom* dAtom;
63 <  double Tb[3], ji[3];
64 <  double A[3][3], I[3][3];
65 <  double angle, mass;
66 <  double vel[3], pos[3], frc[3];
63 > void NPTi::evolveEtaA() {
64 >  eta += dt2 * ( instaVol * (instaPress - targetPressure) /
65 >                 (p_convert*NkBT*tb2));
66 >  oldEta = eta;
67 > }
68  
69 <  double rj[3];
69 <  double instaTemp, instaPress, instaVol;
70 <  double tt2, tb2, scaleFactor;
71 <  double COM[3];
69 > void NPTi::evolveEtaB() {
70  
71 <  tt2 = tauThermostat * tauThermostat;
72 <  tb2 = tauBarostat * tauBarostat;
71 >  prevEta = eta;
72 >  eta = oldEta + dt2 * ( instaVol * (instaPress - targetPressure) /
73 >                 (p_convert*NkBT*tb2));
74 > }
75  
76 <  instaTemp = tStats->getTemperature();
77 <  instaPress = tStats->getPressure();
78 <  instaVol = tStats->getVolume();
79 <  
80 <  tStats->getCOM(COM);
81 <  
82 <  //evolve velocity half step
83 <  for( i=0; i<nAtoms; i++ ){
76 > void NPTi::getVelScaleA(double sc[3], double vel[3]) {
77 >  int i;
78  
79 <    atoms[i]->getVel( vel );
80 <    atoms[i]->getFrc( frc );
79 >  for(i=0; i<3; i++) sc[i] = vel[i] * ( chi + eta );
80 > }
81  
82 <    mass = atoms[i]->getMass();
82 > void NPTi::getVelScaleB(double sc[3], int index ){
83 >  int i;
84  
85 <    for (j=0; j < 3; j++) {
86 <      // velocity half step  (use chi from previous step here):
92 <      vel[j] += dt2 * ((frc[j] / mass ) * eConvert - vel[j]*(chi + eta));
93 <  
94 <    }
85 >  for(i=0; i<3; i++) sc[i] = oldVel[index*3 + i] * ( chi + eta );
86 > }
87  
96 –    atoms[i]->setVel( vel );
97 –  
98 –    if( atoms[i]->isDirectional() ){
88  
89 <      dAtom = (DirectionalAtom *)atoms[i];
89 > void NPTi::getPosScale(double pos[3], double COM[3],
90 >                                               int index, double sc[3]){
91 >  int j;
92  
93 <      // get and convert the torque to body frame
94 <      
104 <      dAtom->getTrq( Tb );
105 <      dAtom->lab2Body( Tb );
106 <      
107 <      // get the angular momentum, and propagate a half step
93 >  for(j=0; j<3; j++)
94 >    sc[j] = ( oldPos[index*3+j] + pos[j]) / 2.0 - COM[j];
95  
96 <      dAtom->getJ( ji );
96 >  for(j=0; j<3; j++)
97 >    sc[j] *= eta;
98 > }
99  
100 <      for (j=0; j < 3; j++)
112 <        ji[j] += dt2 * (Tb[j] * eConvert - ji[j]*chi);
113 <      
114 <      // use the angular velocities to propagate the rotation matrix a
115 <      // full time step
100 > void NPTi::scaleSimBox( void ){
101  
102 <      dAtom->getA(A);
118 <      dAtom->getI(I);
119 <    
120 <      // rotate about the x-axis      
121 <      angle = dt2 * ji[0] / I[0][0];
122 <      this->rotate( 1, 2, angle, ji, A );
102 >  double scaleFactor;
103  
124 –      // rotate about the y-axis
125 –      angle = dt2 * ji[1] / I[1][1];
126 –      this->rotate( 2, 0, angle, ji, A );
127 –      
128 –      // rotate about the z-axis
129 –      angle = dt * ji[2] / I[2][2];
130 –      this->rotate( 0, 1, angle, ji, A);
131 –      
132 –      // rotate about the y-axis
133 –      angle = dt2 * ji[1] / I[1][1];
134 –      this->rotate( 2, 0, angle, ji, A );
135 –      
136 –       // rotate about the x-axis
137 –      angle = dt2 * ji[0] / I[0][0];
138 –      this->rotate( 1, 2, angle, ji, A );
139 –      
140 –      dAtom->setJ( ji );
141 –      dAtom->setA( A  );    
142 –    }    
143 –  }
144 –
145 –  // evolve chi and eta  half step
146 –  
147 –  chi += dt2 * ( instaTemp / targetTemp - 1.0) / tt2;
148 –  eta += dt2 * ( instaVol * (instaPress - targetPressure) / (p_convert*NkBT*tb2));
149 –
150 –  //calculate the integral of chidt
151 –  integralOfChidt += dt2*chi;
152 –
153 –  //save the old positions
154 –  for(i = 0; i < nAtoms; i++){
155 –    atoms[i]->getPos(pos);
156 –    for(j = 0; j < 3; j++)
157 –      oldPos[i*3 + j] = pos[j];
158 –  }
159 –  
160 –  //the first estimation of r(t+dt) is equal to  r(t)
161 –    
162 –  for(k = 0; k < 4; k ++){
163 –
164 –    for(i =0 ; i < nAtoms; i++){
165 –
166 –      atoms[i]->getVel(vel);
167 –      atoms[i]->getPos(pos);
168 –
169 –      for(j = 0; j < 3; j++)
170 –        rj[j] = (oldPos[i*3 + j] + pos[j])/2 - COM[j];    
171 –      
172 –      for(j = 0; j < 3; j++)
173 –        pos[j] = oldPos[i*3 + j] + dt*(vel[j] + eta*rj[j]);
174 –
175 –      atoms[i]->setPos( pos );
176 –    }
177 –    
178 –    if (nConstrained){
179 –      constrainA();
180 –    }
181 –  }
182 –    
183 –
184 –  // Scale the box after all the positions have been moved:
185 –  
104    scaleFactor = exp(dt*eta);
105  
106    if ((scaleFactor > 1.1) || (scaleFactor < 0.9)) {
# Line 193 | Line 111 | template<typename T> void NPTi<T>::moveA() {
111               );
112      painCave.isFatal = 1;
113      simError();
114 <  } else {        
115 <    info->scaleBox(scaleFactor);      
116 <  }  
114 >  } else {
115 >    info->scaleBox(scaleFactor);
116 >  }
117  
118   }
119  
120 < template<typename T> void NPTi<T>::moveB( void ){
203 <  
204 <  //new version of NPTi
205 <  int i, j, k;
206 <  DirectionalAtom* dAtom;
207 <  double Tb[3], ji[3];
208 <  double vel[3], frc[3];
209 <  double mass;
210 <
211 <  double instTemp, instPress, instVol;
212 <  double tt2, tb2;
213 <  double oldChi, prevChi;
214 <  double oldEta, preEta;
215 <  
216 <  tt2 = tauThermostat * tauThermostat;
217 <  tb2 = tauBarostat * tauBarostat;
218 <
219 <  // Set things up for the iteration:
120 > bool NPTi::etaConverged() {
121  
122 <  oldChi = chi;
222 <  oldEta = eta;
223 <
224 <  for( i=0; i<nAtoms; i++ ){
225 <
226 <    atoms[i]->getVel( vel );
227 <
228 <    for (j=0; j < 3; j++)
229 <      oldVel[3*i + j]  = vel[j];
230 <
231 <    if( atoms[i]->isDirectional() ){
232 <
233 <      dAtom = (DirectionalAtom *)atoms[i];
234 <
235 <      dAtom->getJ( ji );
236 <
237 <      for (j=0; j < 3; j++)
238 <        oldJi[3*i + j] = ji[j];
239 <
240 <    }
241 <  }
242 <
243 <  // do the iteration:
244 <
245 <  instVol = tStats->getVolume();
246 <  
247 <  for (k=0; k < 4; k++) {
248 <    
249 <    instTemp = tStats->getTemperature();
250 <    instPress = tStats->getPressure();
251 <
252 <    // evolve chi another half step using the temperature at t + dt/2
253 <
254 <    prevChi = chi;
255 <    chi = oldChi + dt2 * ( instTemp / targetTemp - 1.0) /
256 <      (tauThermostat*tauThermostat);
257 <
258 <    preEta = eta;
259 <    eta = oldEta + dt2 * ( instVol * (instPress - targetPressure) /
260 <       (p_convert*NkBT*tb2));
261 <
262 <  
263 <    for( i=0; i<nAtoms; i++ ){
264 <
265 <      atoms[i]->getFrc( frc );
266 <      atoms[i]->getVel(vel);
267 <      
268 <      mass = atoms[i]->getMass();
269 <      
270 <      // velocity half step
271 <      for (j=0; j < 3; j++)
272 <        vel[j] = oldVel[3*i+j] + dt2 * ((frc[j] / mass ) * eConvert - oldVel[3*i + j]*(chi + eta));
273 <      
274 <      atoms[i]->setVel( vel );
275 <      
276 <      if( atoms[i]->isDirectional() ){
277 <
278 <        dAtom = (DirectionalAtom *)atoms[i];
279 <  
280 <        // get and convert the torque to body frame      
281 <  
282 <        dAtom->getTrq( Tb );
283 <        dAtom->lab2Body( Tb );      
284 <            
285 <        for (j=0; j < 3; j++)
286 <          ji[j] = oldJi[3*i + j] + dt2 * (Tb[j] * eConvert - oldJi[3*i+j]*chi);
287 <      
288 <          dAtom->setJ( ji );
289 <      }
290 <    }
291 <    
292 <    if (nConstrained){
293 <      constrainB();
294 <    }    
295 <    
296 <    if (fabs(prevChi - chi) <=
297 <        chiTolerance && fabs(preEta -eta) <= etaTolerance)
298 <      break;
299 <  }
300 <
301 <  //calculate integral of chida
302 <  integralOfChidt += dt2*chi;
303 <
304 <
122 >  return ( fabs(prevEta - eta) <= etaTolerance );
123   }
124  
125 < template<typename T> void NPTi<T>::resetIntegrator() {
308 <  chi = 0.0;
309 <  eta = 0.0;
310 < }
125 > double NPTi::getConservedQuantity(void){
126  
312 – template<typename T> int NPTi<T>::readyCheck() {
313 –
314 –  //check parent's readyCheck() first
315 –  if (T::readyCheck() == -1)
316 –    return -1;
317 –
318 –  // First check to see if we have a target temperature.
319 –  // Not having one is fatal.
320 –  
321 –  if (!have_target_temp) {
322 –    sprintf( painCave.errMsg,
323 –             "NPTi error: You can't use the NPTi integrator\n"
324 –             "   without a targetTemp!\n"
325 –             );
326 –    painCave.isFatal = 1;
327 –    simError();
328 –    return -1;
329 –  }
330 –
331 –  if (!have_target_pressure) {
332 –    sprintf( painCave.errMsg,
333 –             "NPTi error: You can't use the NPTi integrator\n"
334 –             "   without a targetPressure!\n"
335 –             );
336 –    painCave.isFatal = 1;
337 –    simError();
338 –    return -1;
339 –  }
340 –  
341 –  // We must set tauThermostat.
342 –  
343 –  if (!have_tau_thermostat) {
344 –    sprintf( painCave.errMsg,
345 –             "NPTi error: If you use the NPTi\n"
346 –             "   integrator, you must set tauThermostat.\n");
347 –    painCave.isFatal = 1;
348 –    simError();
349 –    return -1;
350 –  }    
351 –
352 –  // We must set tauBarostat.
353 –  
354 –  if (!have_tau_barostat) {
355 –    sprintf( painCave.errMsg,
356 –             "NPTi error: If you use the NPTi\n"
357 –             "   integrator, you must set tauBarostat.\n");
358 –    painCave.isFatal = 1;
359 –    simError();
360 –    return -1;
361 –  }    
362 –
363 –  if (!have_chi_tolerance) {
364 –    sprintf( painCave.errMsg,
365 –             "NPTi warning: setting chi tolerance to 1e-6\n");
366 –    chiTolerance = 1e-6;
367 –    have_chi_tolerance = 1;
368 –    painCave.isFatal = 0;
369 –    simError();
370 –  }
371 –
372 –  if (!have_eta_tolerance) {
373 –    sprintf( painCave.errMsg,
374 –             "NPTi warning: setting eta tolerance to 1e-6\n");
375 –    etaTolerance = 1e-6;
376 –    have_eta_tolerance = 1;
377 –    painCave.isFatal = 0;
378 –    simError();
379 –  }
380 –  
381 –  
382 –  // We need NkBT a lot, so just set it here: This is the RAW number
383 –  // of particles, so no subtraction or addition of constraints or
384 –  // orientational degrees of freedom:
385 –  
386 –  NkBT = (double)Nparticles * kB * targetTemp;
387 –  
388 –  // fkBT is used because the thermostat operates on more degrees of freedom
389 –  // than the barostat (when there are particles with orientational degrees
390 –  // of freedom).  ndf = 3 * (n_atoms + n_oriented -1) - n_constraint - nZcons
391 –  
392 –  fkBT = (double)info->ndf * kB * targetTemp;
393 –
394 –  return 1;
395 – }
396 –
397 – template<typename T> double NPTi<T>::getConservedQuantity(void){
398 –
127    double conservedQuantity;
400 –  double Three_NkBT;
128    double Energy;
129    double thermostat_kinetic;
130    double thermostat_potential;
131    double barostat_kinetic;
132    double barostat_potential;
406 –  double tb2;
407 –  double eta2;
133  
134    Energy = tStats->getTotalE();
135  
136 <  thermostat_kinetic = fkBT* tauThermostat * tauThermostat * chi * chi /
136 >  thermostat_kinetic = fkBT* tt2 * chi * chi /
137      (2.0 * eConvert);
138  
139    thermostat_potential = fkBT* integralOfChidt / eConvert;
140  
141  
142 <  barostat_kinetic = 3.0 * NkBT * tauBarostat * tauBarostat * eta * eta /
142 >  barostat_kinetic = 3.0 * NkBT * tb2 * eta * eta /
143      (2.0 * eConvert);
144 <  
145 <  barostat_potential = (targetPressure * tStats->getVolume() / p_convert) /
144 >
145 >  barostat_potential = (targetPressure * tStats->getVolume() / p_convert) /
146      eConvert;
147  
148    conservedQuantity = Energy + thermostat_kinetic + thermostat_potential +
149      barostat_kinetic + barostat_potential;
425 –  
426 –  cout.width(8);
427 –  cout.precision(8);
150  
151 <  cerr << info->getTime() << "\t" << Energy << "\t" << thermostat_kinetic <<
152 <      "\t" << thermostat_potential << "\t" << barostat_kinetic <<
431 <      "\t" << barostat_potential << "\t" << conservedQuantity << endl;
151 > //   cout.width(8);
152 > //   cout.precision(8);
153  
154 <  return conservedQuantity;
154 > //   cerr << info->getTime() << "\t" << Energy << "\t" << thermostat_kinetic <<
155 > //       "\t" << thermostat_potential << "\t" << barostat_kinetic <<
156 > //       "\t" << barostat_potential << "\t" << conservedQuantity << endl;
157 >  return conservedQuantity;
158   }
159 +
160 + string NPTi::getAdditionalParameters(void){
161 +  string parameters;
162 +  const int BUFFERSIZE = 2000; // size of the read buffer
163 +  char buffer[BUFFERSIZE];
164 +
165 +  sprintf(buffer,"\t%lf\t%lf;", chi, integralOfChidt);
166 +  parameters += buffer;
167 +
168 +  sprintf(buffer,"\t%lf\t0\t0;", eta);
169 +  parameters += buffer;
170 +
171 +  sprintf(buffer,"\t0\t%lf\t0;", eta);
172 +  parameters += buffer;
173 +
174 +  sprintf(buffer,"\t0\t0\t%lf;", eta);
175 +  parameters += buffer;
176 +
177 +  return parameters;
178 +
179 + }

Diff Legend

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