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 558 by mmeineke, Thu Jun 19 19:21:23 2003 UTC vs.
Revision 1104 by gezelter, Tue Apr 13 16:26:03 2004 UTC

# Line 1 | Line 1
1 < #include <cstdlib>
1 > #include <algorithm>
2 > #include <stdlib.h>
3   #include <iostream>
4 < #include <cmath>
5 <
4 > #include <math.h>
5 > #include <string>
6 > #include <sprng.h>
7   #include "SimSetup.hpp"
8 + #include "ReadWrite.hpp"
9   #include "parse_me.h"
10   #include "Integrator.hpp"
11   #include "simError.h"
12 + #include "RigidBody.hpp"
13 + //#include "ConjugateMinimizer.hpp"
14 + #include "OOPSEMinimizer.hpp"
15  
16   #ifdef IS_MPI
17   #include "mpiBASS.h"
# Line 14 | Line 20
20  
21   // some defines for ensemble and Forcefield  cases
22  
23 < #define NVE_ENS 0
24 < #define NVT_ENS 1
25 < #define NPT_ENS 2
23 > #define NVE_ENS        0
24 > #define NVT_ENS        1
25 > #define NPTi_ENS       2
26 > #define NPTf_ENS       3
27 > #define NPTxyz_ENS     4
28  
21 #define FF_DUFF 0
22 #define FF_LJ   1
29  
30 + #define FF_DUFF  0
31 + #define FF_LJ    1
32 + #define FF_EAM   2
33 + #define FF_H2O   3
34  
35 + using namespace std;
36 +
37 + /**
38 + * Check whether dividend is divisble by divisor or not
39 + */
40 + bool isDivisible(double dividend, double divisor){
41 +  double tolerance = 0.000001;
42 +  double quotient;
43 +  double diff;
44 +  int intQuotient;
45 +  
46 +  quotient = dividend / divisor;
47 +
48 +  if (quotient < 0)
49 +    quotient = -quotient;
50 +
51 +  intQuotient = int (quotient + tolerance);
52 +
53 +  diff = fabs(fabs(dividend) - intQuotient  * fabs(divisor));
54 +
55 +  if (diff <= tolerance)
56 +    return true;
57 +  else
58 +    return false;  
59 + }
60 +
61   SimSetup::SimSetup(){
62 +  
63 +  initSuspend = false;
64 +  isInfoArray = 0;
65 +  nInfo = 1;
66 +
67    stamps = new MakeStamps();
68    globals = new Globals();
69 <  
69 >
70 >
71   #ifdef IS_MPI
72 <  strcpy( checkPointMsg, "SimSetup creation successful" );
72 >  strcpy(checkPointMsg, "SimSetup creation successful");
73    MPIcheckPoint();
74   #endif // IS_MPI
75   }
# Line 37 | Line 79 | SimSetup::~SimSetup(){
79    delete globals;
80   }
81  
82 < void SimSetup::parseFile( char* fileName ){
82 > void SimSetup::setSimInfo(SimInfo* the_info, int theNinfo){
83 >  info = the_info;
84 >  nInfo = theNinfo;
85 >  isInfoArray = 1;
86 >  initSuspend = true;
87 > }
88  
89 +
90 + void SimSetup::parseFile(char* fileName){
91   #ifdef IS_MPI
92 <  if( worldRank == 0 ){
92 >  if (worldRank == 0){
93   #endif // is_mpi
94 <    
94 >
95      inFileName = fileName;
96 <    set_interface_stamps( stamps, globals );
97 <    
96 >    set_interface_stamps(stamps, globals);
97 >
98   #ifdef IS_MPI
99      mpiEventInit();
100   #endif
101  
102 <    yacc_BASS( fileName );
102 >    yacc_BASS(fileName);
103  
104   #ifdef IS_MPI
105      throwMPIEvent(NULL);
106    }
107 <  else receiveParse();
107 >  else{
108 >    receiveParse();
109 >  }
110   #endif
111  
112   }
113  
114   #ifdef IS_MPI
115   void SimSetup::receiveParse(void){
116 <
117 <    set_interface_stamps( stamps, globals );
118 <    mpiEventInit();
119 <    MPIcheckPoint();
69 <    mpiEventLoop();
70 <
116 >  set_interface_stamps(stamps, globals);
117 >  mpiEventInit();
118 >  MPIcheckPoint();
119 >  mpiEventLoop();
120   }
121  
122   #endif // is_mpi
123  
124 < void SimSetup::createSim( void ){
124 > void SimSetup::createSim(void){
125  
126 <  MakeStamps *the_stamps;
78 <  Globals* the_globals;
79 <  int i, j, k, globalAtomIndex;
80 <  
81 <  int ensembleCase;
82 <  int ffCase;
83 <  
84 <  ensembleCase = -1;
85 <  ffCase = -1;
126 >  // gather all of the information from the Bass file
127  
128 <  // get the stamps and globals;
88 <  the_stamps = stamps;
89 <  the_globals = globals;
128 >  gatherInfo();
129  
130 <  // set the easy ones first
92 <  simnfo->target_temp = the_globals->getTargetTemp();
93 <  simnfo->dt = the_globals->getDt();
94 <  simnfo->run_time = the_globals->getRunTime();
130 >  // creation of complex system objects
131  
132 <  // get the ones we know are there, yet still may need some work.
97 <  n_components = the_globals->getNComponents();
98 <  strcpy( force_field, the_globals->getForceField() );
132 >  sysObjectsCreation();
133  
134 <  if( !strcasecmp( force_field, "DUFF" ))    ffCase = FF_DUFF;
101 <  else if( !strcasecmp( force_field, "LJ" )) ffCase = FF_LJ;
102 <  else{
103 <    sprintf( painCave.errMsg,
104 <             "SimSetup Error. Unrecognized force field -> %s\n",
105 <             force_field );
106 <    painCave.isFatal = 1;
107 <    simError();
108 <  }
134 >  // check on the post processing info
135  
136 <  // get the ensemble:
111 <  strcpy( ensemble, the_globals->getEnsemble() );
136 >  finalInfoCheck();
137  
138 <  if( !strcasecmp( ensemble, "NVE" ))      ffCase = NVE_ENS;
139 <  else if( !strcasecmp( ensemble, "NVT" )) ffCase = NVT_ENS;
140 <  else if( !strcasecmp( ensemble, "NPT" )) ffCase = NPT_ENS;
141 <  else{
142 <    sprintf( painCave.errMsg,
143 <             "SimSetup Warning. Unrecognized Ensemble -> %s, "
144 <             "reverting to NVE for this simulation.\n",
120 <             ensemble );
121 <    painCave.isFatal = 0;
122 <    simError();
123 <    strcpy( ensemble, "NVE" );
124 <    ensembleCase = NVE_ENS;
138 >  // initialize the system coordinates
139 >
140 >  if ( !initSuspend ){
141 >    initSystemCoords();
142 >
143 >    if( !(globals->getUseInitTime()) )
144 >      info[0].currentTime = 0.0;
145    }  
126  strcpy( simnfo->ensemble, ensemble );
146  
147 +  // make the output filenames
148  
149 < //   if( !strcasecmp( ensemble, "NPT" ) ) {
130 < //     the_extendedsystem = new ExtendedSystem( simnfo );
131 < //     the_extendedsystem->setTargetTemp(the_globals->getTargetTemp());
132 < //     if (the_globals->haveTargetPressure())
133 < //       the_extendedsystem->setTargetPressure(the_globals->getTargetPressure());
134 < //     else {
135 < //       sprintf( painCave.errMsg,
136 < //                "SimSetup error: If you use the constant pressure\n"
137 < //                "    ensemble, you must set targetPressure.\n"
138 < //                "    This was found in the BASS file.\n");
139 < //       painCave.isFatal = 1;
140 < //       simError();
141 < //     }
149 >  makeOutNames();
150  
151 < //     if (the_globals->haveTauThermostat())
152 < //       the_extendedsystem->setTauThermostat(the_globals->getTauThermostat());
153 < //     else if (the_globals->haveQmass())
154 < //       the_extendedsystem->setQmass(the_globals->getQmass());
155 < //     else {
156 < //       sprintf( painCave.errMsg,
157 < //                "SimSetup error: If you use one of the constant temperature\n"
158 < //                "    ensembles, you must set either tauThermostat or qMass.\n"
159 < //                "    Neither of these was found in the BASS file.\n");
160 < //       painCave.isFatal = 1;
153 < //       simError();
154 < //     }
151 >  if (globals->haveMinimizer())
152 >    // make minimizer
153 >    makeMinimizer();
154 >  else
155 >    // make the integrator
156 >    makeIntegrator();
157 >  
158 > #ifdef IS_MPI
159 >  mpiSim->mpiRefresh();
160 > #endif
161  
162 < //     if (the_globals->haveTauBarostat())
157 < //       the_extendedsystem->setTauBarostat(the_globals->getTauBarostat());
158 < //     else {
159 < //       sprintf( painCave.errMsg,
160 < //                "SimSetup error: If you use the constant pressure\n"
161 < //                "    ensemble, you must set tauBarostat.\n"
162 < //                "    This was found in the BASS file.\n");
163 < //       painCave.isFatal = 1;
164 < //       simError();
165 < //     }
162 >  // initialize the Fortran
163  
164 < //   } else if ( !strcasecmp( ensemble, "NVT") ) {
165 < //     the_extendedsystem = new ExtendedSystem( simnfo );
169 < //     the_extendedsystem->setTargetTemp(the_globals->getTargetTemp());
164 >  initFortran();
165 > }
166  
171 //     if (the_globals->haveTauThermostat())
172 //       the_extendedsystem->setTauThermostat(the_globals->getTauThermostat());
173 //     else if (the_globals->haveQmass())
174 //       the_extendedsystem->setQmass(the_globals->getQmass());
175 //     else {
176 //       sprintf( painCave.errMsg,
177 //                "SimSetup error: If you use one of the constant temperature\n"
178 //                "    ensembles, you must set either tauThermostat or qMass.\n"
179 //                "    Neither of these was found in the BASS file.\n");
180 //       painCave.isFatal = 1;
181 //       simError();
182 //     }
167  
168 <  strcpy( simnfo->mixingRule, the_globals->getMixingRule() );
169 <  simnfo->usePBC = the_globals->getPBC();
170 <          
171 <  int usesDipoles = 0;
172 <  switch( ffCase ){
168 > void SimSetup::makeMolecules(void){
169 >  int i, j, k;
170 >  int exI, exJ, exK, exL, slI, slJ;
171 >  int tempI, tempJ, tempK, tempL;
172 >  int molI;
173 >  int stampID, atomOffset, rbOffset;
174 >  molInit molInfo;
175 >  DirectionalAtom* dAtom;
176 >  RigidBody* myRB;
177 >  StuntDouble* mySD;
178 >  LinkedAssign* extras;
179 >  LinkedAssign* current_extra;
180 >  AtomStamp* currentAtom;
181 >  BondStamp* currentBond;
182 >  BendStamp* currentBend;
183 >  TorsionStamp* currentTorsion;
184 >  RigidBodyStamp* currentRigidBody;
185  
186 <  case FF_DUFF:
187 <    the_ff = new DUFF();
188 <    usesDipoles = 1;
193 <    break;
186 >  bond_pair* theBonds;
187 >  bend_set* theBends;
188 >  torsion_set* theTorsions;
189  
190 <  case FF_LJ:
196 <    the_ff = LJFF();
197 <    break;
190 >  set<int> skipList;
191  
192 <  default:
200 <    sprintf( painCave.errMsg,
201 <             "SimSetup Error. Unrecognized force field in case statement.\n");
202 <    painCave.isFatal = 1;
203 <    simError();
204 <  }
192 >  double phi, theta, psi;
193  
194 < #ifdef IS_MPI
207 <  strcpy( checkPointMsg, "ForceField creation successful" );
208 <  MPIcheckPoint();
209 < #endif // is_mpi
194 >  //init the forceField paramters
195  
196 <  // get the components and calculate the tot_nMol and indvidual n_mol
212 <  the_components = the_globals->getComponents();
213 <  components_nmol = new int[n_components];
214 <  comp_stamps = new MoleculeStamp*[n_components];
196 >  the_ff->readParams();
197  
198 <  if( !the_globals->haveNMol() ){
217 <    // we don't have the total number of molecules, so we assume it is
218 <    // given in each component
198 >  // init the atoms
199  
200 <    tot_nmol = 0;
221 <    for( i=0; i<n_components; i++ ){
200 >  int nMembers, nNew, rb1, rb2;
201  
202 <      if( !the_components[i]->haveNMol() ){
203 <        // we have a problem
204 <        sprintf( painCave.errMsg,
205 <                 "SimSetup Error. No global NMol or component NMol"
206 <                 " given. Cannot calculate the number of atoms.\n" );
207 <        painCave.isFatal = 1;
208 <        simError();
209 <      }
202 >  for (k = 0; k < nInfo; k++){
203 >    the_ff->setSimInfo(&(info[k]));
204 >
205 >    atomOffset = 0;
206 >
207 >    for (i = 0; i < info[k].n_mol; i++){
208 >      stampID = info[k].molecules[i].getStampID();
209 >
210 >      molInfo.nAtoms = comp_stamps[stampID]->getNAtoms();
211 >      molInfo.nBonds = comp_stamps[stampID]->getNBonds();
212 >      molInfo.nBends = comp_stamps[stampID]->getNBends();
213 >      molInfo.nTorsions = comp_stamps[stampID]->getNTorsions();
214 >      molInfo.nRigidBodies = comp_stamps[stampID]->getNRigidBodies();
215 >      
216 >      molInfo.myAtoms = &(info[k].atoms[atomOffset]);
217 >
218 >      if (molInfo.nBonds > 0)
219 >        molInfo.myBonds = new (Bond *) [molInfo.nBonds];
220 >      else
221 >        molInfo.myBonds = NULL;
222  
223 <      tot_nmol += the_components[i]->getNMol();
224 <      components_nmol[i] = the_components[i]->getNMol();
225 <    }
226 <  }
236 <  else{
237 <    sprintf( painCave.errMsg,
238 <             "SimSetup error.\n"
239 <             "\tSorry, the ability to specify total"
240 <             " nMols and then give molfractions in the components\n"
241 <             "\tis not currently supported."
242 <             " Please give nMol in the components.\n" );
243 <    painCave.isFatal = 1;
244 <    simError();
245 <    
246 <    
247 <    //     tot_nmol = the_globals->getNMol();
248 <    
249 <    //   //we have the total number of molecules, now we check for molfractions
250 <    //     for( i=0; i<n_components; i++ ){
251 <    
252 <    //       if( !the_components[i]->haveMolFraction() ){
253 <    
254 <    //  if( !the_components[i]->haveNMol() ){
255 <    //    //we have a problem
256 <    //    std::cerr << "SimSetup error. Neither molFraction nor "
257 <    //              << " nMol was given in component
258 <    
259 <  }
223 >      if (molInfo.nBends > 0)
224 >        molInfo.myBends = new (Bend *) [molInfo.nBends];
225 >      else
226 >        molInfo.myBends = NULL;
227  
228 < #ifdef IS_MPI
229 <  strcpy( checkPointMsg, "Have the number of components" );
230 <  MPIcheckPoint();
231 < #endif // is_mpi
228 >      if (molInfo.nTorsions > 0)
229 >        molInfo.myTorsions = new (Torsion *) [molInfo.nTorsions];
230 >      else
231 >        molInfo.myTorsions = NULL;
232  
233 <  // make an array of molecule stamps that match the components used.
234 <  // also extract the used stamps out into a separate linked list
235 <
269 <  simnfo->nComponents = n_components;
270 <  simnfo->componentsNmol = components_nmol;
271 <  simnfo->compStamps = comp_stamps;
272 <  simnfo->headStamp = new LinkedMolStamp();
273 <  
274 <  char* id;
275 <  LinkedMolStamp* headStamp = simnfo->headStamp;
276 <  LinkedMolStamp* currentStamp = NULL;
277 <  for( i=0; i<n_components; i++ ){
278 <
279 <    id = the_components[i]->getType();
280 <    comp_stamps[i] = NULL;
281 <    
282 <    // check to make sure the component isn't already in the list
283 <
284 <    comp_stamps[i] = headStamp->match( id );
285 <    if( comp_stamps[i] == NULL ){
233 >      theBonds = new bond_pair[molInfo.nBonds];
234 >      theBends = new bend_set[molInfo.nBends];
235 >      theTorsions = new torsion_set[molInfo.nTorsions];
236        
237 <      // extract the component from the list;
288 <      
289 <      currentStamp = the_stamps->extractMolStamp( id );
290 <      if( currentStamp == NULL ){
291 <        sprintf( painCave.errMsg,
292 <                 "SimSetup error: Component \"%s\" was not found in the "
293 <                 "list of declared molecules\n",
294 <                 id );
295 <        painCave.isFatal = 1;
296 <        simError();
297 <      }
298 <      
299 <      headStamp->add( currentStamp );
300 <      comp_stamps[i] = headStamp->match( id );
301 <    }
302 <  }
237 >      // make the Atoms
238  
239 < #ifdef IS_MPI
240 <  strcpy( checkPointMsg, "Component stamps successfully extracted\n" );
306 <  MPIcheckPoint();
307 < #endif // is_mpi
308 <  
239 >      for (j = 0; j < molInfo.nAtoms; j++){
240 >        currentAtom = comp_stamps[stampID]->getAtom(j);
241  
242 +        if (currentAtom->haveOrientation()){
243 +          dAtom = new DirectionalAtom((j + atomOffset),
244 +                                      info[k].getConfiguration());
245 +          info[k].n_oriented++;
246 +          molInfo.myAtoms[j] = dAtom;
247  
248 +          // Directional Atoms have standard unit vectors which are oriented
249 +          // in space using the three Euler angles.  We assume the standard
250 +          // unit vector was originally along the z axis below.
251  
252 <  // caclulate the number of atoms, bonds, bends and torsions
252 >          phi = currentAtom->getEulerPhi() * M_PI / 180.0;
253 >          theta = currentAtom->getEulerTheta() * M_PI / 180.0;
254 >          psi = currentAtom->getEulerPsi()* M_PI / 180.0;
255  
256 <  tot_atoms = 0;
257 <  tot_bonds = 0;
258 <  tot_bends = 0;
259 <  tot_torsions = 0;
318 <  for( i=0; i<n_components; i++ ){
319 <    
320 <    tot_atoms +=    components_nmol[i] * comp_stamps[i]->getNAtoms();
321 <    tot_bonds +=    components_nmol[i] * comp_stamps[i]->getNBonds();
322 <    tot_bends +=    components_nmol[i] * comp_stamps[i]->getNBends();
323 <    tot_torsions += components_nmol[i] * comp_stamps[i]->getNTorsions();
324 <  }
256 >          dAtom->setUnitFrameFromEuler(phi, theta, psi);
257 >            
258 >        }
259 >        else{
260  
261 <  tot_SRI = tot_bonds + tot_bends + tot_torsions;
261 >          molInfo.myAtoms[j] = new Atom((j + atomOffset), info[k].getConfiguration());
262 >        }
263  
264 <  simnfo->n_atoms = tot_atoms;
329 <  simnfo->n_bonds = tot_bonds;
330 <  simnfo->n_bends = tot_bends;
331 <  simnfo->n_torsions = tot_torsions;
332 <  simnfo->n_SRI = tot_SRI;
333 <  simnfo->n_mol = tot_nmol;
334 <  
335 <  simnfo->molMembershipArray = new int[tot_atoms];
264 >        molInfo.myAtoms[j]->setType(currentAtom->getType());
265  
266   #ifdef IS_MPI
267  
268 <  // divide the molecules among processors here.
340 <  
341 <  mpiSim = new mpiSimulation( simnfo );
342 <  
343 <  globalIndex = mpiSim->divideLabor();
268 >        molInfo.myAtoms[j]->setGlobalIndex(globalIndex[j + atomOffset]);
269  
270 <  // set up the local variables
271 <  
347 <  int localMol, allMol;
348 <  int local_atoms, local_bonds, local_bends, local_torsions, local_SRI;
270 > #endif // is_mpi
271 >      }
272  
273 <  int* mol2proc = mpiSim->getMolToProcMap();
274 <  int* molCompType = mpiSim->getMolComponentType();
275 <  
276 <  allMol = 0;
277 <  localMol = 0;
355 <  local_atoms = 0;
356 <  local_bonds = 0;
357 <  local_bends = 0;
358 <  local_torsions = 0;
359 <  globalAtomIndex = 0;
273 >      // make the bonds
274 >      for (j = 0; j < molInfo.nBonds; j++){
275 >        currentBond = comp_stamps[stampID]->getBond(j);
276 >        theBonds[j].a = currentBond->getA() + atomOffset;
277 >        theBonds[j].b = currentBond->getB() + atomOffset;
278  
279 +        tempI = theBonds[j].a;
280 +        tempJ = theBonds[j].b;
281  
282 <  for( i=0; i<n_components; i++ ){
282 > #ifdef IS_MPI
283 >        exI = info[k].atoms[tempI]->getGlobalIndex() + 1;
284 >        exJ = info[k].atoms[tempJ]->getGlobalIndex() + 1;
285 > #else
286 >        exI = tempI + 1;
287 >        exJ = tempJ + 1;
288 > #endif
289  
290 <    for( j=0; j<components_nmol[i]; j++ ){
365 <      
366 <      if( mol2proc[allMol] == worldRank ){
367 <        
368 <        local_atoms +=    comp_stamps[i]->getNAtoms();
369 <        local_bonds +=    comp_stamps[i]->getNBonds();
370 <        local_bends +=    comp_stamps[i]->getNBends();
371 <        local_torsions += comp_stamps[i]->getNTorsions();
372 <        localMol++;
373 <      }      
374 <      for (k = 0; k < comp_stamps[i]->getNAtoms(); k++) {
375 <        simnfo->molMembershipArray[globalAtomIndex] = allMol;
376 <        globalAtomIndex++;
290 >        info[k].excludes->addPair(exI, exJ);
291        }
292  
293 <      allMol++;      
294 <    }
295 <  }
296 <  local_SRI = local_bonds + local_bends + local_torsions;
297 <  
298 <  simnfo->n_atoms = mpiSim->getMyNlocal();  
385 <  
386 <  if( local_atoms != simnfo->n_atoms ){
387 <    sprintf( painCave.errMsg,
388 <             "SimSetup error: mpiSim's localAtom (%d) and SimSetup's"
389 <             " localAtom (%d) are not equal.\n",
390 <             simnfo->n_atoms,
391 <             local_atoms );
392 <    painCave.isFatal = 1;
393 <    simError();
394 <  }
293 >      //make the bends
294 >      for (j = 0; j < molInfo.nBends; j++){
295 >        currentBend = comp_stamps[stampID]->getBend(j);
296 >        theBends[j].a = currentBend->getA() + atomOffset;
297 >        theBends[j].b = currentBend->getB() + atomOffset;
298 >        theBends[j].c = currentBend->getC() + atomOffset;
299  
300 <  simnfo->n_bonds = local_bonds;
301 <  simnfo->n_bends = local_bends;
302 <  simnfo->n_torsions = local_torsions;
399 <  simnfo->n_SRI = local_SRI;
400 <  simnfo->n_mol = localMol;
300 >        if (currentBend->haveExtras()){
301 >          extras = currentBend->getExtras();
302 >          current_extra = extras;
303  
304 <  strcpy( checkPointMsg, "Passed nlocal consistency check." );
305 <  MPIcheckPoint();
306 <  
307 <  
308 < #endif // is_mpi
309 <  
304 >          while (current_extra != NULL){
305 >            if (!strcmp(current_extra->getlhs(), "ghostVectorSource")){
306 >              switch (current_extra->getType()){
307 >                case 0:
308 >                  theBends[j].ghost = current_extra->getInt() + atomOffset;
309 >                  theBends[j].isGhost = 1;
310 >                  break;
311  
312 <  // create the atom and short range interaction arrays
312 >                case 1:
313 >                  theBends[j].ghost = (int) current_extra->getDouble() +
314 >                                      atomOffset;
315 >                  theBends[j].isGhost = 1;
316 >                  break;
317  
318 <  Atom::createArrays(simnfo->n_atoms);
319 <  the_atoms = new Atom*[simnfo->n_atoms];
320 <  the_molecules = new Molecule[simnfo->n_mol];
321 <  int molIndex;
322 <
323 <  // initialize the molecule's stampID's
318 >                default:
319 >                  sprintf(painCave.errMsg,
320 >                          "SimSetup Error: ghostVectorSource was neither a "
321 >                          "double nor an int.\n"
322 >                          "-->Bend[%d] in %s\n",
323 >                          j, comp_stamps[stampID]->getID());
324 >                  painCave.isFatal = 1;
325 >                  simError();
326 >              }
327 >            }
328 >            else{
329 >              sprintf(painCave.errMsg,
330 >                      "SimSetup Error: unhandled bend assignment:\n"
331 >                      "    -->%s in Bend[%d] in %s\n",
332 >                      current_extra->getlhs(), j, comp_stamps[stampID]->getID());
333 >              painCave.isFatal = 1;
334 >              simError();
335 >            }
336  
337 +            current_extra = current_extra->getNext();
338 +          }
339 +        }
340 +
341 +        if (theBends[j].isGhost) {
342 +          
343 +          tempI = theBends[j].a;
344 +          tempJ = theBends[j].b;
345 +          
346   #ifdef IS_MPI
347 <  
347 >          exI = info[k].atoms[tempI]->getGlobalIndex() + 1;
348 >          exJ = info[k].atoms[tempJ]->getGlobalIndex() + 1;
349 > #else
350 >          exI = tempI + 1;
351 >          exJ = tempJ + 1;
352 > #endif          
353 >          info[k].excludes->addPair(exI, exJ);
354  
355 <  molIndex = 0;
422 <  for(i=0; i<mpiSim->getTotNmol(); i++){
423 <    
424 <    if(mol2proc[i] == worldRank ){
425 <      the_molecules[molIndex].setStampID( molCompType[i] );
426 <      the_molecules[molIndex].setMyIndex( molIndex );
427 <      the_molecules[molIndex].setGlobalIndex( i );
428 <      molIndex++;
429 <    }
430 <  }
355 >        } else {
356  
357 < #else // is_mpi
358 <  
359 <  molIndex = 0;
360 <  globalAtomIndex = 0;
361 <  for(i=0; i<n_components; i++){
362 <    for(j=0; j<components_nmol[i]; j++ ){
363 <      the_molecules[molIndex].setStampID( i );
364 <      the_molecules[molIndex].setMyIndex( molIndex );
365 <      the_molecules[molIndex].setGlobalIndex( molIndex );
366 <      for (k = 0; k < comp_stamps[i]->getNAtoms(); k++) {
367 <        simnfo->molMembershipArray[globalAtomIndex] = molIndex;
368 <        globalAtomIndex++;
357 >          tempI = theBends[j].a;
358 >          tempJ = theBends[j].b;
359 >          tempK = theBends[j].c;
360 >          
361 > #ifdef IS_MPI
362 >          exI = info[k].atoms[tempI]->getGlobalIndex() + 1;
363 >          exJ = info[k].atoms[tempJ]->getGlobalIndex() + 1;
364 >          exK = info[k].atoms[tempK]->getGlobalIndex() + 1;
365 > #else
366 >          exI = tempI + 1;
367 >          exJ = tempJ + 1;
368 >          exK = tempK + 1;
369 > #endif
370 >          
371 >          info[k].excludes->addPair(exI, exK);
372 >          info[k].excludes->addPair(exI, exJ);
373 >          info[k].excludes->addPair(exJ, exK);
374 >        }
375        }
445      molIndex++;
446    }
447  }
448    
376  
377 < #endif // is_mpi
377 >      for (j = 0; j < molInfo.nTorsions; j++){
378 >        currentTorsion = comp_stamps[stampID]->getTorsion(j);
379 >        theTorsions[j].a = currentTorsion->getA() + atomOffset;
380 >        theTorsions[j].b = currentTorsion->getB() + atomOffset;
381 >        theTorsions[j].c = currentTorsion->getC() + atomOffset;
382 >        theTorsions[j].d = currentTorsion->getD() + atomOffset;
383  
384 +        tempI = theTorsions[j].a;      
385 +        tempJ = theTorsions[j].b;
386 +        tempK = theTorsions[j].c;
387 +        tempL = theTorsions[j].d;
388  
389 <  if( simnfo->n_SRI ){
390 <    
391 <    Exclude::createArray(simnfo->n_SRI);
392 <    the_excludes = new Exclude*[simnfo->n_SRI];
393 <    for( int ex=0; ex<simnfo->n_SRI; ex++) the_excludes[ex] = new Exclude(ex);
394 <    simnfo->globalExcludes = new int;
395 <    simnfo->n_exclude = simnfo->n_SRI;
396 <  }
397 <  else{
398 <    
399 <    Exclude::createArray( 1 );
464 <    the_excludes = new Exclude*;
465 <    the_excludes[0] = new Exclude(0);
466 <    the_excludes[0]->setPair( 0,0 );
467 <    simnfo->globalExcludes = new int;
468 <    simnfo->globalExcludes[0] = 0;
469 <    simnfo->n_exclude = 0;
470 <  }
389 > #ifdef IS_MPI
390 >        exI = info[k].atoms[tempI]->getGlobalIndex() + 1;
391 >        exJ = info[k].atoms[tempJ]->getGlobalIndex() + 1;
392 >        exK = info[k].atoms[tempK]->getGlobalIndex() + 1;
393 >        exL = info[k].atoms[tempL]->getGlobalIndex() + 1;
394 > #else
395 >        exI = tempI + 1;
396 >        exJ = tempJ + 1;
397 >        exK = tempK + 1;
398 >        exL = tempL + 1;
399 > #endif
400  
401 <  // set the arrays into the SimInfo object
401 >        info[k].excludes->addPair(exI, exJ);
402 >        info[k].excludes->addPair(exI, exK);
403 >        info[k].excludes->addPair(exI, exL);        
404 >        info[k].excludes->addPair(exJ, exK);
405 >        info[k].excludes->addPair(exJ, exL);
406 >        info[k].excludes->addPair(exK, exL);
407 >      }
408  
409 <  simnfo->atoms = the_atoms;
475 <  simnfo->molecules = the_molecules;
476 <  simnfo->nGlobalExcludes = 0;
477 <  simnfo->excludes = the_excludes;
409 >      for (j = 0; j < molInfo.nRigidBodies; j++){
410  
411 +        currentRigidBody = comp_stamps[stampID]->getRigidBody(j);
412 +        nMembers = currentRigidBody->getNMembers();
413  
414 <  // get some of the tricky things that may still be in the globals
414 >        // Create the Rigid Body:
415  
416 <  
417 <  if( the_globals->haveBox() ){
418 <    simnfo->box_x = the_globals->getBox();
485 <    simnfo->box_y = the_globals->getBox();
486 <    simnfo->box_z = the_globals->getBox();
487 <  }
488 <  else if( the_globals->haveDensity() ){
416 >        myRB = new RigidBody();
417 >        
418 >        for (rb1 = 0; rb1 < nMembers; rb1++) {
419  
420 <    double vol;
421 <    vol = (double)tot_nmol / the_globals->getDensity();
492 <    simnfo->box_x = pow( vol, ( 1.0 / 3.0 ) );
493 <    simnfo->box_y = simnfo->box_x;
494 <    simnfo->box_z = simnfo->box_x;
495 <  }
496 <  else{
497 <    if( !the_globals->haveBoxX() ){
498 <      sprintf( painCave.errMsg,
499 <               "SimSetup error, no periodic BoxX size given.\n" );
500 <      painCave.isFatal = 1;
501 <      simError();
502 <    }
503 <    simnfo->box_x = the_globals->getBoxX();
420 >          // molI is atom numbering inside this molecule
421 >          molI = currentRigidBody->getMember(rb1);    
422  
423 <    if( !the_globals->haveBoxY() ){
424 <      sprintf( painCave.errMsg,
507 <               "SimSetup error, no periodic BoxY size given.\n" );
508 <      painCave.isFatal = 1;
509 <      simError();
510 <    }
511 <    simnfo->box_y = the_globals->getBoxY();
423 >          // tempI is atom numbering on local processor
424 >          tempI = molI + atomOffset;
425  
426 <    if( !the_globals->haveBoxZ() ){
427 <      sprintf( painCave.errMsg,
428 <               "SimSetup error, no periodic BoxZ size given.\n" );
516 <      painCave.isFatal = 1;
517 <      simError();
518 <    }
519 <    simnfo->box_z = the_globals->getBoxZ();
520 <  }
426 >          // currentAtom is the AtomStamp (which we need for
427 >          // rigid body reference positions)
428 >          currentAtom = comp_stamps[stampID]->getAtom(molI);
429  
430 +          // When we add to the rigid body, add the atom itself and
431 +          // the stamp info:
432 +
433 +          myRB->addAtom(info[k].atoms[tempI], currentAtom);
434 +          
435 +          // Add this atom to the Skip List for the integrators
436   #ifdef IS_MPI
437 <  strcpy( checkPointMsg, "Box size set up" );
438 <  MPIcheckPoint();
439 < #endif // is_mpi
437 >          slI = info[k].atoms[tempI]->getGlobalIndex();
438 > #else
439 >          slI = tempI;
440 > #endif
441 >          skipList.insert(slI);
442 >          
443 >        }
444 >        
445 >        for(rb1 = 0; rb1 < nMembers - 1; rb1++) {
446 >          for(rb2 = rb1+1; rb2 < nMembers; rb2++) {
447 >            
448 >            tempI = currentRigidBody->getMember(rb1);
449 >            tempJ = currentRigidBody->getMember(rb2);
450 >            
451 >            // Some explanation is required here.
452 >            // Fortran indexing starts at 1, while c indexing starts at 0
453 >            // Also, in parallel computations, the GlobalIndex is
454 >            // used for the exclude list:
455 >            
456 > #ifdef IS_MPI
457 >            exI = info[k].atoms[tempI]->getGlobalIndex() + 1;
458 >            exJ = info[k].atoms[tempJ]->getGlobalIndex() + 1;
459 > #else
460 >            exI = tempI + 1;
461 >            exJ = tempJ + 1;
462 > #endif
463 >            
464 >            info[k].excludes->addPair(exI, exJ);
465 >            
466 >          }
467 >        }
468  
469 +        molInfo.myRigidBodies.push_back(myRB);
470 +        info[k].rigidBodies.push_back(myRB);
471 +      }
472 +      
473  
474 <  // initialize the arrays
474 >      // After this is all set up, scan through the atoms to
475 >      // see if they can be added to the integrableObjects:
476  
477 <  the_ff->setSimInfo( simnfo );
477 >      for (j = 0; j < molInfo.nAtoms; j++){
478  
479 <  makeMolecules();
480 <  simnfo->identArray = new int[simnfo->n_atoms];
481 <  for(i=0; i<simnfo->n_atoms; i++){
482 <    simnfo->identArray[i] = the_atoms[i]->getIdent();
536 <  }
537 <  
538 <  if (the_globals->getUseRF() ) {
539 <    simnfo->useReactionField = 1;
540 <  
541 <    if( !the_globals->haveECR() ){
542 <      sprintf( painCave.errMsg,
543 <               "SimSetup Warning: using default value of 1/2 the smallest "
544 <               "box length for the electrostaticCutoffRadius.\n"
545 <               "I hope you have a very fast processor!\n");
546 <      painCave.isFatal = 0;
547 <      simError();
548 <      double smallest;
549 <      smallest = simnfo->box_x;
550 <      if (simnfo->box_y <= smallest) smallest = simnfo->box_y;
551 <      if (simnfo->box_z <= smallest) smallest = simnfo->box_z;
552 <      simnfo->ecr = 0.5 * smallest;
553 <    } else {
554 <      simnfo->ecr        = the_globals->getECR();
555 <    }
556 <
557 <    if( !the_globals->haveEST() ){
558 <      sprintf( painCave.errMsg,
559 <               "SimSetup Warning: using default value of 0.05 * the "
560 <               "electrostaticCutoffRadius for the electrostaticSkinThickness\n"
561 <               );
562 <      painCave.isFatal = 0;
563 <      simError();
564 <      simnfo->est = 0.05 * simnfo->ecr;
565 <    } else {
566 <      simnfo->est        = the_globals->getEST();
567 <    }
568 <    
569 <    if(!the_globals->haveDielectric() ){
570 <      sprintf( painCave.errMsg,
571 <               "SimSetup Error: You are trying to use Reaction Field without"
572 <               "setting a dielectric constant!\n"
573 <               );
574 <      painCave.isFatal = 1;
575 <      simError();
576 <    }
577 <    simnfo->dielectric = the_globals->getDielectric();  
578 <  } else {
579 <    if (usesDipoles) {
580 <      
581 <      if( !the_globals->haveECR() ){
582 <        sprintf( painCave.errMsg,
583 <                 "SimSetup Warning: using default value of 1/2 the smallest "
584 <                 "box length for the electrostaticCutoffRadius.\n"
585 <                 "I hope you have a very fast processor!\n");
586 <        painCave.isFatal = 0;
587 <        simError();
588 <        double smallest;
589 <        smallest = simnfo->box_x;
590 <        if (simnfo->box_y <= smallest) smallest = simnfo->box_y;
591 <        if (simnfo->box_z <= smallest) smallest = simnfo->box_z;
592 <        simnfo->ecr = 0.5 * smallest;
593 <      } else {
594 <        simnfo->ecr        = the_globals->getECR();
595 <      }
596 <      
597 <      if( !the_globals->haveEST() ){
598 <        sprintf( painCave.errMsg,
599 <                 "SimSetup Warning: using default value of 5%% of the "
600 <                 "electrostaticCutoffRadius for the "
601 <                 "electrostaticSkinThickness\n"
602 <                 );
603 <        painCave.isFatal = 0;
604 <        simError();
605 <        simnfo->est = 0.05 * simnfo->ecr;
606 <      } else {
607 <        simnfo->est        = the_globals->getEST();
608 <      }
609 <    }
610 <  }  
611 <
612 < #ifdef IS_MPI
613 <  strcpy( checkPointMsg, "electrostatic parameters check out" );
614 <  MPIcheckPoint();
615 < #endif // is_mpi
616 <
617 < if( the_globals->haveInitialConfig() ){
618 <
619 <     InitializeFromFile* fileInit;
620 < #ifdef IS_MPI // is_mpi
621 <     if( worldRank == 0 ){
622 < #endif //is_mpi
623 <   fileInit = new InitializeFromFile( the_globals->getInitialConfig() );
624 < #ifdef IS_MPI
625 <     }else fileInit = new InitializeFromFile( NULL );
479 > #ifdef IS_MPI
480 >        slJ = molInfo.myAtoms[j]->getGlobalIndex();
481 > #else
482 >        slJ = j+atomOffset;
483   #endif
627   fileInit->read_xyz( simnfo ); // default velocities on
484  
485 <   delete fileInit;
630 < }
631 < else{
485 >        // if they aren't on the skip list, then they can be integrated
486  
487 < #ifdef IS_MPI
487 >        if (skipList.find(slJ) == skipList.end()) {
488 >          mySD = (StuntDouble *) molInfo.myAtoms[j];
489 >          info[k].integrableObjects.push_back(mySD);
490 >          molInfo.myIntegrableObjects.push_back(mySD);
491 >        }
492 >      }
493  
494 <  // no init from bass
636 <  
637 <  sprintf( painCave.errMsg,
638 <           "Cannot intialize a parallel simulation without an initial configuration file.\n" );
639 <  painCave.isFatal;
640 <  simError();
641 <  
642 < #else
494 >      // all rigid bodies are integrated:
495  
496 <  initFromBass();
496 >      for (j = 0; j < molInfo.nRigidBodies; j++) {
497 >        mySD = (StuntDouble *) molInfo.myRigidBodies[j];
498 >        info[k].integrableObjects.push_back(mySD);      
499 >        molInfo.myIntegrableObjects.push_back(mySD);
500 >      }
501 >    
502 >      
503 >      // send the arrays off to the forceField for init.
504 >      
505 >      the_ff->initializeAtoms(molInfo.nAtoms, molInfo.myAtoms);
506 >      the_ff->initializeBonds(molInfo.nBonds, molInfo.myBonds, theBonds);
507 >      the_ff->initializeBends(molInfo.nBends, molInfo.myBends, theBends);
508 >      the_ff->initializeTorsions(molInfo.nTorsions, molInfo.myTorsions,
509 >                                 theTorsions);
510  
511 +      info[k].molecules[i].initialize(molInfo);
512  
647 #endif
648 }
513  
514 +      atomOffset += molInfo.nAtoms;
515 +      delete[] theBonds;
516 +      delete[] theBends;
517 +      delete[] theTorsions;
518 +    }    
519 +  }
520 +
521   #ifdef IS_MPI
522 <  strcpy( checkPointMsg, "Successfully read in the initial configuration" );
522 >  sprintf(checkPointMsg, "all molecules initialized succesfully");
523    MPIcheckPoint();
524   #endif // is_mpi
525  
526 +  // clean up the forcefield
527  
528 <  
657 <
658 <  
528 >  if (!globals->haveLJrcut()){
529  
530 <  
531 < #ifdef IS_MPI
532 <  if( worldRank == 0 ){
663 < #endif // is_mpi
530 >    the_ff->calcRcut();
531 >
532 >  } else {
533      
534 <    if( the_globals->haveFinalConfig() ){
666 <      strcpy( simnfo->finalName, the_globals->getFinalConfig() );
667 <    }
668 <    else{
669 <      strcpy( simnfo->finalName, inFileName );
670 <      char* endTest;
671 <      int nameLength = strlen( simnfo->finalName );
672 <      endTest = &(simnfo->finalName[nameLength - 5]);
673 <      if( !strcmp( endTest, ".bass" ) ){
674 <        strcpy( endTest, ".eor" );
675 <      }
676 <      else if( !strcmp( endTest, ".BASS" ) ){
677 <        strcpy( endTest, ".eor" );
678 <      }
679 <      else{
680 <        endTest = &(simnfo->finalName[nameLength - 4]);
681 <        if( !strcmp( endTest, ".bss" ) ){
682 <          strcpy( endTest, ".eor" );
683 <        }
684 <        else if( !strcmp( endTest, ".mdl" ) ){
685 <          strcpy( endTest, ".eor" );
686 <        }
687 <        else{
688 <          strcat( simnfo->finalName, ".eor" );
689 <        }
690 <      }
691 <    }
692 <    
693 <    // make the sample and status out names
694 <    
695 <    strcpy( simnfo->sampleName, inFileName );
696 <    char* endTest;
697 <    int nameLength = strlen( simnfo->sampleName );
698 <    endTest = &(simnfo->sampleName[nameLength - 5]);
699 <    if( !strcmp( endTest, ".bass" ) ){
700 <      strcpy( endTest, ".dump" );
701 <    }
702 <    else if( !strcmp( endTest, ".BASS" ) ){
703 <      strcpy( endTest, ".dump" );
704 <    }
705 <    else{
706 <      endTest = &(simnfo->sampleName[nameLength - 4]);
707 <      if( !strcmp( endTest, ".bss" ) ){
708 <        strcpy( endTest, ".dump" );
709 <      }
710 <      else if( !strcmp( endTest, ".mdl" ) ){
711 <        strcpy( endTest, ".dump" );
712 <      }
713 <      else{
714 <        strcat( simnfo->sampleName, ".dump" );
715 <      }
716 <    }
717 <    
718 <    strcpy( simnfo->statusName, inFileName );
719 <    nameLength = strlen( simnfo->statusName );
720 <    endTest = &(simnfo->statusName[nameLength - 5]);
721 <    if( !strcmp( endTest, ".bass" ) ){
722 <      strcpy( endTest, ".stat" );
723 <    }
724 <    else if( !strcmp( endTest, ".BASS" ) ){
725 <      strcpy( endTest, ".stat" );
726 <    }
727 <    else{
728 <      endTest = &(simnfo->statusName[nameLength - 4]);
729 <      if( !strcmp( endTest, ".bss" ) ){
730 <        strcpy( endTest, ".stat" );
731 <      }
732 <      else if( !strcmp( endTest, ".mdl" ) ){
733 <        strcpy( endTest, ".stat" );
734 <      }
735 <      else{
736 <        strcat( simnfo->statusName, ".stat" );
737 <      }
738 <    }
739 <    
740 < #ifdef IS_MPI
534 >    the_ff->setRcut( globals->getLJrcut() );
535    }
742 #endif // is_mpi
743  
744  // set the status, sample, and themal kick times
745  
746  if( the_globals->haveSampleTime() ){
747    simnfo->sampleTime = the_globals->getSampleTime();
748    simnfo->statusTime = simnfo->sampleTime;
749    simnfo->thermalTime = simnfo->sampleTime;
750  }
751  else{
752    simnfo->sampleTime = the_globals->getRunTime();
753    simnfo->statusTime = simnfo->sampleTime;
754    simnfo->thermalTime = simnfo->sampleTime;
755  }
536  
537 <  if( the_globals->haveStatusTime() ){
538 <    simnfo->statusTime = the_globals->getStatusTime();
759 <  }
537 >  the_ff->cleanMe();
538 > }
539  
540 <  if( the_globals->haveThermalTime() ){
541 <    simnfo->thermalTime = the_globals->getThermalTime();
542 <  }
540 > void SimSetup::initFromBass(void){
541 >  int i, j, k;
542 >  int n_cells;
543 >  double cellx, celly, cellz;
544 >  double temp1, temp2, temp3;
545 >  int n_per_extra;
546 >  int n_extra;
547 >  int have_extra, done;
548  
549 <  // check for the temperature set flag
549 >  double vel[3];
550 >  vel[0] = 0.0;
551 >  vel[1] = 0.0;
552 >  vel[2] = 0.0;
553  
554 <  if( the_globals->haveTempSet() ) simnfo->setTemp = the_globals->getTempSet();
554 >  temp1 = (double) tot_nmol / 4.0;
555 >  temp2 = pow(temp1, (1.0 / 3.0));
556 >  temp3 = ceil(temp2);
557  
558 +  have_extra = 0;
559 +  if (temp2 < temp3){
560 +    // we have a non-complete lattice
561 +    have_extra = 1;
562  
563 <  // make the integrator
563 >    n_cells = (int) temp3 - 1;
564 >    cellx = info[0].boxL[0] / temp3;
565 >    celly = info[0].boxL[1] / temp3;
566 >    cellz = info[0].boxL[2] / temp3;
567 >    n_extra = tot_nmol - (4 * n_cells * n_cells * n_cells);
568 >    temp1 = ((double) n_extra) / (pow(temp3, 3.0) - pow(n_cells, 3.0));
569 >    n_per_extra = (int) ceil(temp1);
570  
571 <  switch( ensembleCase ){
572 <
573 <  case NVE_ENS:
574 <    new NVE( simnfo, the_ff );
776 <    break;
777 <
778 <  default:
779 <    sprintf( painCave.errMsg,
780 <             "SimSetup Error. Unrecognized ensemble in case statement.\n");
781 <    painCave.isFatal = 1;
782 <    simError();
783 <  }
784 <
785 <
786 < #ifdef IS_MPI
787 <  mpiSim->mpiRefresh();
788 < #endif
789 <
790 <  // initialize the Fortran
791 <
792 <
793 <  simnfo->refreshSim();
794 <  
795 <  if( !strcmp( simnfo->mixingRule, "standard") ){
796 <    the_ff->initForceField( LB_MIXING_RULE );
797 <  }
798 <  else if( !strcmp( simnfo->mixingRule, "explicit") ){
799 <    the_ff->initForceField( EXPLICIT_MIXING_RULE );
800 <  }
801 <  else{
802 <    sprintf( painCave.errMsg,
803 <             "SimSetup Error: unknown mixing rule -> \"%s\"\n",
804 <             simnfo->mixingRule );
805 <    painCave.isFatal = 1;
806 <    simError();
807 <  }
808 <
809 <
810 < #ifdef IS_MPI
811 <  strcpy( checkPointMsg,
812 <          "Successfully intialized the mixingRule for Fortran." );
813 <  MPIcheckPoint();
814 < #endif // is_mpi
815 < }
816 <
817 <
818 < void SimSetup::makeMolecules( void ){
819 <
820 <  int i, j, exI, exJ, tempEx, stampID, atomOffset, excludeOffset;
821 <  molInit info;
822 <  DirectionalAtom* dAtom;
823 <  LinkedAssign* extras;
824 <  LinkedAssign* current_extra;
825 <  AtomStamp* currentAtom;
826 <  BondStamp* currentBond;
827 <  BendStamp* currentBend;
828 <  TorsionStamp* currentTorsion;
829 <
830 <  bond_pair* theBonds;
831 <  bend_set* theBends;
832 <  torsion_set* theTorsions;
833 <
834 <  
835 <  //init the forceField paramters
836 <
837 <  the_ff->readParams();
838 <
839 <  
840 <  // init the atoms
841 <
842 <  double ux, uy, uz, u, uSqr;
843 <  
844 <  atomOffset = 0;
845 <  excludeOffset = 0;
846 <  for(i=0; i<simnfo->n_mol; i++){
847 <    
848 <    stampID = the_molecules[i].getStampID();
849 <
850 <    info.nAtoms    = comp_stamps[stampID]->getNAtoms();
851 <    info.nBonds    = comp_stamps[stampID]->getNBonds();
852 <    info.nBends    = comp_stamps[stampID]->getNBends();
853 <    info.nTorsions = comp_stamps[stampID]->getNTorsions();
854 <    info.nExcludes = info.nBonds + info.nBends + info.nTorsions;
855 <
856 <    info.myAtoms = &the_atoms[atomOffset];
857 <    info.myExcludes = &the_excludes[excludeOffset];
858 <    info.myBonds = new Bond*[info.nBonds];
859 <    info.myBends = new Bend*[info.nBends];
860 <    info.myTorsions = new Torsion*[info.nTorsions];
861 <
862 <    theBonds = new bond_pair[info.nBonds];
863 <    theBends = new bend_set[info.nBends];
864 <    theTorsions = new torsion_set[info.nTorsions];
865 <    
866 <    // make the Atoms
867 <    
868 <    for(j=0; j<info.nAtoms; j++){
869 <      
870 <      currentAtom = comp_stamps[stampID]->getAtom( j );
871 <      if( currentAtom->haveOrientation() ){
872 <        
873 <        dAtom = new DirectionalAtom(j + atomOffset);
874 <        simnfo->n_oriented++;
875 <        info.myAtoms[j] = dAtom;
876 <        
877 <        ux = currentAtom->getOrntX();
878 <        uy = currentAtom->getOrntY();
879 <        uz = currentAtom->getOrntZ();
880 <        
881 <        uSqr = (ux * ux) + (uy * uy) + (uz * uz);
882 <        
883 <        u = sqrt( uSqr );
884 <        ux = ux / u;
885 <        uy = uy / u;
886 <        uz = uz / u;
887 <        
888 <        dAtom->setSUx( ux );
889 <        dAtom->setSUy( uy );
890 <        dAtom->setSUz( uz );
891 <      }
892 <      else{
893 <        info.myAtoms[j] = new GeneralAtom(j + atomOffset);
894 <      }
895 <      info.myAtoms[j]->setType( currentAtom->getType() );
896 <    
897 < #ifdef IS_MPI
898 <      
899 <      info.myAtoms[j]->setGlobalIndex( globalIndex[j+atomOffset] );
900 <      
901 < #endif // is_mpi
902 <    }
903 <    
904 <    // make the bonds
905 <    for(j=0; j<info.nBonds; j++){
906 <      
907 <      currentBond = comp_stamps[stampID]->getBond( j );
908 <      theBonds[j].a = currentBond->getA() + atomOffset;
909 <      theBonds[j].b = currentBond->getB() + atomOffset;
910 <
911 <      exI = theBonds[j].a;
912 <      exJ = theBonds[j].b;
913 <
914 <      // exclude_I must always be the smaller of the pair
915 <      if( exI > exJ ){
916 <        tempEx = exI;
917 <        exI = exJ;
918 <        exJ = tempEx;
919 <      }
920 < #ifdef IS_MPI
921 <      tempEx = exI;
922 <      exI = the_atoms[tempEx]->getGlobalIndex() + 1;
923 <      tempEx = exJ;
924 <      exJ = the_atoms[tempEx]->getGlobalIndex() + 1;
925 <      
926 <      the_excludes[j+excludeOffset]->setPair( exI, exJ );
927 < #else  // isn't MPI
928 <
929 <      the_excludes[j+excludeOffset]->setPair( (exI+1), (exJ+1) );
930 < #endif  //is_mpi
931 <    }
932 <    excludeOffset += info.nBonds;
933 <
934 <    //make the bends
935 <    for(j=0; j<info.nBends; j++){
936 <      
937 <      currentBend = comp_stamps[stampID]->getBend( j );
938 <      theBends[j].a = currentBend->getA() + atomOffset;
939 <      theBends[j].b = currentBend->getB() + atomOffset;
940 <      theBends[j].c = currentBend->getC() + atomOffset;
941 <          
942 <      if( currentBend->haveExtras() ){
943 <            
944 <        extras = currentBend->getExtras();
945 <        current_extra = extras;
946 <            
947 <        while( current_extra != NULL ){
948 <          if( !strcmp( current_extra->getlhs(), "ghostVectorSource" )){
949 <                
950 <            switch( current_extra->getType() ){
951 <              
952 <            case 0:
953 <              theBends[j].ghost =
954 <                current_extra->getInt() + atomOffset;
955 <              theBends[j].isGhost = 1;
956 <              break;
957 <                  
958 <            case 1:
959 <              theBends[j].ghost =
960 <                (int)current_extra->getDouble() + atomOffset;
961 <              theBends[j].isGhost = 1;
962 <              break;
963 <              
964 <            default:
965 <              sprintf( painCave.errMsg,
966 <                       "SimSetup Error: ghostVectorSource was neither a "
967 <                       "double nor an int.\n"
968 <                       "-->Bend[%d] in %s\n",
969 <                       j, comp_stamps[stampID]->getID() );
970 <              painCave.isFatal = 1;
971 <              simError();
972 <            }
973 <          }
974 <          
975 <          else{
976 <            
977 <            sprintf( painCave.errMsg,
978 <                     "SimSetup Error: unhandled bend assignment:\n"
979 <                     "    -->%s in Bend[%d] in %s\n",
980 <                     current_extra->getlhs(),
981 <                     j, comp_stamps[stampID]->getID() );
982 <            painCave.isFatal = 1;
983 <            simError();
984 <          }
985 <          
986 <          current_extra = current_extra->getNext();
987 <        }
988 <      }
989 <          
990 <      if( !theBends[j].isGhost ){
991 <            
992 <        exI = theBends[j].a;
993 <        exJ = theBends[j].c;
994 <      }
995 <      else{
996 <        
997 <        exI = theBends[j].a;
998 <        exJ = theBends[j].b;
999 <      }
1000 <      
1001 <      // exclude_I must always be the smaller of the pair
1002 <      if( exI > exJ ){
1003 <        tempEx = exI;
1004 <        exI = exJ;
1005 <        exJ = tempEx;
1006 <      }
1007 < #ifdef IS_MPI
1008 <      tempEx = exI;
1009 <      exI = the_atoms[tempEx]->getGlobalIndex() + 1;
1010 <      tempEx = exJ;
1011 <      exJ = the_atoms[tempEx]->getGlobalIndex() + 1;
1012 <      
1013 <      the_excludes[j+excludeOffset]->setPair( exI, exJ );
1014 < #else  // isn't MPI
1015 <      the_excludes[j+excludeOffset]->setPair( (exI+1), (exJ+1) );
1016 < #endif  //is_mpi
1017 <    }
1018 <    excludeOffset += info.nBends;
1019 <
1020 <    for(j=0; j<info.nTorsions; j++){
1021 <      
1022 <      currentTorsion = comp_stamps[stampID]->getTorsion( j );
1023 <      theTorsions[j].a = currentTorsion->getA() + atomOffset;
1024 <      theTorsions[j].b = currentTorsion->getB() + atomOffset;
1025 <      theTorsions[j].c = currentTorsion->getC() + atomOffset;
1026 <      theTorsions[j].d = currentTorsion->getD() + atomOffset;
1027 <      
1028 <      exI = theTorsions[j].a;
1029 <      exJ = theTorsions[j].d;
1030 <
1031 <      // exclude_I must always be the smaller of the pair
1032 <      if( exI > exJ ){
1033 <        tempEx = exI;
1034 <        exI = exJ;
1035 <        exJ = tempEx;
1036 <      }
1037 < #ifdef IS_MPI
1038 <      tempEx = exI;
1039 <      exI = the_atoms[tempEx]->getGlobalIndex() + 1;
1040 <      tempEx = exJ;
1041 <      exJ = the_atoms[tempEx]->getGlobalIndex() + 1;
1042 <      
1043 <      the_excludes[j+excludeOffset]->setPair( exI, exJ );
1044 < #else  // isn't MPI
1045 <      the_excludes[j+excludeOffset]->setPair( (exI+1), (exJ+1) );
1046 < #endif  //is_mpi
1047 <    }
1048 <    excludeOffset += info.nTorsions;
1049 <
1050 <    
1051 <    // send the arrays off to the forceField for init.
1052 <
1053 <    the_ff->initializeAtoms( info.nAtoms, info.myAtoms );
1054 <    the_ff->initializeBonds( info.nBonds, info.myBonds, theBonds );
1055 <    the_ff->initializeBends( info.nBends, info.myBends, theBends );
1056 <    the_ff->initializeTorsions( info.nTorsions, info.myTorsions, theTorsions );
1057 <
1058 <
1059 <    the_molecules[i].initialize( info );
1060 <
1061 <
1062 <    atomOffset += info.nAtoms;
1063 <    delete[] theBonds;
1064 <    delete[] theBends;
1065 <    delete[] theTorsions;
1066 <  }
1067 <
1068 < #ifdef IS_MPI
1069 <  sprintf( checkPointMsg, "all molecules initialized succesfully" );
1070 <  MPIcheckPoint();
1071 < #endif // is_mpi
1072 <
1073 <  // clean up the forcefield
1074 <  the_ff->calcRcut();
1075 <  the_ff->cleanMe();
1076 <
1077 < }
1078 <
1079 < void SimSetup::initFromBass( void ){
1080 <
1081 <  int i, j, k;
1082 <  int n_cells;
1083 <  double cellx, celly, cellz;
1084 <  double temp1, temp2, temp3;
1085 <  int n_per_extra;
1086 <  int n_extra;
1087 <  int have_extra, done;
1088 <
1089 <  temp1 = (double)tot_nmol / 4.0;
1090 <  temp2 = pow( temp1, ( 1.0 / 3.0 ) );
1091 <  temp3 = ceil( temp2 );
1092 <
1093 <  have_extra =0;
1094 <  if( temp2 < temp3 ){ // we have a non-complete lattice
1095 <    have_extra =1;
1096 <
1097 <    n_cells = (int)temp3 - 1;
1098 <    cellx = simnfo->box_x / temp3;
1099 <    celly = simnfo->box_y / temp3;
1100 <    cellz = simnfo->box_z / temp3;
1101 <    n_extra = tot_nmol - ( 4 * n_cells * n_cells * n_cells );
1102 <    temp1 = ((double)n_extra) / ( pow( temp3, 3.0 ) - pow( n_cells, 3.0 ) );
1103 <    n_per_extra = (int)ceil( temp1 );
1104 <
1105 <    if( n_per_extra > 4){
1106 <      sprintf( painCave.errMsg,
1107 <               "SimSetup error. There has been an error in constructing"
1108 <               " the non-complete lattice.\n" );
571 >    if (n_per_extra > 4){
572 >      sprintf(painCave.errMsg,
573 >              "SimSetup error. There has been an error in constructing"
574 >              " the non-complete lattice.\n");
575        painCave.isFatal = 1;
576        simError();
577      }
578    }
579    else{
580 <    n_cells = (int)temp3;
581 <    cellx = simnfo->box_x / temp3;
582 <    celly = simnfo->box_y / temp3;
583 <    cellz = simnfo->box_z / temp3;
580 >    n_cells = (int) temp3;
581 >    cellx = info[0].boxL[0] / temp3;
582 >    celly = info[0].boxL[1] / temp3;
583 >    cellz = info[0].boxL[2] / temp3;
584    }
585  
586    current_mol = 0;
# Line 1122 | Line 588 | void SimSetup::initFromBass( void ){
588    current_comp = 0;
589    current_atom_ndx = 0;
590  
591 <  for( i=0; i < n_cells ; i++ ){
592 <    for( j=0; j < n_cells; j++ ){
593 <      for( k=0; k < n_cells; k++ ){
591 >  for (i = 0; i < n_cells ; i++){
592 >    for (j = 0; j < n_cells; j++){
593 >      for (k = 0; k < n_cells; k++){
594 >        makeElement(i * cellx, j * celly, k * cellz);
595  
596 <        makeElement( i * cellx,
1130 <                     j * celly,
1131 <                     k * cellz );
596 >        makeElement(i * cellx + 0.5 * cellx, j * celly + 0.5 * celly, k * cellz);
597  
598 <        makeElement( i * cellx + 0.5 * cellx,
1134 <                     j * celly + 0.5 * celly,
1135 <                     k * cellz );
598 >        makeElement(i * cellx, j * celly + 0.5 * celly, k * cellz + 0.5 * cellz);
599  
600 <        makeElement( i * cellx,
1138 <                     j * celly + 0.5 * celly,
1139 <                     k * cellz + 0.5 * cellz );
1140 <
1141 <        makeElement( i * cellx + 0.5 * cellx,
1142 <                     j * celly,
1143 <                     k * cellz + 0.5 * cellz );
600 >        makeElement(i * cellx + 0.5 * cellx, j * celly, k * cellz + 0.5 * cellz);
601        }
602      }
603    }
604  
605 <  if( have_extra ){
605 >  if (have_extra){
606      done = 0;
607  
608      int start_ndx;
609 <    for( i=0; i < (n_cells+1) && !done; i++ ){
610 <      for( j=0; j < (n_cells+1) && !done; j++ ){
609 >    for (i = 0; i < (n_cells + 1) && !done; i++){
610 >      for (j = 0; j < (n_cells + 1) && !done; j++){
611 >        if (i < n_cells){
612 >          if (j < n_cells){
613 >            start_ndx = n_cells;
614 >          }
615 >          else
616 >            start_ndx = 0;
617 >        }
618 >        else
619 >          start_ndx = 0;
620  
621 <        if( i < n_cells ){
621 >        for (k = start_ndx; k < (n_cells + 1) && !done; k++){
622 >          makeElement(i * cellx, j * celly, k * cellz);
623 >          done = (current_mol >= tot_nmol);
624  
625 <          if( j < n_cells ){
626 <            start_ndx = n_cells;
627 <          }
628 <          else start_ndx = 0;
629 <        }
1162 <        else start_ndx = 0;
625 >          if (!done && n_per_extra > 1){
626 >            makeElement(i * cellx + 0.5 * cellx, j * celly + 0.5 * celly,
627 >                        k * cellz);
628 >            done = (current_mol >= tot_nmol);
629 >          }
630  
631 <        for( k=start_ndx; k < (n_cells+1) && !done; k++ ){
632 <
633 <          makeElement( i * cellx,
634 <                       j * celly,
635 <                       k * cellz );
1169 <          done = ( current_mol >= tot_nmol );
1170 <
1171 <          if( !done && n_per_extra > 1 ){
1172 <            makeElement( i * cellx + 0.5 * cellx,
1173 <                         j * celly + 0.5 * celly,
1174 <                         k * cellz );
1175 <            done = ( current_mol >= tot_nmol );
1176 <          }
631 >          if (!done && n_per_extra > 2){
632 >            makeElement(i * cellx, j * celly + 0.5 * celly,
633 >                        k * cellz + 0.5 * cellz);
634 >            done = (current_mol >= tot_nmol);
635 >          }
636  
637 <          if( !done && n_per_extra > 2){
638 <            makeElement( i * cellx,
639 <                         j * celly + 0.5 * celly,
640 <                         k * cellz + 0.5 * cellz );
641 <            done = ( current_mol >= tot_nmol );
642 <          }
1184 <
1185 <          if( !done && n_per_extra > 3){
1186 <            makeElement( i * cellx + 0.5 * cellx,
1187 <                         j * celly,
1188 <                         k * cellz + 0.5 * cellz );
1189 <            done = ( current_mol >= tot_nmol );
1190 <          }
1191 <        }
637 >          if (!done && n_per_extra > 3){
638 >            makeElement(i * cellx + 0.5 * cellx, j * celly,
639 >                        k * cellz + 0.5 * cellz);
640 >            done = (current_mol >= tot_nmol);
641 >          }
642 >        }
643        }
644      }
645    }
646  
647 <
648 <  for( i=0; i<simnfo->n_atoms; i++ ){
1198 <    simnfo->atoms[i]->set_vx( 0.0 );
1199 <    simnfo->atoms[i]->set_vy( 0.0 );
1200 <    simnfo->atoms[i]->set_vz( 0.0 );
647 >  for (i = 0; i < info[0].n_atoms; i++){
648 >    info[0].atoms[i]->setVel(vel);
649    }
650   }
651  
652 < void SimSetup::makeElement( double x, double y, double z ){
1205 <
652 > void SimSetup::makeElement(double x, double y, double z){
653    int k;
654    AtomStamp* current_atom;
655    DirectionalAtom* dAtom;
656    double rotMat[3][3];
657 +  double pos[3];
658  
659 <  for( k=0; k<comp_stamps[current_comp]->getNAtoms(); k++ ){
660 <
661 <    current_atom = comp_stamps[current_comp]->getAtom( k );
662 <    if( !current_atom->havePosition() ){
663 <      sprintf( painCave.errMsg,
664 <               "SimSetup:initFromBass error.\n"
665 <               "\tComponent %s, atom %s does not have a position specified.\n"
666 <               "\tThe initialization routine is unable to give a start"
667 <               " position.\n",
1220 <               comp_stamps[current_comp]->getID(),
1221 <               current_atom->getType() );
659 >  for (k = 0; k < comp_stamps[current_comp]->getNAtoms(); k++){
660 >    current_atom = comp_stamps[current_comp]->getAtom(k);
661 >    if (!current_atom->havePosition()){
662 >      sprintf(painCave.errMsg,
663 >              "SimSetup:initFromBass error.\n"
664 >              "\tComponent %s, atom %s does not have a position specified.\n"
665 >              "\tThe initialization routine is unable to give a start"
666 >              " position.\n",
667 >              comp_stamps[current_comp]->getID(), current_atom->getType());
668        painCave.isFatal = 1;
669        simError();
670      }
671  
672 <    the_atoms[current_atom_ndx]->setX( x + current_atom->getPosX() );
673 <    the_atoms[current_atom_ndx]->setY( y + current_atom->getPosY() );
674 <    the_atoms[current_atom_ndx]->setZ( z + current_atom->getPosZ() );
672 >    pos[0] = x + current_atom->getPosX();
673 >    pos[1] = y + current_atom->getPosY();
674 >    pos[2] = z + current_atom->getPosZ();
675  
676 <    if( the_atoms[current_atom_ndx]->isDirectional() ){
676 >    info[0].atoms[current_atom_ndx]->setPos(pos);
677  
678 <      dAtom = (DirectionalAtom *)the_atoms[current_atom_ndx];
678 >    if (info[0].atoms[current_atom_ndx]->isDirectional()){
679 >      dAtom = (DirectionalAtom *) info[0].atoms[current_atom_ndx];
680  
681        rotMat[0][0] = 1.0;
682        rotMat[0][1] = 0.0;
# Line 1243 | Line 690 | void SimSetup::makeElement( double x, double y, double
690        rotMat[2][1] = 0.0;
691        rotMat[2][2] = 1.0;
692  
693 <      dAtom->setA( rotMat );
693 >      dAtom->setA(rotMat);
694      }
695  
696      current_atom_ndx++;
# Line 1252 | Line 699 | void SimSetup::makeElement( double x, double y, double
699    current_mol++;
700    current_comp_mol++;
701  
702 <  if( current_comp_mol >= components_nmol[current_comp] ){
1256 <
702 >  if (current_comp_mol >= components_nmol[current_comp]){
703      current_comp_mol = 0;
704      current_comp++;
705 +  }
706 + }
707 +
708 +
709 + void SimSetup::gatherInfo(void){
710 +  int i;
711 +
712 +  ensembleCase = -1;
713 +  ffCase = -1;
714 +
715 +  // set the easy ones first
716 +
717 +  for (i = 0; i < nInfo; i++){
718 +    info[i].target_temp = globals->getTargetTemp();
719 +    info[i].dt = globals->getDt();
720 +    info[i].run_time = globals->getRunTime();
721 +  }
722 +  n_components = globals->getNComponents();
723 +
724 +
725 +  // get the forceField
726 +
727 +  strcpy(force_field, globals->getForceField());
728 +
729 +  if (!strcasecmp(force_field, "DUFF")){
730 +    ffCase = FF_DUFF;
731 +  }
732 +  else if (!strcasecmp(force_field, "LJ")){
733 +    ffCase = FF_LJ;
734 +  }
735 +  else if (!strcasecmp(force_field, "EAM")){
736 +    ffCase = FF_EAM;
737 +  }
738 +  else if (!strcasecmp(force_field, "WATER")){
739 +    ffCase = FF_H2O;
740 +  }
741 +  else{
742 +    sprintf(painCave.errMsg, "SimSetup Error. Unrecognized force field -> %s\n",
743 +            force_field);
744 +         painCave.isFatal = 1;
745 +         simError();
746 +  }
747 +
748 +    // get the ensemble
749 +
750 +  strcpy(ensemble, globals->getEnsemble());
751 +
752 +  if (!strcasecmp(ensemble, "NVE")){
753 +    ensembleCase = NVE_ENS;
754 +  }
755 +  else if (!strcasecmp(ensemble, "NVT")){
756 +    ensembleCase = NVT_ENS;
757 +  }
758 +  else if (!strcasecmp(ensemble, "NPTi") || !strcasecmp(ensemble, "NPT")){
759 +    ensembleCase = NPTi_ENS;
760 +  }
761 +  else if (!strcasecmp(ensemble, "NPTf")){
762 +    ensembleCase = NPTf_ENS;
763 +  }
764 +  else if (!strcasecmp(ensemble, "NPTxyz")){
765 +    ensembleCase = NPTxyz_ENS;
766 +  }
767 +  else{
768 +    sprintf(painCave.errMsg,
769 +            "SimSetup Warning. Unrecognized Ensemble -> %s \n"
770 +            "\treverting to NVE for this simulation.\n",
771 +            ensemble);
772 +         painCave.isFatal = 0;
773 +         simError();
774 +         strcpy(ensemble, "NVE");
775 +         ensembleCase = NVE_ENS;
776 +  }  
777 +
778 +  for (i = 0; i < nInfo; i++){
779 +    strcpy(info[i].ensemble, ensemble);
780 +
781 +    // get the mixing rule
782 +
783 +    strcpy(info[i].mixingRule, globals->getMixingRule());
784 +    info[i].usePBC = globals->getPBC();
785 +  }
786 +
787 +  // get the components and calculate the tot_nMol and indvidual n_mol
788 +
789 +  the_components = globals->getComponents();
790 +  components_nmol = new int[n_components];
791 +
792 +
793 +  if (!globals->haveNMol()){
794 +    // we don't have the total number of molecules, so we assume it is
795 +    // given in each component
796 +
797 +    tot_nmol = 0;
798 +    for (i = 0; i < n_components; i++){
799 +      if (!the_components[i]->haveNMol()){
800 +        // we have a problem
801 +        sprintf(painCave.errMsg,
802 +                "SimSetup Error. No global NMol or component NMol given.\n"
803 +                "\tCannot calculate the number of atoms.\n");
804 +        painCave.isFatal = 1;
805 +        simError();
806 +      }
807 +
808 +      tot_nmol += the_components[i]->getNMol();
809 +      components_nmol[i] = the_components[i]->getNMol();
810 +    }
811 +  }
812 +  else{
813 +    sprintf(painCave.errMsg,
814 +            "SimSetup error.\n"
815 +            "\tSorry, the ability to specify total"
816 +            " nMols and then give molfractions in the components\n"
817 +            "\tis not currently supported."
818 +            " Please give nMol in the components.\n");
819 +    painCave.isFatal = 1;
820 +    simError();
821 +  }
822 +
823 +  //check whether sample time, status time, thermal time and reset time are divisble by dt
824 +  if (!isDivisible(globals->getSampleTime(), globals->getDt())){
825 +    sprintf(painCave.errMsg,
826 +            "Sample time is not divisible by dt.\n"
827 +            "\tThis will result in samples that are not uniformly\n"
828 +            "\tdistributed in time.  If this is a problem, change\n"
829 +            "\tyour sampleTime variable.\n");
830 +    painCave.isFatal = 0;
831 +    simError();    
832 +  }
833 +
834 +  if (globals->haveStatusTime() && !isDivisible(globals->getSampleTime(), globals->getDt())){
835 +    sprintf(painCave.errMsg,
836 +            "Status time is not divisible by dt.\n"
837 +            "\tThis will result in status reports that are not uniformly\n"
838 +            "\tdistributed in time.  If this is a problem, change \n"
839 +            "\tyour statusTime variable.\n");
840 +    painCave.isFatal = 0;
841 +    simError();    
842 +  }
843 +
844 +  if (globals->haveThermalTime() && !isDivisible(globals->getThermalTime(), globals->getDt())){
845 +    sprintf(painCave.errMsg,
846 +            "Thermal time is not divisible by dt.\n"
847 +            "\tThis will result in thermalizations that are not uniformly\n"
848 +            "\tdistributed in time.  If this is a problem, change \n"
849 +            "\tyour thermalTime variable.\n");
850 +    painCave.isFatal = 0;
851 +    simError();    
852 +  }  
853 +
854 +  if (globals->haveResetTime() && !isDivisible(globals->getResetTime(), globals->getDt())){
855 +    sprintf(painCave.errMsg,
856 +            "Reset time is not divisible by dt.\n"
857 +            "\tThis will result in integrator resets that are not uniformly\n"
858 +            "\tdistributed in time.  If this is a problem, change\n"
859 +            "\tyour resetTime variable.\n");
860 +    painCave.isFatal = 0;
861 +    simError();    
862 +  }
863 +
864 +  // set the status, sample, and thermal kick times
865 +
866 +  for (i = 0; i < nInfo; i++){
867 +    if (globals->haveSampleTime()){
868 +      info[i].sampleTime = globals->getSampleTime();
869 +      info[i].statusTime = info[i].sampleTime;
870 +      info[i].thermalTime = info[i].sampleTime;
871 +    }
872 +    else{
873 +      info[i].sampleTime = globals->getRunTime();
874 +      info[i].statusTime = info[i].sampleTime;
875 +      info[i].thermalTime = info[i].sampleTime;
876 +    }
877 +
878 +    if (globals->haveStatusTime()){
879 +      info[i].statusTime = globals->getStatusTime();
880 +    }
881 +
882 +    if (globals->haveThermalTime()){
883 +      info[i].thermalTime = globals->getThermalTime();
884 +    }
885 +
886 +    info[i].resetIntegrator = 0;
887 +    if( globals->haveResetTime() ){
888 +      info[i].resetTime = globals->getResetTime();
889 +      info[i].resetIntegrator = 1;
890 +    }
891 +
892 +    // check for the temperature set flag
893 +    
894 +    if (globals->haveTempSet())
895 +      info[i].setTemp = globals->getTempSet();
896 +
897 +    // check for the extended State init
898 +
899 +    info[i].useInitXSstate = globals->getUseInitXSstate();
900 +    info[i].orthoTolerance = globals->getOrthoBoxTolerance();
901 +    
902 +  }
903 +  
904 +  //setup seed for random number generator
905 +  int seedValue;
906 +
907 +  if (globals->haveSeed()){
908 +    seedValue = globals->getSeed();
909 +
910 +    if(seedValue / 1E9 == 0){
911 +      sprintf(painCave.errMsg,
912 +              "Seed for sprng library should contain at least 9 digits\n"
913 +              "OOPSE will generate a seed for user\n");
914 +      painCave.isFatal = 0;
915 +      simError();
916 +
917 +      //using seed generated by system instead of invalid seed set by user
918 + #ifndef IS_MPI
919 +      seedValue = make_sprng_seed();
920 + #else
921 +      if (worldRank == 0){
922 +        seedValue = make_sprng_seed();
923 +      }
924 +      MPI_Bcast(&seedValue, 1, MPI_INT, 0, MPI_COMM_WORLD);  
925 + #endif      
926 +    }
927 +  }//end of if branch of globals->haveSeed()
928 +  else{
929 +    
930 + #ifndef IS_MPI
931 +    seedValue = make_sprng_seed();
932 + #else
933 +    if (worldRank == 0){
934 +      seedValue = make_sprng_seed();
935 +    }
936 +    MPI_Bcast(&seedValue, 1, MPI_INT, 0, MPI_COMM_WORLD);  
937 + #endif
938 +  }//end of globals->haveSeed()
939 +
940 +  for (int i = 0; i < nInfo; i++){
941 +    info[i].setSeed(seedValue);
942 +  }
943 +  
944 + #ifdef IS_MPI
945 +  strcpy(checkPointMsg, "Successfully gathered all information from Bass\n");
946 +  MPIcheckPoint();
947 + #endif // is_mpi
948 + }
949 +
950 +
951 + void SimSetup::finalInfoCheck(void){
952 +  int index;
953 +  int usesDipoles;
954 +  int i;
955 +
956 +  for (i = 0; i < nInfo; i++){
957 +    // check electrostatic parameters
958 +
959 +    index = 0;
960 +    usesDipoles = 0;
961 +    while ((index < info[i].n_atoms) && !usesDipoles){
962 +      usesDipoles = (info[i].atoms[index])->hasDipole();
963 +      index++;
964 +    }
965 +
966 + #ifdef IS_MPI
967 +    int myUse = usesDipoles;
968 +    MPI_Allreduce(&myUse, &usesDipoles, 1, MPI_INT, MPI_LOR, MPI_COMM_WORLD);
969 + #endif //is_mpi
970 +
971 +    double theEcr, theEst;
972 +
973 +    if (globals->getUseRF()){
974 +      info[i].useReactionField = 1;
975 +
976 +      if (!globals->haveECR()){
977 +        sprintf(painCave.errMsg,
978 +                "SimSetup Warning: No value was set for electrostaticCutoffRadius.\n"
979 +                "\tOOPSE will use a default value of 15.0 angstroms"
980 +                "\tfor the electrostaticCutoffRadius.\n");
981 +        painCave.isFatal = 0;
982 +        simError();
983 +        theEcr = 15.0;
984 +      }
985 +      else{
986 +        theEcr = globals->getECR();
987 +      }
988 +
989 +      if (!globals->haveEST()){
990 +        sprintf(painCave.errMsg,
991 +                "SimSetup Warning: No value was set for electrostaticSkinThickness.\n"
992 +                "\tOOPSE will use a default value of\n"
993 +                "\t0.05 * electrostaticCutoffRadius\n"
994 +                "\tfor the electrostaticSkinThickness\n");
995 +        painCave.isFatal = 0;
996 +        simError();
997 +        theEst = 0.05 * theEcr;
998 +      }
999 +      else{
1000 +        theEst = globals->getEST();
1001 +      }
1002 +
1003 +      info[i].setDefaultEcr(theEcr, theEst);
1004 +
1005 +      if (!globals->haveDielectric()){
1006 +        sprintf(painCave.errMsg,
1007 +                "SimSetup Error: No Dielectric constant was set.\n"
1008 +                "\tYou are trying to use Reaction Field without"
1009 +                "\tsetting a dielectric constant!\n");
1010 +        painCave.isFatal = 1;
1011 +        simError();
1012 +      }
1013 +      info[i].dielectric = globals->getDielectric();
1014 +    }
1015 +    else{
1016 +      if (usesDipoles){
1017 +        if (!globals->haveECR()){
1018 +          sprintf(painCave.errMsg,
1019 +                  "SimSetup Warning: No value was set for electrostaticCutoffRadius.\n"
1020 +                  "\tOOPSE will use a default value of 15.0 angstroms"
1021 +                  "\tfor the electrostaticCutoffRadius.\n");
1022 +          painCave.isFatal = 0;
1023 +          simError();
1024 +          theEcr = 15.0;
1025 +        }
1026 +        else{
1027 +          theEcr = globals->getECR();
1028 +        }
1029 +        
1030 +        if (!globals->haveEST()){
1031 +          sprintf(painCave.errMsg,
1032 +                  "SimSetup Warning: No value was set for electrostaticSkinThickness.\n"
1033 +                  "\tOOPSE will use a default value of\n"
1034 +                  "\t0.05 * electrostaticCutoffRadius\n"
1035 +                  "\tfor the electrostaticSkinThickness\n");
1036 +          painCave.isFatal = 0;
1037 +          simError();
1038 +          theEst = 0.05 * theEcr;
1039 +        }
1040 +        else{
1041 +          theEst = globals->getEST();
1042 +        }
1043 +        
1044 +        info[i].setDefaultEcr(theEcr, theEst);
1045 +      }
1046 +    }
1047 +  }
1048 + #ifdef IS_MPI
1049 +  strcpy(checkPointMsg, "post processing checks out");
1050 +  MPIcheckPoint();
1051 + #endif // is_mpi
1052 + }
1053 +  
1054 + void SimSetup::initSystemCoords(void){
1055 +  int i;
1056 +
1057 +  char* inName;
1058 +
1059 +  (info[0].getConfiguration())->createArrays(info[0].n_atoms);
1060 +
1061 +  for (i = 0; i < info[0].n_atoms; i++)
1062 +    info[0].atoms[i]->setCoords();
1063 +
1064 +  if (globals->haveInitialConfig()){
1065 +    InitializeFromFile* fileInit;
1066 + #ifdef IS_MPI // is_mpi
1067 +    if (worldRank == 0){
1068 + #endif //is_mpi
1069 +      inName = globals->getInitialConfig();
1070 +      fileInit = new InitializeFromFile(inName);
1071 + #ifdef IS_MPI
1072 +    }
1073 +    else
1074 +      fileInit = new InitializeFromFile(NULL);
1075 + #endif
1076 +    fileInit->readInit(info); // default velocities on
1077 +
1078 +    delete fileInit;
1079 +  }
1080 +  else{
1081 +    
1082 +    // no init from bass
1083 +    
1084 +    sprintf(painCave.errMsg,
1085 +            "Cannot intialize a simulation without an initial configuration file.\n");
1086 +    painCave.isFatal = 1;;
1087 +    simError();
1088 +    
1089 +  }
1090 +
1091 + #ifdef IS_MPI
1092 +  strcpy(checkPointMsg, "Successfully read in the initial configuration");
1093 +  MPIcheckPoint();
1094 + #endif // is_mpi
1095 + }
1096 +
1097 +
1098 + void SimSetup::makeOutNames(void){
1099 +  int k;
1100 +
1101 +
1102 +  for (k = 0; k < nInfo; k++){
1103 + #ifdef IS_MPI
1104 +    if (worldRank == 0){
1105 + #endif // is_mpi
1106 +
1107 +      if (globals->haveFinalConfig()){
1108 +        strcpy(info[k].finalName, globals->getFinalConfig());
1109 +      }
1110 +      else{
1111 +        strcpy(info[k].finalName, inFileName);
1112 +        char* endTest;
1113 +        int nameLength = strlen(info[k].finalName);
1114 +        endTest = &(info[k].finalName[nameLength - 5]);
1115 +        if (!strcmp(endTest, ".bass")){
1116 +          strcpy(endTest, ".eor");
1117 +        }
1118 +        else if (!strcmp(endTest, ".BASS")){
1119 +          strcpy(endTest, ".eor");
1120 +        }
1121 +        else{
1122 +          endTest = &(info[k].finalName[nameLength - 4]);
1123 +          if (!strcmp(endTest, ".bss")){
1124 +            strcpy(endTest, ".eor");
1125 +          }
1126 +          else if (!strcmp(endTest, ".mdl")){
1127 +            strcpy(endTest, ".eor");
1128 +          }
1129 +          else{
1130 +            strcat(info[k].finalName, ".eor");
1131 +          }
1132 +        }
1133 +      }
1134 +
1135 +      // make the sample and status out names
1136 +
1137 +      strcpy(info[k].sampleName, inFileName);
1138 +      char* endTest;
1139 +      int nameLength = strlen(info[k].sampleName);
1140 +      endTest = &(info[k].sampleName[nameLength - 5]);
1141 +      if (!strcmp(endTest, ".bass")){
1142 +        strcpy(endTest, ".dump");
1143 +      }
1144 +      else if (!strcmp(endTest, ".BASS")){
1145 +        strcpy(endTest, ".dump");
1146 +      }
1147 +      else{
1148 +        endTest = &(info[k].sampleName[nameLength - 4]);
1149 +        if (!strcmp(endTest, ".bss")){
1150 +          strcpy(endTest, ".dump");
1151 +        }
1152 +        else if (!strcmp(endTest, ".mdl")){
1153 +          strcpy(endTest, ".dump");
1154 +        }
1155 +        else{
1156 +          strcat(info[k].sampleName, ".dump");
1157 +        }
1158 +      }
1159 +
1160 +      strcpy(info[k].statusName, inFileName);
1161 +      nameLength = strlen(info[k].statusName);
1162 +      endTest = &(info[k].statusName[nameLength - 5]);
1163 +      if (!strcmp(endTest, ".bass")){
1164 +        strcpy(endTest, ".stat");
1165 +      }
1166 +      else if (!strcmp(endTest, ".BASS")){
1167 +        strcpy(endTest, ".stat");
1168 +      }
1169 +      else{
1170 +        endTest = &(info[k].statusName[nameLength - 4]);
1171 +        if (!strcmp(endTest, ".bss")){
1172 +          strcpy(endTest, ".stat");
1173 +        }
1174 +        else if (!strcmp(endTest, ".mdl")){
1175 +          strcpy(endTest, ".stat");
1176 +        }
1177 +        else{
1178 +          strcat(info[k].statusName, ".stat");
1179 +        }
1180 +      }
1181 +
1182 + #ifdef IS_MPI
1183 +
1184 +    }
1185 + #endif // is_mpi
1186 +  }
1187 + }
1188 +
1189 +
1190 + void SimSetup::sysObjectsCreation(void){
1191 +  int i, k;
1192 +
1193 +  // create the forceField
1194 +
1195 +  createFF();
1196 +
1197 +  // extract componentList
1198 +
1199 +  compList();
1200 +
1201 +  // calc the number of atoms, bond, bends, and torsions
1202 +
1203 +  calcSysValues();
1204 +
1205 + #ifdef IS_MPI
1206 +  // divide the molecules among the processors
1207 +
1208 +  mpiMolDivide();
1209 + #endif //is_mpi
1210 +
1211 +  // create the atom and SRI arrays. Also initialize Molecule Stamp ID's
1212 +
1213 +  makeSysArrays();
1214 +
1215 +  // make and initialize the molecules (all but atomic coordinates)
1216 +
1217 +  makeMolecules();
1218 +
1219 +  for (k = 0; k < nInfo; k++){
1220 +    info[k].identArray = new int[info[k].n_atoms];
1221 +    for (i = 0; i < info[k].n_atoms; i++){
1222 +      info[k].identArray[i] = info[k].atoms[i]->getIdent();
1223 +    }
1224 +  }
1225 + }
1226 +
1227 +
1228 + void SimSetup::createFF(void){
1229 +  switch (ffCase){
1230 +    case FF_DUFF:
1231 +      the_ff = new DUFF();
1232 +      break;
1233 +
1234 +    case FF_LJ:
1235 +      the_ff = new LJFF();
1236 +      break;
1237 +
1238 +    case FF_EAM:
1239 +      the_ff = new EAM_FF();
1240 +      break;
1241 +
1242 +    case FF_H2O:
1243 +      the_ff = new WATER();
1244 +      break;
1245 +
1246 +    default:
1247 +      sprintf(painCave.errMsg,
1248 +              "SimSetup Error. Unrecognized force field in case statement.\n");
1249 +      painCave.isFatal = 1;
1250 +      simError();
1251 +  }
1252 +
1253 + #ifdef IS_MPI
1254 +  strcpy(checkPointMsg, "ForceField creation successful");
1255 +  MPIcheckPoint();
1256 + #endif // is_mpi
1257 + }
1258 +
1259 +
1260 + void SimSetup::compList(void){
1261 +  int i;
1262 +  char* id;
1263 +  LinkedMolStamp* headStamp = new LinkedMolStamp();
1264 +  LinkedMolStamp* currentStamp = NULL;
1265 +  comp_stamps = new MoleculeStamp * [n_components];
1266 +
1267 +  // make an array of molecule stamps that match the components used.
1268 +  // also extract the used stamps out into a separate linked list
1269 +
1270 +  for (i = 0; i < nInfo; i++){
1271 +    info[i].nComponents = n_components;
1272 +    info[i].componentsNmol = components_nmol;
1273 +    info[i].compStamps = comp_stamps;
1274 +    info[i].headStamp = headStamp;
1275 +  }
1276 +
1277 +
1278 +  for (i = 0; i < n_components; i++){
1279 +    id = the_components[i]->getType();
1280 +    comp_stamps[i] = NULL;
1281 +
1282 +    // check to make sure the component isn't already in the list
1283 +
1284 +    comp_stamps[i] = headStamp->match(id);
1285 +    if (comp_stamps[i] == NULL){
1286 +      // extract the component from the list;
1287 +
1288 +      currentStamp = stamps->extractMolStamp(id);
1289 +      if (currentStamp == NULL){
1290 +        sprintf(painCave.errMsg,
1291 +                "SimSetup error: Component \"%s\" was not found in the "
1292 +                "list of declared molecules\n",
1293 +                id);
1294 +        painCave.isFatal = 1;
1295 +        simError();
1296 +      }
1297 +
1298 +      headStamp->add(currentStamp);
1299 +      comp_stamps[i] = headStamp->match(id);
1300 +    }
1301 +  }
1302 +
1303 + #ifdef IS_MPI
1304 +  strcpy(checkPointMsg, "Component stamps successfully extracted\n");
1305 +  MPIcheckPoint();
1306 + #endif // is_mpi
1307 + }
1308 +
1309 + void SimSetup::calcSysValues(void){
1310 +  int i;
1311 +
1312 +  int* molMembershipArray;
1313 +
1314 +  tot_atoms = 0;
1315 +  tot_bonds = 0;
1316 +  tot_bends = 0;
1317 +  tot_torsions = 0;
1318 +  tot_rigid = 0;
1319 +  for (i = 0; i < n_components; i++){
1320 +    tot_atoms += components_nmol[i] * comp_stamps[i]->getNAtoms();
1321 +    tot_bonds += components_nmol[i] * comp_stamps[i]->getNBonds();
1322 +    tot_bends += components_nmol[i] * comp_stamps[i]->getNBends();
1323 +    tot_torsions += components_nmol[i] * comp_stamps[i]->getNTorsions();
1324 +    tot_rigid += components_nmol[i] * comp_stamps[i]->getNRigidBodies();
1325 +  }
1326 +  
1327 +  tot_SRI = tot_bonds + tot_bends + tot_torsions;
1328 +  molMembershipArray = new int[tot_atoms];
1329 +
1330 +  for (i = 0; i < nInfo; i++){
1331 +    info[i].n_atoms = tot_atoms;
1332 +    info[i].n_bonds = tot_bonds;
1333 +    info[i].n_bends = tot_bends;
1334 +    info[i].n_torsions = tot_torsions;
1335 +    info[i].n_SRI = tot_SRI;
1336 +    info[i].n_mol = tot_nmol;
1337 +
1338 +    info[i].molMembershipArray = molMembershipArray;
1339 +  }
1340 + }
1341 +
1342 + #ifdef IS_MPI
1343 +
1344 + void SimSetup::mpiMolDivide(void){
1345 +  int i, j, k;
1346 +  int localMol, allMol;
1347 +  int local_atoms, local_bonds, local_bends, local_torsions, local_SRI;
1348 +  int local_rigid;
1349 +
1350 +  mpiSim = new mpiSimulation(info);
1351 +
1352 +  globalIndex = mpiSim->divideLabor();
1353 +
1354 +  // set up the local variables
1355 +
1356 +  mol2proc = mpiSim->getMolToProcMap();
1357 +  molCompType = mpiSim->getMolComponentType();
1358 +
1359 +  allMol = 0;
1360 +  localMol = 0;
1361 +  local_atoms = 0;
1362 +  local_bonds = 0;
1363 +  local_bends = 0;
1364 +  local_torsions = 0;
1365 +  local_rigid = 0;
1366 +  globalAtomIndex = 0;
1367 +
1368 +  for (i = 0; i < n_components; i++){
1369 +    for (j = 0; j < components_nmol[i]; j++){
1370 +      if (mol2proc[allMol] == worldRank){
1371 +        local_atoms += comp_stamps[i]->getNAtoms();
1372 +        local_bonds += comp_stamps[i]->getNBonds();
1373 +        local_bends += comp_stamps[i]->getNBends();
1374 +        local_torsions += comp_stamps[i]->getNTorsions();
1375 +        local_rigid += comp_stamps[i]->getNRigidBodies();
1376 +        localMol++;
1377 +      }      
1378 +      for (k = 0; k < comp_stamps[i]->getNAtoms(); k++){
1379 +        info[0].molMembershipArray[globalAtomIndex] = allMol;
1380 +        globalAtomIndex++;
1381 +      }
1382 +
1383 +      allMol++;
1384 +    }
1385 +  }
1386 +  local_SRI = local_bonds + local_bends + local_torsions;
1387 +
1388 +  info[0].n_atoms = mpiSim->getMyNlocal();  
1389 +  
1390 +
1391 +  if (local_atoms != info[0].n_atoms){
1392 +    sprintf(painCave.errMsg,
1393 +            "SimSetup error: mpiSim's localAtom (%d) and SimSetup's\n"
1394 +            "\tlocalAtom (%d) are not equal.\n",
1395 +            info[0].n_atoms, local_atoms);
1396 +    painCave.isFatal = 1;
1397 +    simError();
1398 +  }
1399 +
1400 +  info[0].n_bonds = local_bonds;
1401 +  info[0].n_bends = local_bends;
1402 +  info[0].n_torsions = local_torsions;
1403 +  info[0].n_SRI = local_SRI;
1404 +  info[0].n_mol = localMol;
1405 +
1406 +  strcpy(checkPointMsg, "Passed nlocal consistency check.");
1407 +  MPIcheckPoint();
1408 + }
1409 +
1410 + #endif // is_mpi
1411 +
1412 +
1413 + void SimSetup::makeSysArrays(void){
1414 +
1415 + #ifndef IS_MPI
1416 +  int k, j;
1417 + #endif // is_mpi
1418 +  int i, l;
1419 +
1420 +  Atom** the_atoms;
1421 +  Molecule* the_molecules;
1422 +
1423 +  for (l = 0; l < nInfo; l++){
1424 +    // create the atom and short range interaction arrays
1425 +
1426 +    the_atoms = new Atom * [info[l].n_atoms];
1427 +    the_molecules = new Molecule[info[l].n_mol];
1428 +    int molIndex;
1429 +
1430 +    // initialize the molecule's stampID's
1431 +
1432 + #ifdef IS_MPI
1433 +
1434 +
1435 +    molIndex = 0;
1436 +    for (i = 0; i < mpiSim->getTotNmol(); i++){
1437 +      if (mol2proc[i] == worldRank){
1438 +        the_molecules[molIndex].setStampID(molCompType[i]);
1439 +        the_molecules[molIndex].setMyIndex(molIndex);
1440 +        the_molecules[molIndex].setGlobalIndex(i);
1441 +        molIndex++;
1442 +      }
1443 +    }
1444 +
1445 + #else // is_mpi
1446 +
1447 +    molIndex = 0;
1448 +    globalAtomIndex = 0;
1449 +    for (i = 0; i < n_components; i++){
1450 +      for (j = 0; j < components_nmol[i]; j++){
1451 +        the_molecules[molIndex].setStampID(i);
1452 +        the_molecules[molIndex].setMyIndex(molIndex);
1453 +        the_molecules[molIndex].setGlobalIndex(molIndex);
1454 +        for (k = 0; k < comp_stamps[i]->getNAtoms(); k++){
1455 +          info[l].molMembershipArray[globalAtomIndex] = molIndex;
1456 +          globalAtomIndex++;
1457 +        }
1458 +        molIndex++;
1459 +      }
1460 +    }
1461 +
1462 +
1463 + #endif // is_mpi
1464 +
1465 +    info[l].globalExcludes = new int;
1466 +    info[l].globalExcludes[0] = 0;
1467 +    
1468 +    // set the arrays into the SimInfo object
1469 +
1470 +    info[l].atoms = the_atoms;
1471 +    info[l].molecules = the_molecules;
1472 +    info[l].nGlobalExcludes = 0;
1473 +
1474 +    the_ff->setSimInfo(info);
1475 +  }
1476 + }
1477 +
1478 + void SimSetup::makeIntegrator(void){
1479 +  int k;
1480 +
1481 +  NVE<RealIntegrator>* myNVE = NULL;
1482 +  NVT<RealIntegrator>* myNVT = NULL;
1483 +  NPTi<NPT<RealIntegrator> >* myNPTi = NULL;
1484 +  NPTf<NPT<RealIntegrator> >* myNPTf = NULL;
1485 +  NPTxyz<NPT<RealIntegrator> >* myNPTxyz = NULL;
1486 +  
1487 +  for (k = 0; k < nInfo; k++){
1488 +    switch (ensembleCase){
1489 +      case NVE_ENS:
1490 +        if (globals->haveZconstraints()){
1491 +          setupZConstraint(info[k]);
1492 +          myNVE = new ZConstraint<NVE<RealIntegrator> >(&(info[k]), the_ff);
1493 +        }
1494 +        else{
1495 +          myNVE = new NVE<RealIntegrator>(&(info[k]), the_ff);
1496 +        }
1497 +        
1498 +        info->the_integrator = myNVE;
1499 +        break;
1500 +
1501 +      case NVT_ENS:
1502 +        if (globals->haveZconstraints()){
1503 +          setupZConstraint(info[k]);
1504 +          myNVT = new ZConstraint<NVT<RealIntegrator> >(&(info[k]), the_ff);
1505 +        }
1506 +        else
1507 +          myNVT = new NVT<RealIntegrator>(&(info[k]), the_ff);
1508 +
1509 +        myNVT->setTargetTemp(globals->getTargetTemp());
1510 +
1511 +        if (globals->haveTauThermostat())
1512 +          myNVT->setTauThermostat(globals->getTauThermostat());
1513 +        else{
1514 +          sprintf(painCave.errMsg,
1515 +                  "SimSetup error: If you use the NVT\n"
1516 +                  "\tensemble, you must set tauThermostat.\n");
1517 +          painCave.isFatal = 1;
1518 +          simError();
1519 +        }
1520 +
1521 +        info->the_integrator = myNVT;
1522 +        break;
1523 +
1524 +      case NPTi_ENS:
1525 +        if (globals->haveZconstraints()){
1526 +          setupZConstraint(info[k]);
1527 +          myNPTi = new ZConstraint<NPTi<NPT <RealIntegrator> > >(&(info[k]), the_ff);
1528 +        }
1529 +        else
1530 +          myNPTi = new NPTi<NPT<RealIntegrator> >(&(info[k]), the_ff);
1531 +
1532 +        myNPTi->setTargetTemp(globals->getTargetTemp());
1533 +
1534 +        if (globals->haveTargetPressure())
1535 +          myNPTi->setTargetPressure(globals->getTargetPressure());
1536 +        else{
1537 +          sprintf(painCave.errMsg,
1538 +                  "SimSetup error: If you use a constant pressure\n"
1539 +                  "\tensemble, you must set targetPressure in the BASS file.\n");
1540 +          painCave.isFatal = 1;
1541 +          simError();
1542 +        }
1543 +
1544 +        if (globals->haveTauThermostat())
1545 +          myNPTi->setTauThermostat(globals->getTauThermostat());
1546 +        else{
1547 +          sprintf(painCave.errMsg,
1548 +                  "SimSetup error: If you use an NPT\n"
1549 +                  "\tensemble, you must set tauThermostat.\n");
1550 +          painCave.isFatal = 1;
1551 +          simError();
1552 +        }
1553 +
1554 +        if (globals->haveTauBarostat())
1555 +          myNPTi->setTauBarostat(globals->getTauBarostat());
1556 +        else{
1557 +          sprintf(painCave.errMsg,
1558 +                  "SimSetup error: If you use an NPT\n"
1559 +                  "\tensemble, you must set tauBarostat.\n");
1560 +          painCave.isFatal = 1;
1561 +          simError();
1562 +        }
1563 +
1564 +        info->the_integrator = myNPTi;
1565 +        break;
1566 +
1567 +      case NPTf_ENS:
1568 +        if (globals->haveZconstraints()){
1569 +          setupZConstraint(info[k]);
1570 +          myNPTf = new ZConstraint<NPTf<NPT <RealIntegrator> > >(&(info[k]), the_ff);
1571 +        }
1572 +        else
1573 +          myNPTf = new NPTf<NPT <RealIntegrator> >(&(info[k]), the_ff);
1574 +
1575 +        myNPTf->setTargetTemp(globals->getTargetTemp());
1576 +
1577 +        if (globals->haveTargetPressure())
1578 +          myNPTf->setTargetPressure(globals->getTargetPressure());
1579 +        else{
1580 +          sprintf(painCave.errMsg,
1581 +                  "SimSetup error: If you use a constant pressure\n"
1582 +                  "\tensemble, you must set targetPressure in the BASS file.\n");
1583 +          painCave.isFatal = 1;
1584 +          simError();
1585 +        }    
1586 +
1587 +        if (globals->haveTauThermostat())
1588 +          myNPTf->setTauThermostat(globals->getTauThermostat());
1589 +
1590 +        else{
1591 +          sprintf(painCave.errMsg,
1592 +                  "SimSetup error: If you use an NPT\n"
1593 +                  "\tensemble, you must set tauThermostat.\n");
1594 +          painCave.isFatal = 1;
1595 +          simError();
1596 +        }
1597 +
1598 +        if (globals->haveTauBarostat())
1599 +          myNPTf->setTauBarostat(globals->getTauBarostat());
1600 +
1601 +        else{
1602 +          sprintf(painCave.errMsg,
1603 +                  "SimSetup error: If you use an NPT\n"
1604 +                  "\tensemble, you must set tauBarostat.\n");
1605 +          painCave.isFatal = 1;
1606 +          simError();
1607 +        }
1608 +
1609 +        info->the_integrator = myNPTf;
1610 +        break;
1611 +
1612 +      case NPTxyz_ENS:
1613 +        if (globals->haveZconstraints()){
1614 +          setupZConstraint(info[k]);
1615 +          myNPTxyz = new ZConstraint<NPTxyz<NPT <RealIntegrator> > >(&(info[k]), the_ff);
1616 +        }
1617 +        else
1618 +          myNPTxyz = new NPTxyz<NPT <RealIntegrator> >(&(info[k]), the_ff);
1619 +
1620 +        myNPTxyz->setTargetTemp(globals->getTargetTemp());
1621 +
1622 +        if (globals->haveTargetPressure())
1623 +          myNPTxyz->setTargetPressure(globals->getTargetPressure());
1624 +        else{
1625 +          sprintf(painCave.errMsg,
1626 +                  "SimSetup error: If you use a constant pressure\n"
1627 +                  "\tensemble, you must set targetPressure in the BASS file.\n");
1628 +          painCave.isFatal = 1;
1629 +          simError();
1630 +        }    
1631 +
1632 +        if (globals->haveTauThermostat())
1633 +          myNPTxyz->setTauThermostat(globals->getTauThermostat());
1634 +        else{
1635 +          sprintf(painCave.errMsg,
1636 +                  "SimSetup error: If you use an NPT\n"
1637 +                  "\tensemble, you must set tauThermostat.\n");
1638 +          painCave.isFatal = 1;
1639 +          simError();
1640 +        }
1641 +
1642 +        if (globals->haveTauBarostat())
1643 +          myNPTxyz->setTauBarostat(globals->getTauBarostat());
1644 +        else{
1645 +          sprintf(painCave.errMsg,
1646 +                  "SimSetup error: If you use an NPT\n"
1647 +                  "\tensemble, you must set tauBarostat.\n");
1648 +          painCave.isFatal = 1;
1649 +          simError();
1650 +        }
1651 +
1652 +        info->the_integrator = myNPTxyz;
1653 +        break;
1654 +
1655 +      default:
1656 +        sprintf(painCave.errMsg,
1657 +                "SimSetup Error. Unrecognized ensemble in case statement.\n");
1658 +        painCave.isFatal = 1;
1659 +        simError();
1660 +    }
1661    }
1662   }
1663 +
1664 + void SimSetup::initFortran(void){
1665 +  info[0].refreshSim();
1666 +
1667 +  if (!strcmp(info[0].mixingRule, "standard")){
1668 +    the_ff->initForceField(LB_MIXING_RULE);
1669 +  }
1670 +  else if (!strcmp(info[0].mixingRule, "explicit")){
1671 +    the_ff->initForceField(EXPLICIT_MIXING_RULE);
1672 +  }
1673 +  else{
1674 +    sprintf(painCave.errMsg, "SimSetup Error: unknown mixing rule -> \"%s\"\n",
1675 +            info[0].mixingRule);
1676 +    painCave.isFatal = 1;
1677 +    simError();
1678 +  }
1679 +
1680 +
1681 + #ifdef IS_MPI
1682 +  strcpy(checkPointMsg, "Successfully intialized the mixingRule for Fortran.");
1683 +  MPIcheckPoint();
1684 + #endif // is_mpi
1685 + }
1686 +
1687 + void SimSetup::setupZConstraint(SimInfo& theInfo){
1688 +  int nZConstraints;
1689 +  ZconStamp** zconStamp;
1690 +
1691 +  if (globals->haveZconstraintTime()){
1692 +    //add sample time of z-constraint  into SimInfo's property list                    
1693 +    DoubleData* zconsTimeProp = new DoubleData();
1694 +    zconsTimeProp->setID(ZCONSTIME_ID);
1695 +    zconsTimeProp->setData(globals->getZconsTime());
1696 +    theInfo.addProperty(zconsTimeProp);
1697 +  }
1698 +  else{
1699 +    sprintf(painCave.errMsg,
1700 +            "ZConstraint error: If you use a ZConstraint,\n"
1701 +            "\tyou must set zconsTime.\n");
1702 +    painCave.isFatal = 1;
1703 +    simError();
1704 +  }
1705 +
1706 +  //push zconsTol into siminfo, if user does not specify
1707 +  //value for zconsTol, a default value will be used
1708 +  DoubleData* zconsTol = new DoubleData();
1709 +  zconsTol->setID(ZCONSTOL_ID);
1710 +  if (globals->haveZconsTol()){
1711 +    zconsTol->setData(globals->getZconsTol());
1712 +  }
1713 +  else{
1714 +    double defaultZConsTol = 0.01;
1715 +    sprintf(painCave.errMsg,
1716 +            "ZConstraint Warning: Tolerance for z-constraint method is not specified.\n"
1717 +            "\tOOPSE will use a default value of %f.\n"
1718 +            "\tTo set the tolerance, use the zconsTol variable.\n",
1719 +            defaultZConsTol);
1720 +    painCave.isFatal = 0;
1721 +    simError();      
1722 +
1723 +    zconsTol->setData(defaultZConsTol);
1724 +  }
1725 +  theInfo.addProperty(zconsTol);
1726 +
1727 +  //set Force Subtraction Policy
1728 +  StringData* zconsForcePolicy = new StringData();
1729 +  zconsForcePolicy->setID(ZCONSFORCEPOLICY_ID);
1730 +
1731 +  if (globals->haveZconsForcePolicy()){
1732 +    zconsForcePolicy->setData(globals->getZconsForcePolicy());
1733 +  }
1734 +  else{
1735 +    sprintf(painCave.errMsg,
1736 +            "ZConstraint Warning: No force subtraction policy was set.\n"
1737 +            "\tOOPSE will use PolicyByMass.\n"
1738 +            "\tTo set the policy, use the zconsForcePolicy variable.\n");
1739 +    painCave.isFatal = 0;
1740 +    simError();
1741 +    zconsForcePolicy->setData("BYMASS");
1742 +  }
1743 +
1744 +  theInfo.addProperty(zconsForcePolicy);
1745 +
1746 +  //set zcons gap
1747 +  DoubleData* zconsGap = new DoubleData();
1748 +  zconsGap->setID(ZCONSGAP_ID);
1749 +
1750 +  if (globals->haveZConsGap()){
1751 +    zconsGap->setData(globals->getZconsGap());
1752 +    theInfo.addProperty(zconsGap);  
1753 +  }
1754 +
1755 +  //set zcons fixtime
1756 +  DoubleData* zconsFixtime = new DoubleData();
1757 +  zconsFixtime->setID(ZCONSFIXTIME_ID);
1758 +
1759 +  if (globals->haveZConsFixTime()){
1760 +    zconsFixtime->setData(globals->getZconsFixtime());
1761 +    theInfo.addProperty(zconsFixtime);  
1762 +  }
1763 +
1764 +  //set zconsUsingSMD
1765 +  IntData* zconsUsingSMD = new IntData();
1766 +  zconsUsingSMD->setID(ZCONSUSINGSMD_ID);
1767 +
1768 +  if (globals->haveZConsUsingSMD()){
1769 +    zconsUsingSMD->setData(globals->getZconsUsingSMD());
1770 +    theInfo.addProperty(zconsUsingSMD);  
1771 +  }
1772 +
1773 +  //Determine the name of ouput file and add it into SimInfo's property list
1774 +  //Be careful, do not use inFileName, since it is a pointer which
1775 +  //point to a string at master node, and slave nodes do not contain that string
1776 +
1777 +  string zconsOutput(theInfo.finalName);
1778 +
1779 +  zconsOutput = zconsOutput.substr(0, zconsOutput.rfind(".")) + ".fz";
1780 +
1781 +  StringData* zconsFilename = new StringData();
1782 +  zconsFilename->setID(ZCONSFILENAME_ID);
1783 +  zconsFilename->setData(zconsOutput);
1784 +
1785 +  theInfo.addProperty(zconsFilename);
1786 +
1787 +  //setup index, pos and other parameters of z-constraint molecules
1788 +  nZConstraints = globals->getNzConstraints();
1789 +  theInfo.nZconstraints = nZConstraints;
1790 +
1791 +  zconStamp = globals->getZconStamp();
1792 +  ZConsParaItem tempParaItem;
1793 +
1794 +  ZConsParaData* zconsParaData = new ZConsParaData();
1795 +  zconsParaData->setID(ZCONSPARADATA_ID);
1796 +
1797 +  for (int i = 0; i < nZConstraints; i++){
1798 +    tempParaItem.havingZPos = zconStamp[i]->haveZpos();
1799 +    tempParaItem.zPos = zconStamp[i]->getZpos();
1800 +    tempParaItem.zconsIndex = zconStamp[i]->getMolIndex();
1801 +    tempParaItem.kRatio = zconStamp[i]->getKratio();
1802 +    tempParaItem.havingCantVel = zconStamp[i]->haveCantVel();
1803 +    tempParaItem.cantVel = zconStamp[i]->getCantVel();    
1804 +    zconsParaData->addItem(tempParaItem);
1805 +  }
1806 +
1807 +  //check the uniqueness of index  
1808 +  if(!zconsParaData->isIndexUnique()){
1809 +    sprintf(painCave.errMsg,
1810 +            "ZConstraint Error: molIndex is not unique!\n");
1811 +    painCave.isFatal = 1;
1812 +    simError();
1813 +  }
1814 +
1815 +  //sort the parameters by index of molecules
1816 +  zconsParaData->sortByIndex();
1817 +  
1818 +  //push data into siminfo, therefore, we can retrieve later
1819 +  theInfo.addProperty(zconsParaData);
1820 + }
1821 +
1822 + void SimSetup::makeMinimizer(){
1823 +
1824 +  OOPSEMinimizer* myOOPSEMinimizer;
1825 +  MinimizerParameterSet* param;
1826 +  char minimizerName[100];
1827 +  
1828 +  for (int i = 0; i < nInfo; i++){
1829 +    
1830 +    //prepare parameter set for minimizer
1831 +    param = new MinimizerParameterSet();
1832 +    param->setDefaultParameter();
1833 +
1834 +    if (globals->haveMinimizer()){
1835 +      param->setFTol(globals->getMinFTol());
1836 +    }
1837 +
1838 +    if (globals->haveMinGTol()){
1839 +      param->setGTol(globals->getMinGTol());
1840 +    }
1841 +
1842 +    if (globals->haveMinMaxIter()){
1843 +      param->setMaxIteration(globals->getMinMaxIter());
1844 +    }
1845 +
1846 +    if (globals->haveMinWriteFrq()){
1847 +      param->setMaxIteration(globals->getMinMaxIter());
1848 +    }
1849 +
1850 +    if (globals->haveMinWriteFrq()){
1851 +      param->setWriteFrq(globals->getMinWriteFrq());
1852 +    }
1853 +    
1854 +    if (globals->haveMinStepSize()){
1855 +      param->setStepSize(globals->getMinStepSize());
1856 +    }
1857 +
1858 +    if (globals->haveMinLSMaxIter()){
1859 +      param->setLineSearchMaxIteration(globals->getMinLSMaxIter());
1860 +    }    
1861 +
1862 +    if (globals->haveMinLSTol()){
1863 +      param->setLineSearchTol(globals->getMinLSTol());
1864 +    }    
1865 +
1866 +    strcpy(minimizerName, globals->getMinimizer());
1867 +
1868 +    if (!strcasecmp(minimizerName, "CG")){
1869 +      myOOPSEMinimizer = new PRCGMinimizer(&(info[i]), the_ff, param);
1870 +    }
1871 +    else if (!strcasecmp(minimizerName, "SD")){
1872 +    //myOOPSEMinimizer = MinimizerFactory.creatMinimizer("", &(info[i]), the_ff, param);
1873 +      myOOPSEMinimizer = new SDMinimizer(&(info[i]), the_ff, param);
1874 +    }
1875 +    else{
1876 +          sprintf(painCave.errMsg,
1877 +                  "SimSetup error: Unrecognized Minimizer, use Conjugate Gradient \n");
1878 +          painCave.isFatal = 0;
1879 +          simError();
1880 +
1881 +      myOOPSEMinimizer = new PRCGMinimizer(&(info[i]), the_ff, param);          
1882 +    }
1883 +     info[i].the_integrator = myOOPSEMinimizer;
1884 +
1885 +     //store the minimizer into simInfo
1886 +     info[i].the_minimizer = myOOPSEMinimizer;
1887 +     info[i].has_minimizer = true;
1888 +  }
1889 +
1890 + }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines