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 855 by mmeineke, Thu Nov 6 22:01:37 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 +    // check for the extended State init
704  
705 +    info[i].useInitXSstate = globals->getUseInitXSstate();
706 +    info[i].orthoTolerance = globals->getOrthoBoxTolerance();
707 +    
708 +  }
709 +  
710 +  //setup seed for random number generator
711 +  int seedValue;
712  
713 +  if (globals->haveSeed()){
714 +    seedValue = globals->getSeed();
715  
716 +    if(seedValue / 1E9 == 0){
717 +      sprintf(painCave.errMsg,
718 +              "Seed for sprng library should contain at least 9 digits\n"
719 +              "OOPSE will generate a seed for user\n");
720 +      painCave.isFatal = 0;
721 +      simError();
722  
723 +      //using seed generated by system instead of invalid seed set by user
724 + #ifndef IS_MPI
725 +      seedValue = make_sprng_seed();
726 + #else
727 +      if (worldRank == 0){
728 +        seedValue = make_sprng_seed();
729 +      }
730 +      MPI_Bcast(&seedValue, 1, MPI_INT, 0, MPI_COMM_WORLD);  
731 + #endif      
732 +    }
733 +  }//end of if branch of globals->haveSeed()
734 +  else{
735 +    
736 + #ifndef IS_MPI
737 +    seedValue = make_sprng_seed();
738 + #else
739 +    if (worldRank == 0){
740 +      seedValue = make_sprng_seed();
741 +    }
742 +    MPI_Bcast(&seedValue, 1, MPI_INT, 0, MPI_COMM_WORLD);  
743 + #endif
744 +  }//end of globals->haveSeed()
745  
746 < void SimSetup::makeAtoms( void ){
746 >  for (int i = 0; i < nInfo; i++){
747 >    info[i].setSeed(seedValue);
748 >  }
749  
750 <  int i, j, k, index;
751 <  double ux, uy, uz, uSqr, u;
752 <  AtomStamp* current_atom;
750 > #ifdef IS_MPI
751 >  strcpy(checkPointMsg, "Succesfully gathered all information from Bass\n");
752 >  MPIcheckPoint();
753 > #endif // is_mpi
754 > }
755  
912  DirectionalAtom* dAtom;
913  int molIndex, molStart, molEnd, nMemb, lMolIndex;
756  
757 <  lMolIndex = 0;
758 <  molIndex = 0;
759 <  index = 0;
760 <  for( i=0; i<n_components; i++ ){
757 > void SimSetup::finalInfoCheck(void){
758 >  int index;
759 >  int usesDipoles;
760 >  int i;
761  
762 <    for( j=0; j<components_nmol[i]; j++ ){
762 >  for (i = 0; i < nInfo; i++){
763 >    // check electrostatic parameters
764  
765 < #ifdef IS_MPI
766 <      if( mpiSim->getMyMolStart() <= molIndex &&
767 <          molIndex <= mpiSim->getMyMolEnd() ){
768 < #endif // is_mpi        
765 >    index = 0;
766 >    usesDipoles = 0;
767 >    while ((index < info[i].n_atoms) && !usesDipoles){
768 >      usesDipoles = (info[i].atoms[index])->hasDipole();
769 >      index++;
770 >    }
771  
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
772   #ifdef IS_MPI
773 <      }
773 >    int myUse = usesDipoles;
774 >    MPI_Allreduce(&myUse, &usesDipoles, 1, MPI_INT, MPI_LOR, MPI_COMM_WORLD);
775   #endif //is_mpi
973      
974      molIndex++;
975    }
976  }
776  
777 < #ifdef IS_MPI
979 <    for( i=0; i<mpiSim->getMyNlocal(); i++ ) the_atoms[i]->setGlobalIndex( globalIndex[i] );
980 <    
981 <    delete[] globalIndex;
777 >    double theEcr, theEst;
778  
779 <    mpiSim->mpiRefresh();
780 < #endif //IS_MPI
985 <          
986 <  the_ff->initializeAtoms();
987 < }
779 >    if (globals->getUseRF()){
780 >      info[i].useReactionField = 1;
781  
782 < void SimSetup::makeBonds( void ){
782 >      if (!globals->haveECR()){
783 >        sprintf(painCave.errMsg,
784 >                "SimSetup Warning: using default value of 1/2 the smallest "
785 >                "box length for the electrostaticCutoffRadius.\n"
786 >                "I hope you have a very fast processor!\n");
787 >        painCave.isFatal = 0;
788 >        simError();
789 >        double smallest;
790 >        smallest = info[i].boxL[0];
791 >        if (info[i].boxL[1] <= smallest)
792 >          smallest = info[i].boxL[1];
793 >        if (info[i].boxL[2] <= smallest)
794 >          smallest = info[i].boxL[2];
795 >        theEcr = 0.5 * smallest;
796 >      }
797 >      else{
798 >        theEcr = globals->getECR();
799 >      }
800  
801 <  int i, j, k, index, offset, molIndex, exI, exJ, tempEx;
802 <  bond_pair* the_bonds;
803 <  BondStamp* current_bond;
804 <
805 <  the_bonds = new bond_pair[tot_bonds];
806 <  index = 0;
807 <  offset = 0;
808 <  molIndex = 0;
809 <
810 <  for( i=0; i<n_components; i++ ){
811 <
1002 <    for( j=0; j<components_nmol[i]; j++ ){
801 >      if (!globals->haveEST()){
802 >        sprintf(painCave.errMsg,
803 >                "SimSetup Warning: using default value of 0.05 * the "
804 >                "electrostaticCutoffRadius for the electrostaticSkinThickness\n");
805 >        painCave.isFatal = 0;
806 >        simError();
807 >        theEst = 0.05 * theEcr;
808 >      }
809 >      else{
810 >        theEst = globals->getEST();
811 >      }
812  
813 < #ifdef IS_MPI
1005 <      if( mpiSim->getMyMolStart() <= molIndex &&
1006 <          molIndex <= mpiSim->getMyMolEnd() ){
1007 < #endif // is_mpi        
1008 <        
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;
813 >      info[i].setDefaultEcr(theEcr, theEst);
814  
815 <          exI = the_bonds[index].a;
816 <          exJ = the_bonds[index].b;
815 >      if (!globals->haveDielectric()){
816 >        sprintf(painCave.errMsg,
817 >                "SimSetup Error: You are trying to use Reaction Field without"
818 >                "setting a dielectric constant!\n");
819 >        painCave.isFatal = 1;
820 >        simError();
821 >      }
822 >      info[i].dielectric = globals->getDielectric();
823 >    }
824 >    else{
825 >      if (usesDipoles){
826 >        if (!globals->haveECR()){
827 >          sprintf(painCave.errMsg,
828 >                  "SimSetup Warning: using default value of 1/2 the smallest "
829 >                  "box length for the electrostaticCutoffRadius.\n"
830 >                  "I hope you have a very fast processor!\n");
831 >          painCave.isFatal = 0;
832 >          simError();
833 >          double smallest;
834 >          smallest = info[i].boxL[0];
835 >          if (info[i].boxL[1] <= smallest)
836 >            smallest = info[i].boxL[1];
837 >          if (info[i].boxL[2] <= smallest)
838 >            smallest = info[i].boxL[2];
839 >          theEcr = 0.5 * smallest;
840 >        }
841 >        else{
842 >          theEcr = globals->getECR();
843 >        }
844  
845 <          // exclude_I must always be the smaller of the pair
846 <          if( exI > exJ ){
847 <            tempEx = exI;
848 <            exI = exJ;
849 <            exJ = tempEx;
850 <          }
845 >        if (!globals->haveEST()){
846 >          sprintf(painCave.errMsg,
847 >                  "SimSetup Warning: using default value of 0.05 * the "
848 >                  "electrostaticCutoffRadius for the "
849 >                  "electrostaticSkinThickness\n");
850 >          painCave.isFatal = 0;
851 >          simError();
852 >          theEst = 0.05 * theEcr;
853 >        }
854 >        else{
855 >          theEst = globals->getEST();
856 >        }
857  
858 <          
859 < #ifdef IS_MPI
858 >        info[i].setDefaultEcr(theEcr, theEst);
859 >      }
860 >    }
861  
862 <          the_excludes[index*2] =    
863 <            the_atoms[exI]->getGlobalIndex() + 1;
864 <          the_excludes[index*2 + 1] =
1031 <            the_atoms[exJ]->getGlobalIndex() + 1;
862 >    if( !initSuspend )
863 >      info[i].checkCutOffs();
864 >  }
865  
1033 #else  // isn't MPI
1034          
1035          the_excludes[index*2] =     exI + 1;
1036          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        
866   #ifdef IS_MPI
867 <      }
867 >  strcpy(checkPointMsg, "post processing checks out");
868 >  MPIcheckPoint();
869 > #endif // is_mpi
870 > }
871 >
872 > void SimSetup::initSystemCoords(void){
873 >  int i;
874 >
875 >  char* inName;
876 >
877 >  (info[0].getConfiguration())->createArrays(info[0].n_atoms);
878 >
879 >  for (i = 0; i < info[0].n_atoms; i++)
880 >    info[0].atoms[i]->setCoords();
881 >
882 >  if (globals->haveInitialConfig()){
883 >    InitializeFromFile* fileInit;
884 > #ifdef IS_MPI // is_mpi
885 >    if (worldRank == 0){
886   #endif //is_mpi
887 <      
888 <      molIndex++;
889 <    }      
887 >      inName = globals->getInitialConfig();
888 >      fileInit = new InitializeFromFile(inName);
889 > #ifdef IS_MPI
890 >    }
891 >    else
892 >      fileInit = new InitializeFromFile(NULL);
893 > #endif
894 >    fileInit->readInit(info); // default velocities on
895 >
896 >    delete fileInit;
897    }
898 +  else{
899 + #ifdef IS_MPI
900  
901 <  the_ff->initializeBonds( the_bonds );
1054 < }
901 >    // no init from bass
902  
903 < void SimSetup::makeBends( void ){
903 >    sprintf(painCave.errMsg,
904 >            "Cannot intialize a parallel simulation without an initial configuration file.\n");
905 >    painCave.isFatal = 1;;
906 >    simError();
907  
908 <  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 <  
908 > #else
909  
910 <  the_bends = new bend_set[tot_bends];
1066 <  index = 0;
1067 <  offset = 0;
1068 <  molIndex = 0;
1069 <  for( i=0; i<n_components; i++ ){
910 >    initFromBass();
911  
1071    for( j=0; j<components_nmol[i]; j++ ){
912  
913 + #endif
914 +  }
915 +
916   #ifdef IS_MPI
917 <      if( mpiSim->getMyMolStart() <= molIndex &&
918 <          molIndex <= mpiSim->getMyMolEnd() ){
919 < #endif // is_mpi        
917 >  strcpy(checkPointMsg, "Successfully read in the initial configuration");
918 >  MPIcheckPoint();
919 > #endif // is_mpi
920 > }
921  
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          }
922  
923 + void SimSetup::makeOutNames(void){
924 +  int k;
925  
1152 #ifdef IS_MPI
926  
927 <          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 <        
927 >  for (k = 0; k < nInfo; k++){
928   #ifdef IS_MPI
929 +    if (worldRank == 0){
930 + #endif // is_mpi
931 +
932 +      if (globals->haveFinalConfig()){
933 +        strcpy(info[k].finalName, globals->getFinalConfig());
934        }
935 < #endif //is_mpi
935 >      else{
936 >        strcpy(info[k].finalName, inFileName);
937 >        char* endTest;
938 >        int nameLength = strlen(info[k].finalName);
939 >        endTest = &(info[k].finalName[nameLength - 5]);
940 >        if (!strcmp(endTest, ".bass")){
941 >          strcpy(endTest, ".eor");
942 >        }
943 >        else if (!strcmp(endTest, ".BASS")){
944 >          strcpy(endTest, ".eor");
945 >        }
946 >        else{
947 >          endTest = &(info[k].finalName[nameLength - 4]);
948 >          if (!strcmp(endTest, ".bss")){
949 >            strcpy(endTest, ".eor");
950 >          }
951 >          else if (!strcmp(endTest, ".mdl")){
952 >            strcpy(endTest, ".eor");
953 >          }
954 >          else{
955 >            strcat(info[k].finalName, ".eor");
956 >          }
957 >        }
958 >      }
959  
960 <      molIndex++;
960 >      // make the sample and status out names
961 >
962 >      strcpy(info[k].sampleName, inFileName);
963 >      char* endTest;
964 >      int nameLength = strlen(info[k].sampleName);
965 >      endTest = &(info[k].sampleName[nameLength - 5]);
966 >      if (!strcmp(endTest, ".bass")){
967 >        strcpy(endTest, ".dump");
968 >      }
969 >      else if (!strcmp(endTest, ".BASS")){
970 >        strcpy(endTest, ".dump");
971 >      }
972 >      else{
973 >        endTest = &(info[k].sampleName[nameLength - 4]);
974 >        if (!strcmp(endTest, ".bss")){
975 >          strcpy(endTest, ".dump");
976 >        }
977 >        else if (!strcmp(endTest, ".mdl")){
978 >          strcpy(endTest, ".dump");
979 >        }
980 >        else{
981 >          strcat(info[k].sampleName, ".dump");
982 >        }
983 >      }
984 >
985 >      strcpy(info[k].statusName, inFileName);
986 >      nameLength = strlen(info[k].statusName);
987 >      endTest = &(info[k].statusName[nameLength - 5]);
988 >      if (!strcmp(endTest, ".bass")){
989 >        strcpy(endTest, ".stat");
990 >      }
991 >      else if (!strcmp(endTest, ".BASS")){
992 >        strcpy(endTest, ".stat");
993 >      }
994 >      else{
995 >        endTest = &(info[k].statusName[nameLength - 4]);
996 >        if (!strcmp(endTest, ".bss")){
997 >          strcpy(endTest, ".stat");
998 >        }
999 >        else if (!strcmp(endTest, ".mdl")){
1000 >          strcpy(endTest, ".stat");
1001 >        }
1002 >        else{
1003 >          strcat(info[k].statusName, ".stat");
1004 >        }
1005 >      }
1006 >
1007 > #ifdef IS_MPI
1008 >
1009      }
1010 + #endif // is_mpi
1011    }
1012 + }
1013  
1014 +
1015 + void SimSetup::sysObjectsCreation(void){
1016 +  int i, k;
1017 +
1018 +  // create the forceField
1019 +
1020 +  createFF();
1021 +
1022 +  // extract componentList
1023 +
1024 +  compList();
1025 +
1026 +  // calc the number of atoms, bond, bends, and torsions
1027 +
1028 +  calcSysValues();
1029 +
1030   #ifdef IS_MPI
1031 <  sprintf( checkPointMsg,
1182 <           "Successfully created the bends list.\n" );
1183 <  MPIcheckPoint();
1184 < #endif // is_mpi
1185 <  
1031 >  // divide the molecules among the processors
1032  
1033 <  the_ff->initializeBends( the_bends );
1034 < }
1033 >  mpiMolDivide();
1034 > #endif //is_mpi
1035  
1036 < void SimSetup::makeTorsions( void ){
1036 >  // create the atom and SRI arrays. Also initialize Molecule Stamp ID's
1037  
1038 <  int i, j, k, index, offset, molIndex, exI, exJ, tempEx;
1193 <  torsion_set* the_torsions;
1194 <  TorsionStamp* current_torsion;
1038 >  makeSysArrays();
1039  
1040 <  the_torsions = new torsion_set[tot_torsions];
1197 <  index = 0;
1198 <  offset = 0;
1199 <  molIndex = 0;
1200 <  for( i=0; i<n_components; i++ ){
1040 >  // make and initialize the molecules (all but atomic coordinates)
1041  
1042 <    for( j=0; j<components_nmol[i]; j++ ){
1042 >  makeMolecules();
1043 >
1044 >  for (k = 0; k < nInfo; k++){
1045 >    info[k].identArray = new int[info[k].n_atoms];
1046 >    for (i = 0; i < info[k].n_atoms; i++){
1047 >      info[k].identArray[i] = info[k].atoms[i]->getIdent();
1048 >    }
1049 >  }
1050 > }
1051 >
1052 >
1053 > void SimSetup::createFF(void){
1054 >  switch (ffCase){
1055 >    case FF_DUFF:
1056 >      the_ff = new DUFF();
1057 >      break;
1058  
1059 +    case FF_LJ:
1060 +      the_ff = new LJFF();
1061 +      break;
1062 +
1063 +    case FF_EAM:
1064 +      the_ff = new EAM_FF();
1065 +      break;
1066 +
1067 +    default:
1068 +      sprintf(painCave.errMsg,
1069 +              "SimSetup Error. Unrecognized force field in case statement.\n");
1070 +      painCave.isFatal = 1;
1071 +      simError();
1072 +  }
1073 +
1074   #ifdef IS_MPI
1075 <      if( mpiSim->getMyMolStart() <= molIndex &&
1076 <          molIndex <= mpiSim->getMyMolEnd() ){
1077 < #endif // is_mpi        
1075 >  strcpy(checkPointMsg, "ForceField creation successful");
1076 >  MPIcheckPoint();
1077 > #endif // is_mpi
1078 > }
1079  
1209      for( k=0; k<comp_stamps[i]->getNTorsions(); k++ ){
1080  
1081 <        current_torsion = comp_stamps[i]->getTorsion( k );
1082 <        the_torsions[index].a = current_torsion->getA() + offset;
1083 <        the_torsions[index].b = current_torsion->getB() + offset;
1084 <        the_torsions[index].c = current_torsion->getC() + offset;
1085 <        the_torsions[index].d = current_torsion->getD() + offset;
1081 > void SimSetup::compList(void){
1082 >  int i;
1083 >  char* id;
1084 >  LinkedMolStamp* headStamp = new LinkedMolStamp();
1085 >  LinkedMolStamp* currentStamp = NULL;
1086 >  comp_stamps = new MoleculeStamp * [n_components];
1087  
1088 <        exI = the_torsions[index].a;
1089 <        exJ = the_torsions[index].d;
1088 >  // make an array of molecule stamps that match the components used.
1089 >  // also extract the used stamps out into a separate linked list
1090  
1091 <        
1092 <        // exclude_I must always be the smaller of the pair
1093 <        if( exI > exJ ){
1094 <          tempEx = exI;
1095 <          exI = exJ;
1096 <          exJ = tempEx;
1226 <        }
1091 >  for (i = 0; i < nInfo; i++){
1092 >    info[i].nComponents = n_components;
1093 >    info[i].componentsNmol = components_nmol;
1094 >    info[i].compStamps = comp_stamps;
1095 >    info[i].headStamp = headStamp;
1096 >  }
1097  
1098  
1099 < #ifdef IS_MPI
1100 <        
1101 <        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 <        
1099 >  for (i = 0; i < n_components; i++){
1100 >    id = the_components[i]->getType();
1101 >    comp_stamps[i] = NULL;
1102  
1103 <        // increment the index and repeat;
1245 <        index++;
1246 <      }
1247 <      offset += comp_stamps[i]->getNAtoms();
1103 >    // check to make sure the component isn't already in the list
1104  
1105 < #ifdef IS_MPI
1105 >    comp_stamps[i] = headStamp->match(id);
1106 >    if (comp_stamps[i] == NULL){
1107 >      // extract the component from the list;
1108 >
1109 >      currentStamp = stamps->extractMolStamp(id);
1110 >      if (currentStamp == NULL){
1111 >        sprintf(painCave.errMsg,
1112 >                "SimSetup error: Component \"%s\" was not found in the "
1113 >                "list of declared molecules\n",
1114 >                id);
1115 >        painCave.isFatal = 1;
1116 >        simError();
1117        }
1251 #endif //is_mpi      
1118  
1119 <      molIndex++;
1119 >      headStamp->add(currentStamp);
1120 >      comp_stamps[i] = headStamp->match(id);
1121      }
1122    }
1123  
1124 <  the_ff->initializeTorsions( the_torsions );
1124 > #ifdef IS_MPI
1125 >  strcpy(checkPointMsg, "Component stamps successfully extracted\n");
1126 >  MPIcheckPoint();
1127 > #endif // is_mpi
1128   }
1129  
1130 < void SimSetup::initFromBass( void ){
1130 > void SimSetup::calcSysValues(void){
1131 >  int i;
1132  
1133 <  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;
1133 >  int* molMembershipArray;
1134  
1135 <  temp1 = (double)tot_nmol / 4.0;
1136 <  temp2 = pow( temp1, ( 1.0 / 3.0 ) );
1137 <  temp3 = ceil( temp2 );
1135 >  tot_atoms = 0;
1136 >  tot_bonds = 0;
1137 >  tot_bends = 0;
1138 >  tot_torsions = 0;
1139 >  for (i = 0; i < n_components; i++){
1140 >    tot_atoms += components_nmol[i] * comp_stamps[i]->getNAtoms();
1141 >    tot_bonds += components_nmol[i] * comp_stamps[i]->getNBonds();
1142 >    tot_bends += components_nmol[i] * comp_stamps[i]->getNBends();
1143 >    tot_torsions += components_nmol[i] * comp_stamps[i]->getNTorsions();
1144 >  }
1145  
1146 <  have_extra =0;
1147 <  if( temp2 < temp3 ){ // we have a non-complete lattice
1276 <    have_extra =1;
1146 >  tot_SRI = tot_bonds + tot_bends + tot_torsions;
1147 >  molMembershipArray = new int[tot_atoms];
1148  
1149 <    n_cells = (int)temp3 - 1;
1150 <    cellx = simnfo->box_x / temp3;
1151 <    celly = simnfo->box_y / temp3;
1152 <    cellz = simnfo->box_z / temp3;
1153 <    n_extra = tot_nmol - ( 4 * n_cells * n_cells * n_cells );
1154 <    temp1 = ((double)n_extra) / ( pow( temp3, 3.0 ) - pow( n_cells, 3.0 ) );
1155 <    n_per_extra = (int)ceil( temp1 );
1149 >  for (i = 0; i < nInfo; i++){
1150 >    info[i].n_atoms = tot_atoms;
1151 >    info[i].n_bonds = tot_bonds;
1152 >    info[i].n_bends = tot_bends;
1153 >    info[i].n_torsions = tot_torsions;
1154 >    info[i].n_SRI = tot_SRI;
1155 >    info[i].n_mol = tot_nmol;
1156  
1157 <    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 <    }
1157 >    info[i].molMembershipArray = molMembershipArray;
1158    }
1159 <  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 <  }
1159 > }
1160  
1161 <  current_mol = 0;
1302 <  current_comp_mol = 0;
1303 <  current_comp = 0;
1304 <  current_atom_ndx = 0;
1161 > #ifdef IS_MPI
1162  
1163 <  for( i=0; i < n_cells ; i++ ){
1164 <    for( j=0; j < n_cells; j++ ){
1165 <      for( k=0; k < n_cells; k++ ){
1163 > void SimSetup::mpiMolDivide(void){
1164 >  int i, j, k;
1165 >  int localMol, allMol;
1166 >  int local_atoms, local_bonds, local_bends, local_torsions, local_SRI;
1167  
1168 <        makeElement( i * cellx,
1311 <                     j * celly,
1312 <                     k * cellz );
1168 >  mpiSim = new mpiSimulation(info);
1169  
1170 <        makeElement( i * cellx + 0.5 * cellx,
1315 <                     j * celly + 0.5 * celly,
1316 <                     k * cellz );
1170 >  globalIndex = mpiSim->divideLabor();
1171  
1172 <        makeElement( i * cellx,
1319 <                     j * celly + 0.5 * celly,
1320 <                     k * cellz + 0.5 * cellz );
1172 >  // set up the local variables
1173  
1174 <        makeElement( i * cellx + 0.5 * cellx,
1175 <                     j * celly,
1176 <                     k * cellz + 0.5 * cellz );
1174 >  mol2proc = mpiSim->getMolToProcMap();
1175 >  molCompType = mpiSim->getMolComponentType();
1176 >
1177 >  allMol = 0;
1178 >  localMol = 0;
1179 >  local_atoms = 0;
1180 >  local_bonds = 0;
1181 >  local_bends = 0;
1182 >  local_torsions = 0;
1183 >  globalAtomIndex = 0;
1184 >
1185 >
1186 >  for (i = 0; i < n_components; i++){
1187 >    for (j = 0; j < components_nmol[i]; j++){
1188 >      if (mol2proc[allMol] == worldRank){
1189 >        local_atoms += comp_stamps[i]->getNAtoms();
1190 >        local_bonds += comp_stamps[i]->getNBonds();
1191 >        local_bends += comp_stamps[i]->getNBends();
1192 >        local_torsions += comp_stamps[i]->getNTorsions();
1193 >        localMol++;
1194 >      }      
1195 >      for (k = 0; k < comp_stamps[i]->getNAtoms(); k++){
1196 >        info[0].molMembershipArray[globalAtomIndex] = allMol;
1197 >        globalAtomIndex++;
1198        }
1199 +
1200 +      allMol++;
1201      }
1202    }
1203 +  local_SRI = local_bonds + local_bends + local_torsions;
1204  
1205 <  if( have_extra ){
1330 <    done = 0;
1205 >  info[0].n_atoms = mpiSim->getMyNlocal();  
1206  
1207 <    int start_ndx;
1208 <    for( i=0; i < (n_cells+1) && !done; i++ ){
1209 <      for( j=0; j < (n_cells+1) && !done; j++ ){
1207 >  if (local_atoms != info[0].n_atoms){
1208 >    sprintf(painCave.errMsg,
1209 >            "SimSetup error: mpiSim's localAtom (%d) and SimSetup's"
1210 >            " localAtom (%d) are not equal.\n",
1211 >            info[0].n_atoms, local_atoms);
1212 >    painCave.isFatal = 1;
1213 >    simError();
1214 >  }
1215  
1216 <        if( i < n_cells ){
1216 >  info[0].n_bonds = local_bonds;
1217 >  info[0].n_bends = local_bends;
1218 >  info[0].n_torsions = local_torsions;
1219 >  info[0].n_SRI = local_SRI;
1220 >  info[0].n_mol = localMol;
1221  
1222 <          if( j < n_cells ){
1223 <            start_ndx = n_cells;
1224 <          }
1341 <          else start_ndx = 0;
1342 <        }
1343 <        else start_ndx = 0;
1222 >  strcpy(checkPointMsg, "Passed nlocal consistency check.");
1223 >  MPIcheckPoint();
1224 > }
1225  
1226 <        for( k=start_ndx; k < (n_cells+1) && !done; k++ ){
1226 > #endif // is_mpi
1227  
1347          makeElement( i * cellx,
1348                       j * celly,
1349                       k * cellz );
1350          done = ( current_mol >= tot_nmol );
1228  
1229 <          if( !done && n_per_extra > 1 ){
1230 <            makeElement( i * cellx + 0.5 * cellx,
1231 <                         j * celly + 0.5 * celly,
1232 <                         k * cellz );
1233 <            done = ( current_mol >= tot_nmol );
1234 <          }
1229 > void SimSetup::makeSysArrays(void){
1230 >
1231 > #ifndef IS_MPI
1232 >  int k, j;
1233 > #endif // is_mpi
1234 >  int i, l;
1235  
1236 <          if( !done && n_per_extra > 2){
1237 <            makeElement( i * cellx,
1238 <                         j * celly + 0.5 * celly,
1362 <                         k * cellz + 0.5 * cellz );
1363 <            done = ( current_mol >= tot_nmol );
1364 <          }
1236 >  Atom** the_atoms;
1237 >  Molecule* the_molecules;
1238 >  Exclude** the_excludes;
1239  
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  }
1240  
1241 +  for (l = 0; l < nInfo; l++){
1242 +    // create the atom and short range interaction arrays
1243  
1244 <  for( i=0; i<simnfo->n_atoms; i++ ){
1245 <    simnfo->atoms[i]->set_vx( 0.0 );
1246 <    simnfo->atoms[i]->set_vy( 0.0 );
1381 <    simnfo->atoms[i]->set_vz( 0.0 );
1382 <  }
1383 < }
1244 >    the_atoms = new Atom * [info[l].n_atoms];
1245 >    the_molecules = new Molecule[info[l].n_mol];
1246 >    int molIndex;
1247  
1248 < void SimSetup::makeElement( double x, double y, double z ){
1248 >    // initialize the molecule's stampID's
1249  
1250 <  int k;
1388 <  AtomStamp* current_atom;
1389 <  DirectionalAtom* dAtom;
1390 <  double rotMat[3][3];
1250 > #ifdef IS_MPI
1251  
1392  for( k=0; k<comp_stamps[current_comp]->getNAtoms(); k++ ){
1252  
1253 <    current_atom = comp_stamps[current_comp]->getAtom( k );
1254 <    if( !current_atom->havePosition() ){
1255 <      sprintf( painCave.errMsg,
1256 <               "SimSetup:initFromBass error.\n"
1257 <               "\tComponent %s, atom %s does not have a position specified.\n"
1258 <               "\tThe initialization routine is unable to give a start"
1259 <               " position.\n",
1260 <               comp_stamps[current_comp]->getID(),
1402 <               current_atom->getType() );
1403 <      painCave.isFatal = 1;
1404 <      simError();
1253 >    molIndex = 0;
1254 >    for (i = 0; i < mpiSim->getTotNmol(); i++){
1255 >      if (mol2proc[i] == worldRank){
1256 >        the_molecules[molIndex].setStampID(molCompType[i]);
1257 >        the_molecules[molIndex].setMyIndex(molIndex);
1258 >        the_molecules[molIndex].setGlobalIndex(i);
1259 >        molIndex++;
1260 >      }
1261      }
1262  
1263 <    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() );
1263 > #else // is_mpi
1264  
1265 <    if( the_atoms[current_atom_ndx]->isDirectional() ){
1265 >    molIndex = 0;
1266 >    globalAtomIndex = 0;
1267 >    for (i = 0; i < n_components; i++){
1268 >      for (j = 0; j < components_nmol[i]; j++){
1269 >        the_molecules[molIndex].setStampID(i);
1270 >        the_molecules[molIndex].setMyIndex(molIndex);
1271 >        the_molecules[molIndex].setGlobalIndex(molIndex);
1272 >        for (k = 0; k < comp_stamps[i]->getNAtoms(); k++){
1273 >          info[l].molMembershipArray[globalAtomIndex] = molIndex;
1274 >          globalAtomIndex++;
1275 >        }
1276 >        molIndex++;
1277 >      }
1278 >    }
1279  
1413      dAtom = (DirectionalAtom *)the_atoms[current_atom_ndx];
1280  
1281 <      rotMat[0][0] = 1.0;
1416 <      rotMat[0][1] = 0.0;
1417 <      rotMat[0][2] = 0.0;
1281 > #endif // is_mpi
1282  
1419      rotMat[1][0] = 0.0;
1420      rotMat[1][1] = 1.0;
1421      rotMat[1][2] = 0.0;
1283  
1284 <      rotMat[2][0] = 0.0;
1285 <      rotMat[2][1] = 0.0;
1286 <      rotMat[2][2] = 1.0;
1284 >    if (info[l].n_SRI){
1285 >      Exclude::createArray(info[l].n_SRI);
1286 >      the_excludes = new Exclude * [info[l].n_SRI];
1287 >      for (int ex = 0; ex < info[l].n_SRI; ex++){
1288 >        the_excludes[ex] = new Exclude(ex);
1289 >      }
1290 >      info[l].globalExcludes = new int;
1291 >      info[l].n_exclude = info[l].n_SRI;
1292 >    }
1293 >    else{
1294 >      Exclude::createArray(1);
1295 >      the_excludes = new Exclude * ;
1296 >      the_excludes[0] = new Exclude(0);
1297 >      the_excludes[0]->setPair(0, 0);
1298 >      info[l].globalExcludes = new int;
1299 >      info[l].globalExcludes[0] = 0;
1300 >      info[l].n_exclude = 0;
1301 >    }
1302  
1303 <      dAtom->setA( rotMat );
1303 >    // set the arrays into the SimInfo object
1304 >
1305 >    info[l].atoms = the_atoms;
1306 >    info[l].molecules = the_molecules;
1307 >    info[l].nGlobalExcludes = 0;
1308 >    info[l].excludes = the_excludes;
1309 >
1310 >    the_ff->setSimInfo(info);
1311 >  }
1312 > }
1313 >
1314 > void SimSetup::makeIntegrator(void){
1315 >  int k;
1316 >
1317 >  NVE<RealIntegrator>* myNVE = NULL;
1318 >  NVT<RealIntegrator>* myNVT = NULL;
1319 >  NPTi<NPT<RealIntegrator> >* myNPTi = NULL;
1320 >  NPTf<NPT<RealIntegrator> >* myNPTf = NULL;
1321 >  NPTxyz<NPT<RealIntegrator> >* myNPTxyz = NULL;
1322 >  
1323 >  for (k = 0; k < nInfo; k++){
1324 >    switch (ensembleCase){
1325 >      case NVE_ENS:
1326 >        if (globals->haveZconstraints()){
1327 >          setupZConstraint(info[k]);
1328 >          myNVE = new ZConstraint<NVE<RealIntegrator> >(&(info[k]), the_ff);
1329 >        }
1330 >        else{
1331 >          myNVE = new NVE<RealIntegrator>(&(info[k]), the_ff);
1332 >        }
1333 >        
1334 >        info->the_integrator = myNVE;
1335 >        break;
1336 >
1337 >      case NVT_ENS:
1338 >        if (globals->haveZconstraints()){
1339 >          setupZConstraint(info[k]);
1340 >          myNVT = new ZConstraint<NVT<RealIntegrator> >(&(info[k]), the_ff);
1341 >        }
1342 >        else
1343 >          myNVT = new NVT<RealIntegrator>(&(info[k]), the_ff);
1344 >
1345 >        myNVT->setTargetTemp(globals->getTargetTemp());
1346 >
1347 >        if (globals->haveTauThermostat())
1348 >          myNVT->setTauThermostat(globals->getTauThermostat());
1349 >        else{
1350 >          sprintf(painCave.errMsg,
1351 >                  "SimSetup error: If you use the NVT\n"
1352 >                  "    ensemble, you must set tauThermostat.\n");
1353 >          painCave.isFatal = 1;
1354 >          simError();
1355 >        }
1356 >
1357 >        info->the_integrator = myNVT;
1358 >        break;
1359 >
1360 >      case NPTi_ENS:
1361 >        if (globals->haveZconstraints()){
1362 >          setupZConstraint(info[k]);
1363 >          myNPTi = new ZConstraint<NPTi<NPT <RealIntegrator> > >(&(info[k]), the_ff);
1364 >        }
1365 >        else
1366 >          myNPTi = new NPTi<NPT<RealIntegrator> >(&(info[k]), the_ff);
1367 >
1368 >        myNPTi->setTargetTemp(globals->getTargetTemp());
1369 >
1370 >        if (globals->haveTargetPressure())
1371 >          myNPTi->setTargetPressure(globals->getTargetPressure());
1372 >        else{
1373 >          sprintf(painCave.errMsg,
1374 >                  "SimSetup error: If you use a constant pressure\n"
1375 >                  "    ensemble, you must set targetPressure in the BASS file.\n");
1376 >          painCave.isFatal = 1;
1377 >          simError();
1378 >        }
1379 >
1380 >        if (globals->haveTauThermostat())
1381 >          myNPTi->setTauThermostat(globals->getTauThermostat());
1382 >        else{
1383 >          sprintf(painCave.errMsg,
1384 >                  "SimSetup error: If you use an NPT\n"
1385 >                  "    ensemble, you must set tauThermostat.\n");
1386 >          painCave.isFatal = 1;
1387 >          simError();
1388 >        }
1389 >
1390 >        if (globals->haveTauBarostat())
1391 >          myNPTi->setTauBarostat(globals->getTauBarostat());
1392 >        else{
1393 >          sprintf(painCave.errMsg,
1394 >                  "SimSetup error: If you use an NPT\n"
1395 >                  "    ensemble, you must set tauBarostat.\n");
1396 >          painCave.isFatal = 1;
1397 >          simError();
1398 >        }
1399 >
1400 >        info->the_integrator = myNPTi;
1401 >        break;
1402 >
1403 >      case NPTf_ENS:
1404 >        if (globals->haveZconstraints()){
1405 >          setupZConstraint(info[k]);
1406 >          myNPTf = new ZConstraint<NPTf<NPT <RealIntegrator> > >(&(info[k]), the_ff);
1407 >        }
1408 >        else
1409 >          myNPTf = new NPTf<NPT <RealIntegrator> >(&(info[k]), the_ff);
1410 >
1411 >        myNPTf->setTargetTemp(globals->getTargetTemp());
1412 >
1413 >        if (globals->haveTargetPressure())
1414 >          myNPTf->setTargetPressure(globals->getTargetPressure());
1415 >        else{
1416 >          sprintf(painCave.errMsg,
1417 >                  "SimSetup error: If you use a constant pressure\n"
1418 >                  "    ensemble, you must set targetPressure in the BASS file.\n");
1419 >          painCave.isFatal = 1;
1420 >          simError();
1421 >        }    
1422 >
1423 >        if (globals->haveTauThermostat())
1424 >          myNPTf->setTauThermostat(globals->getTauThermostat());
1425 >
1426 >        else{
1427 >          sprintf(painCave.errMsg,
1428 >                  "SimSetup error: If you use an NPT\n"
1429 >                  "    ensemble, you must set tauThermostat.\n");
1430 >          painCave.isFatal = 1;
1431 >          simError();
1432 >        }
1433 >
1434 >        if (globals->haveTauBarostat())
1435 >          myNPTf->setTauBarostat(globals->getTauBarostat());
1436 >
1437 >        else{
1438 >          sprintf(painCave.errMsg,
1439 >                  "SimSetup error: If you use an NPT\n"
1440 >                  "    ensemble, you must set tauBarostat.\n");
1441 >          painCave.isFatal = 1;
1442 >          simError();
1443 >        }
1444 >
1445 >        info->the_integrator = myNPTf;
1446 >        break;
1447 >
1448 >      case NPTxyz_ENS:
1449 >        if (globals->haveZconstraints()){
1450 >          setupZConstraint(info[k]);
1451 >          myNPTxyz = new ZConstraint<NPTxyz<NPT <RealIntegrator> > >(&(info[k]), the_ff);
1452 >        }
1453 >        else
1454 >          myNPTxyz = new NPTxyz<NPT <RealIntegrator> >(&(info[k]), the_ff);
1455 >
1456 >        myNPTxyz->setTargetTemp(globals->getTargetTemp());
1457 >
1458 >        if (globals->haveTargetPressure())
1459 >          myNPTxyz->setTargetPressure(globals->getTargetPressure());
1460 >        else{
1461 >          sprintf(painCave.errMsg,
1462 >                  "SimSetup error: If you use a constant pressure\n"
1463 >                  "    ensemble, you must set targetPressure in the BASS file.\n");
1464 >          painCave.isFatal = 1;
1465 >          simError();
1466 >        }    
1467 >
1468 >        if (globals->haveTauThermostat())
1469 >          myNPTxyz->setTauThermostat(globals->getTauThermostat());
1470 >        else{
1471 >          sprintf(painCave.errMsg,
1472 >                  "SimSetup error: If you use an NPT\n"
1473 >                  "    ensemble, you must set tauThermostat.\n");
1474 >          painCave.isFatal = 1;
1475 >          simError();
1476 >        }
1477 >
1478 >        if (globals->haveTauBarostat())
1479 >          myNPTxyz->setTauBarostat(globals->getTauBarostat());
1480 >        else{
1481 >          sprintf(painCave.errMsg,
1482 >                  "SimSetup error: If you use an NPT\n"
1483 >                  "    ensemble, you must set tauBarostat.\n");
1484 >          painCave.isFatal = 1;
1485 >          simError();
1486 >        }
1487 >
1488 >        info->the_integrator = myNPTxyz;
1489 >        break;
1490 >
1491 >      default:
1492 >        sprintf(painCave.errMsg,
1493 >                "SimSetup Error. Unrecognized ensemble in case statement.\n");
1494 >        painCave.isFatal = 1;
1495 >        simError();
1496      }
1497 +  }
1498 + }
1499  
1500 <    current_atom_ndx++;
1500 > void SimSetup::initFortran(void){
1501 >  info[0].refreshSim();
1502 >
1503 >  if (!strcmp(info[0].mixingRule, "standard")){
1504 >    the_ff->initForceField(LB_MIXING_RULE);
1505    }
1506 +  else if (!strcmp(info[0].mixingRule, "explicit")){
1507 +    the_ff->initForceField(EXPLICIT_MIXING_RULE);
1508 +  }
1509 +  else{
1510 +    sprintf(painCave.errMsg, "SimSetup Error: unknown mixing rule -> \"%s\"\n",
1511 +            info[0].mixingRule);
1512 +    painCave.isFatal = 1;
1513 +    simError();
1514 +  }
1515  
1433  current_mol++;
1434  current_comp_mol++;
1516  
1517 <  if( current_comp_mol >= components_nmol[current_comp] ){
1517 > #ifdef IS_MPI
1518 >  strcpy(checkPointMsg, "Successfully intialized the mixingRule for Fortran.");
1519 >  MPIcheckPoint();
1520 > #endif // is_mpi
1521 > }
1522  
1523 <    current_comp_mol = 0;
1524 <    current_comp++;
1523 > void SimSetup::setupZConstraint(SimInfo& theInfo){
1524 >  int nZConstraints;
1525 >  ZconStamp** zconStamp;
1526 >
1527 >  if (globals->haveZconstraintTime()){
1528 >    //add sample time of z-constraint  into SimInfo's property list                    
1529 >    DoubleData* zconsTimeProp = new DoubleData();
1530 >    zconsTimeProp->setID(ZCONSTIME_ID);
1531 >    zconsTimeProp->setData(globals->getZconsTime());
1532 >    theInfo.addProperty(zconsTimeProp);
1533    }
1534 +  else{
1535 +    sprintf(painCave.errMsg,
1536 +            "ZConstraint error: If you use an ZConstraint\n"
1537 +            " , you must set sample time.\n");
1538 +    painCave.isFatal = 1;
1539 +    simError();
1540 +  }
1541 +
1542 +  //push zconsTol into siminfo, if user does not specify
1543 +  //value for zconsTol, a default value will be used
1544 +  DoubleData* zconsTol = new DoubleData();
1545 +  zconsTol->setID(ZCONSTOL_ID);
1546 +  if (globals->haveZconsTol()){
1547 +    zconsTol->setData(globals->getZconsTol());
1548 +  }
1549 +  else{
1550 +    double defaultZConsTol = 0.01;
1551 +    sprintf(painCave.errMsg,
1552 +            "ZConstraint Waring: Tolerance for z-constraint methodl is not specified\n"
1553 +            " , default value %f is used.\n",
1554 +            defaultZConsTol);
1555 +    painCave.isFatal = 0;
1556 +    simError();      
1557 +
1558 +    zconsTol->setData(defaultZConsTol);
1559 +  }
1560 +  theInfo.addProperty(zconsTol);
1561 +
1562 +  //set Force Subtraction Policy
1563 +  StringData* zconsForcePolicy = new StringData();
1564 +  zconsForcePolicy->setID(ZCONSFORCEPOLICY_ID);
1565 +
1566 +  if (globals->haveZconsForcePolicy()){
1567 +    zconsForcePolicy->setData(globals->getZconsForcePolicy());
1568 +  }
1569 +  else{
1570 +    sprintf(painCave.errMsg,
1571 +            "ZConstraint Warning: User does not set force Subtraction policy, "
1572 +            "PolicyByMass is used\n");
1573 +    painCave.isFatal = 0;
1574 +    simError();
1575 +    zconsForcePolicy->setData("BYMASS");
1576 +  }
1577 +
1578 +  theInfo.addProperty(zconsForcePolicy);
1579 +
1580 +  //Determine the name of ouput file and add it into SimInfo's property list
1581 +  //Be careful, do not use inFileName, since it is a pointer which
1582 +  //point to a string at master node, and slave nodes do not contain that string
1583 +
1584 +  string zconsOutput(theInfo.finalName);
1585 +
1586 +  zconsOutput = zconsOutput.substr(0, zconsOutput.rfind(".")) + ".fz";
1587 +
1588 +  StringData* zconsFilename = new StringData();
1589 +  zconsFilename->setID(ZCONSFILENAME_ID);
1590 +  zconsFilename->setData(zconsOutput);
1591 +
1592 +  theInfo.addProperty(zconsFilename);
1593 +
1594 +  //setup index, pos and other parameters of z-constraint molecules
1595 +  nZConstraints = globals->getNzConstraints();
1596 +  theInfo.nZconstraints = nZConstraints;
1597 +
1598 +  zconStamp = globals->getZconStamp();
1599 +  ZConsParaItem tempParaItem;
1600 +
1601 +  ZConsParaData* zconsParaData = new ZConsParaData();
1602 +  zconsParaData->setID(ZCONSPARADATA_ID);
1603 +
1604 +  for (int i = 0; i < nZConstraints; i++){
1605 +    tempParaItem.havingZPos = zconStamp[i]->haveZpos();
1606 +    tempParaItem.zPos = zconStamp[i]->getZpos();
1607 +    tempParaItem.zconsIndex = zconStamp[i]->getMolIndex();
1608 +    tempParaItem.kRatio = zconStamp[i]->getKratio();
1609 +
1610 +    zconsParaData->addItem(tempParaItem);
1611 +  }
1612 +
1613 +  //check the uniqueness of index  
1614 +  if(!zconsParaData->isIndexUnique()){
1615 +    sprintf(painCave.errMsg,
1616 +            "ZConstraint Error: molIndex is not unique\n");
1617 +    painCave.isFatal = 1;
1618 +    simError();
1619 +  }
1620 +
1621 +  //sort the parameters by index of molecules
1622 +  zconsParaData->sortByIndex();
1623 +  
1624 +  //push data into siminfo, therefore, we can retrieve later
1625 +  theInfo.addProperty(zconsParaData);
1626   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines