20 |
|
return ( x >= 0 ) ? floor( x + 0.5 ) : ceil( x - 0.5 ); |
21 |
|
} |
22 |
|
|
23 |
+ |
inline double min( double a, double b ){ |
24 |
+ |
return (a < b ) ? a : b; |
25 |
+ |
} |
26 |
|
|
27 |
|
SimInfo* currentInfo; |
28 |
|
|
40 |
|
thermalTime = 0.0; |
41 |
|
currentTime = 0.0; |
42 |
|
rCut = 0.0; |
40 |
– |
origRcut = -1.0; |
43 |
|
ecr = 0.0; |
42 |
– |
origEcr = -1.0; |
44 |
|
est = 0.0; |
44 |
– |
oldEcr = 0.0; |
45 |
– |
oldRcut = 0.0; |
45 |
|
|
46 |
< |
haveOrigRcut = 0; |
47 |
< |
haveOrigEcr = 0; |
46 |
> |
haveRcut = 0; |
47 |
> |
haveEcr = 0; |
48 |
|
boxIsInit = 0; |
49 |
|
|
50 |
|
resetTime = 1e99; |
103 |
|
// [ 2 5 8 ] |
104 |
|
double FortranHmatInv[9]; // the inverted Hmat (for Fortran); |
105 |
|
|
107 |
– |
|
106 |
|
if( !boxIsInit ) boxIsInit = 1; |
107 |
|
|
108 |
|
for(i=0; i < 3; i++) |
529 |
|
this->ndfTrans = this->getNDFtranslational(); |
530 |
|
} |
531 |
|
|
534 |
– |
|
535 |
– |
void SimInfo::setRcut( double theRcut ){ |
536 |
– |
|
537 |
– |
rCut = theRcut; |
538 |
– |
checkCutOffs(); |
539 |
– |
} |
540 |
– |
|
532 |
|
void SimInfo::setDefaultRcut( double theRcut ){ |
533 |
|
|
534 |
< |
haveOrigRcut = 1; |
544 |
< |
origRcut = theRcut; |
534 |
> |
haveRcut = 1; |
535 |
|
rCut = theRcut; |
536 |
|
|
537 |
|
( rCut > ecr )? rList = rCut + 1.0: rList = ecr + 1.0; |
539 |
|
notifyFortranCutOffs( &rCut, &rList, &ecr, &est ); |
540 |
|
} |
541 |
|
|
552 |
– |
void SimInfo::setEcr( double theEcr ){ |
553 |
– |
|
554 |
– |
ecr = theEcr; |
555 |
– |
checkCutOffs(); |
556 |
– |
} |
557 |
– |
|
542 |
|
void SimInfo::setDefaultEcr( double theEcr ){ |
543 |
|
|
544 |
< |
haveOrigEcr = 1; |
561 |
< |
origEcr = theEcr; |
544 |
> |
haveEcr = 1; |
545 |
|
|
546 |
|
( rCut > ecr )? rList = rCut + 1.0: rList = ecr + 1.0; |
547 |
|
|
550 |
|
notifyFortranCutOffs( &rCut, &rList, &ecr, &est ); |
551 |
|
} |
552 |
|
|
570 |
– |
void SimInfo::setEcr( double theEcr, double theEst ){ |
571 |
– |
|
572 |
– |
est = theEst; |
573 |
– |
setEcr( theEcr ); |
574 |
– |
} |
575 |
– |
|
553 |
|
void SimInfo::setDefaultEcr( double theEcr, double theEst ){ |
554 |
|
|
555 |
|
est = theEst; |
558 |
|
|
559 |
|
|
560 |
|
void SimInfo::checkCutOffs( void ){ |
584 |
– |
|
585 |
– |
int cutChanged = 0; |
561 |
|
|
562 |
|
if( boxIsInit ){ |
563 |
|
|
564 |
|
//we need to check cutOffs against the box |
565 |
< |
|
566 |
< |
//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)) { |
565 |
> |
|
566 |
> |
if( rCut > maxCutoff ){ |
567 |
|
sprintf( painCave.errMsg, |
568 |
< |
"New Box size is setting the long range cutoff radius " |
569 |
< |
"to %lf at time %lf\n", |
570 |
< |
maxCutoff, currentTime ); |
571 |
< |
painCave.isFatal = 0; |
568 |
> |
"Box size is too small for the long range cutoff radius, " |
569 |
> |
"%lf, at time %lf\n", |
570 |
> |
rCut, currentTime ); |
571 |
> |
painCave.isFatal = 1; |
572 |
|
simError(); |
614 |
– |
rCut = maxCutoff; |
573 |
|
} |
574 |
< |
|
575 |
< |
|
576 |
< |
//detect the change of ecr |
577 |
< |
if( maxCutoff > ecr ){ |
578 |
< |
if( ecr < origEcr ){ |
579 |
< |
ecr = origEcr; |
580 |
< |
if (ecr > maxCutoff) ecr = maxCutoff; |
581 |
< |
|
582 |
< |
sprintf( painCave.errMsg, |
625 |
< |
"New Box size is setting the electrostaticCutoffRadius " |
626 |
< |
"to %lf at time %lf\n", |
627 |
< |
ecr, currentTime ); |
628 |
< |
painCave.isFatal = 0; |
629 |
< |
simError(); |
574 |
> |
|
575 |
> |
if( haveEcr ){ |
576 |
> |
if( ecr > maxCutoff ){ |
577 |
> |
sprintf( painCave.errMsg, |
578 |
> |
"Box size is too small for the electrostatic cutoff radius, " |
579 |
> |
"%lf, at time %lf\n", |
580 |
> |
ecr, currentTime ); |
581 |
> |
painCave.isFatal = 1; |
582 |
> |
simError(); |
583 |
|
} |
584 |
|
} |
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 |
– |
|
585 |
|
} else { |
586 |
|
// initialize this stuff before using it, OK? |
587 |
|
sprintf( painCave.errMsg, |