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 469 by mmeineke, Mon Apr 7 20:06:31 2003 UTC vs.
Revision 823 by mmeineke, Mon Oct 27 22:07:48 2003 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines