# | Line 239 | Line 239 | void SimSetup::createSim( void ){ | |
---|---|---|
239 | ||
240 | ||
241 | globalIndex = mpiSim->divideLabor(); | |
242 | – | |
243 | – | |
242 | ||
243 | // set up the local variables | |
244 | ||
# | Line 316 | Line 314 | void SimSetup::createSim( void ){ | |
314 | ||
315 | if(mol2proc[i] == worldRank ){ | |
316 | the_molecules[molIndex].setStampID( molCompType[i] ); | |
317 | + | the_molecules[molIndex].setMyIndex( molIndex ); |
318 | molIndex++; | |
319 | } | |
320 | } | |
# | Line 326 | Line 325 | void SimSetup::createSim( void ){ | |
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 | } | |
# | Line 336 | Line 336 | void SimSetup::createSim( void ){ | |
336 | ||
337 | if( simnfo->n_SRI ){ | |
338 | ||
339 | – | std::cerr << "n_SRI = " << simnfo->n_SRI << "\n"; |
340 | – | |
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 = tot_SRI; |
343 | > | simnfo->n_exclude = simnfo->n_SRI; |
344 | } | |
345 | else{ | |
346 | ||
# | Line 660 | Line 658 | void SimSetup::createSim( void ){ | |
658 | if( !strcmp( force_field, "TraPPE_Ex" ) ) new Symplectic( simnfo, the_ff ); | |
659 | if( !strcmp( force_field, "LJ" ) ) new Verlet( *simnfo, the_ff ); | |
660 | ||
661 | + | #ifdef IS_MPI |
662 | + | mpiSim->mpiRefresh(); |
663 | + | #endif |
664 | ||
664 | – | |
665 | // initialize the Fortran | |
666 | < | |
666 | > | |
667 | > | |
668 | simnfo->refreshSim(); | |
669 | ||
670 | if( !strcmp( simnfo->mixingRule, "standard") ){ | |
# | Line 782 | Line 783 | void SimSetup::makeMolecules( void ){ | |
783 | theBonds[j].a = currentBond->getA() + atomOffset; | |
784 | theBonds[j].b = currentBond->getB() + atomOffset; | |
785 | ||
786 | < | exI = theBonds[i].a; |
787 | < | exJ = theBonds[i].b; |
786 | > | exI = theBonds[j].a; |
787 | > | exJ = theBonds[j].b; |
788 | ||
789 | // exclude_I must always be the smaller of the pair | |
790 | if( exI > exJ ){ | |
# | Line 799 | Line 800 | void SimSetup::makeMolecules( void ){ | |
800 | ||
801 | the_excludes[j+excludeOffset]->setPair( exI, exJ ); | |
802 | #else // isn't MPI | |
803 | + | |
804 | the_excludes[j+excludeOffset]->setPair( (exI+1), (exJ+1) ); | |
805 | #endif //is_mpi | |
806 | } | |
# | Line 836 | Line 838 | void SimSetup::makeMolecules( void ){ | |
838 | ||
839 | default: | |
840 | sprintf( painCave.errMsg, | |
841 | < | "SimSetup Error: ghostVectorSource was neiter a " |
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() ); | |
# | Line 930 | Line 932 | void SimSetup::makeMolecules( void ){ | |
932 | ||
933 | ||
934 | the_molecules[i].initialize( info ); | |
935 | + | |
936 | + | |
937 | atomOffset += info.nAtoms; | |
938 | delete[] theBonds; | |
939 | delete[] theBends; | |
940 | delete[] theTorsions; | |
941 | } | |
942 | ||
943 | + | #ifdef IS_MPI |
944 | + | sprintf( checkPointMsg, "all molecules initialized succesfully" ); |
945 | + | MPIcheckPoint(); |
946 | + | #endif // is_mpi |
947 | + | |
948 | // clean up the forcefield | |
949 | the_ff->calcRcut(); | |
950 | the_ff->cleanMe(); | |
951 | + | |
952 | } | |
953 | ||
954 | void SimSetup::initFromBass( void ){ |
– | Removed lines |
+ | Added lines |
< | Changed lines |
> | Changed lines |