12 |
|
|
13 |
|
#include "fortranWrappers.hpp" |
14 |
|
|
15 |
+ |
#include "MatVec3.h" |
16 |
+ |
|
17 |
|
#ifdef IS_MPI |
18 |
|
#include "mpiSimulation.hpp" |
19 |
|
#endif |
22 |
|
return ( x >= 0 ) ? floor( x + 0.5 ) : ceil( x - 0.5 ); |
23 |
|
} |
24 |
|
|
25 |
+ |
inline double min( double a, double b ){ |
26 |
+ |
return (a < b ) ? a : b; |
27 |
+ |
} |
28 |
|
|
29 |
|
SimInfo* currentInfo; |
30 |
|
|
31 |
|
SimInfo::SimInfo(){ |
32 |
< |
excludes = NULL; |
32 |
> |
|
33 |
|
n_constraints = 0; |
34 |
|
nZconstraints = 0; |
35 |
|
n_oriented = 0; |
42 |
|
thermalTime = 0.0; |
43 |
|
currentTime = 0.0; |
44 |
|
rCut = 0.0; |
40 |
– |
origRcut = -1.0; |
45 |
|
ecr = 0.0; |
42 |
– |
origEcr = -1.0; |
46 |
|
est = 0.0; |
44 |
– |
oldEcr = 0.0; |
45 |
– |
oldRcut = 0.0; |
47 |
|
|
48 |
< |
haveOrigRcut = 0; |
49 |
< |
haveOrigEcr = 0; |
48 |
> |
haveRcut = 0; |
49 |
> |
haveEcr = 0; |
50 |
|
boxIsInit = 0; |
51 |
|
|
52 |
|
resetTime = 1e99; |
53 |
|
|
54 |
+ |
orthoRhombic = 0; |
55 |
|
orthoTolerance = 1E-6; |
56 |
|
useInitXSstate = true; |
57 |
|
|
58 |
|
usePBC = 0; |
59 |
|
useLJ = 0; |
60 |
|
useSticky = 0; |
61 |
< |
useDipole = 0; |
61 |
> |
useCharges = 0; |
62 |
> |
useDipoles = 0; |
63 |
|
useReactionField = 0; |
64 |
|
useGB = 0; |
65 |
|
useEAM = 0; |
66 |
|
|
67 |
+ |
excludes = Exclude::Instance(); |
68 |
+ |
|
69 |
|
myConfiguration = new SimState(); |
70 |
|
|
71 |
+ |
has_minimizer = false; |
72 |
+ |
the_minimizer =NULL; |
73 |
+ |
|
74 |
|
wrapMeSimInfo( this ); |
75 |
|
} |
76 |
|
|
112 |
|
// [ 2 5 8 ] |
113 |
|
double FortranHmatInv[9]; // the inverted Hmat (for Fortran); |
114 |
|
|
107 |
– |
|
115 |
|
if( !boxIsInit ) boxIsInit = 1; |
116 |
|
|
117 |
|
for(i=0; i < 3; i++) |
188 |
|
|
189 |
|
if( orthoRhombic ){ |
190 |
|
sprintf( painCave.errMsg, |
191 |
< |
"Hmat is switching from Non-Orthorhombic to OrthoRhombic\n" |
192 |
< |
" If this is a bad thing, change the orthoBoxTolerance( currently %G ).\n", |
191 |
> |
"OOPSE is switching from the default Non-Orthorhombic\n" |
192 |
> |
"\tto the faster Orthorhombic periodic boundary computations.\n" |
193 |
> |
"\tThis is usually a good thing, but if you wan't the\n" |
194 |
> |
"\tNon-Orthorhombic computations, make the orthoBoxTolerance\n" |
195 |
> |
"\tvariable ( currently set to %G ) smaller.\n", |
196 |
|
orthoTolerance); |
197 |
|
simError(); |
198 |
|
} |
199 |
|
else { |
200 |
|
sprintf( painCave.errMsg, |
201 |
< |
"Hmat is switching from Orthorhombic to Non-OrthoRhombic\n" |
202 |
< |
" If this is a bad thing, change the orthoBoxTolerance( currently %G ).\n", |
201 |
> |
"OOPSE is switching from the faster Orthorhombic to the more\n" |
202 |
> |
"\tflexible Non-Orthorhombic periodic boundary computations.\n" |
203 |
> |
"\tThis is usually because the box has deformed under\n" |
204 |
> |
"\tNPTf integration. If you wan't to live on the edge with\n" |
205 |
> |
"\tthe Orthorhombic computations, make the orthoBoxTolerance\n" |
206 |
> |
"\tvariable ( currently set to %G ) larger.\n", |
207 |
|
orthoTolerance); |
208 |
|
simError(); |
195 |
– |
} |
196 |
– |
} |
197 |
– |
} |
198 |
– |
|
199 |
– |
double SimInfo::matDet3(double a[3][3]) { |
200 |
– |
int i, j, k; |
201 |
– |
double determinant; |
202 |
– |
|
203 |
– |
determinant = 0.0; |
204 |
– |
|
205 |
– |
for(i = 0; i < 3; i++) { |
206 |
– |
j = (i+1)%3; |
207 |
– |
k = (i+2)%3; |
208 |
– |
|
209 |
– |
determinant += a[0][i] * (a[1][j]*a[2][k] - a[1][k]*a[2][j]); |
210 |
– |
} |
211 |
– |
|
212 |
– |
return determinant; |
213 |
– |
} |
214 |
– |
|
215 |
– |
void SimInfo::invertMat3(double a[3][3], double b[3][3]) { |
216 |
– |
|
217 |
– |
int i, j, k, l, m, n; |
218 |
– |
double determinant; |
219 |
– |
|
220 |
– |
determinant = matDet3( a ); |
221 |
– |
|
222 |
– |
if (determinant == 0.0) { |
223 |
– |
sprintf( painCave.errMsg, |
224 |
– |
"Can't invert a matrix with a zero determinant!\n"); |
225 |
– |
painCave.isFatal = 1; |
226 |
– |
simError(); |
227 |
– |
} |
228 |
– |
|
229 |
– |
for (i=0; i < 3; i++) { |
230 |
– |
j = (i+1)%3; |
231 |
– |
k = (i+2)%3; |
232 |
– |
for(l = 0; l < 3; l++) { |
233 |
– |
m = (l+1)%3; |
234 |
– |
n = (l+2)%3; |
235 |
– |
|
236 |
– |
b[l][i] = (a[j][m]*a[k][n] - a[j][n]*a[k][m]) / determinant; |
237 |
– |
} |
238 |
– |
} |
239 |
– |
} |
240 |
– |
|
241 |
– |
void SimInfo::matMul3(double a[3][3], double b[3][3], double c[3][3]) { |
242 |
– |
double r00, r01, r02, r10, r11, r12, r20, r21, r22; |
243 |
– |
|
244 |
– |
r00 = a[0][0]*b[0][0] + a[0][1]*b[1][0] + a[0][2]*b[2][0]; |
245 |
– |
r01 = a[0][0]*b[0][1] + a[0][1]*b[1][1] + a[0][2]*b[2][1]; |
246 |
– |
r02 = a[0][0]*b[0][2] + a[0][1]*b[1][2] + a[0][2]*b[2][2]; |
247 |
– |
|
248 |
– |
r10 = a[1][0]*b[0][0] + a[1][1]*b[1][0] + a[1][2]*b[2][0]; |
249 |
– |
r11 = a[1][0]*b[0][1] + a[1][1]*b[1][1] + a[1][2]*b[2][1]; |
250 |
– |
r12 = a[1][0]*b[0][2] + a[1][1]*b[1][2] + a[1][2]*b[2][2]; |
251 |
– |
|
252 |
– |
r20 = a[2][0]*b[0][0] + a[2][1]*b[1][0] + a[2][2]*b[2][0]; |
253 |
– |
r21 = a[2][0]*b[0][1] + a[2][1]*b[1][1] + a[2][2]*b[2][1]; |
254 |
– |
r22 = a[2][0]*b[0][2] + a[2][1]*b[1][2] + a[2][2]*b[2][2]; |
255 |
– |
|
256 |
– |
c[0][0] = r00; c[0][1] = r01; c[0][2] = r02; |
257 |
– |
c[1][0] = r10; c[1][1] = r11; c[1][2] = r12; |
258 |
– |
c[2][0] = r20; c[2][1] = r21; c[2][2] = r22; |
259 |
– |
} |
260 |
– |
|
261 |
– |
void SimInfo::matVecMul3(double m[3][3], double inVec[3], double outVec[3]) { |
262 |
– |
double a0, a1, a2; |
263 |
– |
|
264 |
– |
a0 = inVec[0]; a1 = inVec[1]; a2 = inVec[2]; |
265 |
– |
|
266 |
– |
outVec[0] = m[0][0]*a0 + m[0][1]*a1 + m[0][2]*a2; |
267 |
– |
outVec[1] = m[1][0]*a0 + m[1][1]*a1 + m[1][2]*a2; |
268 |
– |
outVec[2] = m[2][0]*a0 + m[2][1]*a1 + m[2][2]*a2; |
269 |
– |
} |
270 |
– |
|
271 |
– |
void SimInfo::transposeMat3(double in[3][3], double out[3][3]) { |
272 |
– |
double temp[3][3]; |
273 |
– |
int i, j; |
274 |
– |
|
275 |
– |
for (i = 0; i < 3; i++) { |
276 |
– |
for (j = 0; j < 3; j++) { |
277 |
– |
temp[j][i] = in[i][j]; |
209 |
|
} |
210 |
|
} |
280 |
– |
for (i = 0; i < 3; i++) { |
281 |
– |
for (j = 0; j < 3; j++) { |
282 |
– |
out[i][j] = temp[i][j]; |
283 |
– |
} |
284 |
– |
} |
211 |
|
} |
286 |
– |
|
287 |
– |
void SimInfo::printMat3(double A[3][3] ){ |
212 |
|
|
289 |
– |
std::cerr |
290 |
– |
<< "[ " << A[0][0] << ", " << A[0][1] << ", " << A[0][2] << " ]\n" |
291 |
– |
<< "[ " << A[1][0] << ", " << A[1][1] << ", " << A[1][2] << " ]\n" |
292 |
– |
<< "[ " << A[2][0] << ", " << A[2][1] << ", " << A[2][2] << " ]\n"; |
293 |
– |
} |
294 |
– |
|
295 |
– |
void SimInfo::printMat9(double A[9] ){ |
296 |
– |
|
297 |
– |
std::cerr |
298 |
– |
<< "[ " << A[0] << ", " << A[1] << ", " << A[2] << " ]\n" |
299 |
– |
<< "[ " << A[3] << ", " << A[4] << ", " << A[5] << " ]\n" |
300 |
– |
<< "[ " << A[6] << ", " << A[7] << ", " << A[8] << " ]\n"; |
301 |
– |
} |
302 |
– |
|
303 |
– |
|
304 |
– |
void SimInfo::crossProduct3(double a[3],double b[3], double out[3]){ |
305 |
– |
|
306 |
– |
out[0] = a[1] * b[2] - a[2] * b[1]; |
307 |
– |
out[1] = a[2] * b[0] - a[0] * b[2] ; |
308 |
– |
out[2] = a[0] * b[1] - a[1] * b[0]; |
309 |
– |
|
310 |
– |
} |
311 |
– |
|
312 |
– |
double SimInfo::dotProduct3(double a[3], double b[3]){ |
313 |
– |
return a[0]*b[0] + a[1]*b[1]+ a[2]*b[2]; |
314 |
– |
} |
315 |
– |
|
316 |
– |
double SimInfo::length3(double a[3]){ |
317 |
– |
return sqrt(a[0]*a[0] + a[1]*a[1] + a[2]*a[2]); |
318 |
– |
} |
319 |
– |
|
213 |
|
void SimInfo::calcBoxL( void ){ |
214 |
|
|
215 |
|
double dx, dy, dz, dsq; |
265 |
|
rk[0] = Hmat[0][2]; |
266 |
|
rk[1] = Hmat[1][2]; |
267 |
|
rk[2] = Hmat[2][2]; |
268 |
< |
|
269 |
< |
crossProduct3(ri,rj, rij); |
270 |
< |
distXY = dotProduct3(rk,rij) / length3(rij); |
268 |
> |
|
269 |
> |
crossProduct3(ri, rj, rij); |
270 |
> |
distXY = dotProduct3(rk,rij) / norm3(rij); |
271 |
|
|
272 |
|
crossProduct3(rj,rk, rjk); |
273 |
< |
distYZ = dotProduct3(ri,rjk) / length3(rjk); |
273 |
> |
distYZ = dotProduct3(ri,rjk) / norm3(rjk); |
274 |
|
|
275 |
|
crossProduct3(rk,ri, rki); |
276 |
< |
distZX = dotProduct3(rj,rki) / length3(rki); |
276 |
> |
distZX = dotProduct3(rj,rki) / norm3(rki); |
277 |
|
|
278 |
|
minDist = min(min(distXY, distYZ), distZX); |
279 |
|
return minDist/2; |
321 |
|
|
322 |
|
int SimInfo::getNDF(){ |
323 |
|
int ndf_local; |
324 |
+ |
|
325 |
+ |
ndf_local = 0; |
326 |
|
|
327 |
< |
ndf_local = 3 * n_atoms + 3 * n_oriented - n_constraints; |
327 |
> |
for(int i = 0; i < integrableObjects.size(); i++){ |
328 |
> |
ndf_local += 3; |
329 |
> |
if (integrableObjects[i]->isDirectional()) { |
330 |
> |
if (integrableObjects[i]->isLinear()) |
331 |
> |
ndf_local += 2; |
332 |
> |
else |
333 |
> |
ndf_local += 3; |
334 |
> |
} |
335 |
> |
} |
336 |
|
|
337 |
+ |
// n_constraints is local, so subtract them on each processor: |
338 |
+ |
|
339 |
+ |
ndf_local -= n_constraints; |
340 |
+ |
|
341 |
|
#ifdef IS_MPI |
342 |
|
MPI_Allreduce(&ndf_local,&ndf,1,MPI_INT,MPI_SUM, MPI_COMM_WORLD); |
343 |
|
#else |
344 |
|
ndf = ndf_local; |
345 |
|
#endif |
346 |
|
|
347 |
+ |
// nZconstraints is global, as are the 3 COM translations for the |
348 |
+ |
// entire system: |
349 |
+ |
|
350 |
|
ndf = ndf - 3 - nZconstraints; |
351 |
|
|
352 |
|
return ndf; |
356 |
|
int ndfRaw_local; |
357 |
|
|
358 |
|
// Raw degrees of freedom that we have to set |
359 |
< |
ndfRaw_local = 3 * n_atoms + 3 * n_oriented; |
360 |
< |
|
359 |
> |
ndfRaw_local = 0; |
360 |
> |
|
361 |
> |
for(int i = 0; i < integrableObjects.size(); i++){ |
362 |
> |
ndfRaw_local += 3; |
363 |
> |
if (integrableObjects[i]->isDirectional()) { |
364 |
> |
if (integrableObjects[i]->isLinear()) |
365 |
> |
ndfRaw_local += 2; |
366 |
> |
else |
367 |
> |
ndfRaw_local += 3; |
368 |
> |
} |
369 |
> |
} |
370 |
> |
|
371 |
|
#ifdef IS_MPI |
372 |
|
MPI_Allreduce(&ndfRaw_local,&ndfRaw,1,MPI_INT,MPI_SUM, MPI_COMM_WORLD); |
373 |
|
#else |
380 |
|
int SimInfo::getNDFtranslational() { |
381 |
|
int ndfTrans_local; |
382 |
|
|
383 |
< |
ndfTrans_local = 3 * n_atoms - n_constraints; |
383 |
> |
ndfTrans_local = 3 * integrableObjects.size() - n_constraints; |
384 |
|
|
385 |
+ |
|
386 |
|
#ifdef IS_MPI |
387 |
|
MPI_Allreduce(&ndfTrans_local,&ndfTrans,1,MPI_INT,MPI_SUM, MPI_COMM_WORLD); |
388 |
|
#else |
394 |
|
return ndfTrans; |
395 |
|
} |
396 |
|
|
397 |
+ |
int SimInfo::getTotIntegrableObjects() { |
398 |
+ |
int nObjs_local; |
399 |
+ |
int nObjs; |
400 |
+ |
|
401 |
+ |
nObjs_local = integrableObjects.size(); |
402 |
+ |
|
403 |
+ |
|
404 |
+ |
#ifdef IS_MPI |
405 |
+ |
MPI_Allreduce(&nObjs_local,&nObjs,1,MPI_INT,MPI_SUM, MPI_COMM_WORLD); |
406 |
+ |
#else |
407 |
+ |
nObjs = nObjs_local; |
408 |
+ |
#endif |
409 |
+ |
|
410 |
+ |
|
411 |
+ |
return nObjs; |
412 |
+ |
} |
413 |
+ |
|
414 |
|
void SimInfo::refreshSim(){ |
415 |
|
|
416 |
|
simtype fInfo; |
420 |
|
|
421 |
|
fInfo.dielect = 0.0; |
422 |
|
|
423 |
< |
if( useDipole ){ |
423 |
> |
if( useDipoles ){ |
424 |
|
if( useReactionField )fInfo.dielect = dielectric; |
425 |
|
} |
426 |
|
|
429 |
|
fInfo.SIM_uses_LJ = useLJ; |
430 |
|
fInfo.SIM_uses_sticky = useSticky; |
431 |
|
//fInfo.SIM_uses_sticky = 0; |
432 |
< |
fInfo.SIM_uses_dipoles = useDipole; |
432 |
> |
fInfo.SIM_uses_charges = useCharges; |
433 |
> |
fInfo.SIM_uses_dipoles = useDipoles; |
434 |
|
//fInfo.SIM_uses_dipoles = 0; |
435 |
< |
//fInfo.SIM_uses_RF = useReactionField; |
436 |
< |
fInfo.SIM_uses_RF = 0; |
435 |
> |
fInfo.SIM_uses_RF = useReactionField; |
436 |
> |
//fInfo.SIM_uses_RF = 0; |
437 |
|
fInfo.SIM_uses_GB = useGB; |
438 |
|
fInfo.SIM_uses_EAM = useEAM; |
439 |
|
|
440 |
< |
excl = Exclude::getArray(); |
440 |
> |
n_exclude = excludes->getSize(); |
441 |
> |
excl = excludes->getFortranArray(); |
442 |
|
|
443 |
|
#ifdef IS_MPI |
444 |
|
n_global = mpiSim->getTotAtoms(); |
471 |
|
this->ndfTrans = this->getNDFtranslational(); |
472 |
|
} |
473 |
|
|
534 |
– |
|
535 |
– |
void SimInfo::setRcut( double theRcut ){ |
536 |
– |
|
537 |
– |
rCut = theRcut; |
538 |
– |
checkCutOffs(); |
539 |
– |
} |
540 |
– |
|
474 |
|
void SimInfo::setDefaultRcut( double theRcut ){ |
475 |
|
|
476 |
< |
haveOrigRcut = 1; |
544 |
< |
origRcut = theRcut; |
476 |
> |
haveRcut = 1; |
477 |
|
rCut = theRcut; |
478 |
|
|
479 |
|
( rCut > ecr )? rList = rCut + 1.0: rList = ecr + 1.0; |
481 |
|
notifyFortranCutOffs( &rCut, &rList, &ecr, &est ); |
482 |
|
} |
483 |
|
|
552 |
– |
void SimInfo::setEcr( double theEcr ){ |
553 |
– |
|
554 |
– |
ecr = theEcr; |
555 |
– |
checkCutOffs(); |
556 |
– |
} |
557 |
– |
|
484 |
|
void SimInfo::setDefaultEcr( double theEcr ){ |
485 |
|
|
486 |
< |
haveOrigEcr = 1; |
487 |
< |
origEcr = theEcr; |
486 |
> |
haveEcr = 1; |
487 |
> |
ecr = theEcr; |
488 |
|
|
489 |
|
( rCut > ecr )? rList = rCut + 1.0: rList = ecr + 1.0; |
490 |
|
|
565 |
– |
ecr = theEcr; |
566 |
– |
|
491 |
|
notifyFortranCutOffs( &rCut, &rList, &ecr, &est ); |
492 |
|
} |
493 |
|
|
570 |
– |
void SimInfo::setEcr( double theEcr, double theEst ){ |
571 |
– |
|
572 |
– |
est = theEst; |
573 |
– |
setEcr( theEcr ); |
574 |
– |
} |
575 |
– |
|
494 |
|
void SimInfo::setDefaultEcr( double theEcr, double theEst ){ |
495 |
|
|
496 |
|
est = theEst; |
499 |
|
|
500 |
|
|
501 |
|
void SimInfo::checkCutOffs( void ){ |
584 |
– |
|
585 |
– |
int cutChanged = 0; |
502 |
|
|
503 |
|
if( boxIsInit ){ |
504 |
|
|
505 |
|
//we need to check cutOffs against the box |
506 |
< |
|
507 |
< |
//detect the change of rCut |
592 |
< |
if(( maxCutoff > rCut )&&(usePBC)){ |
593 |
< |
if( rCut < origRcut ){ |
594 |
< |
rCut = origRcut; |
595 |
< |
|
596 |
< |
if (rCut > maxCutoff) |
597 |
< |
rCut = maxCutoff; |
598 |
< |
|
599 |
< |
sprintf( painCave.errMsg, |
600 |
< |
"New Box size is setting the long range cutoff radius " |
601 |
< |
"to %lf at time %lf\n", |
602 |
< |
rCut, currentTime ); |
603 |
< |
painCave.isFatal = 0; |
604 |
< |
simError(); |
605 |
< |
} |
606 |
< |
} |
607 |
< |
else if ((rCut > maxCutoff)&&(usePBC)) { |
506 |
> |
|
507 |
> |
if( rCut > maxCutoff ){ |
508 |
|
sprintf( painCave.errMsg, |
509 |
< |
"New Box size is setting the long range cutoff radius " |
510 |
< |
"to %lf at time %lf\n", |
511 |
< |
maxCutoff, currentTime ); |
512 |
< |
painCave.isFatal = 0; |
509 |
> |
"LJrcut is too large for the current periodic box.\n" |
510 |
> |
"\tCurrent Value of LJrcut = %G at time %G\n " |
511 |
> |
"\tThis is larger than half of at least one of the\n" |
512 |
> |
"\tperiodic box vectors. Right now, the Box matrix is:\n" |
513 |
> |
"\n" |
514 |
> |
"\t[ %G %G %G ]\n" |
515 |
> |
"\t[ %G %G %G ]\n" |
516 |
> |
"\t[ %G %G %G ]\n", |
517 |
> |
rCut, currentTime, |
518 |
> |
Hmat[0][0], Hmat[0][1], Hmat[0][2], |
519 |
> |
Hmat[1][0], Hmat[1][1], Hmat[1][2], |
520 |
> |
Hmat[2][0], Hmat[2][1], Hmat[2][2]); |
521 |
> |
painCave.isFatal = 1; |
522 |
|
simError(); |
614 |
– |
rCut = maxCutoff; |
523 |
|
} |
524 |
< |
|
525 |
< |
|
526 |
< |
//detect the change of ecr |
527 |
< |
if( maxCutoff > ecr ){ |
528 |
< |
if( ecr < origEcr ){ |
529 |
< |
ecr = origEcr; |
530 |
< |
if (ecr > maxCutoff) ecr = maxCutoff; |
531 |
< |
|
532 |
< |
sprintf( painCave.errMsg, |
533 |
< |
"New Box size is setting the electrostaticCutoffRadius " |
534 |
< |
"to %lf at time %lf\n", |
535 |
< |
ecr, currentTime ); |
536 |
< |
painCave.isFatal = 0; |
537 |
< |
simError(); |
524 |
> |
|
525 |
> |
if( haveEcr ){ |
526 |
> |
if( ecr > maxCutoff ){ |
527 |
> |
sprintf( painCave.errMsg, |
528 |
> |
"electrostaticCutoffRadius is too large for the current\n" |
529 |
> |
"\tperiodic box.\n\n" |
530 |
> |
"\tCurrent Value of ECR = %G at time %G\n " |
531 |
> |
"\tThis is larger than half of at least one of the\n" |
532 |
> |
"\tperiodic box vectors. Right now, the Box matrix is:\n" |
533 |
> |
"\n" |
534 |
> |
"\t[ %G %G %G ]\n" |
535 |
> |
"\t[ %G %G %G ]\n" |
536 |
> |
"\t[ %G %G %G ]\n", |
537 |
> |
ecr, currentTime, |
538 |
> |
Hmat[0][0], Hmat[0][1], Hmat[0][2], |
539 |
> |
Hmat[1][0], Hmat[1][1], Hmat[1][2], |
540 |
> |
Hmat[2][0], Hmat[2][1], Hmat[2][2]); |
541 |
> |
painCave.isFatal = 1; |
542 |
> |
simError(); |
543 |
|
} |
544 |
|
} |
632 |
– |
else if( ecr > maxCutoff){ |
633 |
– |
sprintf( painCave.errMsg, |
634 |
– |
"New Box size is setting the electrostaticCutoffRadius " |
635 |
– |
"to %lf at time %lf\n", |
636 |
– |
maxCutoff, currentTime ); |
637 |
– |
painCave.isFatal = 0; |
638 |
– |
simError(); |
639 |
– |
ecr = maxCutoff; |
640 |
– |
} |
641 |
– |
|
642 |
– |
if( (oldEcr != ecr) || ( oldRcut != rCut ) ) cutChanged = 1; |
643 |
– |
|
644 |
– |
// rlist is the 1.0 plus max( rcut, ecr ) |
645 |
– |
|
646 |
– |
( rCut > ecr )? rList = rCut + 1.0: rList = ecr + 1.0; |
647 |
– |
|
648 |
– |
if( cutChanged ){ |
649 |
– |
notifyFortranCutOffs( &rCut, &rList, &ecr, &est ); |
650 |
– |
} |
651 |
– |
|
652 |
– |
oldEcr = ecr; |
653 |
– |
oldRcut = rCut; |
654 |
– |
|
545 |
|
} else { |
546 |
|
// initialize this stuff before using it, OK? |
547 |
|
sprintf( painCave.errMsg, |
548 |
< |
"Trying to check cutoffs without a box. Be smarter.\n" ); |
548 |
> |
"Trying to check cutoffs without a box.\n" |
549 |
> |
"\tOOPSE should have better programmers than that.\n" ); |
550 |
|
painCave.isFatal = 1; |
551 |
|
simError(); |
552 |
|
} |
589 |
|
return NULL; |
590 |
|
} |
591 |
|
|
701 |
– |
vector<GenericData*> SimInfo::getProperties(){ |
702 |
– |
|
703 |
– |
vector<GenericData*> result; |
704 |
– |
map<string, GenericData*>::iterator i; |
705 |
– |
|
706 |
– |
for(i = properties.begin(); i != properties.end(); i++) |
707 |
– |
result.push_back((*i).second); |
708 |
– |
|
709 |
– |
return result; |
710 |
– |
} |
711 |
– |
|
712 |
– |
double SimInfo::matTrace3(double m[3][3]){ |
713 |
– |
double trace; |
714 |
– |
trace = m[0][0] + m[1][1] + m[2][2]; |
715 |
– |
|
716 |
– |
return trace; |
717 |
– |
} |