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 653 by chuckv, Fri Jul 25 20:00:17 2003 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines