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

Comparing:
branches/mmeineke/OOPSE/libmdtools/SimSetup.cpp (file contents), Revision 377 by mmeineke, Fri Mar 21 17:42:12 2003 UTC vs.
trunk/OOPSE/libmdtools/SimSetup.cpp (file contents), Revision 604 by gezelter, Tue Jul 15 03:08:00 2003 UTC

# Line 12 | Line 12 | SimSetup::SimSetup(){
12   #include "mpiSimulation.hpp"
13   #endif
14  
15 + // some defines for ensemble and Forcefield  cases
16 +
17 + #define NVE_ENS   0
18 + #define NVT_ENS   1
19 + #define NPTi_ENS  2
20 + #define NPTf_ENS  3
21 + #define NPTim_ENS 4
22 + #define NPTfm_ENS 5
23 +
24 +
25 + #define FF_DUFF 0
26 + #define FF_LJ   1
27 +
28 +
29   SimSetup::SimSetup(){
30    stamps = new MakeStamps();
31    globals = new Globals();
# Line 66 | Line 80 | void SimSetup::createSim( void ){
80  
81    MakeStamps *the_stamps;
82    Globals* the_globals;
83 <  int i, j;
83 >  int i, j, k, globalAtomIndex;
84 >  
85 >  int ensembleCase;
86 >  int ffCase;
87 >  
88 >  ensembleCase = -1;
89 >  ffCase = -1;
90  
91    // get the stamps and globals;
92    the_stamps = stamps;
# Line 80 | Line 100 | void SimSetup::createSim( void ){
100    // get the ones we know are there, yet still may need some work.
101    n_components = the_globals->getNComponents();
102    strcpy( force_field, the_globals->getForceField() );
103 +
104 +  if( !strcasecmp( force_field, "DUFF" )) ffCase = FF_DUFF;
105 +  else if( !strcasecmp( force_field, "LJ" )) ffCase = FF_LJ;
106 +  else{
107 +    sprintf( painCave.errMsg,
108 +             "SimSetup Error. Unrecognized force field -> %s\n",
109 +             force_field );
110 +    painCave.isFatal = 1;
111 +    simError();
112 +  }
113 +
114 +  // get the ensemble:
115    strcpy( ensemble, the_globals->getEnsemble() );
116 +
117 +  if( !strcasecmp( ensemble, "NVE" ))      ensembleCase = NVE_ENS;
118 +  else if( !strcasecmp( ensemble, "NVT" )) ensembleCase = NVT_ENS;
119 +  else if( !strcasecmp( ensemble, "NPTi" ) || !strcasecmp( ensemble, "NPT") )
120 +    ensembleCase = NPTi_ENS;
121 +  else if( !strcasecmp( ensemble, "NPTf" )) ensembleCase = NPTf_ENS;
122 +  else if( !strcasecmp( ensemble, "NPTim" )) ensembleCase = NPTim_ENS;
123 +  else if( !strcasecmp( ensemble, "NPTfm" )) ensembleCase = NPTfm_ENS;
124 +  else{
125 +    sprintf( painCave.errMsg,
126 +             "SimSetup Warning. Unrecognized Ensemble -> %s, "
127 +             "reverting to NVE for this simulation.\n",
128 +             ensemble );
129 +    painCave.isFatal = 0;
130 +    simError();
131 +    strcpy( ensemble, "NVE" );
132 +    ensembleCase = NVE_ENS;
133 +  }  
134    strcpy( simnfo->ensemble, ensemble );
135 +
136 +
137 + //   if( !strcasecmp( ensemble, "NPT" ) ) {
138 + //     the_extendedsystem = new ExtendedSystem( simnfo );
139 + //     the_extendedsystem->setTargetTemp(the_globals->getTargetTemp());
140 + //     if (the_globals->haveTargetPressure())
141 + //       the_extendedsystem->setTargetPressure(the_globals->getTargetPressure());
142 + //     else {
143 + //       sprintf( painCave.errMsg,
144 + //                "SimSetup error: If you use the constant pressure\n"
145 + //                "    ensemble, you must set targetPressure.\n"
146 + //                "    This was found in the BASS file.\n");
147 + //       painCave.isFatal = 1;
148 + //       simError();
149 + //     }
150 +
151 + //     if (the_globals->haveTauThermostat())
152 + //       the_extendedsystem->setTauThermostat(the_globals->getTauThermostat());
153 + //     else if (the_globals->haveQmass())
154 + //       the_extendedsystem->setQmass(the_globals->getQmass());
155 + //     else {
156 + //       sprintf( painCave.errMsg,
157 + //                "SimSetup error: If you use one of the constant temperature\n"
158 + //                "    ensembles, you must set either tauThermostat or qMass.\n"
159 + //                "    Neither of these was found in the BASS file.\n");
160 + //       painCave.isFatal = 1;
161 + //       simError();
162 + //     }
163  
164 + //     if (the_globals->haveTauBarostat())
165 + //       the_extendedsystem->setTauBarostat(the_globals->getTauBarostat());
166 + //     else {
167 + //       sprintf( painCave.errMsg,
168 + //                "SimSetup error: If you use the constant pressure\n"
169 + //                "    ensemble, you must set tauBarostat.\n"
170 + //                "    This was found in the BASS file.\n");
171 + //       painCave.isFatal = 1;
172 + //       simError();
173 + //     }
174 +
175 + //   } else if ( !strcasecmp( ensemble, "NVT") ) {
176 + //     the_extendedsystem = new ExtendedSystem( simnfo );
177 + //     the_extendedsystem->setTargetTemp(the_globals->getTargetTemp());
178 +
179 + //     if (the_globals->haveTauThermostat())
180 + //       the_extendedsystem->setTauThermostat(the_globals->getTauThermostat());
181 + //     else if (the_globals->haveQmass())
182 + //       the_extendedsystem->setQmass(the_globals->getQmass());
183 + //     else {
184 + //       sprintf( painCave.errMsg,
185 + //                "SimSetup error: If you use one of the constant temperature\n"
186 + //                "    ensembles, you must set either tauThermostat or qMass.\n"
187 + //                "    Neither of these was found in the BASS file.\n");
188 + //       painCave.isFatal = 1;
189 + //       simError();
190 + //     }
191 +
192    strcpy( simnfo->mixingRule, the_globals->getMixingRule() );
193    simnfo->usePBC = the_globals->getPBC();
194            
195 +  int usesDipoles = 0;
196 +  switch( ffCase ){
197  
198 +  case FF_DUFF:
199 +    the_ff = new DUFF();
200 +    usesDipoles = 1;
201 +    break;
202  
203 <  if( !strcmp( force_field, "TraPPE" ) ) the_ff = new TraPPEFF();
204 <  else if( !strcmp( force_field, "DipoleTest" ) ) the_ff = new DipoleTestFF();
205 <  else if( !strcmp( force_field, "TraPPE_Ex" ) ) the_ff = new TraPPE_ExFF();
206 <  else if( !strcmp( force_field, "LJ" ) ) the_ff = new LJ_FF();
207 <  else{
203 >  case FF_LJ:
204 >    the_ff = new LJFF();
205 >    break;
206 >
207 >  default:
208      sprintf( painCave.errMsg,
209 <             "SimSetup Error. Unrecognized force field -> %s\n",
98 <             force_field );
209 >             "SimSetup Error. Unrecognized force field in case statement.\n");
210      painCave.isFatal = 1;
211      simError();
212    }
# Line 105 | Line 216 | void SimSetup::createSim( void ){
216    MPIcheckPoint();
217   #endif // is_mpi
218  
108 –  
109 –
219    // get the components and calculate the tot_nMol and indvidual n_mol
220    the_components = the_globals->getComponents();
221    components_nmol = new int[n_components];
# Line 230 | Line 339 | void SimSetup::createSim( void ){
339    simnfo->n_torsions = tot_torsions;
340    simnfo->n_SRI = tot_SRI;
341    simnfo->n_mol = tot_nmol;
233 –
342    
343 +  simnfo->molMembershipArray = new int[tot_atoms];
344 +
345   #ifdef IS_MPI
346  
347    // divide the molecules among processors here.
348    
349    mpiSim = new mpiSimulation( simnfo );
350    
241 –  
242 –
351    globalIndex = mpiSim->divideLabor();
352  
245 –
246 –
353    // set up the local variables
354    
355    int localMol, allMol;
356    int local_atoms, local_bonds, local_bends, local_torsions, local_SRI;
357 +
358 +  int* mol2proc = mpiSim->getMolToProcMap();
359 +  int* molCompType = mpiSim->getMolComponentType();
360    
361    allMol = 0;
362    localMol = 0;
# Line 255 | Line 364 | void SimSetup::createSim( void ){
364    local_bonds = 0;
365    local_bends = 0;
366    local_torsions = 0;
367 +  globalAtomIndex = 0;
368 +
369 +
370    for( i=0; i<n_components; i++ ){
371  
372      for( j=0; j<components_nmol[i]; j++ ){
373        
374 <      if( mpiSim->getMyMolStart() <= allMol &&
263 <          allMol <= mpiSim->getMyMolEnd() ){
374 >      if( mol2proc[allMol] == worldRank ){
375          
376          local_atoms +=    comp_stamps[i]->getNAtoms();
377          local_bonds +=    comp_stamps[i]->getNBonds();
# Line 268 | Line 379 | void SimSetup::createSim( void ){
379          local_torsions += comp_stamps[i]->getNTorsions();
380          localMol++;
381        }      
382 <      allMol++;
382 >      for (k = 0; k < comp_stamps[i]->getNAtoms(); k++) {
383 >        simnfo->molMembershipArray[globalAtomIndex] = allMol;
384 >        globalAtomIndex++;
385 >      }
386 >
387 >      allMol++;      
388      }
389    }
390    local_SRI = local_bonds + local_bends + local_torsions;
391    
276 –
392    simnfo->n_atoms = mpiSim->getMyNlocal();  
393    
394    if( local_atoms != simnfo->n_atoms ){
395      sprintf( painCave.errMsg,
396               "SimSetup error: mpiSim's localAtom (%d) and SimSetup's"
397 <             " localAtom (%d) are note equal.\n",
397 >             " localAtom (%d) are not equal.\n",
398               simnfo->n_atoms,
399               local_atoms );
400      painCave.isFatal = 1;
# Line 304 | Line 419 | void SimSetup::createSim( void ){
419    Atom::createArrays(simnfo->n_atoms);
420    the_atoms = new Atom*[simnfo->n_atoms];
421    the_molecules = new Molecule[simnfo->n_mol];
422 +  int molIndex;
423  
424 +  // initialize the molecule's stampID's
425  
426 + #ifdef IS_MPI
427 +  
428 +
429 +  molIndex = 0;
430 +  for(i=0; i<mpiSim->getTotNmol(); i++){
431 +    
432 +    if(mol2proc[i] == worldRank ){
433 +      the_molecules[molIndex].setStampID( molCompType[i] );
434 +      the_molecules[molIndex].setMyIndex( molIndex );
435 +      the_molecules[molIndex].setGlobalIndex( i );
436 +      molIndex++;
437 +    }
438 +  }
439 +
440 + #else // is_mpi
441 +  
442 +  molIndex = 0;
443 +  globalAtomIndex = 0;
444 +  for(i=0; i<n_components; i++){
445 +    for(j=0; j<components_nmol[i]; j++ ){
446 +      the_molecules[molIndex].setStampID( i );
447 +      the_molecules[molIndex].setMyIndex( molIndex );
448 +      the_molecules[molIndex].setGlobalIndex( molIndex );
449 +      for (k = 0; k < comp_stamps[i]->getNAtoms(); k++) {
450 +        simnfo->molMembershipArray[globalAtomIndex] = molIndex;
451 +        globalAtomIndex++;
452 +      }
453 +      molIndex++;
454 +    }
455 +  }
456 +    
457 +
458 + #endif // is_mpi
459 +
460 +
461    if( simnfo->n_SRI ){
462 <    the_sris = new SRI*[simnfo->n_SRI];
463 <    the_excludes = new int[2 * simnfo->n_SRI];
462 >    
463 >    Exclude::createArray(simnfo->n_SRI);
464 >    the_excludes = new Exclude*[simnfo->n_SRI];
465 >    for( int ex=0; ex<simnfo->n_SRI; ex++) the_excludes[ex] = new Exclude(ex);
466      simnfo->globalExcludes = new int;
467 <    simnfo->n_exclude = tot_SRI;
467 >    simnfo->n_exclude = simnfo->n_SRI;
468    }
469    else{
470      
471 <    the_excludes = new int[2];
472 <    the_excludes[0] = 0;
473 <    the_excludes[1] = 0;
471 >    Exclude::createArray( 1 );
472 >    the_excludes = new Exclude*;
473 >    the_excludes[0] = new Exclude(0);
474 >    the_excludes[0]->setPair( 0,0 );
475      simnfo->globalExcludes = new int;
476      simnfo->globalExcludes[0] = 0;
477 <
323 <    simnfo->n_exclude = 1;
477 >    simnfo->n_exclude = 0;
478    }
479  
480    // set the arrays into the SimInfo object
481  
482    simnfo->atoms = the_atoms;
483 <  simnfo->sr_interactions = the_sris;
483 >  simnfo->molecules = the_molecules;
484    simnfo->nGlobalExcludes = 0;
485    simnfo->excludes = the_excludes;
486  
487  
488    // get some of the tricky things that may still be in the globals
489  
490 <  if( simnfo->n_dipoles ){
337 <
338 <    if( !the_globals->haveRRF() ){
339 <      sprintf( painCave.errMsg,
340 <               "SimSetup Error, system has dipoles, but no rRF was set.\n");
341 <      painCave.isFatal = 1;
342 <      simError();
343 <    }
344 <    if( !the_globals->haveDielectric() ){
345 <      sprintf( painCave.errMsg,
346 <               "SimSetup Error, system has dipoles, but no"
347 <               " dielectric was set.\n" );
348 <      painCave.isFatal = 1;
349 <      simError();
350 <    }
351 <
352 <    simnfo->rRF        = the_globals->getRRF();
353 <    simnfo->dielectric = the_globals->getDielectric();
354 <  }
355 <
356 < #ifdef IS_MPI
357 <  strcpy( checkPointMsg, "rRf and dielectric check out" );
358 <  MPIcheckPoint();
359 < #endif // is_mpi
360 <  
490 >  double boxVector[3];
491    if( the_globals->haveBox() ){
492 <    simnfo->box_x = the_globals->getBox();
493 <    simnfo->box_y = the_globals->getBox();
494 <    simnfo->box_z = the_globals->getBox();
492 >    boxVector[0] = the_globals->getBox();
493 >    boxVector[1] = the_globals->getBox();
494 >    boxVector[2] = the_globals->getBox();
495 >    
496 >    simnfo->setBox( boxVector );
497    }
498    else if( the_globals->haveDensity() ){
499  
500      double vol;
501      vol = (double)tot_nmol / the_globals->getDensity();
502 <    simnfo->box_x = pow( vol, ( 1.0 / 3.0 ) );
503 <    simnfo->box_y = simnfo->box_x;
504 <    simnfo->box_z = simnfo->box_x;
502 >     boxVector[0] = pow( vol, ( 1.0 / 3.0 ) );
503 >     boxVector[1] = boxVector[0];
504 >     boxVector[2] = boxVector[0];
505 >
506 >    simnfo->setBox( boxVector );
507    }
508    else{
509      if( !the_globals->haveBoxX() ){
# Line 378 | Line 512 | void SimSetup::createSim( void ){
512        painCave.isFatal = 1;
513        simError();
514      }
515 <    simnfo->box_x = the_globals->getBoxX();
515 >    boxVector[0] = the_globals->getBoxX();
516  
517      if( !the_globals->haveBoxY() ){
518        sprintf( painCave.errMsg,
# Line 386 | Line 520 | void SimSetup::createSim( void ){
520        painCave.isFatal = 1;
521        simError();
522      }
523 <    simnfo->box_y = the_globals->getBoxY();
523 >    boxVector[1] = the_globals->getBoxY();
524  
525      if( !the_globals->haveBoxZ() ){
526        sprintf( painCave.errMsg,
# Line 394 | Line 528 | void SimSetup::createSim( void ){
528        painCave.isFatal = 1;
529        simError();
530      }
531 <    simnfo->box_z = the_globals->getBoxZ();
531 >    boxVector[2] = the_globals->getBoxZ();
532 >
533 >    simnfo->setBox( boxVector );
534    }
535  
536   #ifdef IS_MPI
# Line 407 | Line 543 | void SimSetup::createSim( void ){
543  
544    the_ff->setSimInfo( simnfo );
545  
546 <  makeAtoms();
546 >  makeMolecules();
547    simnfo->identArray = new int[simnfo->n_atoms];
548    for(i=0; i<simnfo->n_atoms; i++){
549      simnfo->identArray[i] = the_atoms[i]->getIdent();
550    }
551    
552 <  if( tot_bonds ){
553 <    makeBonds();
554 <  }
555 <
556 <  if( tot_bends ){
557 <    makeBends();
558 <  }
559 <
560 <  if( tot_torsions ){
561 <    makeTorsions();
562 <  }
563 <
564 <
565 <
552 >  if (the_globals->getUseRF() ) {
553 >    simnfo->useReactionField = 1;
554 >  
555 >    if( !the_globals->haveECR() ){
556 >      sprintf( painCave.errMsg,
557 >               "SimSetup Warning: using default value of 1/2 the smallest "
558 >               "box length for the electrostaticCutoffRadius.\n"
559 >               "I hope you have a very fast processor!\n");
560 >      painCave.isFatal = 0;
561 >      simError();
562 >      double smallest;
563 >      smallest = simnfo->boxLx;
564 >      if (simnfo->boxLy <= smallest) smallest = simnfo->boxLy;
565 >      if (simnfo->boxLz <= smallest) smallest = simnfo->boxLz;
566 >      simnfo->ecr = 0.5 * smallest;
567 >    } else {
568 >      simnfo->ecr        = the_globals->getECR();
569 >    }
570  
571 +    if( !the_globals->haveEST() ){
572 +      sprintf( painCave.errMsg,
573 +               "SimSetup Warning: using default value of 0.05 * the "
574 +               "electrostaticCutoffRadius for the electrostaticSkinThickness\n"
575 +               );
576 +      painCave.isFatal = 0;
577 +      simError();
578 +      simnfo->est = 0.05 * simnfo->ecr;
579 +    } else {
580 +      simnfo->est        = the_globals->getEST();
581 +    }
582 +    
583 +    if(!the_globals->haveDielectric() ){
584 +      sprintf( painCave.errMsg,
585 +               "SimSetup Error: You are trying to use Reaction Field without"
586 +               "setting a dielectric constant!\n"
587 +               );
588 +      painCave.isFatal = 1;
589 +      simError();
590 +    }
591 +    simnfo->dielectric = the_globals->getDielectric();  
592 +  } else {
593 +    if (usesDipoles) {
594 +      
595 +      if( !the_globals->haveECR() ){
596 +        sprintf( painCave.errMsg,
597 +                 "SimSetup Warning: using default value of 1/2 the smallest "
598 +                 "box length for the electrostaticCutoffRadius.\n"
599 +                 "I hope you have a very fast processor!\n");
600 +        painCave.isFatal = 0;
601 +        simError();
602 +        double smallest;
603 +        smallest = simnfo->boxLx;
604 +        if (simnfo->boxLy <= smallest) smallest = simnfo->boxLy;
605 +        if (simnfo->boxLz <= smallest) smallest = simnfo->boxLz;
606 +        simnfo->ecr = 0.5 * smallest;
607 +      } else {
608 +        simnfo->ecr        = the_globals->getECR();
609 +      }
610 +      
611 +      if( !the_globals->haveEST() ){
612 +        sprintf( painCave.errMsg,
613 +                 "SimSetup Warning: using default value of 5%% of the "
614 +                 "electrostaticCutoffRadius for the "
615 +                 "electrostaticSkinThickness\n"
616 +                 );
617 +        painCave.isFatal = 0;
618 +        simError();
619 +        simnfo->est = 0.05 * simnfo->ecr;
620 +      } else {
621 +        simnfo->est        = the_globals->getEST();
622 +      }
623 +    }
624 +  }  
625  
626 + #ifdef IS_MPI
627 +  strcpy( checkPointMsg, "electrostatic parameters check out" );
628 +  MPIcheckPoint();
629 + #endif // is_mpi
630  
631   if( the_globals->haveInitialConfig() ){
632  
# Line 583 | Line 781 | void SimSetup::createSim( void ){
781    if( the_globals->haveTempSet() ) simnfo->setTemp = the_globals->getTempSet();
782  
783  
784 < //   // make the longe range forces and the integrator
784 >  // make the integrator
785 >  
786 >  
787 >  NVT*  myNVT = NULL;
788 >  NPTi* myNPTi = NULL;
789 >  NPTf* myNPTf = NULL;
790 >  NPTim* myNPTim = NULL;
791  
792 < //   new AllLong( simnfo );
792 >  switch( ensembleCase ){
793  
794 <  if( !strcmp( force_field, "TraPPE" ) ) new Verlet( *simnfo, the_ff );
795 <  if( !strcmp( force_field, "DipoleTest" ) ) new Symplectic( simnfo, the_ff );
796 <  if( !strcmp( force_field, "TraPPE_Ex" ) ) new Symplectic( simnfo, the_ff );
797 <  if( !strcmp( force_field, "LJ" ) ) new Verlet( *simnfo, the_ff );
794 >  case NVE_ENS:
795 >    new NVE( simnfo, the_ff );
796 >    break;
797 >
798 >  case NVT_ENS:
799 >    myNVT = new NVT( simnfo, the_ff );
800 >    myNVT->setTargetTemp(the_globals->getTargetTemp());
801 >
802 >    if (the_globals->haveTauThermostat())
803 >      myNVT->setTauThermostat(the_globals->getTauThermostat());
804 >
805 >    else {
806 >      sprintf( painCave.errMsg,
807 >               "SimSetup error: If you use the NVT\n"
808 >               "    ensemble, you must set tauThermostat.\n");
809 >      painCave.isFatal = 1;
810 >      simError();
811 >    }
812 >    break;
813 >
814 >  case NPTi_ENS:
815 >    myNPTi = new NPTi( simnfo, the_ff );
816 >    myNPTi->setTargetTemp( the_globals->getTargetTemp());
817 >
818 >    if (the_globals->haveTargetPressure())
819 >      myNPTi->setTargetPressure(the_globals->getTargetPressure());
820 >    else {
821 >      sprintf( painCave.errMsg,
822 >               "SimSetup error: If you use a constant pressure\n"
823 >               "    ensemble, you must set targetPressure in the BASS file.\n");
824 >      painCave.isFatal = 1;
825 >      simError();
826 >    }
827 >    
828 >    if( the_globals->haveTauThermostat() )
829 >      myNPTi->setTauThermostat( the_globals->getTauThermostat() );
830 >    else{
831 >      sprintf( painCave.errMsg,
832 >               "SimSetup error: If you use an NPT\n"
833 >               "    ensemble, you must set tauThermostat.\n");
834 >      painCave.isFatal = 1;
835 >      simError();
836 >    }
837 >
838 >    if( the_globals->haveTauBarostat() )
839 >      myNPTi->setTauBarostat( the_globals->getTauBarostat() );
840 >    else{
841 >      sprintf( painCave.errMsg,
842 >               "SimSetup error: If you use an NPT\n"
843 >               "    ensemble, you must set tauBarostat.\n");
844 >      painCave.isFatal = 1;
845 >      simError();
846 >    }
847 >    break;
848  
849 +  case NPTf_ENS:
850 +    myNPTf = new NPTf( simnfo, the_ff );
851 +    myNPTf->setTargetTemp( the_globals->getTargetTemp());
852  
853 +    if (the_globals->haveTargetPressure())
854 +      myNPTf->setTargetPressure(the_globals->getTargetPressure());
855 +    else {
856 +      sprintf( painCave.errMsg,
857 +               "SimSetup error: If you use a constant pressure\n"
858 +               "    ensemble, you must set targetPressure in the BASS file.\n");
859 +      painCave.isFatal = 1;
860 +      simError();
861 +    }    
862  
863 +    if( the_globals->haveTauThermostat() )
864 +      myNPTf->setTauThermostat( the_globals->getTauThermostat() );
865 +    else{
866 +      sprintf( painCave.errMsg,
867 +               "SimSetup error: If you use an NPT\n"
868 +               "    ensemble, you must set tauThermostat.\n");
869 +      painCave.isFatal = 1;
870 +      simError();
871 +    }
872 +
873 +    if( the_globals->haveTauBarostat() )
874 +      myNPTf->setTauBarostat( the_globals->getTauBarostat() );
875 +    else{
876 +      sprintf( painCave.errMsg,
877 +               "SimSetup error: If you use an NPT\n"
878 +               "    ensemble, you must set tauBarostat.\n");
879 +      painCave.isFatal = 1;
880 +      simError();
881 +    }
882 +    break;
883 +    
884 +  case NPTim_ENS:
885 +    myNPTim = new NPTim( simnfo, the_ff );
886 +    myNPTim->setTargetTemp( the_globals->getTargetTemp());
887 +
888 +    if (the_globals->haveTargetPressure())
889 +      myNPTim->setTargetPressure(the_globals->getTargetPressure());
890 +    else {
891 +      sprintf( painCave.errMsg,
892 +               "SimSetup error: If you use a constant pressure\n"
893 +               "    ensemble, you must set targetPressure in the BASS file.\n");
894 +      painCave.isFatal = 1;
895 +      simError();
896 +    }
897 +    
898 +    if( the_globals->haveTauThermostat() )
899 +      myNPTim->setTauThermostat( the_globals->getTauThermostat() );
900 +    else{
901 +      sprintf( painCave.errMsg,
902 +               "SimSetup error: If you use an NPT\n"
903 +               "    ensemble, you must set tauThermostat.\n");
904 +      painCave.isFatal = 1;
905 +      simError();
906 +    }
907 +
908 +    if( the_globals->haveTauBarostat() )
909 +      myNPTim->setTauBarostat( the_globals->getTauBarostat() );
910 +    else{
911 +      sprintf( painCave.errMsg,
912 +               "SimSetup error: If you use an NPT\n"
913 +               "    ensemble, you must set tauBarostat.\n");
914 +      painCave.isFatal = 1;
915 +      simError();
916 +    }
917 +    break;
918 +
919 +    
920 +
921 +  default:
922 +    sprintf( painCave.errMsg,
923 +             "SimSetup Error. Unrecognized ensemble in case statement.\n");
924 +    painCave.isFatal = 1;
925 +    simError();
926 +  }
927 +
928 +
929 + #ifdef IS_MPI
930 +  mpiSim->mpiRefresh();
931 + #endif
932 +
933    // initialize the Fortran
934 <  
934 >
935 >
936    simnfo->refreshSim();
937    
938    if( !strcmp( simnfo->mixingRule, "standard") ){
# Line 620 | Line 957 | void SimSetup::makeAtoms( void ){
957   #endif // is_mpi
958   }
959  
623 – void SimSetup::makeAtoms( void ){
960  
961 <  int i, j, k, index;
626 <  double ux, uy, uz, uSqr, u;
627 <  AtomStamp* current_atom;
961 > void SimSetup::makeMolecules( void ){
962  
963 +  int i, j, exI, exJ, tempEx, stampID, atomOffset, excludeOffset;
964 +  molInit info;
965    DirectionalAtom* dAtom;
966 <  int molIndex, molStart, molEnd, nMemb, lMolIndex;
966 >  LinkedAssign* extras;
967 >  LinkedAssign* current_extra;
968 >  AtomStamp* currentAtom;
969 >  BondStamp* currentBond;
970 >  BendStamp* currentBend;
971 >  TorsionStamp* currentTorsion;
972  
973 <  lMolIndex = 0;
974 <  molIndex = 0;
975 <  index = 0;
635 <  for( i=0; i<n_components; i++ ){
973 >  bond_pair* theBonds;
974 >  bend_set* theBends;
975 >  torsion_set* theTorsions;
976  
977 <    for( j=0; j<components_nmol[i]; j++ ){
977 >  
978 >  //init the forceField paramters
979  
980 < #ifdef IS_MPI
640 <      if( mpiSim->getMyMolStart() <= molIndex &&
641 <          molIndex <= mpiSim->getMyMolEnd() ){
642 < #endif // is_mpi        
980 >  the_ff->readParams();
981  
982 <        molStart = index;
983 <        nMemb = comp_stamps[i]->getNAtoms();
646 <        for( k=0; k<comp_stamps[i]->getNAtoms(); k++ ){
647 <          
648 <          current_atom = comp_stamps[i]->getAtom( k );
649 <          if( current_atom->haveOrientation() ){
650 <            
651 <            dAtom = new DirectionalAtom(index);
652 <            simnfo->n_oriented++;
653 <            the_atoms[index] = dAtom;
654 <            
655 <            ux = current_atom->getOrntX();
656 <            uy = current_atom->getOrntY();
657 <            uz = current_atom->getOrntZ();
658 <            
659 <            uSqr = (ux * ux) + (uy * uy) + (uz * uz);
660 <            
661 <            u = sqrt( uSqr );
662 <            ux = ux / u;
663 <            uy = uy / u;
664 <            uz = uz / u;
665 <            
666 <            dAtom->setSUx( ux );
667 <            dAtom->setSUy( uy );
668 <            dAtom->setSUz( uz );
669 <          }
670 <          else{
671 <            the_atoms[index] = new GeneralAtom(index);
672 <          }
673 <          the_atoms[index]->setType( current_atom->getType() );
674 <          the_atoms[index]->setIndex( index );
675 <          
676 <          // increment the index and repeat;
677 <          index++;
678 <        }
679 <        
680 <        molEnd = index -1;
681 <        the_molecules[lMolIndex].setNMembers( nMemb );
682 <        the_molecules[lMolIndex].setStartAtom( molStart );
683 <        the_molecules[lMolIndex].setEndAtom( molEnd );
684 <        the_molecules[lMolIndex].setStampID( i );
685 <        lMolIndex++;
982 >  
983 >  // init the atoms
984  
985 < #ifdef IS_MPI
986 <      }
987 < #endif //is_mpi
988 <      
989 <      molIndex++;
692 <    }
693 <  }
694 <
695 < #ifdef IS_MPI
696 <    for( i=0; i<mpiSim->getMyNlocal(); i++ ) the_atoms[i]->setGlobalIndex( globalIndex[i] );
985 >  double ux, uy, uz, u, uSqr;
986 >  
987 >  atomOffset = 0;
988 >  excludeOffset = 0;
989 >  for(i=0; i<simnfo->n_mol; i++){
990      
991 <    delete[] globalIndex;
991 >    stampID = the_molecules[i].getStampID();
992  
993 <    mpiSim->mpiRefresh();
994 < #endif //IS_MPI
995 <          
996 <  the_ff->initializeAtoms();
997 < }
993 >    info.nAtoms    = comp_stamps[stampID]->getNAtoms();
994 >    info.nBonds    = comp_stamps[stampID]->getNBonds();
995 >    info.nBends    = comp_stamps[stampID]->getNBends();
996 >    info.nTorsions = comp_stamps[stampID]->getNTorsions();
997 >    info.nExcludes = info.nBonds + info.nBends + info.nTorsions;
998  
999 < void SimSetup::makeBonds( void ){
999 >    info.myAtoms = &the_atoms[atomOffset];
1000 >    info.myExcludes = &the_excludes[excludeOffset];
1001 >    info.myBonds = new Bond*[info.nBonds];
1002 >    info.myBends = new Bend*[info.nBends];
1003 >    info.myTorsions = new Torsion*[info.nTorsions];
1004  
1005 <  int i, j, k, index, offset, molIndex, exI, exJ, tempEx;
1006 <  bond_pair* the_bonds;
1007 <  BondStamp* current_bond;
1008 <
1009 <  the_bonds = new bond_pair[tot_bonds];
1010 <  index = 0;
1011 <  offset = 0;
1012 <  molIndex = 0;
1013 <
1014 <  for( i=0; i<n_components; i++ ){
718 <
719 <    for( j=0; j<components_nmol[i]; j++ ){
720 <
721 < #ifdef IS_MPI
722 <      if( mpiSim->getMyMolStart() <= molIndex &&
723 <          molIndex <= mpiSim->getMyMolEnd() ){
724 < #endif // is_mpi        
1005 >    theBonds = new bond_pair[info.nBonds];
1006 >    theBends = new bend_set[info.nBends];
1007 >    theTorsions = new torsion_set[info.nTorsions];
1008 >    
1009 >    // make the Atoms
1010 >    
1011 >    for(j=0; j<info.nAtoms; j++){
1012 >      
1013 >      currentAtom = comp_stamps[stampID]->getAtom( j );
1014 >      if( currentAtom->haveOrientation() ){
1015          
1016 <        for( k=0; k<comp_stamps[i]->getNBonds(); k++ ){
1017 <          
1018 <          current_bond = comp_stamps[i]->getBond( k );
729 <          the_bonds[index].a = current_bond->getA() + offset;
730 <          the_bonds[index].b = current_bond->getB() + offset;
731 <
732 <          exI = the_bonds[index].a;
733 <          exJ = the_bonds[index].b;
734 <
735 <          // exclude_I must always be the smaller of the pair
736 <          if( exI > exJ ){
737 <            tempEx = exI;
738 <            exI = exJ;
739 <            exJ = tempEx;
740 <          }
741 <
742 <          
743 < #ifdef IS_MPI
744 <
745 <          the_excludes[index*2] =    
746 <            the_atoms[exI]->getGlobalIndex() + 1;
747 <          the_excludes[index*2 + 1] =
748 <            the_atoms[exJ]->getGlobalIndex() + 1;
749 <
750 < #else  // isn't MPI
751 <          
752 <          the_excludes[index*2] =     exI + 1;
753 <          the_excludes[index*2 + 1] = exJ + 1;
754 <          // fortran index from 1 (hence the +1 in the indexing)
755 < #endif  //is_mpi
756 <          
757 <          // increment the index and repeat;
758 <          index++;
759 <        }
760 <        offset += comp_stamps[i]->getNAtoms();
1016 >        dAtom = new DirectionalAtom(j + atomOffset);
1017 >        simnfo->n_oriented++;
1018 >        info.myAtoms[j] = dAtom;
1019          
1020 < #ifdef IS_MPI
1020 >        ux = currentAtom->getOrntX();
1021 >        uy = currentAtom->getOrntY();
1022 >        uz = currentAtom->getOrntZ();
1023 >        
1024 >        uSqr = (ux * ux) + (uy * uy) + (uz * uz);
1025 >        
1026 >        u = sqrt( uSqr );
1027 >        ux = ux / u;
1028 >        uy = uy / u;
1029 >        uz = uz / u;
1030 >        
1031 >        dAtom->setSUx( ux );
1032 >        dAtom->setSUy( uy );
1033 >        dAtom->setSUz( uz );
1034        }
1035 < #endif //is_mpi
1035 >      else{
1036 >        info.myAtoms[j] = new GeneralAtom(j + atomOffset);
1037 >      }
1038 >      info.myAtoms[j]->setType( currentAtom->getType() );
1039 >    
1040 > #ifdef IS_MPI
1041        
1042 <      molIndex++;
1043 <    }      
1044 <  }
1042 >      info.myAtoms[j]->setGlobalIndex( globalIndex[j+atomOffset] );
1043 >      
1044 > #endif // is_mpi
1045 >    }
1046 >    
1047 >    // make the bonds
1048 >    for(j=0; j<info.nBonds; j++){
1049 >      
1050 >      currentBond = comp_stamps[stampID]->getBond( j );
1051 >      theBonds[j].a = currentBond->getA() + atomOffset;
1052 >      theBonds[j].b = currentBond->getB() + atomOffset;
1053  
1054 <  the_ff->initializeBonds( the_bonds );
1055 < }
1054 >      exI = theBonds[j].a;
1055 >      exJ = theBonds[j].b;
1056  
1057 < void SimSetup::makeBends( void ){
1058 <
1059 <  int i, j, k, index, offset, molIndex, exI, exJ, tempEx;
1060 <  bend_set* the_bends;
1061 <  BendStamp* current_bend;
1062 <  LinkedAssign* extras;
779 <  LinkedAssign* current_extra;
780 <  
781 <
782 <  the_bends = new bend_set[tot_bends];
783 <  index = 0;
784 <  offset = 0;
785 <  molIndex = 0;
786 <  for( i=0; i<n_components; i++ ){
787 <
788 <    for( j=0; j<components_nmol[i]; j++ ){
789 <
1057 >      // exclude_I must always be the smaller of the pair
1058 >      if( exI > exJ ){
1059 >        tempEx = exI;
1060 >        exI = exJ;
1061 >        exJ = tempEx;
1062 >      }
1063   #ifdef IS_MPI
1064 <      if( mpiSim->getMyMolStart() <= molIndex &&
1065 <          molIndex <= mpiSim->getMyMolEnd() ){
1066 < #endif // is_mpi        
1064 >      tempEx = exI;
1065 >      exI = the_atoms[tempEx]->getGlobalIndex() + 1;
1066 >      tempEx = exJ;
1067 >      exJ = the_atoms[tempEx]->getGlobalIndex() + 1;
1068 >      
1069 >      the_excludes[j+excludeOffset]->setPair( exI, exJ );
1070 > #else  // isn't MPI
1071  
1072 <        for( k=0; k<comp_stamps[i]->getNBends(); k++ ){
1072 >      the_excludes[j+excludeOffset]->setPair( (exI+1), (exJ+1) );
1073 > #endif  //is_mpi
1074 >    }
1075 >    excludeOffset += info.nBonds;
1076 >
1077 >    //make the bends
1078 >    for(j=0; j<info.nBends; j++){
1079 >      
1080 >      currentBend = comp_stamps[stampID]->getBend( j );
1081 >      theBends[j].a = currentBend->getA() + atomOffset;
1082 >      theBends[j].b = currentBend->getB() + atomOffset;
1083 >      theBends[j].c = currentBend->getC() + atomOffset;
1084            
1085 <          current_bend = comp_stamps[i]->getBend( k );
798 <          the_bends[index].a = current_bend->getA() + offset;
799 <          the_bends[index].b = current_bend->getB() + offset;
800 <          the_bends[index].c = current_bend->getC() + offset;
801 <          
802 <          if( current_bend->haveExtras() ){
1085 >      if( currentBend->haveExtras() ){
1086              
1087 <            extras = current_bend->getExtras();
1088 <            current_extra = extras;
1087 >        extras = currentBend->getExtras();
1088 >        current_extra = extras;
1089              
1090 <            while( current_extra != NULL ){
1091 <              if( !strcmp( current_extra->getlhs(), "ghostVectorSource" )){
1090 >        while( current_extra != NULL ){
1091 >          if( !strcmp( current_extra->getlhs(), "ghostVectorSource" )){
1092                  
1093 <                switch( current_extra->getType() ){
1094 <                  
1095 <                case 0:
1096 <                  the_bends[index].ghost =
1097 <                    current_extra->getInt() + offset;
1098 <                  the_bends[index].isGhost = 1;
1099 <                  break;
817 <                  
818 <                case 1:
819 <                  the_bends[index].ghost =
820 <                    (int)current_extra->getDouble() + offset;
821 <                  the_bends[index].isGhost = 1;
822 <                  break;
1093 >            switch( current_extra->getType() ){
1094 >              
1095 >            case 0:
1096 >              theBends[j].ghost =
1097 >                current_extra->getInt() + atomOffset;
1098 >              theBends[j].isGhost = 1;
1099 >              break;
1100                    
1101 <                default:
1102 <                  sprintf( painCave.errMsg,
1103 <                           "SimSetup Error: ghostVectorSource was neiter a "
1104 <                           "double nor an int.\n"
1105 <                           "-->Bend[%d] in %s\n",
829 <                           k, comp_stamps[i]->getID() );
830 <                  painCave.isFatal = 1;
831 <                  simError();
832 <                }
833 <              }
1101 >            case 1:
1102 >              theBends[j].ghost =
1103 >                (int)current_extra->getDouble() + atomOffset;
1104 >              theBends[j].isGhost = 1;
1105 >              break;
1106                
1107 <              else{
1108 <                
1109 <                sprintf( painCave.errMsg,
1110 <                         "SimSetup Error: unhandled bend assignment:\n"
1111 <                         "    -->%s in Bend[%d] in %s\n",
1112 <                         current_extra->getlhs(),
1113 <                         k, comp_stamps[i]->getID() );
1114 <                painCave.isFatal = 1;
843 <                simError();
844 <              }
845 <              
846 <              current_extra = current_extra->getNext();
1107 >            default:
1108 >              sprintf( painCave.errMsg,
1109 >                       "SimSetup Error: ghostVectorSource was neither a "
1110 >                       "double nor an int.\n"
1111 >                       "-->Bend[%d] in %s\n",
1112 >                       j, comp_stamps[stampID]->getID() );
1113 >              painCave.isFatal = 1;
1114 >              simError();
1115              }
1116            }
1117            
850 –          if( !the_bends[index].isGhost ){
851 –            
852 –            exI = the_bends[index].a;
853 –            exJ = the_bends[index].c;
854 –          }
1118            else{
1119              
1120 <            exI = the_bends[index].a;
1121 <            exJ = the_bends[index].b;
1120 >            sprintf( painCave.errMsg,
1121 >                     "SimSetup Error: unhandled bend assignment:\n"
1122 >                     "    -->%s in Bend[%d] in %s\n",
1123 >                     current_extra->getlhs(),
1124 >                     j, comp_stamps[stampID]->getID() );
1125 >            painCave.isFatal = 1;
1126 >            simError();
1127            }
1128            
1129 <          // exclude_I must always be the smaller of the pair
862 <          if( exI > exJ ){
863 <            tempEx = exI;
864 <            exI = exJ;
865 <            exJ = tempEx;
866 <          }
867 <
868 <
869 < #ifdef IS_MPI
870 <
871 <          the_excludes[(index + tot_bonds)*2] =    
872 <            the_atoms[exI]->getGlobalIndex() + 1;
873 <          the_excludes[(index + tot_bonds)*2 + 1] =
874 <            the_atoms[exJ]->getGlobalIndex() + 1;
875 <          
876 < #else  // isn't MPI
877 <          
878 <          the_excludes[(index + tot_bonds)*2] =     exI + 1;
879 <          the_excludes[(index + tot_bonds)*2 + 1] = exJ + 1;
880 <          // fortran index from 1 (hence the +1 in the indexing)
881 < #endif  //is_mpi
882 <          
883 <          
884 <          // increment the index and repeat;
885 <          index++;
1129 >          current_extra = current_extra->getNext();
1130          }
1131 <        offset += comp_stamps[i]->getNAtoms();
1131 >      }
1132 >          
1133 >      if( !theBends[j].isGhost ){
1134 >            
1135 >        exI = theBends[j].a;
1136 >        exJ = theBends[j].c;
1137 >      }
1138 >      else{
1139          
1140 < #ifdef IS_MPI
1140 >        exI = theBends[j].a;
1141 >        exJ = theBends[j].b;
1142        }
1143 < #endif //is_mpi
1143 >      
1144 >      // exclude_I must always be the smaller of the pair
1145 >      if( exI > exJ ){
1146 >        tempEx = exI;
1147 >        exI = exJ;
1148 >        exJ = tempEx;
1149 >      }
1150 > #ifdef IS_MPI
1151 >      tempEx = exI;
1152 >      exI = the_atoms[tempEx]->getGlobalIndex() + 1;
1153 >      tempEx = exJ;
1154 >      exJ = the_atoms[tempEx]->getGlobalIndex() + 1;
1155 >      
1156 >      the_excludes[j+excludeOffset]->setPair( exI, exJ );
1157 > #else  // isn't MPI
1158 >      the_excludes[j+excludeOffset]->setPair( (exI+1), (exJ+1) );
1159 > #endif  //is_mpi
1160 >    }
1161 >    excludeOffset += info.nBends;
1162  
1163 <      molIndex++;
1163 >    for(j=0; j<info.nTorsions; j++){
1164 >      
1165 >      currentTorsion = comp_stamps[stampID]->getTorsion( j );
1166 >      theTorsions[j].a = currentTorsion->getA() + atomOffset;
1167 >      theTorsions[j].b = currentTorsion->getB() + atomOffset;
1168 >      theTorsions[j].c = currentTorsion->getC() + atomOffset;
1169 >      theTorsions[j].d = currentTorsion->getD() + atomOffset;
1170 >      
1171 >      exI = theTorsions[j].a;
1172 >      exJ = theTorsions[j].d;
1173 >
1174 >      // exclude_I must always be the smaller of the pair
1175 >      if( exI > exJ ){
1176 >        tempEx = exI;
1177 >        exI = exJ;
1178 >        exJ = tempEx;
1179 >      }
1180 > #ifdef IS_MPI
1181 >      tempEx = exI;
1182 >      exI = the_atoms[tempEx]->getGlobalIndex() + 1;
1183 >      tempEx = exJ;
1184 >      exJ = the_atoms[tempEx]->getGlobalIndex() + 1;
1185 >      
1186 >      the_excludes[j+excludeOffset]->setPair( exI, exJ );
1187 > #else  // isn't MPI
1188 >      the_excludes[j+excludeOffset]->setPair( (exI+1), (exJ+1) );
1189 > #endif  //is_mpi
1190      }
1191 <  }
1191 >    excludeOffset += info.nTorsions;
1192  
1193 < #ifdef IS_MPI
1194 <  sprintf( checkPointMsg,
899 <           "Successfully created the bends list.\n" );
900 <  MPIcheckPoint();
901 < #endif // is_mpi
902 <  
1193 >    
1194 >    // send the arrays off to the forceField for init.
1195  
1196 <  the_ff->initializeBends( the_bends );
1197 < }
1196 >    the_ff->initializeAtoms( info.nAtoms, info.myAtoms );
1197 >    the_ff->initializeBonds( info.nBonds, info.myBonds, theBonds );
1198 >    the_ff->initializeBends( info.nBends, info.myBends, theBends );
1199 >    the_ff->initializeTorsions( info.nTorsions, info.myTorsions, theTorsions );
1200  
907 – void SimSetup::makeTorsions( void ){
1201  
1202 <  int i, j, k, index, offset, molIndex, exI, exJ, tempEx;
910 <  torsion_set* the_torsions;
911 <  TorsionStamp* current_torsion;
1202 >    the_molecules[i].initialize( info );
1203  
913 –  the_torsions = new torsion_set[tot_torsions];
914 –  index = 0;
915 –  offset = 0;
916 –  molIndex = 0;
917 –  for( i=0; i<n_components; i++ ){
1204  
1205 <    for( j=0; j<components_nmol[i]; j++ ){
1205 >    atomOffset += info.nAtoms;
1206 >    delete[] theBonds;
1207 >    delete[] theBends;
1208 >    delete[] theTorsions;
1209 >  }
1210  
1211   #ifdef IS_MPI
1212 <      if( mpiSim->getMyMolStart() <= molIndex &&
1213 <          molIndex <= mpiSim->getMyMolEnd() ){
1214 < #endif // is_mpi        
1212 >  sprintf( checkPointMsg, "all molecules initialized succesfully" );
1213 >  MPIcheckPoint();
1214 > #endif // is_mpi
1215  
1216 <      for( k=0; k<comp_stamps[i]->getNTorsions(); k++ ){
1216 >  // clean up the forcefield
1217 >  the_ff->calcRcut();
1218 >  the_ff->cleanMe();
1219  
928 –        current_torsion = comp_stamps[i]->getTorsion( k );
929 –        the_torsions[index].a = current_torsion->getA() + offset;
930 –        the_torsions[index].b = current_torsion->getB() + offset;
931 –        the_torsions[index].c = current_torsion->getC() + offset;
932 –        the_torsions[index].d = current_torsion->getD() + offset;
933 –
934 –        exI = the_torsions[index].a;
935 –        exJ = the_torsions[index].d;
936 –
937 –        
938 –        // exclude_I must always be the smaller of the pair
939 –        if( exI > exJ ){
940 –          tempEx = exI;
941 –          exI = exJ;
942 –          exJ = tempEx;
943 –        }
944 –
945 –
946 – #ifdef IS_MPI
947 –        
948 –        the_excludes[(index + tot_bonds + tot_bends)*2] =    
949 –          the_atoms[exI]->getGlobalIndex() + 1;
950 –        the_excludes[(index + tot_bonds + tot_bends)*2 + 1] =
951 –          the_atoms[exJ]->getGlobalIndex() + 1;
952 –        
953 – #else  // isn't MPI
954 –        
955 –        the_excludes[(index + tot_bonds + tot_bends)*2] =     exI + 1;
956 –        the_excludes[(index + tot_bonds + tot_bends)*2 + 1] = exJ + 1;
957 –        // fortran indexes from 1 (hence the +1 in the indexing)
958 – #endif  //is_mpi
959 –        
960 –
961 –        // increment the index and repeat;
962 –        index++;
963 –      }
964 –      offset += comp_stamps[i]->getNAtoms();
965 –
966 – #ifdef IS_MPI
967 –      }
968 – #endif //is_mpi      
969 –
970 –      molIndex++;
971 –    }
972 –  }
973 –
974 –  the_ff->initializeTorsions( the_torsions );
1220   }
1221  
1222   void SimSetup::initFromBass( void ){
# Line 993 | Line 1238 | void SimSetup::initFromBass( void ){
1238      have_extra =1;
1239  
1240      n_cells = (int)temp3 - 1;
1241 <    cellx = simnfo->box_x / temp3;
1242 <    celly = simnfo->box_y / temp3;
1243 <    cellz = simnfo->box_z / temp3;
1241 >    cellx = simnfo->boxLx / temp3;
1242 >    celly = simnfo->boxLy / temp3;
1243 >    cellz = simnfo->boxLz / temp3;
1244      n_extra = tot_nmol - ( 4 * n_cells * n_cells * n_cells );
1245      temp1 = ((double)n_extra) / ( pow( temp3, 3.0 ) - pow( n_cells, 3.0 ) );
1246      n_per_extra = (int)ceil( temp1 );
# Line 1010 | Line 1255 | void SimSetup::initFromBass( void ){
1255    }
1256    else{
1257      n_cells = (int)temp3;
1258 <    cellx = simnfo->box_x / temp3;
1259 <    celly = simnfo->box_y / temp3;
1260 <    cellz = simnfo->box_z / temp3;
1258 >    cellx = simnfo->boxLx / temp3;
1259 >    celly = simnfo->boxLy / temp3;
1260 >    cellz = simnfo->boxLz / temp3;
1261    }
1262  
1263    current_mol = 0;

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines