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 483 by gezelter, Wed Apr 9 04:06:43 2003 UTC vs.
Revision 811 by mmeineke, Tue Oct 21 19:33:19 2003 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines