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 778 by mmeineke, Fri Sep 19 20:00:27 2003 UTC vs.
Revision 859 by mmeineke, Mon Nov 10 21:50:36 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 –
7   #include "SimSetup.hpp"
8   #include "ReadWrite.hpp"
9   #include "parse_me.h"
# Line 22 | Line 21
21   #define NVT_ENS        1
22   #define NPTi_ENS       2
23   #define NPTf_ENS       3
24 < #define NPTim_ENS      4
26 < #define NPTfm_ENS      5
24 > #define NPTxyz_ENS     4
25  
26 +
27   #define FF_DUFF 0
28   #define FF_LJ   1
29   #define FF_EAM  2
# Line 32 | Line 31 | SimSetup::SimSetup(){
31   using namespace std;
32  
33   SimSetup::SimSetup(){
34 +  
35 +  initSuspend = false;
36    isInfoArray = 0;
37    nInfo = 1;
38  
# Line 54 | 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 92 | Line 94 | void SimSetup::createSim(void){
94   #endif // is_mpi
95  
96   void SimSetup::createSim(void){
95 –  int i, j, k, globalAtomIndex;
97  
98    // gather all of the information from the Bass file
99  
# Line 108 | Line 109 | void SimSetup::createSim(void){
109  
110    // initialize the system coordinates
111  
112 <  if (!isInfoArray){
112 >  if ( !initSuspend ){
113      initSystemCoords();
114 +
115 +    if( !(globals->getUseInitTime()) )
116 +      info[0].currentTime = 0.0;
117    }  
118  
119    // make the output filenames
# Line 131 | Line 135 | void SimSetup::makeMolecules(void){
135  
136  
137   void SimSetup::makeMolecules(void){
138 <  int k, l;
138 >  int k;
139    int i, j, exI, exJ, tempEx, stampID, atomOffset, excludeOffset;
140    molInit molInfo;
141    DirectionalAtom* dAtom;
# Line 553 | Line 557 | void SimSetup::gatherInfo(void){
557  
558  
559   void SimSetup::gatherInfo(void){
560 <  int i, j, k;
560 >  int i;
561  
562    ensembleCase = -1;
563    ffCase = -1;
# Line 604 | Line 608 | void SimSetup::gatherInfo(void){
608    else if (!strcasecmp(ensemble, "NPTf")){
609      ensembleCase = NPTf_ENS;
610    }
611 <  else if (!strcasecmp(ensemble, "NPTim")){
612 <    ensembleCase = NPTim_ENS;
611 >  else if (!strcasecmp(ensemble, "NPTxyz")){
612 >    ensembleCase = NPTxyz_ENS;
613    }
610 –  else if (!strcasecmp(ensemble, "NPTfm")){
611 –    ensembleCase = NPTfm_ENS;
612 –  }
614    else{
615      sprintf(painCave.errMsg,
616              "SimSetup Warning. Unrecognized Ensemble -> %s, "
# Line 695 | 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  
703 <    // get some of the tricky things that may still be in the globals
703 >    // check for the extended State init
704  
705 <    double boxVector[3];
706 <    if (globals->haveBox()){
707 <      boxVector[0] = globals->getBox();
707 <      boxVector[1] = globals->getBox();
708 <      boxVector[2] = globals->getBox();
709 <
710 <      info[i].setBox(boxVector);
711 <    }
712 <    else if (globals->haveDensity()){
713 <      double vol;
714 <      vol = (double) tot_nmol / globals->getDensity();
715 <      boxVector[0] = pow(vol, (1.0 / 3.0));
716 <      boxVector[1] = boxVector[0];
717 <      boxVector[2] = boxVector[0];
718 <
719 <      info[i].setBox(boxVector);
720 <    }
721 <    else{
722 <      if (!globals->haveBoxX()){
723 <        sprintf(painCave.errMsg,
724 <                "SimSetup error, no periodic BoxX size given.\n");
725 <        painCave.isFatal = 1;
726 <        simError();
727 <      }
728 <      boxVector[0] = globals->getBoxX();
729 <
730 <      if (!globals->haveBoxY()){
731 <        sprintf(painCave.errMsg,
732 <                "SimSetup error, no periodic BoxY size given.\n");
733 <        painCave.isFatal = 1;
734 <        simError();
735 <      }
736 <      boxVector[1] = globals->getBoxY();
737 <
738 <      if (!globals->haveBoxZ()){
739 <        sprintf(painCave.errMsg,
740 <                "SimSetup error, no periodic BoxZ size given.\n");
741 <        painCave.isFatal = 1;
742 <        simError();
743 <      }
744 <      boxVector[2] = globals->getBoxZ();
745 <
746 <      info[i].setBox(boxVector);
747 <    }
705 >    info[i].useInitXSstate = globals->getUseInitXSstate();
706 >    info[i].orthoTolerance = globals->getOrthoBoxTolerance();
707 >    
708    }
709 <
709 >  
710    //setup seed for random number generator
711    int seedValue;
712  
# Line 821 | Line 781 | void SimSetup::finalInfoCheck(void){
781  
782        if (!globals->haveECR()){
783          sprintf(painCave.errMsg,
784 <                "SimSetup Warning: using default value of 1/2 the smallest "
785 <                "box length for the electrostaticCutoffRadius.\n"
826 <                "I hope you have a very fast processor!\n");
784 >                "SimSetup Warning: using default value of 15.0 angstroms"
785 >                "box length for the electrostaticCutoffRadius.\n");
786          painCave.isFatal = 0;
787          simError();
788 <        double smallest;
830 <        smallest = info[i].boxL[0];
831 <        if (info[i].boxL[1] <= smallest)
832 <          smallest = info[i].boxL[1];
833 <        if (info[i].boxL[2] <= smallest)
834 <          smallest = info[i].boxL[2];
835 <        theEcr = 0.5 * smallest;
788 >        theEcr = 15.0;
789        }
790        else{
791          theEcr = globals->getECR();
# Line 850 | Line 803 | void SimSetup::finalInfoCheck(void){
803          theEst = globals->getEST();
804        }
805  
806 <      info[i].setEcr(theEcr, theEst);
806 >      info[i].setDefaultEcr(theEcr, theEst);
807  
808        if (!globals->haveDielectric()){
809          sprintf(painCave.errMsg,
# Line 865 | Line 818 | void SimSetup::finalInfoCheck(void){
818        if (usesDipoles){
819          if (!globals->haveECR()){
820            sprintf(painCave.errMsg,
821 <                  "SimSetup Warning: using default value of 1/2 the smallest "
822 <                  "box length for the electrostaticCutoffRadius.\n"
823 <                  "I hope you have a very fast processor!\n");
824 <          painCave.isFatal = 0;
825 <          simError();
873 <          double smallest;
874 <          smallest = info[i].boxL[0];
875 <          if (info[i].boxL[1] <= smallest)
876 <            smallest = info[i].boxL[1];
877 <          if (info[i].boxL[2] <= smallest)
878 <            smallest = info[i].boxL[2];
879 <          theEcr = 0.5 * smallest;
821 >                  "SimSetup Warning: using default value of 15.0 angstroms"
822 >                  "box length for the electrostaticCutoffRadius.\n");
823 >          painCave.isFatal = 0;
824 >          simError();
825 >          theEcr = 15.0;
826          }
827          else{
828            theEcr = globals->getECR();
829          }
830 <
830 >        
831          if (!globals->haveEST()){
832            sprintf(painCave.errMsg,
833                    "SimSetup Warning: using default value of 0.05 * the "
# Line 894 | Line 840 | void SimSetup::finalInfoCheck(void){
840          else{
841            theEst = globals->getEST();
842          }
843 <
844 <        info[i].setEcr(theEcr, theEst);
843 >        
844 >        info[i].setDefaultEcr(theEcr, theEst);
845        }
846      }
847    }
902 –
848   #ifdef IS_MPI
849    strcpy(checkPointMsg, "post processing checks out");
850    MPIcheckPoint();
851   #endif // is_mpi
852   }
853 <
853 >  
854   void SimSetup::initSystemCoords(void){
855    int i;
856  
# Line 922 | Line 867 | void SimSetup::initSystemCoords(void){
867      if (worldRank == 0){
868   #endif //is_mpi
869        inName = globals->getInitialConfig();
925 –      double* tempDouble = new double[1000000];
870        fileInit = new InitializeFromFile(inName);
871   #ifdef IS_MPI
872      }
# Line 934 | Line 878 | void SimSetup::initSystemCoords(void){
878      delete fileInit;
879    }
880    else{
881 < #ifdef IS_MPI
938 <
881 >    
882      // no init from bass
883 <
883 >    
884      sprintf(painCave.errMsg,
885 <            "Cannot intialize a parallel simulation without an initial configuration file.\n");
886 <    painCave.isFatal;
885 >            "Cannot intialize a simulation without an initial configuration file.\n");
886 >    painCave.isFatal = 1;;
887      simError();
888 <
946 < #else
947 <
948 <    initFromBass();
949 <
950 <
951 < #endif
888 >    
889    }
890  
891   #ifdef IS_MPI
# Line 1166 | Line 1103 | void SimSetup::calcSysValues(void){
1103   }
1104  
1105   void SimSetup::calcSysValues(void){
1106 <  int i, j, k;
1106 >  int i;
1107  
1108    int* molMembershipArray;
1109  
# Line 1265 | Line 1202 | void SimSetup::makeSysArrays(void){
1202  
1203  
1204   void SimSetup::makeSysArrays(void){
1205 <  int i, j, k, l;
1205 >
1206 > #ifndef IS_MPI
1207 >  int k, j;
1208 > #endif // is_mpi
1209 >  int i, l;
1210  
1211    Atom** the_atoms;
1212    Molecule* the_molecules;
# Line 1348 | Line 1289 | void SimSetup::makeIntegrator(void){
1289   void SimSetup::makeIntegrator(void){
1290    int k;
1291  
1292 +  NVE<RealIntegrator>* myNVE = NULL;
1293    NVT<RealIntegrator>* myNVT = NULL;
1294    NPTi<NPT<RealIntegrator> >* myNPTi = NULL;
1295 <  NPTf<RealIntegrator>* myNPTf = NULL;
1296 <  NPTim<RealIntegrator>* myNPTim = NULL;
1355 <  NPTfm<RealIntegrator>* myNPTfm = NULL;
1295 >  NPTf<NPT<RealIntegrator> >* myNPTf = NULL;
1296 >  NPTxyz<NPT<RealIntegrator> >* myNPTxyz = NULL;
1297    
1298    for (k = 0; k < nInfo; k++){
1299      switch (ensembleCase){
1300        case NVE_ENS:
1301          if (globals->haveZconstraints()){
1302            setupZConstraint(info[k]);
1303 <          new ZConstraint<NVE<RealIntegrator> >(&(info[k]), the_ff);
1303 >          myNVE = new ZConstraint<NVE<RealIntegrator> >(&(info[k]), the_ff);
1304          }
1305 <        else
1306 <          new NVE<RealIntegrator>(&(info[k]), the_ff);
1305 >        else{
1306 >          myNVE = new NVE<RealIntegrator>(&(info[k]), the_ff);
1307 >        }
1308 >        
1309 >        info->the_integrator = myNVE;
1310          break;
1311  
1312        case NVT_ENS:
# Line 1384 | Line 1328 | void SimSetup::makeIntegrator(void){
1328            painCave.isFatal = 1;
1329            simError();
1330          }
1331 +
1332 +        info->the_integrator = myNVT;
1333          break;
1334  
1335        case NPTi_ENS:
# Line 1425 | Line 1371 | void SimSetup::makeIntegrator(void){
1371            painCave.isFatal = 1;
1372            simError();
1373          }
1374 +
1375 +        info->the_integrator = myNPTi;
1376          break;
1377  
1378        case NPTf_ENS:
1379          if (globals->haveZconstraints()){
1380            setupZConstraint(info[k]);
1381 <          myNPTf = new ZConstraint<NPTf<RealIntegrator> >(&(info[k]), the_ff);
1381 >          myNPTf = new ZConstraint<NPTf<NPT <RealIntegrator> > >(&(info[k]), the_ff);
1382          }
1383          else
1384 <          myNPTf = new NPTf<RealIntegrator>(&(info[k]), the_ff);
1384 >          myNPTf = new NPTf<NPT <RealIntegrator> >(&(info[k]), the_ff);
1385  
1386          myNPTf->setTargetTemp(globals->getTargetTemp());
1387  
# Line 1449 | Line 1397 | void SimSetup::makeIntegrator(void){
1397  
1398          if (globals->haveTauThermostat())
1399            myNPTf->setTauThermostat(globals->getTauThermostat());
1400 +
1401          else{
1402            sprintf(painCave.errMsg,
1403                    "SimSetup error: If you use an NPT\n"
# Line 1459 | Line 1408 | void SimSetup::makeIntegrator(void){
1408  
1409          if (globals->haveTauBarostat())
1410            myNPTf->setTauBarostat(globals->getTauBarostat());
1462 –        else{
1463 –          sprintf(painCave.errMsg,
1464 –                  "SimSetup error: If you use an NPT\n"
1465 –                  "    ensemble, you must set tauBarostat.\n");
1466 –          painCave.isFatal = 1;
1467 –          simError();
1468 –        }
1469 –        break;
1411  
1471 –      case NPTim_ENS:
1472 –        if (globals->haveZconstraints()){
1473 –          setupZConstraint(info[k]);
1474 –          myNPTim = new ZConstraint<NPTim<RealIntegrator> >(&(info[k]), the_ff);
1475 –        }
1476 –        else
1477 –          myNPTim = new NPTim<RealIntegrator>(&(info[k]), the_ff);
1478 –
1479 –        myNPTim->setTargetTemp(globals->getTargetTemp());
1480 –
1481 –        if (globals->haveTargetPressure())
1482 –          myNPTim->setTargetPressure(globals->getTargetPressure());
1412          else{
1413            sprintf(painCave.errMsg,
1485 –                  "SimSetup error: If you use a constant pressure\n"
1486 –                  "    ensemble, you must set targetPressure in the BASS file.\n");
1487 –          painCave.isFatal = 1;
1488 –          simError();
1489 –        }
1490 –
1491 –        if (globals->haveTauThermostat())
1492 –          myNPTim->setTauThermostat(globals->getTauThermostat());
1493 –        else{
1494 –          sprintf(painCave.errMsg,
1414                    "SimSetup error: If you use an NPT\n"
1496 –                  "    ensemble, you must set tauThermostat.\n");
1497 –          painCave.isFatal = 1;
1498 –          simError();
1499 –        }
1500 –
1501 –        if (globals->haveTauBarostat())
1502 –          myNPTim->setTauBarostat(globals->getTauBarostat());
1503 –        else{
1504 –          sprintf(painCave.errMsg,
1505 –                  "SimSetup error: If you use an NPT\n"
1415                    "    ensemble, you must set tauBarostat.\n");
1416            painCave.isFatal = 1;
1417            simError();
1418          }
1419 +
1420 +        info->the_integrator = myNPTf;
1421          break;
1422  
1423 <      case NPTfm_ENS:
1423 >      case NPTxyz_ENS:
1424          if (globals->haveZconstraints()){
1425            setupZConstraint(info[k]);
1426 <          myNPTfm = new ZConstraint<NPTfm<RealIntegrator> >(&(info[k]), the_ff);
1426 >          myNPTxyz = new ZConstraint<NPTxyz<NPT <RealIntegrator> > >(&(info[k]), the_ff);
1427          }
1428          else
1429 <          myNPTfm = new NPTfm<RealIntegrator>(&(info[k]), the_ff);
1429 >          myNPTxyz = new NPTxyz<NPT <RealIntegrator> >(&(info[k]), the_ff);
1430  
1431 <        myNPTfm->setTargetTemp(globals->getTargetTemp());
1431 >        myNPTxyz->setTargetTemp(globals->getTargetTemp());
1432  
1433          if (globals->haveTargetPressure())
1434 <          myNPTfm->setTargetPressure(globals->getTargetPressure());
1434 >          myNPTxyz->setTargetPressure(globals->getTargetPressure());
1435          else{
1436            sprintf(painCave.errMsg,
1437                    "SimSetup error: If you use a constant pressure\n"
1438                    "    ensemble, you must set targetPressure in the BASS file.\n");
1439            painCave.isFatal = 1;
1440            simError();
1441 <        }
1441 >        }    
1442  
1443          if (globals->haveTauThermostat())
1444 <          myNPTfm->setTauThermostat(globals->getTauThermostat());
1444 >          myNPTxyz->setTauThermostat(globals->getTauThermostat());
1445          else{
1446            sprintf(painCave.errMsg,
1447                    "SimSetup error: If you use an NPT\n"
# Line 1540 | Line 1451 | void SimSetup::makeIntegrator(void){
1451          }
1452  
1453          if (globals->haveTauBarostat())
1454 <          myNPTfm->setTauBarostat(globals->getTauBarostat());
1454 >          myNPTxyz->setTauBarostat(globals->getTauBarostat());
1455          else{
1456            sprintf(painCave.errMsg,
1457                    "SimSetup error: If you use an NPT\n"
# Line 1548 | Line 1459 | void SimSetup::makeIntegrator(void){
1459            painCave.isFatal = 1;
1460            simError();
1461          }
1462 +
1463 +        info->the_integrator = myNPTxyz;
1464          break;
1465  
1466        default:

Diff Legend

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