ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/group/branches/new-templateless/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.
branches/new-templateless/OOPSE/libmdtools/SimInfo.cpp (file contents), Revision 850 by mmeineke, Mon Nov 3 22:07:17 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 +  resetTime = 1e99;
52    
53  
54    usePBC = 0;
# Line 60 | Line 61 | SimInfo::SimInfo(){
61  
62    myConfiguration = new SimState();
63  
64 +  properties = new GenericData();
65 +
66    wrapMeSimInfo( this );
67   }
68  
# Line 67 | Line 70 | SimInfo::~SimInfo(){
70   SimInfo::~SimInfo(){
71  
72    delete myConfiguration;
73 <
71 <  map<string, GenericData*>::iterator i;
72 <  
73 <  for(i = properties.begin(); i != properties.end(); i++)
74 <    delete (*i).second;
75 <    
73 >  delete properties;    
74   }
75  
76   void SimInfo::setBox(double newBox[3]) {
# Line 93 | Line 91 | void SimInfo::setBoxM( double theBox[3][3] ){
91  
92   void SimInfo::setBoxM( double theBox[3][3] ){
93    
94 <  int i, j, status;
97 <  double smallestBoxL, maxCutoff;
94 >  int i, j;
95    double FortranHmat[9]; // to preserve compatibility with Fortran the
96                           // ordering in the array is as follows:
97                           // [ 0 3 6 ]
# Line 281 | Line 278 | void SimInfo::printMat9(double A[9] ){
278              << "[ " << A[6] << ", " << A[7] << ", " << A[8] << " ]\n";
279   }
280  
281 +
282 + void SimInfo::crossProduct3(double a[3],double b[3], double out[3]){
283 +
284 +      out[0] = a[1] * b[2] - a[2] * b[1];
285 +      out[1] = a[2] * b[0] - a[0] * b[2] ;
286 +      out[2] = a[0] * b[1] - a[1] * b[0];
287 +      
288 + }
289 +
290 + double SimInfo::dotProduct3(double a[3], double b[3]){
291 +  return a[0]*b[0] + a[1]*b[1]+ a[2]*b[2];
292 + }
293 +
294 + double SimInfo::length3(double a[3]){
295 +  return sqrt(a[0]*a[0] + a[1]*a[1] + a[2]*a[2]);
296 + }
297 +
298   void SimInfo::calcBoxL( void ){
299  
300    double dx, dy, dz, dsq;
287 –  int i;
301  
302    // boxVol = Determinant of Hmat
303  
# Line 295 | Line 308 | void SimInfo::calcBoxL( void ){
308    dx = Hmat[0][0]; dy = Hmat[1][0]; dz = Hmat[2][0];
309    dsq = dx*dx + dy*dy + dz*dz;
310    boxL[0] = sqrt( dsq );
311 <  maxCutoff = 0.5 * boxL[0];
311 >  //maxCutoff = 0.5 * boxL[0];
312  
313    // boxLy
314    
315    dx = Hmat[0][1]; dy = Hmat[1][1]; dz = Hmat[2][1];
316    dsq = dx*dx + dy*dy + dz*dz;
317    boxL[1] = sqrt( dsq );
318 <  if( (0.5 * boxL[1]) < maxCutoff ) maxCutoff = 0.5 * boxL[1];
318 >  //if( (0.5 * boxL[1]) < maxCutoff ) maxCutoff = 0.5 * boxL[1];
319  
320 +
321    // boxLz
322    
323    dx = Hmat[0][2]; dy = Hmat[1][2]; dz = Hmat[2][2];
324    dsq = dx*dx + dy*dy + dz*dz;
325    boxL[2] = sqrt( dsq );
326 <  if( (0.5 * boxL[2]) < maxCutoff ) maxCutoff = 0.5 * boxL[2];
326 >  //if( (0.5 * boxL[2]) < maxCutoff ) maxCutoff = 0.5 * boxL[2];
327 >
328 >  //calculate the max cutoff
329 >  maxCutoff =  calcMaxCutOff();
330    
331    checkCutOffs();
332  
333   }
334 +
335 +
336 + double SimInfo::calcMaxCutOff(){
337 +
338 +  double ri[3], rj[3], rk[3];
339 +  double rij[3], rjk[3], rki[3];
340 +  double minDist;
341 +
342 +  ri[0] = Hmat[0][0];
343 +  ri[1] = Hmat[1][0];
344 +  ri[2] = Hmat[2][0];
345 +
346 +  rj[0] = Hmat[0][1];
347 +  rj[1] = Hmat[1][1];
348 +  rj[2] = Hmat[2][1];
349  
350 +  rk[0] = Hmat[0][2];
351 +  rk[1] = Hmat[1][2];
352 +  rk[2] = Hmat[2][2];
353 +  
354 +  crossProduct3(ri,rj, rij);
355 +  distXY = dotProduct3(rk,rij) / length3(rij);
356  
357 +  crossProduct3(rj,rk, rjk);
358 +  distYZ = dotProduct3(ri,rjk) / length3(rjk);
359 +
360 +  crossProduct3(rk,ri, rki);
361 +  distZX = dotProduct3(rj,rki) / length3(rki);
362 +
363 +  minDist = min(min(distXY, distYZ), distZX);
364 +  return minDist/2;
365 +  
366 + }
367 +
368   void SimInfo::wrapVector( double thePos[3] ){
369  
370 <  int i, j, k;
370 >  int i;
371    double scaled[3];
372  
373    if( !orthoRhombic ){
# Line 356 | Line 405 | int SimInfo::getNDF(){
405  
406  
407   int SimInfo::getNDF(){
408 <  int ndf_local, ndf;
408 >  int ndf_local;
409    
410    ndf_local = 3 * n_atoms + 3 * n_oriented - n_constraints;
411  
# Line 372 | Line 421 | int SimInfo::getNDFraw() {
421   }
422  
423   int SimInfo::getNDFraw() {
424 <  int ndfRaw_local, ndfRaw;
424 >  int ndfRaw_local;
425  
426    // Raw degrees of freedom that we have to set
427    ndfRaw_local = 3 * n_atoms + 3 * n_oriented;
# Line 387 | Line 436 | int SimInfo::getNDFtranslational() {
436   }
437  
438   int SimInfo::getNDFtranslational() {
439 <  int ndfTrans_local, ndfTrans;
439 >  int ndfTrans_local;
440  
441    ndfTrans_local = 3 * n_atoms - n_constraints;
442  
# Line 463 | Line 512 | void SimInfo::setRcut( double theRcut ){
512  
513   void SimInfo::setRcut( double theRcut ){
514  
466 –  if( !haveOrigRcut ){
467 –    haveOrigRcut = 1;
468 –    origRcut = theRcut;
469 –  }
470 –
515    rCut = theRcut;
516    checkCutOffs();
517   }
518  
519 < void SimInfo::setEcr( double theEcr ){
519 > void SimInfo::setDefaultRcut( double theRcut ){
520  
521 <  if( !haveOrigEcr ){
522 <    haveOrigEcr = 1;
523 <    origEcr = theEcr;
480 <  }
521 >  haveOrigRcut = 1;
522 >  origRcut = theRcut;
523 >  rCut = theRcut;
524  
525 +  ( rCut > ecr )? rList = rCut + 1.0: rList = ecr + 1.0;
526 +
527 +  notifyFortranCutOffs( &rCut, &rList, &ecr, &est );
528 + }
529 +
530 + void SimInfo::setEcr( double theEcr ){
531 +
532    ecr = theEcr;
533    checkCutOffs();
534   }
535  
536 + void SimInfo::setDefaultEcr( double theEcr ){
537 +
538 +  haveOrigEcr = 1;
539 +  origEcr = theEcr;
540 +  
541 +  ( rCut > ecr )? rList = rCut + 1.0: rList = ecr + 1.0;
542 +
543 +  ecr = theEcr;
544 +
545 +  notifyFortranCutOffs( &rCut, &rList, &ecr, &est );
546 + }
547 +
548   void SimInfo::setEcr( double theEcr, double theEst ){
549  
550    est = theEst;
551    setEcr( theEcr );
552   }
553  
554 + void SimInfo::setDefaultEcr( double theEcr, double theEst ){
555  
556 +  est = theEst;
557 +  setDefaultEcr( theEcr );
558 + }
559 +
560 +
561   void SimInfo::checkCutOffs( void ){
562  
563    int cutChanged = 0;
# Line 497 | Line 565 | void SimInfo::checkCutOffs( void ){
565    if( boxIsInit ){
566      
567      //we need to check cutOffs against the box
568 <    
568 >
569 >    //detect the change of rCut
570      if(( maxCutoff > rCut )&&(usePBC)){
571        if( rCut < origRcut ){
572 <        rCut = origRcut;
573 <        if (rCut > maxCutoff) rCut = maxCutoff;
574 <        
575 <        sprintf( painCave.errMsg,
576 <                 "New Box size is setting the long range cutoff radius "
577 <                 "to %lf at time %lf\n",
578 <                 rCut, currentTime );
579 <        painCave.isFatal = 0;
580 <        simError();
572 >        rCut = origRcut;
573 >        
574 >        if (rCut > maxCutoff)
575 >          rCut = maxCutoff;
576 >  
577 >          sprintf( painCave.errMsg,
578 >                    "New Box size is setting the long range cutoff radius "
579 >                    "to %lf at time %lf\n",
580 >                    rCut, currentTime );
581 >          painCave.isFatal = 0;
582 >          simError();
583        }
584      }
585 <    
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)) {
585 >    else if ((rCut > maxCutoff)&&(usePBC)) {
586        sprintf( painCave.errMsg,
587                 "New Box size is setting the long range cutoff radius "
588 <               "to %lf at time %lf\n",
588 >               "to %lf at time %lf\n",
589                 maxCutoff, currentTime );
590        painCave.isFatal = 0;
591        simError();
592        rCut = maxCutoff;
593      }
594 <    
595 <    if( ecr > maxCutoff){
594 >
595 >
596 >    //detect the change of ecr
597 >    if( maxCutoff > ecr ){
598 >      if( ecr < origEcr ){
599 >        ecr = origEcr;
600 >        if (ecr > maxCutoff) ecr = maxCutoff;
601 >  
602 >          sprintf( painCave.errMsg,
603 >                    "New Box size is setting the electrostaticCutoffRadius "
604 >                    "to %lf at time %lf\n",
605 >                    ecr, currentTime );
606 >            painCave.isFatal = 0;
607 >            simError();
608 >      }
609 >    }
610 >    else if( ecr > maxCutoff){
611        sprintf( painCave.errMsg,
612                 "New Box size is setting the electrostaticCutoffRadius "
613                 "to %lf at time %lf\n",
# Line 554 | Line 624 | void SimInfo::checkCutOffs( void ){
624      ( rCut > ecr )? rList = rCut + 1.0: rList = ecr + 1.0;
625      
626      if( cutChanged ){
557 –      
627        notifyFortranCutOffs( &rCut, &rList, &ecr, &est );
628      }
629      
# Line 571 | Line 640 | void SimInfo::checkCutOffs( void ){
640    
641   }
642  
643 < void SimInfo::addProperty(GenericData* prop){
643 > GenericData* SimInfo::getProperty(char* propName){
644  
645 <  map<string, GenericData*>::iterator result;
577 <  result = properties.find(prop->getID());
578 <  
579 <  //we can't simply use  properties[prop->getID()] = prop,
580 <  //it will cause memory leak if we already contain a propery which has the same name of prop
581 <  
582 <  if(result != properties.end()){
583 <    
584 <    delete (*result).second;
585 <    (*result).second = prop;
586 <      
587 <  }
588 <  else{
589 <
590 <    properties[prop->getID()] = prop;
591 <
592 <  }
593 <    
645 >  return properties->find( propName );
646   }
647  
596 – GenericData* SimInfo::getProperty(const string& propName){
597 –
598 –  map<string, GenericData*>::iterator result;
599 –  
600 –  //string lowerCaseName = ();
601 –  
602 –  result = properties.find(propName);
603 –  
604 –  if(result != properties.end())
605 –    return (*result).second;  
606 –  else  
607 –    return NULL;  
608 – }
609 –
610 – vector<GenericData*> SimInfo::getProperties(){
611 –
612 –  vector<GenericData*> result;
613 –  map<string, GenericData*>::iterator i;
614 –  
615 –  for(i = properties.begin(); i != properties.end(); i++)
616 –    result.push_back((*i).second);
617 –    
618 –  return result;
619 – }
620 –
648   double SimInfo::matTrace3(double m[3][3]){
649    double trace;
650    trace = m[0][0] + m[1][1] + m[2][2];

Diff Legend

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