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

Comparing trunk/OOPSE/libmdtools/SimSetup.cpp (file contents):
Revision 814 by mmeineke, Thu Oct 23 19:57:25 2003 UTC vs.
Revision 841 by mmeineke, Wed Oct 29 17:55:28 2003 UTC

# Line 1 | Line 1
1   #include <algorithm>
2 < #include <cstdlib>
2 > #include <stdlib.h>
3   #include <iostream>
4 < #include <cmath>
4 > #include <math.h>
5   #include <string>
6   #include <sprng.h>
7   #include "SimSetup.hpp"
# Line 31 | Line 31 | SimSetup::SimSetup(){
31   using namespace std;
32  
33   SimSetup::SimSetup(){
34 +  
35 +  initSuspend = false;
36    isInfoArray = 0;
37    nInfo = 1;
38  
# Line 53 | Line 55 | void SimSetup::setSimInfo(SimInfo* the_info, int theNi
55    info = the_info;
56    nInfo = theNinfo;
57    isInfoArray = 1;
58 +  initSuspend = true;
59   }
60  
61  
# Line 100 | Line 103 | void SimSetup::createSim(void){
103  
104    sysObjectsCreation();
105  
103  // check on the post processing info
104
105  finalInfoCheck();
106
106    // initialize the system coordinates
107  
108 <  if (!isInfoArray){
108 >  if ( !initSuspend ){
109      initSystemCoords();
110  
111      if( !(globals->getUseInitTime()) )
112        info[0].currentTime = 0.0;
113    }  
114  
115 +  // check on the post processing info
116 +
117 +  finalInfoCheck();
118 +
119    // make the output filenames
120  
121    makeOutNames();
# Line 693 | Line 696 | void SimSetup::gatherInfo(void){
696      }
697  
698      // check for the temperature set flag
699 <
699 >    
700      if (globals->haveTempSet())
701        info[i].setTemp = globals->getTempSet();
702 <
700 <    // get some of the tricky things that may still be in the globals
701 <
702 <    double boxVector[3];
703 <    if (globals->haveBox()){
704 <      boxVector[0] = globals->getBox();
705 <      boxVector[1] = globals->getBox();
706 <      boxVector[2] = globals->getBox();
707 <
708 <      info[i].setBox(boxVector);
709 <    }
710 <    else if (globals->haveDensity()){
711 <      double vol;
712 <      vol = (double) tot_nmol / globals->getDensity();
713 <      boxVector[0] = pow(vol, (1.0 / 3.0));
714 <      boxVector[1] = boxVector[0];
715 <      boxVector[2] = boxVector[0];
716 <
717 <      info[i].setBox(boxVector);
718 <    }
719 <    else{
720 <      if (!globals->haveBoxX()){
721 <        sprintf(painCave.errMsg,
722 <                "SimSetup error, no periodic BoxX size given.\n");
723 <        painCave.isFatal = 1;
724 <        simError();
725 <      }
726 <      boxVector[0] = globals->getBoxX();
727 <
728 <      if (!globals->haveBoxY()){
729 <        sprintf(painCave.errMsg,
730 <                "SimSetup error, no periodic BoxY size given.\n");
731 <        painCave.isFatal = 1;
732 <        simError();
733 <      }
734 <      boxVector[1] = globals->getBoxY();
735 <
736 <      if (!globals->haveBoxZ()){
737 <        sprintf(painCave.errMsg,
738 <                "SimSetup error, no periodic BoxZ size given.\n");
739 <        painCave.isFatal = 1;
740 <        simError();
741 <      }
742 <      boxVector[2] = globals->getBoxZ();
743 <
744 <      info[i].setBox(boxVector);
745 <    }
702 >    
703    }
704 <
704 >  
705    //setup seed for random number generator
706    int seedValue;
707  
# Line 848 | Line 805 | void SimSetup::finalInfoCheck(void){
805          theEst = globals->getEST();
806        }
807  
808 <      info[i].setEcr(theEcr, theEst);
808 >      info[i].setDefaultEcr(theEcr, theEst);
809  
810        if (!globals->haveDielectric()){
811          sprintf(painCave.errMsg,
# Line 893 | Line 850 | void SimSetup::finalInfoCheck(void){
850            theEst = globals->getEST();
851          }
852  
853 <        info[i].setEcr(theEcr, theEst);
853 >        info[i].setDefaultEcr(theEcr, theEst);
854        }
855      }
856    }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines