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 412 by mmeineke, Wed Mar 26 21:50:33 2003 UTC vs.
Revision 841 by mmeineke, Wed Oct 29 17:55:28 2003 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines