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 674 by mmeineke, Mon Aug 11 18:29:46 2003 UTC vs.
Revision 860 by mmeineke, Tue Nov 11 17:20:12 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 20 | Line 20 | inline double roundMe( double x ){
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  
29   SimInfo::SimInfo(){
30    excludes = NULL;
31    n_constraints = 0;
32 +  nZconstraints = 0;
33    n_oriented = 0;
34    n_dipoles = 0;
35    ndf = 0;
# Line 38 | Line 42 | SimInfo::SimInfo(){
42    rCut = 0.0;
43    ecr = 0.0;
44    est = 0.0;
41 –  oldEcr = 0.0;
42 –  oldRcut = 0.0;
45  
46 <  haveOrigRcut = 0;
47 <  haveOrigEcr = 0;
46 >  haveRcut = 0;
47 >  haveEcr = 0;
48    boxIsInit = 0;
49    
50 <  
50 >  resetTime = 1e99;
51  
52 +  orthoTolerance = 1E-6;
53 +  useInitXSstate = true;
54 +
55    usePBC = 0;
56    useLJ = 0;
57    useSticky = 0;
# Line 90 | Line 95 | void SimInfo::setBoxM( double theBox[3][3] ){
95  
96   void SimInfo::setBoxM( double theBox[3][3] ){
97    
98 <  int i, j, status;
94 <  double smallestBoxL, maxCutoff;
98 >  int i, j;
99    double FortranHmat[9]; // to preserve compatibility with Fortran the
100                           // ordering in the array is as follows:
101                           // [ 0 3 6 ]
# Line 99 | Line 103 | void SimInfo::setBoxM( double theBox[3][3] ){
103                           // [ 2 5 8 ]
104    double FortranHmatInv[9]; // the inverted Hmat (for Fortran);
105  
102 –  
106    if( !boxIsInit ) boxIsInit = 1;
107  
108    for(i=0; i < 3; i++)
# Line 143 | Line 146 | void SimInfo::calcHmatInv( void ) {
146  
147   void SimInfo::calcHmatInv( void ) {
148    
149 +  int oldOrtho;
150    int i,j;
151    double smallDiag;
152    double tol;
# Line 150 | Line 154 | void SimInfo::calcHmatInv( void ) {
154  
155    invertMat3( Hmat, HmatInv );
156  
153 –  // Check the inverse to make sure it is sane:
154 –
155 –  matMul3( Hmat, HmatInv, sanity );
156 –    
157    // check to see if Hmat is orthorhombic
158    
159 <  smallDiag = Hmat[0][0];
160 <  if(smallDiag > Hmat[1][1]) smallDiag = Hmat[1][1];
161 <  if(smallDiag > Hmat[2][2]) smallDiag = Hmat[2][2];
162 <  tol = smallDiag * 1E-6;
159 >  oldOrtho = orthoRhombic;
160 >
161 >  smallDiag = fabs(Hmat[0][0]);
162 >  if(smallDiag > fabs(Hmat[1][1])) smallDiag = fabs(Hmat[1][1]);
163 >  if(smallDiag > fabs(Hmat[2][2])) smallDiag = fabs(Hmat[2][2]);
164 >  tol = smallDiag * orthoTolerance;
165  
166    orthoRhombic = 1;
167    
# Line 167 | Line 169 | void SimInfo::calcHmatInv( void ) {
169      for (j = 0 ; j < 3; j++) {
170        if (i != j) {
171          if (orthoRhombic) {
172 <          if (Hmat[i][j] >= tol) orthoRhombic = 0;
172 >          if ( fabs(Hmat[i][j]) >= tol) orthoRhombic = 0;
173          }        
174        }
175      }
176    }
177 +
178 +  if( oldOrtho != orthoRhombic ){
179 +    
180 +    if( orthoRhombic ){
181 +      sprintf( painCave.errMsg,
182 +               "Hmat is switching from Non-Orthorhombic to OrthoRhombic\n"
183 +               "       If this is a bad thing, change the orthoBoxTolerance( currently %G ).\n",
184 +               orthoTolerance);
185 +      simError();
186 +    }
187 +    else {
188 +      sprintf( painCave.errMsg,
189 +               "Hmat is switching from Orthorhombic to Non-OrthoRhombic\n"
190 +               "       If this is a bad thing, change the orthoBoxTolerance( currently %G ).\n",
191 +               orthoTolerance);
192 +      simError();
193 +    }
194 +  }
195   }
196  
197   double SimInfo::matDet3(double a[3][3]) {
# Line 278 | Line 298 | void SimInfo::printMat9(double A[9] ){
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 +
318   void SimInfo::calcBoxL( void ){
319  
320    double dx, dy, dz, dsq;
284 –  int i;
321  
322    // boxVol = Determinant of Hmat
323  
# Line 292 | Line 328 | void SimInfo::calcBoxL( void ){
328    dx = Hmat[0][0]; dy = Hmat[1][0]; dz = Hmat[2][0];
329    dsq = dx*dx + dy*dy + dz*dz;
330    boxL[0] = sqrt( dsq );
331 <  maxCutoff = 0.5 * boxL[0];
331 >  //maxCutoff = 0.5 * boxL[0];
332  
333    // boxLy
334    
335    dx = Hmat[0][1]; dy = Hmat[1][1]; dz = Hmat[2][1];
336    dsq = dx*dx + dy*dy + dz*dz;
337    boxL[1] = sqrt( dsq );
338 <  if( (0.5 * boxL[1]) < maxCutoff ) maxCutoff = 0.5 * boxL[1];
338 >  //if( (0.5 * boxL[1]) < maxCutoff ) maxCutoff = 0.5 * boxL[1];
339  
340 +
341    // boxLz
342    
343    dx = Hmat[0][2]; dy = Hmat[1][2]; dz = Hmat[2][2];
344    dsq = dx*dx + dy*dy + dz*dz;
345    boxL[2] = sqrt( dsq );
346 <  if( (0.5 * boxL[2]) < maxCutoff ) maxCutoff = 0.5 * boxL[2];
346 >  //if( (0.5 * boxL[2]) < maxCutoff ) maxCutoff = 0.5 * boxL[2];
347 >
348 >  //calculate the max cutoff
349 >  maxCutoff =  calcMaxCutOff();
350    
351    checkCutOffs();
352  
353   }
354  
355  
356 + double SimInfo::calcMaxCutOff(){
357 +
358 +  double ri[3], rj[3], rk[3];
359 +  double rij[3], rjk[3], rki[3];
360 +  double minDist;
361 +
362 +  ri[0] = Hmat[0][0];
363 +  ri[1] = Hmat[1][0];
364 +  ri[2] = Hmat[2][0];
365 +
366 +  rj[0] = Hmat[0][1];
367 +  rj[1] = Hmat[1][1];
368 +  rj[2] = Hmat[2][1];
369 +
370 +  rk[0] = Hmat[0][2];
371 +  rk[1] = Hmat[1][2];
372 +  rk[2] = Hmat[2][2];
373 +  
374 +  crossProduct3(ri,rj, rij);
375 +  distXY = dotProduct3(rk,rij) / length3(rij);
376 +
377 +  crossProduct3(rj,rk, rjk);
378 +  distYZ = dotProduct3(ri,rjk) / length3(rjk);
379 +
380 +  crossProduct3(rk,ri, rki);
381 +  distZX = dotProduct3(rj,rki) / length3(rki);
382 +
383 +  minDist = min(min(distXY, distYZ), distZX);
384 +  return minDist/2;
385 +  
386 + }
387 +
388   void SimInfo::wrapVector( double thePos[3] ){
389  
390 <  int i, j, k;
390 >  int i;
391    double scaled[3];
392  
393    if( !orthoRhombic ){
# Line 353 | Line 425 | int SimInfo::getNDF(){
425  
426  
427   int SimInfo::getNDF(){
428 <  int ndf_local, ndf;
428 >  int ndf_local;
429    
430    ndf_local = 3 * n_atoms + 3 * n_oriented - n_constraints;
431  
# Line 369 | Line 441 | int SimInfo::getNDFraw() {
441   }
442  
443   int SimInfo::getNDFraw() {
444 <  int ndfRaw_local, ndfRaw;
444 >  int ndfRaw_local;
445  
446    // Raw degrees of freedom that we have to set
447    ndfRaw_local = 3 * n_atoms + 3 * n_oriented;
# Line 382 | Line 454 | int SimInfo::getNDFraw() {
454  
455    return ndfRaw;
456   }
457 <
457 >
458 > int SimInfo::getNDFtranslational() {
459 >  int ndfTrans_local;
460 >
461 >  ndfTrans_local = 3 * n_atoms - n_constraints;
462 >
463 > #ifdef IS_MPI
464 >  MPI_Allreduce(&ndfTrans_local,&ndfTrans,1,MPI_INT,MPI_SUM, MPI_COMM_WORLD);
465 > #else
466 >  ndfTrans = ndfTrans_local;
467 > #endif
468 >
469 >  ndfTrans = ndfTrans - 3 - nZconstraints;
470 >
471 >  return ndfTrans;
472 > }
473 >
474   void SimInfo::refreshSim(){
475  
476    simtype fInfo;
# Line 438 | Line 526 | void SimInfo::refreshSim(){
526  
527    this->ndf = this->getNDF();
528    this->ndfRaw = this->getNDFraw();
529 <
529 >  this->ndfTrans = this->getNDFtranslational();
530   }
531  
532 + void SimInfo::setDefaultRcut( double theRcut ){
533  
534 < void SimInfo::setRcut( double theRcut ){
534 >  haveRcut = 1;
535 >  rCut = theRcut;
536  
537 <  if( !haveOrigRcut ){
448 <    haveOrigRcut = 1;
449 <    origRcut = theRcut;
450 <  }
537 >  ( rCut > ecr )? rList = rCut + 1.0: rList = ecr + 1.0;
538  
539 <  rCut = theRcut;
453 <  checkCutOffs();
539 >  notifyFortranCutOffs( &rCut, &rList, &ecr, &est );
540   }
541  
542 < void SimInfo::setEcr( double theEcr ){
542 > void SimInfo::setDefaultEcr( double theEcr ){
543  
544 <  if( !haveOrigEcr ){
545 <    haveOrigEcr = 1;
546 <    origEcr = theEcr;
461 <  }
544 >  haveEcr = 1;
545 >  
546 >  ( rCut > ecr )? rList = rCut + 1.0: rList = ecr + 1.0;
547  
548    ecr = theEcr;
549 <  checkCutOffs();
549 >
550 >  notifyFortranCutOffs( &rCut, &rList, &ecr, &est );
551   }
552  
553 < void SimInfo::setEcr( double theEcr, double theEst ){
553 > void SimInfo::setDefaultEcr( double theEcr, double theEst ){
554  
555    est = theEst;
556 <  setEcr( theEcr );
556 >  setDefaultEcr( theEcr );
557   }
558  
559  
560   void SimInfo::checkCutOffs( void ){
561 <
476 <  int cutChanged = 0;
477 <
478 <
479 <
561 >  
562    if( boxIsInit ){
563      
564      //we need to check cutOffs against the box
565 <  
566 <    if(( maxCutoff > rCut )&&(usePBC)){
567 <      if( rCut < origRcut ){
568 <        rCut = origRcut;
569 <        if (rCut > maxCutoff) rCut = maxCutoff;
570 <        
571 <        sprintf( painCave.errMsg,
572 <                 "New Box size is setting the long range cutoff radius "
491 <                 "to %lf\n",
492 <                 rCut );
493 <        painCave.isFatal = 0;
494 <        simError();
495 <      }
565 >    
566 >    if( rCut > maxCutoff ){
567 >      sprintf( painCave.errMsg,
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();
573      }
574 <
575 <    if( maxCutoff > ecr ){
576 <      if( ecr < origEcr ){
500 <        rCut = origEcr;
501 <        if (ecr > maxCutoff) ecr = maxCutoff;
502 <        
574 >    
575 >    if( haveEcr ){
576 >      if( ecr > maxCutoff ){
577          sprintf( painCave.errMsg,
578 <                 "New Box size is setting the electrostaticCutoffRadius "
579 <                 "to %lf\n",
580 <                 ecr );
581 <        painCave.isFatal = 0;
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      }
585 <
586 <
587 <    if ((rCut > maxCutoff)&&(usePBC)) {
588 <      sprintf( painCave.errMsg,
589 <               "New Box size is setting the long range cutoff radius "
590 <               "to %lf\n",
517 <               maxCutoff );
518 <      painCave.isFatal = 0;
519 <      simError();
520 <      rCut = maxCutoff;
521 <    }
522 <
523 <    if( ecr > maxCutoff){
524 <      sprintf( painCave.errMsg,
525 <               "New Box size is setting the electrostaticCutoffRadius "
526 <               "to %lf\n",
527 <               maxCutoff  );
528 <      painCave.isFatal = 0;
529 <      simError();      
530 <      ecr = maxCutoff;
531 <    }
532 <
533 <    
585 >  } else {
586 >    // initialize this stuff before using it, OK?
587 >    sprintf( painCave.errMsg,
588 >             "Trying to check cutoffs without a box. Be smarter.\n" );
589 >    painCave.isFatal = 1;
590 >    simError();      
591    }
535 –  
536 –
537 –  if( (oldEcr != ecr) || ( oldRcut != rCut ) ) cutChanged = 1;
538 –
539 –  // rlist is the 1.0 plus max( rcut, ecr )
592    
541 –  ( rCut > ecr )? rList = rCut + 1.0: rList = ecr + 1.0;
542 –
543 –  if( cutChanged ){
544 –    
545 –    notifyFortranCutOffs( &rCut, &rList, &ecr, &est );
546 –  }
547 –
548 –  oldEcr = ecr;
549 –  oldRcut = rCut;
593   }
594  
595   void SimInfo::addProperty(GenericData* prop){
# Line 596 | Line 639 | vector<GenericData*> SimInfo::getProperties(){
639    return result;
640   }
641  
642 + double SimInfo::matTrace3(double m[3][3]){
643 +  double trace;
644 +  trace = m[0][0] + m[1][1] + m[2][2];
645  
646 +  return trace;
647 + }

Diff Legend

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