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 770 by gezelter, Fri Sep 19 14:55:41 2003 UTC vs.
Revision 855 by mmeineke, Thu Nov 6 22:01:37 2003 UTC

# Line 1 | Line 1
1 < #include <cstdlib>
2 < #include <cstring>
3 < #include <cmath>
1 > #include <stdlib.h>
2 > #include <string.h>
3 > #include <math.h>
4  
5   #include <iostream>
6   using namespace std;
# Line 48 | Line 48 | SimInfo::SimInfo(){
48    haveOrigEcr = 0;
49    boxIsInit = 0;
50    
51 <  
51 >  resetTime = 1e99;
52  
53 +  orthoTolerance = 1E-6;
54 +  useInitXSstate = true;
55 +
56    usePBC = 0;
57    useLJ = 0;
58    useSticky = 0;
# Line 93 | Line 96 | void SimInfo::setBoxM( double theBox[3][3] ){
96  
97   void SimInfo::setBoxM( double theBox[3][3] ){
98    
99 <  int i, j, status;
97 <  double smallestBoxL, maxCutoff;
99 >  int i, j;
100    double FortranHmat[9]; // to preserve compatibility with Fortran the
101                           // ordering in the array is as follows:
102                           // [ 0 3 6 ]
# Line 146 | Line 148 | void SimInfo::calcHmatInv( void ) {
148  
149   void SimInfo::calcHmatInv( void ) {
150    
151 +  int oldOrtho;
152    int i,j;
153    double smallDiag;
154    double tol;
# Line 153 | Line 156 | void SimInfo::calcHmatInv( void ) {
156  
157    invertMat3( Hmat, HmatInv );
158  
156 –  // Check the inverse to make sure it is sane:
157 –
158 –  matMul3( Hmat, HmatInv, sanity );
159 –    
159    // check to see if Hmat is orthorhombic
160    
161 <  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;
161 >  oldOrtho = orthoRhombic;
162  
163 +  smallDiag = fabs(Hmat[0][0]);
164 +  if(smallDiag > fabs(Hmat[1][1])) smallDiag = fabs(Hmat[1][1]);
165 +  if(smallDiag > fabs(Hmat[2][2])) smallDiag = fabs(Hmat[2][2]);
166 +  tol = smallDiag * orthoTolerance;
167 +
168    orthoRhombic = 1;
169    
170    for (i = 0; i < 3; i++ ) {
171      for (j = 0 ; j < 3; j++) {
172        if (i != j) {
173          if (orthoRhombic) {
174 <          if (Hmat[i][j] >= tol) orthoRhombic = 0;
174 >          if ( fabs(Hmat[i][j]) >= tol) orthoRhombic = 0;
175          }        
176        }
177      }
178    }
179 +
180 +  if( oldOrtho != orthoRhombic ){
181 +    
182 +    if( orthoRhombic ){
183 +      sprintf( painCave.errMsg,
184 +               "Hmat is switching from Non-Orthorhombic to OrthoRhombic\n"
185 +               "       If this is a bad thing, change the orthoBoxTolerance( currently %G ).\n",
186 +               orthoTolerance);
187 +      simError();
188 +    }
189 +    else {
190 +      sprintf( painCave.errMsg,
191 +               "Hmat is switching from Orthorhombic to Non-OrthoRhombic\n"
192 +               "       If this is a bad thing, change the orthoBoxTolerance( currently %G ).\n",
193 +               orthoTolerance);
194 +      simError();
195 +    }
196 +  }
197   }
198  
199   double SimInfo::matDet3(double a[3][3]) {
# Line 281 | Line 300 | void SimInfo::printMat9(double A[9] ){
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 +
320   void SimInfo::calcBoxL( void ){
321  
322    double dx, dy, dz, dsq;
287 –  int i;
323  
324    // boxVol = Determinant of Hmat
325  
# Line 295 | Line 330 | void SimInfo::calcBoxL( void ){
330    dx = Hmat[0][0]; dy = Hmat[1][0]; dz = Hmat[2][0];
331    dsq = dx*dx + dy*dy + dz*dz;
332    boxL[0] = sqrt( dsq );
333 <  maxCutoff = 0.5 * boxL[0];
333 >  //maxCutoff = 0.5 * boxL[0];
334  
335    // boxLy
336    
337    dx = Hmat[0][1]; dy = Hmat[1][1]; dz = Hmat[2][1];
338    dsq = dx*dx + dy*dy + dz*dz;
339    boxL[1] = sqrt( dsq );
340 <  if( (0.5 * boxL[1]) < maxCutoff ) maxCutoff = 0.5 * boxL[1];
340 >  //if( (0.5 * boxL[1]) < maxCutoff ) maxCutoff = 0.5 * boxL[1];
341  
342 +
343    // boxLz
344    
345    dx = Hmat[0][2]; dy = Hmat[1][2]; dz = Hmat[2][2];
346    dsq = dx*dx + dy*dy + dz*dz;
347    boxL[2] = sqrt( dsq );
348 <  if( (0.5 * boxL[2]) < maxCutoff ) maxCutoff = 0.5 * boxL[2];
348 >  //if( (0.5 * boxL[2]) < maxCutoff ) maxCutoff = 0.5 * boxL[2];
349 >
350 >  //calculate the max cutoff
351 >  maxCutoff =  calcMaxCutOff();
352    
353    checkCutOffs();
354  
355   }
356  
357  
358 + double SimInfo::calcMaxCutOff(){
359 +
360 +  double ri[3], rj[3], rk[3];
361 +  double rij[3], rjk[3], rki[3];
362 +  double minDist;
363 +
364 +  ri[0] = Hmat[0][0];
365 +  ri[1] = Hmat[1][0];
366 +  ri[2] = Hmat[2][0];
367 +
368 +  rj[0] = Hmat[0][1];
369 +  rj[1] = Hmat[1][1];
370 +  rj[2] = Hmat[2][1];
371 +
372 +  rk[0] = Hmat[0][2];
373 +  rk[1] = Hmat[1][2];
374 +  rk[2] = Hmat[2][2];
375 +  
376 +  crossProduct3(ri,rj, rij);
377 +  distXY = dotProduct3(rk,rij) / length3(rij);
378 +
379 +  crossProduct3(rj,rk, rjk);
380 +  distYZ = dotProduct3(ri,rjk) / length3(rjk);
381 +
382 +  crossProduct3(rk,ri, rki);
383 +  distZX = dotProduct3(rj,rki) / length3(rki);
384 +
385 +  minDist = min(min(distXY, distYZ), distZX);
386 +  return minDist/2;
387 +  
388 + }
389 +
390   void SimInfo::wrapVector( double thePos[3] ){
391  
392 <  int i, j, k;
392 >  int i;
393    double scaled[3];
394  
395    if( !orthoRhombic ){
# Line 356 | Line 427 | int SimInfo::getNDF(){
427  
428  
429   int SimInfo::getNDF(){
430 <  int ndf_local, ndf;
430 >  int ndf_local;
431    
432    ndf_local = 3 * n_atoms + 3 * n_oriented - n_constraints;
433  
# Line 372 | Line 443 | int SimInfo::getNDFraw() {
443   }
444  
445   int SimInfo::getNDFraw() {
446 <  int ndfRaw_local, ndfRaw;
446 >  int ndfRaw_local;
447  
448    // Raw degrees of freedom that we have to set
449    ndfRaw_local = 3 * n_atoms + 3 * n_oriented;
# Line 387 | Line 458 | int SimInfo::getNDFtranslational() {
458   }
459  
460   int SimInfo::getNDFtranslational() {
461 <  int ndfTrans_local, ndfTrans;
461 >  int ndfTrans_local;
462  
463    ndfTrans_local = 3 * n_atoms - n_constraints;
464  
# Line 463 | Line 534 | void SimInfo::setRcut( double theRcut ){
534  
535   void SimInfo::setRcut( double theRcut ){
536  
466 –  if( !haveOrigRcut ){
467 –    haveOrigRcut = 1;
468 –    origRcut = theRcut;
469 –  }
470 –
537    rCut = theRcut;
538    checkCutOffs();
539   }
540  
541 < void SimInfo::setEcr( double theEcr ){
541 > void SimInfo::setDefaultRcut( double theRcut ){
542  
543 <  if( !haveOrigEcr ){
544 <    haveOrigEcr = 1;
545 <    origEcr = theEcr;
480 <  }
543 >  haveOrigRcut = 1;
544 >  origRcut = theRcut;
545 >  rCut = theRcut;
546  
547 +  ( rCut > ecr )? rList = rCut + 1.0: rList = ecr + 1.0;
548 +
549 +  notifyFortranCutOffs( &rCut, &rList, &ecr, &est );
550 + }
551 +
552 + void SimInfo::setEcr( double theEcr ){
553 +
554    ecr = theEcr;
555    checkCutOffs();
556   }
557  
558 + void SimInfo::setDefaultEcr( double theEcr ){
559 +
560 +  haveOrigEcr = 1;
561 +  origEcr = theEcr;
562 +  
563 +  ( rCut > ecr )? rList = rCut + 1.0: rList = ecr + 1.0;
564 +
565 +  ecr = theEcr;
566 +
567 +  notifyFortranCutOffs( &rCut, &rList, &ecr, &est );
568 + }
569 +
570   void SimInfo::setEcr( double theEcr, double theEst ){
571  
572    est = theEst;
573    setEcr( theEcr );
574   }
575  
576 + void SimInfo::setDefaultEcr( double theEcr, double theEst ){
577  
578 +  est = theEst;
579 +  setDefaultEcr( theEcr );
580 + }
581 +
582 +
583   void SimInfo::checkCutOffs( void ){
584  
585    int cutChanged = 0;
# Line 497 | Line 587 | void SimInfo::checkCutOffs( void ){
587    if( boxIsInit ){
588      
589      //we need to check cutOffs against the box
590 <    
590 >
591 >    //detect the change of rCut
592      if(( maxCutoff > rCut )&&(usePBC)){
593        if( rCut < origRcut ){
594 <        rCut = origRcut;
595 <        if (rCut > maxCutoff) rCut = maxCutoff;
596 <        
597 <        sprintf( painCave.errMsg,
598 <                 "New Box size is setting the long range cutoff radius "
599 <                 "to %lf at time %lf\n",
600 <                 rCut, currentTime );
601 <        painCave.isFatal = 0;
602 <        simError();
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 <    
515 <    if( maxCutoff > ecr ){
516 <      if( ecr < origEcr ){
517 <        ecr = origEcr;
518 <        if (ecr > maxCutoff) ecr = maxCutoff;
519 <        
520 <        sprintf( painCave.errMsg,
521 <                 "New Box size is setting the electrostaticCutoffRadius "
522 <                 "to %lf at time %lf\n",
523 <                 ecr, currentTime );
524 <        painCave.isFatal = 0;
525 <        simError();
526 <      }
527 <    }
528 <    
529 <    
530 <    if ((rCut > maxCutoff)&&(usePBC)) {
607 >    else if ((rCut > maxCutoff)&&(usePBC)) {
608        sprintf( painCave.errMsg,
609                 "New Box size is setting the long range cutoff radius "
610 <               "to %lf at time %lf\n",
610 >               "to %lf at time %lf\n",
611                 maxCutoff, currentTime );
612        painCave.isFatal = 0;
613        simError();
614        rCut = maxCutoff;
615      }
616 <    
617 <    if( ecr > maxCutoff){
616 >
617 >
618 >    //detect the change of ecr
619 >    if( maxCutoff > ecr ){
620 >      if( ecr < origEcr ){
621 >        ecr = origEcr;
622 >        if (ecr > maxCutoff) ecr = maxCutoff;
623 >  
624 >          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();
630 >      }
631 >    }
632 >    else if( ecr > maxCutoff){
633        sprintf( painCave.errMsg,
634                 "New Box size is setting the electrostaticCutoffRadius "
635                 "to %lf at time %lf\n",
# Line 554 | Line 646 | void SimInfo::checkCutOffs( void ){
646      ( rCut > ecr )? rList = rCut + 1.0: rList = ecr + 1.0;
647      
648      if( cutChanged ){
557 –      
649        notifyFortranCutOffs( &rCut, &rList, &ecr, &est );
650      }
651      

Diff Legend

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