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 407 by mmeineke, Wed Mar 26 20:22:02 2003 UTC vs.
Revision 811 by mmeineke, Tue Oct 21 19:33:19 2003 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines