ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/group/branches/new-templateless/OOPSE/libmdtools/SimSetup.cpp
(Generate patch)

Comparing:
trunk/OOPSE/libmdtools/SimSetup.cpp (file contents), Revision 557 by mmeineke, Thu Jun 19 19:11:53 2003 UTC vs.
branches/new-templateless/OOPSE/libmdtools/SimSetup.cpp (file contents), Revision 851 by mmeineke, Wed Nov 5 19:18:17 2003 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines