# | Line 12 | Line 12 | using namespace std; | |
---|---|---|
12 | ||
13 | #include "fortranWrappers.hpp" | |
14 | ||
15 | + | #include "MatVec3.h" |
16 | + | |
17 | #ifdef IS_MPI | |
18 | #include "mpiSimulation.hpp" | |
19 | #endif | |
# | Line 27 | Line 29 | SimInfo::SimInfo(){ | |
29 | SimInfo* currentInfo; | |
30 | ||
31 | SimInfo::SimInfo(){ | |
32 | < | excludes = NULL; |
32 | > | |
33 | n_constraints = 0; | |
34 | nZconstraints = 0; | |
35 | n_oriented = 0; | |
# | Line 40 | Line 42 | SimInfo::SimInfo(){ | |
42 | thermalTime = 0.0; | |
43 | currentTime = 0.0; | |
44 | rCut = 0.0; | |
45 | < | ecr = 0.0; |
44 | < | est = 0.0; |
45 | > | rSw = 0.0; |
46 | ||
47 | haveRcut = 0; | |
48 | < | haveEcr = 0; |
48 | > | haveRsw = 0; |
49 | boxIsInit = 0; | |
50 | ||
51 | resetTime = 1e99; | |
52 | ||
53 | + | orthoRhombic = 0; |
54 | orthoTolerance = 1E-6; | |
55 | useInitXSstate = true; | |
56 | ||
57 | usePBC = 0; | |
58 | useLJ = 0; | |
59 | useSticky = 0; | |
60 | < | useDipole = 0; |
60 | > | useCharges = 0; |
61 | > | useDipoles = 0; |
62 | useReactionField = 0; | |
63 | useGB = 0; | |
64 | useEAM = 0; | |
65 | + | useSolidThermInt = 0; |
66 | + | useLiquidThermInt = 0; |
67 | ||
68 | + | haveCutoffGroups = false; |
69 | + | |
70 | + | excludes = Exclude::Instance(); |
71 | + | |
72 | myConfiguration = new SimState(); | |
73 | ||
74 | + | has_minimizer = false; |
75 | + | the_minimizer =NULL; |
76 | + | |
77 | + | ngroup = 0; |
78 | + | |
79 | wrapMeSimInfo( this ); | |
80 | } | |
81 | ||
# | Line 74 | Line 88 | SimInfo::~SimInfo(){ | |
88 | ||
89 | for(i = properties.begin(); i != properties.end(); i++) | |
90 | delete (*i).second; | |
91 | < | |
91 | > | |
92 | } | |
93 | ||
94 | void SimInfo::setBox(double newBox[3]) { | |
# | Line 177 | Line 191 | void SimInfo::calcHmatInv( void ) { | |
191 | ||
192 | if( oldOrtho != orthoRhombic ){ | |
193 | ||
194 | < | if( orthoRhombic ){ |
194 | > | if( orthoRhombic ) { |
195 | sprintf( painCave.errMsg, | |
196 | < | "Hmat is switching from Non-Orthorhombic to OrthoRhombic\n" |
197 | < | " If this is a bad thing, change the orthoBoxTolerance( currently %G ).\n", |
196 | > | "OOPSE is switching from the default Non-Orthorhombic\n" |
197 | > | "\tto the faster Orthorhombic periodic boundary computations.\n" |
198 | > | "\tThis is usually a good thing, but if you wan't the\n" |
199 | > | "\tNon-Orthorhombic computations, make the orthoBoxTolerance\n" |
200 | > | "\tvariable ( currently set to %G ) smaller.\n", |
201 | orthoTolerance); | |
202 | + | painCave.severity = OOPSE_INFO; |
203 | simError(); | |
204 | } | |
205 | else { | |
206 | sprintf( painCave.errMsg, | |
207 | < | "Hmat is switching from Orthorhombic to Non-OrthoRhombic\n" |
208 | < | " If this is a bad thing, change the orthoBoxTolerance( currently %G ).\n", |
207 | > | "OOPSE is switching from the faster Orthorhombic to the more\n" |
208 | > | "\tflexible Non-Orthorhombic periodic boundary computations.\n" |
209 | > | "\tThis is usually because the box has deformed under\n" |
210 | > | "\tNPTf integration. If you wan't to live on the edge with\n" |
211 | > | "\tthe Orthorhombic computations, make the orthoBoxTolerance\n" |
212 | > | "\tvariable ( currently set to %G ) larger.\n", |
213 | orthoTolerance); | |
214 | + | painCave.severity = OOPSE_WARNING; |
215 | simError(); | |
216 | } | |
217 | } | |
218 | } | |
219 | ||
197 | – | double SimInfo::matDet3(double a[3][3]) { |
198 | – | int i, j, k; |
199 | – | double determinant; |
200 | – | |
201 | – | determinant = 0.0; |
202 | – | |
203 | – | for(i = 0; i < 3; i++) { |
204 | – | j = (i+1)%3; |
205 | – | k = (i+2)%3; |
206 | – | |
207 | – | determinant += a[0][i] * (a[1][j]*a[2][k] - a[1][k]*a[2][j]); |
208 | – | } |
209 | – | |
210 | – | return determinant; |
211 | – | } |
212 | – | |
213 | – | void SimInfo::invertMat3(double a[3][3], double b[3][3]) { |
214 | – | |
215 | – | int i, j, k, l, m, n; |
216 | – | double determinant; |
217 | – | |
218 | – | determinant = matDet3( a ); |
219 | – | |
220 | – | if (determinant == 0.0) { |
221 | – | sprintf( painCave.errMsg, |
222 | – | "Can't invert a matrix with a zero determinant!\n"); |
223 | – | painCave.isFatal = 1; |
224 | – | simError(); |
225 | – | } |
226 | – | |
227 | – | for (i=0; i < 3; i++) { |
228 | – | j = (i+1)%3; |
229 | – | k = (i+2)%3; |
230 | – | for(l = 0; l < 3; l++) { |
231 | – | m = (l+1)%3; |
232 | – | n = (l+2)%3; |
233 | – | |
234 | – | b[l][i] = (a[j][m]*a[k][n] - a[j][n]*a[k][m]) / determinant; |
235 | – | } |
236 | – | } |
237 | – | } |
238 | – | |
239 | – | void SimInfo::matMul3(double a[3][3], double b[3][3], double c[3][3]) { |
240 | – | double r00, r01, r02, r10, r11, r12, r20, r21, r22; |
241 | – | |
242 | – | r00 = a[0][0]*b[0][0] + a[0][1]*b[1][0] + a[0][2]*b[2][0]; |
243 | – | r01 = a[0][0]*b[0][1] + a[0][1]*b[1][1] + a[0][2]*b[2][1]; |
244 | – | r02 = a[0][0]*b[0][2] + a[0][1]*b[1][2] + a[0][2]*b[2][2]; |
245 | – | |
246 | – | r10 = a[1][0]*b[0][0] + a[1][1]*b[1][0] + a[1][2]*b[2][0]; |
247 | – | r11 = a[1][0]*b[0][1] + a[1][1]*b[1][1] + a[1][2]*b[2][1]; |
248 | – | r12 = a[1][0]*b[0][2] + a[1][1]*b[1][2] + a[1][2]*b[2][2]; |
249 | – | |
250 | – | r20 = a[2][0]*b[0][0] + a[2][1]*b[1][0] + a[2][2]*b[2][0]; |
251 | – | r21 = a[2][0]*b[0][1] + a[2][1]*b[1][1] + a[2][2]*b[2][1]; |
252 | – | r22 = a[2][0]*b[0][2] + a[2][1]*b[1][2] + a[2][2]*b[2][2]; |
253 | – | |
254 | – | c[0][0] = r00; c[0][1] = r01; c[0][2] = r02; |
255 | – | c[1][0] = r10; c[1][1] = r11; c[1][2] = r12; |
256 | – | c[2][0] = r20; c[2][1] = r21; c[2][2] = r22; |
257 | – | } |
258 | – | |
259 | – | void SimInfo::matVecMul3(double m[3][3], double inVec[3], double outVec[3]) { |
260 | – | double a0, a1, a2; |
261 | – | |
262 | – | a0 = inVec[0]; a1 = inVec[1]; a2 = inVec[2]; |
263 | – | |
264 | – | outVec[0] = m[0][0]*a0 + m[0][1]*a1 + m[0][2]*a2; |
265 | – | outVec[1] = m[1][0]*a0 + m[1][1]*a1 + m[1][2]*a2; |
266 | – | outVec[2] = m[2][0]*a0 + m[2][1]*a1 + m[2][2]*a2; |
267 | – | } |
268 | – | |
269 | – | void SimInfo::transposeMat3(double in[3][3], double out[3][3]) { |
270 | – | double temp[3][3]; |
271 | – | int i, j; |
272 | – | |
273 | – | for (i = 0; i < 3; i++) { |
274 | – | for (j = 0; j < 3; j++) { |
275 | – | temp[j][i] = in[i][j]; |
276 | – | } |
277 | – | } |
278 | – | for (i = 0; i < 3; i++) { |
279 | – | for (j = 0; j < 3; j++) { |
280 | – | out[i][j] = temp[i][j]; |
281 | – | } |
282 | – | } |
283 | – | } |
284 | – | |
285 | – | void SimInfo::printMat3(double A[3][3] ){ |
286 | – | |
287 | – | std::cerr |
288 | – | << "[ " << A[0][0] << ", " << A[0][1] << ", " << A[0][2] << " ]\n" |
289 | – | << "[ " << A[1][0] << ", " << A[1][1] << ", " << A[1][2] << " ]\n" |
290 | – | << "[ " << A[2][0] << ", " << A[2][1] << ", " << A[2][2] << " ]\n"; |
291 | – | } |
292 | – | |
293 | – | void SimInfo::printMat9(double A[9] ){ |
294 | – | |
295 | – | std::cerr |
296 | – | << "[ " << A[0] << ", " << A[1] << ", " << A[2] << " ]\n" |
297 | – | << "[ " << A[3] << ", " << A[4] << ", " << A[5] << " ]\n" |
298 | – | << "[ " << A[6] << ", " << A[7] << ", " << A[8] << " ]\n"; |
299 | – | } |
300 | – | |
301 | – | |
302 | – | void SimInfo::crossProduct3(double a[3],double b[3], double out[3]){ |
303 | – | |
304 | – | out[0] = a[1] * b[2] - a[2] * b[1]; |
305 | – | out[1] = a[2] * b[0] - a[0] * b[2] ; |
306 | – | out[2] = a[0] * b[1] - a[1] * b[0]; |
307 | – | |
308 | – | } |
309 | – | |
310 | – | double SimInfo::dotProduct3(double a[3], double b[3]){ |
311 | – | return a[0]*b[0] + a[1]*b[1]+ a[2]*b[2]; |
312 | – | } |
313 | – | |
314 | – | double SimInfo::length3(double a[3]){ |
315 | – | return sqrt(a[0]*a[0] + a[1]*a[1] + a[2]*a[2]); |
316 | – | } |
317 | – | |
220 | void SimInfo::calcBoxL( void ){ | |
221 | ||
222 | double dx, dy, dz, dsq; | |
# | Line 370 | Line 272 | double SimInfo::calcMaxCutOff(){ | |
272 | rk[0] = Hmat[0][2]; | |
273 | rk[1] = Hmat[1][2]; | |
274 | rk[2] = Hmat[2][2]; | |
275 | < | |
276 | < | crossProduct3(ri,rj, rij); |
277 | < | distXY = dotProduct3(rk,rij) / length3(rij); |
275 | > | |
276 | > | crossProduct3(ri, rj, rij); |
277 | > | distXY = dotProduct3(rk,rij) / norm3(rij); |
278 | ||
279 | crossProduct3(rj,rk, rjk); | |
280 | < | distYZ = dotProduct3(ri,rjk) / length3(rjk); |
280 | > | distYZ = dotProduct3(ri,rjk) / norm3(rjk); |
281 | ||
282 | crossProduct3(rk,ri, rki); | |
283 | < | distZX = dotProduct3(rj,rki) / length3(rki); |
283 | > | distZX = dotProduct3(rj,rki) / norm3(rki); |
284 | ||
285 | minDist = min(min(distXY, distYZ), distZX); | |
286 | return minDist/2; | |
# | Line 426 | Line 328 | int SimInfo::getNDF(){ | |
328 | ||
329 | int SimInfo::getNDF(){ | |
330 | int ndf_local; | |
331 | + | |
332 | + | ndf_local = 0; |
333 | ||
334 | < | ndf_local = 3 * n_atoms + 3 * n_oriented - n_constraints; |
334 | > | for(int i = 0; i < integrableObjects.size(); i++){ |
335 | > | ndf_local += 3; |
336 | > | if (integrableObjects[i]->isDirectional()) { |
337 | > | if (integrableObjects[i]->isLinear()) |
338 | > | ndf_local += 2; |
339 | > | else |
340 | > | ndf_local += 3; |
341 | > | } |
342 | > | } |
343 | ||
344 | + | // n_constraints is local, so subtract them on each processor: |
345 | + | |
346 | + | ndf_local -= n_constraints; |
347 | + | |
348 | #ifdef IS_MPI | |
349 | MPI_Allreduce(&ndf_local,&ndf,1,MPI_INT,MPI_SUM, MPI_COMM_WORLD); | |
350 | #else | |
351 | ndf = ndf_local; | |
352 | #endif | |
353 | ||
354 | + | // nZconstraints is global, as are the 3 COM translations for the |
355 | + | // entire system: |
356 | + | |
357 | ndf = ndf - 3 - nZconstraints; | |
358 | ||
359 | return ndf; | |
# | Line 444 | Line 363 | int SimInfo::getNDFraw() { | |
363 | int ndfRaw_local; | |
364 | ||
365 | // Raw degrees of freedom that we have to set | |
366 | < | ndfRaw_local = 3 * n_atoms + 3 * n_oriented; |
367 | < | |
366 | > | ndfRaw_local = 0; |
367 | > | |
368 | > | for(int i = 0; i < integrableObjects.size(); i++){ |
369 | > | ndfRaw_local += 3; |
370 | > | if (integrableObjects[i]->isDirectional()) { |
371 | > | if (integrableObjects[i]->isLinear()) |
372 | > | ndfRaw_local += 2; |
373 | > | else |
374 | > | ndfRaw_local += 3; |
375 | > | } |
376 | > | } |
377 | > | |
378 | #ifdef IS_MPI | |
379 | MPI_Allreduce(&ndfRaw_local,&ndfRaw,1,MPI_INT,MPI_SUM, MPI_COMM_WORLD); | |
380 | #else | |
# | Line 458 | Line 387 | int SimInfo::getNDFtranslational() { | |
387 | int SimInfo::getNDFtranslational() { | |
388 | int ndfTrans_local; | |
389 | ||
390 | < | ndfTrans_local = 3 * n_atoms - n_constraints; |
390 | > | ndfTrans_local = 3 * integrableObjects.size() - n_constraints; |
391 | ||
392 | + | |
393 | #ifdef IS_MPI | |
394 | MPI_Allreduce(&ndfTrans_local,&ndfTrans,1,MPI_INT,MPI_SUM, MPI_COMM_WORLD); | |
395 | #else | |
# | Line 471 | Line 401 | int SimInfo::getNDFtranslational() { | |
401 | return ndfTrans; | |
402 | } | |
403 | ||
404 | + | int SimInfo::getTotIntegrableObjects() { |
405 | + | int nObjs_local; |
406 | + | int nObjs; |
407 | + | |
408 | + | nObjs_local = integrableObjects.size(); |
409 | + | |
410 | + | |
411 | + | #ifdef IS_MPI |
412 | + | MPI_Allreduce(&nObjs_local,&nObjs,1,MPI_INT,MPI_SUM, MPI_COMM_WORLD); |
413 | + | #else |
414 | + | nObjs = nObjs_local; |
415 | + | #endif |
416 | + | |
417 | + | |
418 | + | return nObjs; |
419 | + | } |
420 | + | |
421 | void SimInfo::refreshSim(){ | |
422 | ||
423 | simtype fInfo; | |
# | Line 480 | Line 427 | void SimInfo::refreshSim(){ | |
427 | ||
428 | fInfo.dielect = 0.0; | |
429 | ||
430 | < | if( useDipole ){ |
430 | > | if( useDipoles ){ |
431 | if( useReactionField )fInfo.dielect = dielectric; | |
432 | } | |
433 | ||
# | Line 489 | Line 436 | void SimInfo::refreshSim(){ | |
436 | fInfo.SIM_uses_LJ = useLJ; | |
437 | fInfo.SIM_uses_sticky = useSticky; | |
438 | //fInfo.SIM_uses_sticky = 0; | |
439 | < | fInfo.SIM_uses_dipoles = useDipole; |
439 | > | fInfo.SIM_uses_charges = useCharges; |
440 | > | fInfo.SIM_uses_dipoles = useDipoles; |
441 | //fInfo.SIM_uses_dipoles = 0; | |
442 | < | //fInfo.SIM_uses_RF = useReactionField; |
443 | < | fInfo.SIM_uses_RF = 0; |
442 | > | fInfo.SIM_uses_RF = useReactionField; |
443 | > | //fInfo.SIM_uses_RF = 0; |
444 | fInfo.SIM_uses_GB = useGB; | |
445 | fInfo.SIM_uses_EAM = useEAM; | |
446 | ||
447 | < | excl = Exclude::getArray(); |
448 | < | |
447 | > | n_exclude = excludes->getSize(); |
448 | > | excl = excludes->getFortranArray(); |
449 | > | |
450 | #ifdef IS_MPI | |
451 | < | n_global = mpiSim->getTotAtoms(); |
451 | > | n_global = mpiSim->getNAtomsGlobal(); |
452 | #else | |
453 | n_global = n_atoms; | |
454 | #endif | |
455 | < | |
455 | > | |
456 | isError = 0; | |
457 | < | |
457 | > | |
458 | > | getFortranGroupArrays(this, FglobalGroupMembership, mfact); |
459 | > | //it may not be a good idea to pass the address of first element in vector |
460 | > | //since c++ standard does not require vector to be stored continuously in meomory |
461 | > | //Most of the compilers will organize the memory of vector continuously |
462 | setFsimulation( &fInfo, &n_global, &n_atoms, identArray, &n_exclude, excl, | |
463 | < | &nGlobalExcludes, globalExcludes, molMembershipArray, |
464 | < | &isError ); |
463 | > | &nGlobalExcludes, globalExcludes, molMembershipArray, |
464 | > | &mfact[0], &ngroup, &FglobalGroupMembership[0], &isError); |
465 | ||
466 | if( isError ){ | |
467 | < | |
467 | > | |
468 | sprintf( painCave.errMsg, | |
469 | < | "There was an error setting the simulation information in fortran.\n" ); |
469 | > | "There was an error setting the simulation information in fortran.\n" ); |
470 | painCave.isFatal = 1; | |
471 | + | painCave.severity = OOPSE_ERROR; |
472 | simError(); | |
473 | } | |
474 | < | |
474 | > | |
475 | #ifdef IS_MPI | |
476 | sprintf( checkPointMsg, | |
477 | "succesfully sent the simulation information to fortran.\n"); | |
478 | MPIcheckPoint(); | |
479 | #endif // is_mpi | |
480 | < | |
480 | > | |
481 | this->ndf = this->getNDF(); | |
482 | this->ndfRaw = this->getNDFraw(); | |
483 | this->ndfTrans = this->getNDFtranslational(); | |
484 | } | |
485 | ||
486 | void SimInfo::setDefaultRcut( double theRcut ){ | |
487 | < | |
487 | > | |
488 | haveRcut = 1; | |
489 | rCut = theRcut; | |
490 | < | |
537 | < | ( rCut > ecr )? rList = rCut + 1.0: rList = ecr + 1.0; |
538 | < | |
539 | < | notifyFortranCutOffs( &rCut, &rList, &ecr, &est ); |
540 | < | } |
541 | < | |
542 | < | void SimInfo::setDefaultEcr( double theEcr ){ |
543 | < | |
544 | < | haveEcr = 1; |
545 | < | ecr = theEcr; |
490 | > | rList = rCut + 1.0; |
491 | ||
492 | < | ( rCut > ecr )? rList = rCut + 1.0: rList = ecr + 1.0; |
548 | < | |
549 | < | notifyFortranCutOffs( &rCut, &rList, &ecr, &est ); |
492 | > | notifyFortranCutOffs( &rCut, &rSw, &rList ); |
493 | } | |
494 | ||
495 | < | void SimInfo::setDefaultEcr( double theEcr, double theEst ){ |
495 | > | void SimInfo::setDefaultRcut( double theRcut, double theRsw ){ |
496 | ||
497 | < | est = theEst; |
498 | < | setDefaultEcr( theEcr ); |
497 | > | rSw = theRsw; |
498 | > | setDefaultRcut( theRcut ); |
499 | } | |
500 | ||
501 | ||
# | Line 564 | Line 507 | void SimInfo::checkCutOffs( void ){ | |
507 | ||
508 | if( rCut > maxCutoff ){ | |
509 | sprintf( painCave.errMsg, | |
510 | < | "Box size is too small for the long range cutoff radius, " |
511 | < | "%lf, at time %lf\n", |
512 | < | rCut, currentTime ); |
510 | > | "cutoffRadius is too large for the current periodic box.\n" |
511 | > | "\tCurrent Value of cutoffRadius = %G at time %G\n " |
512 | > | "\tThis is larger than half of at least one of the\n" |
513 | > | "\tperiodic box vectors. Right now, the Box matrix is:\n" |
514 | > | "\n" |
515 | > | "\t[ %G %G %G ]\n" |
516 | > | "\t[ %G %G %G ]\n" |
517 | > | "\t[ %G %G %G ]\n", |
518 | > | rCut, currentTime, |
519 | > | Hmat[0][0], Hmat[0][1], Hmat[0][2], |
520 | > | Hmat[1][0], Hmat[1][1], Hmat[1][2], |
521 | > | Hmat[2][0], Hmat[2][1], Hmat[2][2]); |
522 | > | painCave.severity = OOPSE_ERROR; |
523 | painCave.isFatal = 1; | |
524 | simError(); | |
525 | < | } |
573 | < | |
574 | < | if( haveEcr ){ |
575 | < | if( ecr > maxCutoff ){ |
576 | < | sprintf( painCave.errMsg, |
577 | < | "Box size is too small for the electrostatic cutoff radius, " |
578 | < | "%lf, at time %lf\n", |
579 | < | ecr, currentTime ); |
580 | < | painCave.isFatal = 1; |
581 | < | simError(); |
582 | < | } |
583 | < | } |
525 | > | } |
526 | } else { | |
527 | // initialize this stuff before using it, OK? | |
528 | sprintf( painCave.errMsg, | |
529 | < | "Trying to check cutoffs without a box. Be smarter.\n" ); |
529 | > | "Trying to check cutoffs without a box.\n" |
530 | > | "\tOOPSE should have better programmers than that.\n" ); |
531 | > | painCave.severity = OOPSE_ERROR; |
532 | painCave.isFatal = 1; | |
533 | simError(); | |
534 | } | |
# | Line 627 | Line 571 | GenericData* SimInfo::getProperty(const string& propNa | |
571 | return NULL; | |
572 | } | |
573 | ||
630 | – | vector<GenericData*> SimInfo::getProperties(){ |
574 | ||
575 | < | vector<GenericData*> result; |
576 | < | map<string, GenericData*>::iterator i; |
575 | > | void SimInfo::getFortranGroupArrays(SimInfo* info, |
576 | > | vector<int>& FglobalGroupMembership, |
577 | > | vector<double>& mfact){ |
578 | ||
579 | < | for(i = properties.begin(); i != properties.end(); i++) |
580 | < | result.push_back((*i).second); |
581 | < | |
582 | < | return result; |
583 | < | } |
579 | > | Molecule* myMols; |
580 | > | Atom** myAtoms; |
581 | > | int numAtom; |
582 | > | double mtot; |
583 | > | int numMol; |
584 | > | int numCutoffGroups; |
585 | > | CutoffGroup* myCutoffGroup; |
586 | > | vector<CutoffGroup*>::iterator iterCutoff; |
587 | > | Atom* cutoffAtom; |
588 | > | vector<Atom*>::iterator iterAtom; |
589 | > | int atomIndex; |
590 | > | double totalMass; |
591 | > | |
592 | > | mfact.clear(); |
593 | > | FglobalGroupMembership.clear(); |
594 | > | |
595 | ||
596 | < | double SimInfo::matTrace3(double m[3][3]){ |
597 | < | double trace; |
598 | < | trace = m[0][0] + m[1][1] + m[2][2]; |
596 | > | // Fix the silly fortran indexing problem |
597 | > | #ifdef IS_MPI |
598 | > | numAtom = mpiSim->getNAtomsGlobal(); |
599 | > | #else |
600 | > | numAtom = n_atoms; |
601 | > | #endif |
602 | > | for (int i = 0; i < numAtom; i++) |
603 | > | FglobalGroupMembership.push_back(globalGroupMembership[i] + 1); |
604 | > | |
605 | ||
606 | < | return trace; |
606 | > | myMols = info->molecules; |
607 | > | numMol = info->n_mol; |
608 | > | for(int i = 0; i < numMol; i++){ |
609 | > | numCutoffGroups = myMols[i].getNCutoffGroups(); |
610 | > | for(myCutoffGroup =myMols[i].beginCutoffGroup(iterCutoff); |
611 | > | myCutoffGroup != NULL; |
612 | > | myCutoffGroup =myMols[i].nextCutoffGroup(iterCutoff)){ |
613 | > | |
614 | > | totalMass = myCutoffGroup->getMass(); |
615 | > | |
616 | > | for(cutoffAtom = myCutoffGroup->beginAtom(iterAtom); |
617 | > | cutoffAtom != NULL; |
618 | > | cutoffAtom = myCutoffGroup->nextAtom(iterAtom)){ |
619 | > | mfact.push_back(cutoffAtom->getMass()/totalMass); |
620 | > | } |
621 | > | } |
622 | > | } |
623 | > | |
624 | } |
– | Removed lines |
+ | Added lines |
< | Changed lines |
> | Changed lines |