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

Comparing trunk/OOPSE/libmdtools/SimInfo.cpp (file contents):
Revision 841 by mmeineke, Wed Oct 29 17:55:28 2003 UTC vs.
Revision 859 by mmeineke, Mon Nov 10 21:50:36 2003 UTC

# Line 37 | Line 37 | SimInfo::SimInfo(){
37    thermalTime = 0.0;
38    currentTime = 0.0;
39    rCut = 0.0;
40 –  origRcut = -1.0;
40    ecr = 0.0;
42 –  origEcr = -1.0;
41    est = 0.0;
44 –  oldEcr = 0.0;
45 –  oldRcut = 0.0;
42  
43 <  haveOrigRcut = 0;
44 <  haveOrigEcr = 0;
43 >  haveRcut = 0;
44 >  haveEcr = 0;
45    boxIsInit = 0;
46    
47    resetTime = 1e99;
52 –  
48  
49 +  orthoTolerance = 1E-6;
50 +  useInitXSstate = true;
51 +
52    usePBC = 0;
53    useLJ = 0;
54    useSticky = 0;
# Line 102 | Line 100 | void SimInfo::setBoxM( double theBox[3][3] ){
100                           // [ 2 5 8 ]
101    double FortranHmatInv[9]; // the inverted Hmat (for Fortran);
102  
105 –  
103    if( !boxIsInit ) boxIsInit = 1;
104  
105    for(i=0; i < 3; i++)
# Line 146 | Line 143 | void SimInfo::calcHmatInv( void ) {
143  
144   void SimInfo::calcHmatInv( void ) {
145    
146 +  int oldOrtho;
147    int i,j;
148    double smallDiag;
149    double tol;
# Line 153 | Line 151 | void SimInfo::calcHmatInv( void ) {
151  
152    invertMat3( Hmat, HmatInv );
153  
156 –  // Check the inverse to make sure it is sane:
157 –
158 –  matMul3( Hmat, HmatInv, sanity );
159 –    
154    // check to see if Hmat is orthorhombic
155    
156 <  smallDiag = Hmat[0][0];
163 <  if(smallDiag > Hmat[1][1]) smallDiag = Hmat[1][1];
164 <  if(smallDiag > Hmat[2][2]) smallDiag = Hmat[2][2];
165 <  tol = smallDiag * 1E-6;
156 >  oldOrtho = orthoRhombic;
157  
158 +  smallDiag = fabs(Hmat[0][0]);
159 +  if(smallDiag > fabs(Hmat[1][1])) smallDiag = fabs(Hmat[1][1]);
160 +  if(smallDiag > fabs(Hmat[2][2])) smallDiag = fabs(Hmat[2][2]);
161 +  tol = smallDiag * orthoTolerance;
162 +
163    orthoRhombic = 1;
164    
165    for (i = 0; i < 3; i++ ) {
166      for (j = 0 ; j < 3; j++) {
167        if (i != j) {
168          if (orthoRhombic) {
169 <          if (Hmat[i][j] >= tol) orthoRhombic = 0;
169 >          if ( fabs(Hmat[i][j]) >= tol) orthoRhombic = 0;
170          }        
171        }
172      }
173    }
174 +
175 +  if( oldOrtho != orthoRhombic ){
176 +    
177 +    if( orthoRhombic ){
178 +      sprintf( painCave.errMsg,
179 +               "Hmat is switching from Non-Orthorhombic to OrthoRhombic\n"
180 +               "       If this is a bad thing, change the orthoBoxTolerance( currently %G ).\n",
181 +               orthoTolerance);
182 +      simError();
183 +    }
184 +    else {
185 +      sprintf( painCave.errMsg,
186 +               "Hmat is switching from Orthorhombic to Non-OrthoRhombic\n"
187 +               "       If this is a bad thing, change the orthoBoxTolerance( currently %G ).\n",
188 +               orthoTolerance);
189 +      simError();
190 +    }
191 +  }
192   }
193  
194   double SimInfo::matDet3(double a[3][3]) {
# Line 512 | Line 526 | void SimInfo::refreshSim(){
526    this->ndfTrans = this->getNDFtranslational();
527   }
528  
529 + void SimInfo::setDefaultRcut( double theRcut ){
530  
531 < void SimInfo::setRcut( double theRcut ){
517 <
531 >  haveRcut = 1;
532    rCut = theRcut;
519 –  checkCutOffs();
520 – }
533  
534 < void SimInfo::setDefaultRcut( double theRcut ){
534 >  ( rCut > ecr )? rList = rCut + 1.0: rList = ecr + 1.0;
535  
536 <  haveOrigRcut = 1;
525 <  origRcut = theRcut;
526 <  rCut = theRcut;
527 < }
528 <
529 < void SimInfo::setEcr( double theEcr ){
530 <
531 <  ecr = theEcr;
532 <  checkCutOffs();
536 >  notifyFortranCutOffs( &rCut, &rList, &ecr, &est );
537   }
538  
539   void SimInfo::setDefaultEcr( double theEcr ){
540  
541 <  haveOrigEcr = 1;
538 <  origEcr = theEcr;
541 >  haveEcr = 1;
542    
543 +  ( rCut > ecr )? rList = rCut + 1.0: rList = ecr + 1.0;
544 +
545    ecr = theEcr;
541 – }
546  
547 < void SimInfo::setEcr( double theEcr, double theEst ){
544 <
545 <  est = theEst;
546 <  setEcr( theEcr );
547 >  notifyFortranCutOffs( &rCut, &rList, &ecr, &est );
548   }
549  
550   void SimInfo::setDefaultEcr( double theEcr, double theEst ){
# Line 554 | Line 555 | void SimInfo::checkCutOffs( void ){
555  
556  
557   void SimInfo::checkCutOffs( void ){
557 –
558 –  int cutChanged = 0;
558    
559    if( boxIsInit ){
560      
561      //we need to check cutOffs against the box
562 <
563 <    //detect the change of rCut
565 <    if(( maxCutoff > rCut )&&(usePBC)){
566 <      if( rCut < origRcut ){
567 <        rCut = origRcut;
568 <        
569 <        if (rCut > maxCutoff)
570 <          rCut = maxCutoff;
571 <  
572 <          sprintf( painCave.errMsg,
573 <                    "New Box size is setting the long range cutoff radius "
574 <                    "to %lf at time %lf\n",
575 <                    rCut, currentTime );
576 <          painCave.isFatal = 0;
577 <          simError();
578 <      }
579 <    }
580 <    else if ((rCut > maxCutoff)&&(usePBC)) {
562 >    
563 >    if( rCut > maxCutoff ){
564        sprintf( painCave.errMsg,
565 <               "New Box size is setting the long range cutoff radius "
566 <               "to %lf at time %lf\n",
567 <               maxCutoff, currentTime );
568 <      painCave.isFatal = 0;
565 >               "Box size is too small for the long range cutoff radius, "
566 >               "%lf, at time %lf\n",
567 >               rCut, currentTime );
568 >      painCave.isFatal = 1;
569        simError();
587 –      rCut = maxCutoff;
570      }
571 <
572 <
573 <    //detect the change of ecr
574 <    if( maxCutoff > ecr ){
575 <      if( ecr < origEcr ){
576 <        ecr = origEcr;
577 <        if (ecr > maxCutoff) ecr = maxCutoff;
578 <  
579 <          sprintf( painCave.errMsg,
598 <                    "New Box size is setting the electrostaticCutoffRadius "
599 <                    "to %lf at time %lf\n",
600 <                    ecr, currentTime );
601 <            painCave.isFatal = 0;
602 <            simError();
571 >    
572 >    if( haveEcr ){
573 >      if( ecr > maxCutoff ){
574 >        sprintf( painCave.errMsg,
575 >                 "Box size is too small for the electrostatic cutoff radius, "
576 >                 "%lf, at time %lf\n",
577 >                 ecr, currentTime );
578 >        painCave.isFatal = 1;
579 >        simError();
580        }
581      }
605 –    else if( ecr > maxCutoff){
606 –      sprintf( painCave.errMsg,
607 –               "New Box size is setting the electrostaticCutoffRadius "
608 –               "to %lf at time %lf\n",
609 –               maxCutoff, currentTime  );
610 –      painCave.isFatal = 0;
611 –      simError();      
612 –      ecr = maxCutoff;
613 –    }
614 –
615 –    if( (oldEcr != ecr) || ( oldRcut != rCut ) ) cutChanged = 1;
616 –    
617 –    // rlist is the 1.0 plus max( rcut, ecr )
618 –    
619 –    ( rCut > ecr )? rList = rCut + 1.0: rList = ecr + 1.0;
620 –    
621 –    if( cutChanged ){
622 –      
623 –      notifyFortranCutOffs( &rCut, &rList, &ecr, &est );
624 –    }
625 –    
626 –    oldEcr = ecr;
627 –    oldRcut = rCut;
628 –    
582    } else {
583      // initialize this stuff before using it, OK?
584      sprintf( painCave.errMsg,

Diff Legend

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