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

Comparing trunk/OOPSE/libmdtools/NPTf.cpp (file contents):
Revision 586 by mmeineke, Wed Jul 9 22:14:06 2003 UTC vs.
Revision 847 by mmeineke, Fri Oct 31 18:28:52 2003 UTC

# Line 1 | Line 1
1 + #include <math.h>
2   #include "Atom.hpp"
3   #include "SRI.hpp"
4   #include "AbstractClasses.hpp"
# Line 6 | 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 non-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 < NPTf::NPTf ( SimInfo *theInfo, ForceFields* the_ff):
27 <  Integrator( theInfo, the_ff )
26 > template<typename T> NPTf<T>::NPTf ( SimInfo *theInfo, ForceFields* the_ff):
27 >  T( theInfo, the_ff )
28   {
29 <  int i;
30 <  chi = 0.0;
31 <  for(i = 0; i < 9; i++) eta[i] = 0.0;
32 <  have_tau_thermostat = 0;
33 <  have_tau_barostat = 0;
34 <  have_target_temp = 0;
35 <  have_target_pressure = 0;
29 >  GenericData* data;
30 >  DoubleArrayData * etaValue;
31 >  vector<double> etaArray;
32 >  int i,j;
33 >
34 >  for(i = 0; i < 3; i++){
35 >    for (j = 0; j < 3; j++){
36 >
37 >      eta[i][j] = 0.0;
38 >      oldEta[i][j] = 0.0;
39 >    }
40 >  }
41 >
42 >    // retrieve eta array from simInfo if it exists
43 >    data = info->getProperty(ETAVALUE_ID);
44 >    if(data){
45 >      etaValue = dynamic_cast<DoubleArrayData*>(data);
46 >
47 >      if(etaValue){
48 >        etaArray = etaValue->getData();
49 >
50 >        for(i = 0; i < 3; i++){
51 >          for (j = 0; j < 3; j++){
52 >            eta[i][j] = etaArray[3*i+j];
53 >            oldEta[i][j] = eta[i][j];
54 >          }
55 >        }
56 >
57 >      }
58 >    }
59 >
60   }
61  
62 < void NPTf::moveA() {
35 <  
36 <  int i,j,k;
37 <  int atomIndex, aMatIndex;
38 <  DirectionalAtom* dAtom;
39 <  double Tb[3];
40 <  double ji[3];
41 <  double rj[3];
42 <  double ident[3][3], eta1[3][3], eta2[3][3], hmnew[3][3];
43 <  double hm[9];
44 <  double vx, vy, vz;
45 <  double scx, scy, scz;
46 <  double instaTemp, instaPress, instaVol;
47 <  double tt2, tb2;
48 <  double angle;
49 <  double press[9];
62 > template<typename T> NPTf<T>::~NPTf() {
63  
64 <  tt2 = tauThermostat * tauThermostat;
65 <  tb2 = tauBarostat * tauBarostat;
64 >  // empty for now
65 > }
66  
67 <  instaTemp = tStats->getTemperature();
55 <  tStats->getPressureTensor(press);
56 <  instaVol = tStats->getVolume();
57 <  
58 <  // first evolve chi a half step
59 <  
60 <  chi += dt2 * ( instaTemp / targetTemp - 1.0) / tt2;
61 <  
62 <  eta[0] += dt2 * instaVol * (press[0] - targetPressure/p_convert) /
63 <    (NkBT*tb2);
64 <  eta[1] += dt2 * instaVol * press[1] / (NkBT*tb2);
65 <  eta[2] += dt2 * instaVol * press[2] / (NkBT*tb2);
66 <  eta[3] += dt2 * instaVol * press[3] / (NkBT*tb2);
67 <  eta[4] += dt2 * instaVol * (press[4] - targetPressure/p_convert) /
68 <    (NkBT*tb2);
69 <  eta[5] += dt2 * instaVol * press[5] / (NkBT*tb2);
70 <  eta[6] += dt2 * instaVol * press[6] / (NkBT*tb2);
71 <  eta[7] += dt2 * instaVol * press[7] / (NkBT*tb2);
72 <  eta[8] += dt2 * instaVol * (press[8] - targetPressure/p_convert) /
73 <    (NkBT*tb2);
74 <  
75 <  for( i=0; i<nAtoms; i++ ){
76 <    atomIndex = i * 3;
77 <    aMatIndex = i * 9;
78 <    
79 <    // velocity half step
80 <    
81 <    vx = vel[atomIndex];
82 <    vy = vel[atomIndex+1];
83 <    vz = vel[atomIndex+2];
84 <    
85 <    scx = (chi + eta[0])*vx + eta[1]*vy + eta[2]*vz;
86 <    scy = eta[3]*vx + (chi + eta[4])*vy + eta[5]*vz;
87 <    scz = eta[6]*vx + eta[7]*vy + (chi + eta[8])*vz;
88 <    
89 <    vx += dt2 * ((frc[atomIndex]  /atoms[i]->getMass())*eConvert - scx);
90 <    vy += dt2 * ((frc[atomIndex+1]/atoms[i]->getMass())*eConvert - scy);
91 <    vz += dt2 * ((frc[atomIndex+2]/atoms[i]->getMass())*eConvert - scz);
67 > template<typename T> void NPTf<T>::resetIntegrator() {
68  
69 <    vel[atomIndex] = vx;
94 <    vel[atomIndex+1] = vy;
95 <    vel[atomIndex+2] = vz;
69 >  int i, j;
70  
71 <    // position whole step    
71 >  for(i = 0; i < 3; i++)
72 >    for (j = 0; j < 3; j++)
73 >      eta[i][j] = 0.0;
74  
75 <    rj[0] = pos[atomIndex];
76 <    rj[1] = pos[atomIndex+1];
101 <    rj[2] = pos[atomIndex+2];
75 >  T::resetIntegrator();
76 > }
77  
78 <    info->wrapVector(rj);
78 > template<typename T> void NPTf<T>::evolveEtaA() {
79  
80 <    scx = eta[0]*rj[0] + eta[1]*rj[1] + eta[2]*rj[2];
106 <    scy = eta[3]*rj[0] + eta[4]*rj[1] + eta[5]*rj[2];
107 <    scz = eta[6]*rj[0] + eta[7]*rj[1] + eta[8]*rj[2];
80 >  int i, j;
81  
82 <    pos[atomIndex] += dt * (vel[atomIndex] + scx);
83 <    pos[atomIndex+1] += dt * (vel[atomIndex+1] + scy);
84 <    pos[atomIndex+2] += dt * (vel[atomIndex+2] + scz);
85 <  
86 <    if( atoms[i]->isDirectional() ){
82 >  for(i = 0; i < 3; i ++){
83 >    for(j = 0; j < 3; j++){
84 >      if( i == j)
85 >        eta[i][j] += dt2 *  instaVol *
86 >          (press[i][j] - targetPressure/p_convert) / (NkBT*tb2);
87 >      else
88 >        eta[i][j] += dt2 * instaVol * press[i][j] / (NkBT*tb2);
89 >    }
90 >  }
91  
92 <      dAtom = (DirectionalAtom *)atoms[i];
93 <          
94 <      // get and convert the torque to body frame
95 <      
119 <      Tb[0] = dAtom->getTx();
120 <      Tb[1] = dAtom->getTy();
121 <      Tb[2] = dAtom->getTz();
122 <      
123 <      dAtom->lab2Body( Tb );
124 <      
125 <      // get the angular momentum, and propagate a half step
92 >  for(i = 0; i < 3; i++)
93 >    for (j = 0; j < 3; j++)
94 >      oldEta[i][j] = eta[i][j];
95 > }
96  
97 <      ji[0] = dAtom->getJx();
98 <      ji[1] = dAtom->getJy();
99 <      ji[2] = dAtom->getJz();
100 <      
101 <      ji[0] += dt2 * (Tb[0] * eConvert - ji[0]*chi);
102 <      ji[1] += dt2 * (Tb[1] * eConvert - ji[1]*chi);
103 <      ji[2] += dt2 * (Tb[2] * eConvert - ji[2]*chi);
104 <      
105 <      // use the angular velocities to propagate the rotation matrix a
106 <      // full time step
107 <      
108 <      // rotate about the x-axis      
109 <      angle = dt2 * ji[0] / dAtom->getIxx();
110 <      this->rotate( 1, 2, angle, ji, &Amat[aMatIndex] );
111 <      
112 <      // rotate about the y-axis
143 <      angle = dt2 * ji[1] / dAtom->getIyy();
144 <      this->rotate( 2, 0, angle, ji, &Amat[aMatIndex] );
145 <      
146 <      // rotate about the z-axis
147 <      angle = dt * ji[2] / dAtom->getIzz();
148 <      this->rotate( 0, 1, angle, ji, &Amat[aMatIndex] );
149 <      
150 <      // rotate about the y-axis
151 <      angle = dt2 * ji[1] / dAtom->getIyy();
152 <      this->rotate( 2, 0, angle, ji, &Amat[aMatIndex] );
153 <      
154 <       // rotate about the x-axis
155 <      angle = dt2 * ji[0] / dAtom->getIxx();
156 <      this->rotate( 1, 2, angle, ji, &Amat[aMatIndex] );
157 <      
158 <      dAtom->setJx( ji[0] );
159 <      dAtom->setJy( ji[1] );
160 <      dAtom->setJz( ji[2] );
97 > template<typename T> void NPTf<T>::evolveEtaB() {
98 >
99 >  int i,j;
100 >
101 >  for(i = 0; i < 3; i++)
102 >    for (j = 0; j < 3; j++)
103 >      prevEta[i][j] = eta[i][j];
104 >
105 >  for(i = 0; i < 3; i ++){
106 >    for(j = 0; j < 3; j++){
107 >      if( i == j) {
108 >        eta[i][j] = oldEta[i][j] + dt2 *  instaVol *
109 >          (press[i][j] - targetPressure/p_convert) / (NkBT*tb2);
110 >      } else {
111 >        eta[i][j] = oldEta[i][j] + dt2 * instaVol * press[i][j] / (NkBT*tb2);
112 >      }
113      }
162 –    
114    }
115 + }
116  
117 + template<typename T> void NPTf<T>::getVelScaleA(double sc[3], double vel[3]) {
118 +  int i,j;
119 +  double vScale[3][3];
120 +
121 +  for (i = 0; i < 3; i++ ) {
122 +    for (j = 0; j < 3; j++ ) {
123 +      vScale[i][j] = eta[i][j];
124 +
125 +      if (i == j) {
126 +        vScale[i][j] += chi;
127 +      }
128 +    }
129 +  }
130 +
131 +  info->matVecMul3( vScale, vel, sc );
132 + }
133 +
134 + template<typename T> void NPTf<T>::getVelScaleB(double sc[3], int index ){
135 +  int i,j;
136 +  double myVel[3];
137 +  double vScale[3][3];
138 +
139 +  for (i = 0; i < 3; i++ ) {
140 +    for (j = 0; j < 3; j++ ) {
141 +      vScale[i][j] = eta[i][j];
142 +
143 +      if (i == j) {
144 +        vScale[i][j] += chi;
145 +      }
146 +    }
147 +  }
148 +
149 +  for (j = 0; j < 3; j++)
150 +    myVel[j] = oldVel[3*index + j];
151 +
152 +  info->matVecMul3( vScale, myVel, sc );
153 + }
154 +
155 + template<typename T> void NPTf<T>::getPosScale(double pos[3], double COM[3],
156 +                                               int index, double sc[3]){
157 +  int j;
158 +  double rj[3];
159 +
160 +  for(j=0; j<3; j++)
161 +    rj[j] = ( oldPos[index*3+j] + pos[j]) / 2.0 - COM[j];
162 +
163 +  info->matVecMul3( eta, rj, sc );
164 + }
165 +
166 + template<typename T> void NPTf<T>::scaleSimBox( void ){
167 +
168 +  int i,j,k;
169 +  double scaleMat[3][3];
170 +  double eta2ij;
171 +  double bigScale, smallScale, offDiagMax;
172 +  double hm[3][3], hmnew[3][3];
173 +
174 +
175 +
176    // Scale the box after all the positions have been moved:
177  
178    // Use a taylor expansion for eta products:  Hmat = Hmat . exp(dt * etaMat)
179    //  Hmat = Hmat . ( Ident + dt * etaMat  + dt^2 * etaMat*etaMat / 2)
180  
181 +  bigScale = 1.0;
182 +  smallScale = 1.0;
183 +  offDiagMax = 0.0;
184  
185    for(i=0; i<3; i++){
186      for(j=0; j<3; j++){
173 –      ident[i][j] = 0.0;
174 –      eta1[i][j] = eta[3*i+j];
175 –      eta2[i][j] = 0.0;
176 –      for(k=0; k<3; k++){
177 –        eta2[i][j] += eta[3*i+k] * eta[3*k+j];
178 –      }
179 –    }
180 –    ident[i][i] = 1.0;
181 –  }
187  
188 <  
189 <  info->getBoxM(hm);
190 <
191 <  for(i=0; i<3; i++){
187 <    for(j=0; j<3; j++){      
188 <      hmnew[i][j] = 0.0;
188 >      // Calculate the matrix Product of the eta array (we only need
189 >      // the ij element right now):
190 >
191 >      eta2ij = 0.0;
192        for(k=0; k<3; k++){
193 <        // remember that hmat has transpose ordering for Fortran compat:
191 <        hmnew[i][j] += hm[3*k+i] * (ident[k][j]
192 <                                    + dt * eta1[k][j]
193 <                                    + 0.5 * dt * dt * eta2[k][j]);
193 >        eta2ij += eta[i][k] * eta[k][j];
194        }
195 –    }
196 –  }
197 –  
198 –  for (i = 0; i < 3; i++) {
199 –    for (j = 0; j < 3; j++) {
200 –      // remember that hmat has transpose ordering for Fortran compat:
201 –      hm[3*j + i] = hmnew[i][j];
202 –    }
203 –  }
195  
196 <  info->setBoxM(hm);
197 <  
198 < }
196 >      scaleMat[i][j] = 0.0;
197 >      // identity matrix (see above):
198 >      if (i == j) scaleMat[i][j] = 1.0;
199 >      // Taylor expansion for the exponential truncated at second order:
200 >      scaleMat[i][j] += dt*eta[i][j]  + 0.5*dt*dt*eta2ij;
201  
202 < void NPTf::moveB( void ){
203 <  int i,j,k;
204 <  int atomIndex;
212 <  DirectionalAtom* dAtom;
213 <  double Tb[3];
214 <  double ji[3];
215 <  double press[9];
216 <  double instaTemp, instaVol;
217 <  double tt2, tb2;
218 <  double vx, vy, vz;
219 <  double scx, scy, scz;
220 <  const double p_convert = 1.63882576e8;
221 <  
222 <  tt2 = tauThermostat * tauThermostat;
223 <  tb2 = tauBarostat * tauBarostat;
224 <
225 <  instaTemp = tStats->getTemperature();
226 <  tStats->getPressureTensor(press);
227 <  instaVol = tStats->getVolume();
228 <  
229 <  // first evolve chi a half step
230 <  
231 <  chi += dt2 * ( instaTemp / targetTemp - 1.0) / tt2;
232 <  
233 <  eta[0] += dt2 * instaVol * (press[0] - targetPressure/p_convert) /
234 <    (NkBT*tb2);
235 <  eta[1] += dt2 * instaVol * press[1] / (NkBT*tb2);
236 <  eta[2] += dt2 * instaVol * press[2] / (NkBT*tb2);
237 <  eta[3] += dt2 * instaVol * press[3] / (NkBT*tb2);
238 <  eta[4] += dt2 * instaVol * (press[4] - targetPressure/p_convert) /
239 <    (NkBT*tb2);
240 <  eta[5] += dt2 * instaVol * press[5] / (NkBT*tb2);
241 <  eta[6] += dt2 * instaVol * press[6] / (NkBT*tb2);
242 <  eta[7] += dt2 * instaVol * press[7] / (NkBT*tb2);
243 <  eta[8] += dt2 * instaVol * (press[8] - targetPressure/p_convert) /
244 <    (NkBT*tb2);
245 <
246 <  for( i=0; i<nAtoms; i++ ){
247 <    atomIndex = i * 3;
248 <
249 <    // velocity half step
250 <    
251 <    vx = vel[atomIndex];
252 <    vy = vel[atomIndex+1];
253 <    vz = vel[atomIndex+2];
254 <    
255 <    scx = (chi + eta[0])*vx + eta[1]*vy + eta[2]*vz;
256 <    scy = eta[3]*vx + (chi + eta[4])*vy + eta[5]*vz;
257 <    scz = eta[6]*vx + eta[7]*vy + (chi + eta[8])*vz;
258 <    
259 <    vx += dt2 * ((frc[atomIndex]  /atoms[i]->getMass())*eConvert - scx);
260 <    vy += dt2 * ((frc[atomIndex+1]/atoms[i]->getMass())*eConvert - scy);
261 <    vz += dt2 * ((frc[atomIndex+2]/atoms[i]->getMass())*eConvert - scz);
262 <
263 <    vel[atomIndex] = vx;
264 <    vel[atomIndex+1] = vy;
265 <    vel[atomIndex+2] = vz;
266 <    
267 <    if( atoms[i]->isDirectional() ){
268 <      
269 <      dAtom = (DirectionalAtom *)atoms[i];
270 <      
271 <      // get and convert the torque to body frame
272 <      
273 <      Tb[0] = dAtom->getTx();
274 <      Tb[1] = dAtom->getTy();
275 <      Tb[2] = dAtom->getTz();
276 <      
277 <      dAtom->lab2Body( Tb );
278 <      
279 <      // get the angular momentum, and complete the angular momentum
280 <      // half step
281 <      
282 <      ji[0] = dAtom->getJx();
283 <      ji[1] = dAtom->getJy();
284 <      ji[2] = dAtom->getJz();
285 <      
286 <      ji[0] += dt2 * (Tb[0] * eConvert - ji[0]*chi);
287 <      ji[1] += dt2 * (Tb[1] * eConvert - ji[1]*chi);
288 <      ji[2] += dt2 * (Tb[2] * eConvert - ji[2]*chi);
289 <      
290 <      dAtom->setJx( ji[0] );
291 <      dAtom->setJy( ji[1] );
292 <      dAtom->setJz( ji[2] );
202 >      if (i != j)
203 >        if (fabs(scaleMat[i][j]) > offDiagMax)
204 >          offDiagMax = fabs(scaleMat[i][j]);
205      }
294 –  }
295 – }
206  
207 < int NPTf::readyCheck() {
208 <
299 <  // First check to see if we have a target temperature.
300 <  // Not having one is fatal.
301 <  
302 <  if (!have_target_temp) {
303 <    sprintf( painCave.errMsg,
304 <             "NPTf error: You can't use the NPTf integrator\n"
305 <             "   without a targetTemp!\n"
306 <             );
307 <    painCave.isFatal = 1;
308 <    simError();
309 <    return -1;
207 >    if (scaleMat[i][i] > bigScale) bigScale = scaleMat[i][i];
208 >    if (scaleMat[i][i] < smallScale) smallScale = scaleMat[i][i];
209    }
210  
211 <  if (!have_target_pressure) {
211 >  if ((bigScale > 1.1) || (smallScale < 0.9)) {
212      sprintf( painCave.errMsg,
213 <             "NPTf error: You can't use the NPTf integrator\n"
214 <             "   without a targetPressure!\n"
215 <             );
213 >             "NPTf error: Attempting a Box scaling of more than 10 percent.\n"
214 >             " Check your tauBarostat, as it is probably too small!\n\n"
215 >             " scaleMat = [%lf\t%lf\t%lf]\n"
216 >             "            [%lf\t%lf\t%lf]\n"
217 >             "            [%lf\t%lf\t%lf]\n",
218 >             scaleMat[0][0],scaleMat[0][1],scaleMat[0][2],
219 >             scaleMat[1][0],scaleMat[1][1],scaleMat[1][2],
220 >             scaleMat[2][0],scaleMat[2][1],scaleMat[2][2]);
221      painCave.isFatal = 1;
222      simError();
223 <    return -1;
320 <  }
321 <  
322 <  // We must set tauThermostat.
323 <  
324 <  if (!have_tau_thermostat) {
223 >  } else if (offDiagMax > 0.1) {
224      sprintf( painCave.errMsg,
225 <             "NPTf error: If you use the NPTf\n"
226 <             "   integrator, you must set tauThermostat.\n");
225 >             "NPTf error: Attempting an off-diagonal Box scaling of more than 10 percent.\n"
226 >             " Check your tauBarostat, as it is probably too small!\n\n"
227 >             " scaleMat = [%lf\t%lf\t%lf]\n"
228 >             "            [%lf\t%lf\t%lf]\n"
229 >             "            [%lf\t%lf\t%lf]\n",
230 >             scaleMat[0][0],scaleMat[0][1],scaleMat[0][2],
231 >             scaleMat[1][0],scaleMat[1][1],scaleMat[1][2],
232 >             scaleMat[2][0],scaleMat[2][1],scaleMat[2][2]);
233      painCave.isFatal = 1;
234      simError();
235 <    return -1;
236 <  }    
235 >  } else {
236 >    info->getBoxM(hm);
237 >    info->matMul3(hm, scaleMat, hmnew);
238 >    info->setBoxM(hmnew);
239 >  }
240 > }
241  
242 <  // We must set tauBarostat.
243 <  
244 <  if (!have_tau_barostat) {
336 <    sprintf( painCave.errMsg,
337 <             "NPTf error: If you use the NPTf\n"
338 <             "   integrator, you must set tauBarostat.\n");
339 <    painCave.isFatal = 1;
340 <    simError();
341 <    return -1;
342 <  }    
242 > template<typename T> bool NPTf<T>::etaConverged() {
243 >  int i;
244 >  double diffEta, sumEta;
245  
246 <  // We need NkBT a lot, so just set it here:
246 >  sumEta = 0;
247 >  for(i = 0; i < 3; i++)
248 >    sumEta += pow(prevEta[i][i] - eta[i][i], 2);
249  
250 <  NkBT = (double)info->ndf * kB * targetTemp;
250 >  diffEta = sqrt( sumEta / 3.0 );
251  
252 <  return 1;
252 >  return ( diffEta <= etaTolerance );
253   }
254 +
255 + template<typename T> double NPTf<T>::getConservedQuantity(void){
256 +
257 +  double conservedQuantity;
258 +  double totalEnergy;
259 +  double thermostat_kinetic;
260 +  double thermostat_potential;
261 +  double barostat_kinetic;
262 +  double barostat_potential;
263 +  double trEta;
264 +  double a[3][3], b[3][3];
265 +
266 +  totalEnergy = tStats->getTotalE();
267 +
268 +  thermostat_kinetic = fkBT * tt2 * chi * chi /
269 +    (2.0 * eConvert);
270 +
271 +  thermostat_potential = fkBT* integralOfChidt / eConvert;
272 +
273 +  info->transposeMat3(eta, a);
274 +  info->matMul3(a, eta, b);
275 +  trEta = info->matTrace3(b);
276 +
277 +  barostat_kinetic = NkBT * tb2 * trEta /
278 +    (2.0 * eConvert);
279 +
280 +  barostat_potential = (targetPressure * tStats->getVolume() / p_convert) /
281 +    eConvert;
282 +
283 +  conservedQuantity = totalEnergy + thermostat_kinetic + thermostat_potential +
284 +    barostat_kinetic + barostat_potential;
285 +
286 + //   cout.width(8);
287 + //   cout.precision(8);
288 +
289 + //   cerr << info->getTime() << "\t" << Energy << "\t" << thermostat_kinetic <<
290 + //       "\t" << thermostat_potential << "\t" << barostat_kinetic <<
291 + //       "\t" << barostat_potential << "\t" << conservedQuantity << endl;
292 +
293 +  return conservedQuantity;
294 +
295 + }
296 +
297 + template<typename T> string NPTf<T>::getAdditionalParameters(void){
298 +  string parameters;
299 +  const int BUFFERSIZE = 2000; // size of the read buffer
300 +  char buffer[BUFFERSIZE];
301 +
302 +  sprintf(buffer,"\t%lf\t%lf;", chi, integralOfChidt);
303 +  parameters += buffer;
304 +
305 +  for(int i = 0; i < 3; i++){
306 +    sprintf(buffer,"\t%lf\t%lf\t%lf;", eta[3*i], eta[3*i+1], eta[3*i+2]);
307 +    parameters += buffer;
308 +  }
309 +
310 +  return parameters;
311 +
312 + }

Diff Legend

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