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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines