ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/group/trunk/OOPSE/libmdtools/SimSetup.cpp
(Generate patch)

Comparing trunk/OOPSE/libmdtools/SimSetup.cpp (file contents):
Revision 605 by gezelter, Tue Jul 15 03:27:24 2003 UTC vs.
Revision 859 by mmeineke, Mon Nov 10 21:50:36 2003 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines