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 555 by mmeineke, Tue Jun 17 21:56:15 2003 UTC vs.
Revision 580 by gezelter, Wed Jul 9 13:56:36 2003 UTC

# Line 12 | Line 12
12   #include "mpiSimulation.hpp"
13   #endif
14  
15 + // some defines for ensemble and Forcefield  cases
16 +
17 + #define NVE_ENS 0
18 + #define NVT_ENS 1
19 + #define NPTi_ENS 2
20 + #define NPTf_ENS 3
21 +
22 + #define FF_DUFF 0
23 + #define FF_LJ   1
24 +
25 +
26   SimSetup::SimSetup(){
27    stamps = new MakeStamps();
28    globals = new Globals();
# Line 66 | Line 77 | void SimSetup::createSim( void ){
77  
78    MakeStamps *the_stamps;
79    Globals* the_globals;
69 –  ExtendedSystem* the_extendedsystem;
80    int i, j, k, globalAtomIndex;
81 +  
82 +  int ensembleCase;
83 +  int ffCase;
84 +  
85 +  ensembleCase = -1;
86 +  ffCase = -1;
87  
88    // get the stamps and globals;
89    the_stamps = stamps;
# Line 82 | Line 98 | void SimSetup::createSim( void ){
98    n_components = the_globals->getNComponents();
99    strcpy( force_field, the_globals->getForceField() );
100  
101 <  // get the ensemble and set up an extended system if we need it:
101 >  if( !strcasecmp( force_field, "DUFF" )) ffCase = FF_DUFF;
102 >  else if( !strcasecmp( force_field, "LJ" )) ffCase = FF_LJ;
103 >  else{
104 >    sprintf( painCave.errMsg,
105 >             "SimSetup Error. Unrecognized force field -> %s\n",
106 >             force_field );
107 >    painCave.isFatal = 1;
108 >    simError();
109 >  }
110 >
111 >  // get the ensemble:
112    strcpy( ensemble, the_globals->getEnsemble() );
87 –  if( !strcasecmp( ensemble, "NPT" ) ) {
88 –    the_extendedsystem = new ExtendedSystem( simnfo );
89 –    the_extendedsystem->setTargetTemp(the_globals->getTargetTemp());
90 –    if (the_globals->haveTargetPressure())
91 –      the_extendedsystem->setTargetPressure(the_globals->getTargetPressure());
92 –    else {
93 –      sprintf( painCave.errMsg,
94 –               "SimSetup error: If you use the constant pressure\n"
95 –               "    ensemble, you must set targetPressure.\n"
96 –               "    This was found in the BASS file.\n");
97 –      painCave.isFatal = 1;
98 –      simError();
99 –    }
113  
114 <    if (the_globals->haveTauThermostat())
115 <      the_extendedsystem->setTauThermostat(the_globals->getTauThermostat());
116 <    else if (the_globals->haveQmass())
117 <      the_extendedsystem->setQmass(the_globals->getQmass());
118 <    else {
119 <      sprintf( painCave.errMsg,
107 <               "SimSetup error: If you use one of the constant temperature\n"
108 <               "    ensembles, you must set either tauThermostat or qMass.\n"
109 <               "    Neither of these was found in the BASS file.\n");
110 <      painCave.isFatal = 1;
111 <      simError();
112 <    }
113 <
114 <    if (the_globals->haveTauBarostat())
115 <      the_extendedsystem->setTauBarostat(the_globals->getTauBarostat());
116 <    else {
117 <      sprintf( painCave.errMsg,
118 <               "SimSetup error: If you use the constant pressure\n"
119 <               "    ensemble, you must set tauBarostat.\n"
120 <               "    This was found in the BASS file.\n");
121 <      painCave.isFatal = 1;
122 <      simError();
123 <    }
124 <
125 <  } else if ( !strcasecmp( ensemble, "NVT") ) {
126 <    the_extendedsystem = new ExtendedSystem( simnfo );
127 <    the_extendedsystem->setTargetTemp(the_globals->getTargetTemp());
128 <
129 <    if (the_globals->haveTauThermostat())
130 <      the_extendedsystem->setTauThermostat(the_globals->getTauThermostat());
131 <    else if (the_globals->haveQmass())
132 <      the_extendedsystem->setQmass(the_globals->getQmass());
133 <    else {
134 <      sprintf( painCave.errMsg,
135 <               "SimSetup error: If you use one of the constant temperature\n"
136 <               "    ensembles, you must set either tauThermostat or qMass.\n"
137 <               "    Neither of these was found in the BASS file.\n");
138 <      painCave.isFatal = 1;
139 <      simError();
140 <    }
141 <
142 <  } else if ( !strcasecmp( ensemble, "NVE") ) {
143 <  } else {
114 >  if( !strcasecmp( ensemble, "NVE" ))      ensembleCase = NVE_ENS;
115 >  else if( !strcasecmp( ensemble, "NVT" )) ensembleCase = NVT_ENS;
116 >  else if( !strcasecmp( ensemble, "NPTi" ) || !strcasecmp( ensemble, "NPT") )
117 >    ensembleCase = NPTi_ENS;
118 >  else if( !strcasecmp( ensemble, "NPTf" )) ensembleCase = NPTf_ENS;
119 >  else{
120      sprintf( painCave.errMsg,
121               "SimSetup Warning. Unrecognized Ensemble -> %s, "
122               "reverting to NVE for this simulation.\n",
# Line 148 | Line 124 | void SimSetup::createSim( void ){
124      painCave.isFatal = 0;
125      simError();
126      strcpy( ensemble, "NVE" );
127 +    ensembleCase = NVE_ENS;
128    }  
129    strcpy( simnfo->ensemble, ensemble );
130 +
131 +
132 + //   if( !strcasecmp( ensemble, "NPT" ) ) {
133 + //     the_extendedsystem = new ExtendedSystem( simnfo );
134 + //     the_extendedsystem->setTargetTemp(the_globals->getTargetTemp());
135 + //     if (the_globals->haveTargetPressure())
136 + //       the_extendedsystem->setTargetPressure(the_globals->getTargetPressure());
137 + //     else {
138 + //       sprintf( painCave.errMsg,
139 + //                "SimSetup error: If you use the constant pressure\n"
140 + //                "    ensemble, you must set targetPressure.\n"
141 + //                "    This was found in the BASS file.\n");
142 + //       painCave.isFatal = 1;
143 + //       simError();
144 + //     }
145 +
146 + //     if (the_globals->haveTauThermostat())
147 + //       the_extendedsystem->setTauThermostat(the_globals->getTauThermostat());
148 + //     else if (the_globals->haveQmass())
149 + //       the_extendedsystem->setQmass(the_globals->getQmass());
150 + //     else {
151 + //       sprintf( painCave.errMsg,
152 + //                "SimSetup error: If you use one of the constant temperature\n"
153 + //                "    ensembles, you must set either tauThermostat or qMass.\n"
154 + //                "    Neither of these was found in the BASS file.\n");
155 + //       painCave.isFatal = 1;
156 + //       simError();
157 + //     }
158 +
159 + //     if (the_globals->haveTauBarostat())
160 + //       the_extendedsystem->setTauBarostat(the_globals->getTauBarostat());
161 + //     else {
162 + //       sprintf( painCave.errMsg,
163 + //                "SimSetup error: If you use the constant pressure\n"
164 + //                "    ensemble, you must set tauBarostat.\n"
165 + //                "    This was found in the BASS file.\n");
166 + //       painCave.isFatal = 1;
167 + //       simError();
168 + //     }
169 +
170 + //   } else if ( !strcasecmp( ensemble, "NVT") ) {
171 + //     the_extendedsystem = new ExtendedSystem( simnfo );
172 + //     the_extendedsystem->setTargetTemp(the_globals->getTargetTemp());
173  
174 + //     if (the_globals->haveTauThermostat())
175 + //       the_extendedsystem->setTauThermostat(the_globals->getTauThermostat());
176 + //     else if (the_globals->haveQmass())
177 + //       the_extendedsystem->setQmass(the_globals->getQmass());
178 + //     else {
179 + //       sprintf( painCave.errMsg,
180 + //                "SimSetup error: If you use one of the constant temperature\n"
181 + //                "    ensembles, you must set either tauThermostat or qMass.\n"
182 + //                "    Neither of these was found in the BASS file.\n");
183 + //       painCave.isFatal = 1;
184 + //       simError();
185 + //     }
186 +
187    strcpy( simnfo->mixingRule, the_globals->getMixingRule() );
188    simnfo->usePBC = the_globals->getPBC();
189            
190    int usesDipoles = 0;
191 <  if( !strcmp( force_field, "TraPPE_Ex" ) ){
192 <    the_ff = new TraPPE_ExFF();
191 >  switch( ffCase ){
192 >
193 >  case FF_DUFF:
194 >    the_ff = new DUFF();
195      usesDipoles = 1;
196 <  }
197 <  else if( !strcasecmp( force_field, "LJ" ) ) the_ff = new LJ_FF();
198 <  else{
196 >    break;
197 >
198 >  case FF_LJ:
199 >    the_ff = new LJFF();
200 >    break;
201 >
202 >  default:
203      sprintf( painCave.errMsg,
204 <             "SimSetup Error. Unrecognized force field -> %s\n",
166 <             force_field );
204 >             "SimSetup Error. Unrecognized force field in case statement.\n");
205      painCave.isFatal = 1;
206      simError();
207    }
# Line 173 | Line 211 | void SimSetup::createSim( void ){
211    MPIcheckPoint();
212   #endif // is_mpi
213  
176 –  
177 –
214    // get the components and calculate the tot_nMol and indvidual n_mol
215    the_components = the_globals->getComponents();
216    components_nmol = new int[n_components];
# Line 446 | Line 482 | void SimSetup::createSim( void ){
482  
483    // get some of the tricky things that may still be in the globals
484  
485 <  
485 >  double boxVector[3];
486    if( the_globals->haveBox() ){
487 <    simnfo->box_x = the_globals->getBox();
488 <    simnfo->box_y = the_globals->getBox();
489 <    simnfo->box_z = the_globals->getBox();
487 >    boxVector[0] = the_globals->getBox();
488 >    boxVector[1] = the_globals->getBox();
489 >    boxVector[2] = the_globals->getBox();
490 >    
491 >    simnfo->setBox( boxVector );
492    }
493    else if( the_globals->haveDensity() ){
494  
495      double vol;
496      vol = (double)tot_nmol / the_globals->getDensity();
497 <    simnfo->box_x = pow( vol, ( 1.0 / 3.0 ) );
498 <    simnfo->box_y = simnfo->box_x;
499 <    simnfo->box_z = simnfo->box_x;
497 >     boxVector[0] = pow( vol, ( 1.0 / 3.0 ) );
498 >     boxVector[1] = boxVector[0];
499 >     boxVector[2] = boxVector[0];
500 >
501 >    simnfo->setBox( boxVector );
502    }
503    else{
504      if( !the_globals->haveBoxX() ){
# Line 467 | Line 507 | void SimSetup::createSim( void ){
507        painCave.isFatal = 1;
508        simError();
509      }
510 <    simnfo->box_x = the_globals->getBoxX();
510 >    boxVector[0] = the_globals->getBoxX();
511  
512      if( !the_globals->haveBoxY() ){
513        sprintf( painCave.errMsg,
# Line 475 | Line 515 | void SimSetup::createSim( void ){
515        painCave.isFatal = 1;
516        simError();
517      }
518 <    simnfo->box_y = the_globals->getBoxY();
518 >    boxVector[1] = the_globals->getBoxY();
519  
520      if( !the_globals->haveBoxZ() ){
521        sprintf( painCave.errMsg,
# Line 483 | Line 523 | void SimSetup::createSim( void ){
523        painCave.isFatal = 1;
524        simError();
525      }
526 <    simnfo->box_z = the_globals->getBoxZ();
526 >    boxVector[2] = the_globals->getBoxZ();
527 >
528 >    simnfo->setBox( boxVector );
529    }
530  
531   #ifdef IS_MPI
# Line 513 | Line 555 | void SimSetup::createSim( void ){
555        painCave.isFatal = 0;
556        simError();
557        double smallest;
558 <      smallest = simnfo->box_x;
559 <      if (simnfo->box_y <= smallest) smallest = simnfo->box_y;
560 <      if (simnfo->box_z <= smallest) smallest = simnfo->box_z;
558 >      smallest = simnfo->boxLx;
559 >      if (simnfo->boxLy <= smallest) smallest = simnfo->boxLy;
560 >      if (simnfo->boxLz <= smallest) smallest = simnfo->boxLz;
561        simnfo->ecr = 0.5 * smallest;
562      } else {
563        simnfo->ecr        = the_globals->getECR();
# Line 553 | Line 595 | void SimSetup::createSim( void ){
595          painCave.isFatal = 0;
596          simError();
597          double smallest;
598 <        smallest = simnfo->box_x;
599 <        if (simnfo->box_y <= smallest) smallest = simnfo->box_y;
600 <        if (simnfo->box_z <= smallest) smallest = simnfo->box_z;
598 >        smallest = simnfo->boxLx;
599 >        if (simnfo->boxLy <= smallest) smallest = simnfo->boxLy;
600 >        if (simnfo->boxLz <= smallest) smallest = simnfo->boxLz;
601          simnfo->ecr = 0.5 * smallest;
602        } else {
603          simnfo->ecr        = the_globals->getECR();
# Line 735 | Line 777 | void SimSetup::createSim( void ){
777  
778  
779    // make the integrator
780 +  
781 +  
782 +  NVT* myNVT = NULL;
783 +  switch( ensembleCase ){
784  
785 +  case NVE_ENS:
786 +    new NVE( simnfo, the_ff );
787 +    break;
788  
789 <  if( !strcmp( ensemble, "TraPPE_Ex" ) ){
790 <    new Symplectic(simnfo, the_ff, the_extendedsystem);
791 <  }
792 <  else if( !strcmp( force_field, "LJ" ) ){
793 <    new Verlet( *simnfo, the_ff, the_extendedsystem );
789 >  case NVT_ENS:
790 >    myNVT = new NVT( simnfo, the_ff );
791 >    myNVT->setTargetTemp(the_globals->getTargetTemp());
792 >
793 >    if (the_globals->haveTauThermostat())
794 >      myNVT->setTauThermostat(the_globals->getTauThermostat());
795 > //     else if (the_globals->haveQmass())
796 > //       myNVT->setQmass(the_globals->getQmass());
797 >    else {
798 >      sprintf( painCave.errMsg,
799 >               "SimSetup error: If you use the NVT\n"
800 >               "    ensemble, you must set either tauThermostat or qMass.\n"
801 >               "    Neither of these was found in the BASS file.\n");
802 >      painCave.isFatal = 1;
803 >      simError();
804 >    }
805 >    break;
806 >
807 >  default:
808 >    sprintf( painCave.errMsg,
809 >             "SimSetup Error. Unrecognized ensemble in case statement.\n");
810 >    painCave.isFatal = 1;
811 >    simError();
812    }
813  
814 +
815   #ifdef IS_MPI
816    mpiSim->mpiRefresh();
817   #endif
# Line 1056 | Line 1124 | void SimSetup::initFromBass( void ){
1124      have_extra =1;
1125  
1126      n_cells = (int)temp3 - 1;
1127 <    cellx = simnfo->box_x / temp3;
1128 <    celly = simnfo->box_y / temp3;
1129 <    cellz = simnfo->box_z / temp3;
1127 >    cellx = simnfo->boxLx / temp3;
1128 >    celly = simnfo->boxLy / temp3;
1129 >    cellz = simnfo->boxLz / temp3;
1130      n_extra = tot_nmol - ( 4 * n_cells * n_cells * n_cells );
1131      temp1 = ((double)n_extra) / ( pow( temp3, 3.0 ) - pow( n_cells, 3.0 ) );
1132      n_per_extra = (int)ceil( temp1 );
# Line 1073 | Line 1141 | void SimSetup::initFromBass( void ){
1141    }
1142    else{
1143      n_cells = (int)temp3;
1144 <    cellx = simnfo->box_x / temp3;
1145 <    celly = simnfo->box_y / temp3;
1146 <    cellz = simnfo->box_z / temp3;
1144 >    cellx = simnfo->boxLx / temp3;
1145 >    celly = simnfo->boxLy / temp3;
1146 >    cellz = simnfo->boxLz / temp3;
1147    }
1148  
1149    current_mol = 0;

Diff Legend

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