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 605 by gezelter, Tue Jul 15 03:27:24 2003 UTC vs.
Revision 841 by mmeineke, Wed Oct 29 17:55:28 2003 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines