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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines