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 378 by mmeineke, Fri Mar 21 17:42:12 2003 UTC vs.
Revision 489 by mmeineke, Thu Apr 10 20:08:56 2003 UTC

# Line 66 | Line 66 | void SimSetup::createSim( void ){
66  
67    MakeStamps *the_stamps;
68    Globals* the_globals;
69 +  ExtendedSystem* the_extendedsystem;
70    int i, j;
71  
72    // get the stamps and globals;
# Line 80 | Line 81 | void SimSetup::createSim( void ){
81    // get the ones we know are there, yet still may need some work.
82    n_components = the_globals->getNComponents();
83    strcpy( force_field, the_globals->getForceField() );
84 +
85 +  // get the ensemble and set up an extended system if we need it:
86    strcpy( ensemble, the_globals->getEnsemble() );
87 +  if( !strcasecmp( ensemble, "NPT" ) ) {
88 +    the_extendedsystem = new ExtendedSystem( simnfo );
89 +    the_extendedsystem->setTargetTemp(the_globals->getTargetTemp());
90 +    if (the_globals->haveTargetPressure())
91 +      the_extendedsystem->setTargetPressure(the_globals->getTargetPressure());
92 +    else {
93 +      sprintf( painCave.errMsg,
94 +               "SimSetup error: If you use the constant pressure\n"
95 +               "    ensemble, you must set targetPressure.\n"
96 +               "    This was found in the BASS file.\n");
97 +      painCave.isFatal = 1;
98 +      simError();
99 +    }
100 +
101 +    if (the_globals->haveTauThermostat())
102 +      the_extendedsystem->setTauThermostat(the_globals->getTauThermostat());
103 +    else if (the_globals->haveQmass())
104 +      the_extendedsystem->setQmass(the_globals->getQmass());
105 +    else {
106 +      sprintf( painCave.errMsg,
107 +               "SimSetup error: If you use one of the constant temperature\n"
108 +               "    ensembles, you must set either tauThermostat or qMass.\n"
109 +               "    Neither of these was found in the BASS file.\n");
110 +      painCave.isFatal = 1;
111 +      simError();
112 +    }
113 +
114 +    if (the_globals->haveTauBarostat())
115 +      the_extendedsystem->setTauBarostat(the_globals->getTauBarostat());
116 +    else {
117 +      sprintf( painCave.errMsg,
118 +               "SimSetup error: If you use the constant pressure\n"
119 +               "    ensemble, you must set tauBarostat.\n"
120 +               "    This was found in the BASS file.\n");
121 +      painCave.isFatal = 1;
122 +      simError();
123 +    }
124 +
125 +  } else if ( !strcasecmp( ensemble, "NVT") ) {
126 +    the_extendedsystem = new ExtendedSystem( simnfo );
127 +    the_extendedsystem->setTargetTemp(the_globals->getTargetTemp());
128 +
129 +    if (the_globals->haveTauThermostat())
130 +      the_extendedsystem->setTauThermostat(the_globals->getTauThermostat());
131 +    else if (the_globals->haveQmass())
132 +      the_extendedsystem->setQmass(the_globals->getQmass());
133 +    else {
134 +      sprintf( painCave.errMsg,
135 +               "SimSetup error: If you use one of the constant temperature\n"
136 +               "    ensembles, you must set either tauThermostat or qMass.\n"
137 +               "    Neither of these was found in the BASS file.\n");
138 +      painCave.isFatal = 1;
139 +      simError();
140 +    }
141 +
142 +  } else if ( !strcasecmp( ensemble, "NVE") ) {
143 +  } else {
144 +    sprintf( painCave.errMsg,
145 +             "SimSetup Warning. Unrecognized Ensemble -> %s, "
146 +             "reverting to NVE for this simulation.\n",
147 +             ensemble );
148 +    painCave.isFatal = 0;
149 +    simError();
150 +    strcpy( ensemble, "NVE" );
151 +  }  
152    strcpy( simnfo->ensemble, ensemble );
153  
154    strcpy( simnfo->mixingRule, the_globals->getMixingRule() );
155    simnfo->usePBC = the_globals->getPBC();
156            
157 <
158 <
159 <  if( !strcmp( force_field, "TraPPE" ) ) the_ff = new TraPPEFF();
160 <  else if( !strcmp( force_field, "DipoleTest" ) ) the_ff = new DipoleTestFF();
161 <  else if( !strcmp( force_field, "TraPPE_Ex" ) ) the_ff = new TraPPE_ExFF();
162 <  else if( !strcmp( force_field, "LJ" ) ) the_ff = new LJ_FF();
157 >  int usesDipoles = 0;
158 >  if( !strcmp( force_field, "TraPPE_Ex" ) ){
159 >    the_ff = new TraPPE_ExFF();
160 >    usesDipoles = 1;
161 >  }
162 >  else if( !strcasecmp( force_field, "LJ" ) ) the_ff = new LJ_FF();
163    else{
164      sprintf( painCave.errMsg,
165               "SimSetup Error. Unrecognized force field -> %s\n",
# Line 242 | Line 310 | void SimSetup::createSim( void ){
310  
311    globalIndex = mpiSim->divideLabor();
312  
245 –
246 –
313    // set up the local variables
314    
315    int localMol, allMol;
316    int local_atoms, local_bonds, local_bends, local_torsions, local_SRI;
317 +
318 +  int* mol2proc = mpiSim->getMolToProcMap();
319 +  int* molCompType = mpiSim->getMolComponentType();
320    
321    allMol = 0;
322    localMol = 0;
# Line 259 | Line 328 | void SimSetup::createSim( void ){
328  
329      for( j=0; j<components_nmol[i]; j++ ){
330        
331 <      if( mpiSim->getMyMolStart() <= allMol &&
263 <          allMol <= mpiSim->getMyMolEnd() ){
331 >      if( mol2proc[allMol] == worldRank ){
332          
333          local_atoms +=    comp_stamps[i]->getNAtoms();
334          local_bonds +=    comp_stamps[i]->getNBonds();
# Line 279 | Line 347 | void SimSetup::createSim( void ){
347    if( local_atoms != simnfo->n_atoms ){
348      sprintf( painCave.errMsg,
349               "SimSetup error: mpiSim's localAtom (%d) and SimSetup's"
350 <             " localAtom (%d) are note equal.\n",
350 >             " localAtom (%d) are not equal.\n",
351               simnfo->n_atoms,
352               local_atoms );
353      painCave.isFatal = 1;
# Line 304 | Line 372 | void SimSetup::createSim( void ){
372    Atom::createArrays(simnfo->n_atoms);
373    the_atoms = new Atom*[simnfo->n_atoms];
374    the_molecules = new Molecule[simnfo->n_mol];
375 +  int molIndex;
376  
377 +  // initialize the molecule's stampID's
378  
379 <  if( simnfo->n_SRI ){
380 <    the_sris = new SRI*[simnfo->n_SRI];
381 <    the_excludes = new int[2 * simnfo->n_SRI];
379 > #ifdef IS_MPI
380 >  
381 >
382 >  molIndex = 0;
383 >  for(i=0; i<mpiSim->getTotNmol(); i++){
384 >    
385 >    if(mol2proc[i] == worldRank ){
386 >      the_molecules[molIndex].setStampID( molCompType[i] );
387 >      the_molecules[molIndex].setMyIndex( molIndex );
388 >      the_molecules[molIndex].setGlobalIndex( i );
389 >      molIndex++;
390 >    }
391 >  }
392 >
393 > #else // is_mpi
394 >  
395 >  molIndex = 0;
396 >  for(i=0; i<n_components; i++){
397 >    for(j=0; j<components_nmol[i]; j++ ){
398 >      the_molecules[molIndex].setStampID( i );
399 >      the_molecules[molIndex].setMyIndex( molIndex );
400 >      the_molecules[molIndex].setGlobalIndex( molIndex );
401 >      molIndex++;
402 >    }
403 >  }
404 >    
405 >
406 > #endif // is_mpi
407 >
408 >
409 >  if( simnfo->n_SRI ){
410 >    
411 >    Exclude::createArray(simnfo->n_SRI);
412 >    the_excludes = new Exclude*[simnfo->n_SRI];
413 >    for( int ex=0; ex<simnfo->n_SRI; ex++) the_excludes[ex] = new Exclude(ex);
414      simnfo->globalExcludes = new int;
415 <    simnfo->n_exclude = tot_SRI;
415 >    simnfo->n_exclude = simnfo->n_SRI;
416    }
417    else{
418      
419 <    the_excludes = new int[2];
420 <    the_excludes[0] = 0;
421 <    the_excludes[1] = 0;
419 >    Exclude::createArray( 1 );
420 >    the_excludes = new Exclude*;
421 >    the_excludes[0] = new Exclude(0);
422 >    the_excludes[0]->setPair( 0,0 );
423      simnfo->globalExcludes = new int;
424      simnfo->globalExcludes[0] = 0;
425 <
323 <    simnfo->n_exclude = 1;
425 >    simnfo->n_exclude = 0;
426    }
427  
428    // set the arrays into the SimInfo object
429  
430    simnfo->atoms = the_atoms;
431 <  simnfo->sr_interactions = the_sris;
431 >  simnfo->molecules = the_molecules;
432    simnfo->nGlobalExcludes = 0;
433    simnfo->excludes = the_excludes;
434  
435  
436    // get some of the tricky things that may still be in the globals
437  
336 –  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
438    
439    if( the_globals->haveBox() ){
440      simnfo->box_x = the_globals->getBox();
# Line 407 | Line 485 | void SimSetup::createSim( void ){
485  
486    the_ff->setSimInfo( simnfo );
487  
488 <  makeAtoms();
488 >  makeMolecules();
489    simnfo->identArray = new int[simnfo->n_atoms];
490 +  simnfo->molMembershipArray = new int[simnfo->n_atoms];
491    for(i=0; i<simnfo->n_atoms; i++){
492      simnfo->identArray[i] = the_atoms[i]->getIdent();
493    }
494 <  
495 <  if( tot_bonds ){
417 <    makeBonds();
494 >  for(i=0; i< simnfo->n_mol; i++) {
495 >    the_molecules[i].atomicRollCall(simnfo->molMembershipArray);
496    }
497 +  
498 +  if (the_globals->getUseRF() ) {
499 +    simnfo->useReactionField = 1;
500 +  
501 +    if( !the_globals->haveECR() ){
502 +      sprintf( painCave.errMsg,
503 +               "SimSetup Warning: using default value of 1/2 the smallest "
504 +               "box length for the electrostaticCutoffRadius.\n"
505 +               "I hope you have a very fast processor!\n");
506 +      painCave.isFatal = 0;
507 +      simError();
508 +      double smallest;
509 +      smallest = simnfo->box_x;
510 +      if (simnfo->box_y <= smallest) smallest = simnfo->box_y;
511 +      if (simnfo->box_z <= smallest) smallest = simnfo->box_z;
512 +      simnfo->ecr = 0.5 * smallest;
513 +    } else {
514 +      simnfo->ecr        = the_globals->getECR();
515 +    }
516  
517 <  if( tot_bends ){
518 <    makeBends();
519 <  }
520 <
521 <  if( tot_torsions ){
522 <    makeTorsions();
523 <  }
524 <
525 <
526 <
527 <
517 >    if( !the_globals->haveEST() ){
518 >      sprintf( painCave.errMsg,
519 >               "SimSetup Warning: using default value of 0.05 * the "
520 >               "electrostaticCutoffRadius for the electrostaticSkinThickness\n"
521 >               );
522 >      painCave.isFatal = 0;
523 >      simError();
524 >      simnfo->est = 0.05 * simnfo->ecr;
525 >    } else {
526 >      simnfo->est        = the_globals->getEST();
527 >    }
528 >    
529 >    if(!the_globals->haveDielectric() ){
530 >      sprintf( painCave.errMsg,
531 >               "SimSetup Error: You are trying to use Reaction Field without"
532 >               "setting a dielectric constant!\n"
533 >               );
534 >      painCave.isFatal = 1;
535 >      simError();
536 >    }
537 >    simnfo->dielectric = the_globals->getDielectric();  
538 >  } else {
539 >    if (usesDipoles) {
540 >      
541 >      if( !the_globals->haveECR() ){
542 >        sprintf( painCave.errMsg,
543 >                 "SimSetup Warning: using default value of 1/2 the smallest "
544 >                 "box length for the electrostaticCutoffRadius.\n"
545 >                 "I hope you have a very fast processor!\n");
546 >        painCave.isFatal = 0;
547 >        simError();
548 >        double smallest;
549 >        smallest = simnfo->box_x;
550 >        if (simnfo->box_y <= smallest) smallest = simnfo->box_y;
551 >        if (simnfo->box_z <= smallest) smallest = simnfo->box_z;
552 >        simnfo->ecr = 0.5 * smallest;
553 >      } else {
554 >        simnfo->ecr        = the_globals->getECR();
555 >      }
556 >      
557 >      if( !the_globals->haveEST() ){
558 >        sprintf( painCave.errMsg,
559 >                 "SimSetup Warning: using default value of 5%% of the "
560 >                 "electrostaticCutoffRadius for the "
561 >                 "electrostaticSkinThickness\n"
562 >                 );
563 >        painCave.isFatal = 0;
564 >        simError();
565 >        simnfo->est = 0.05 * simnfo->ecr;
566 >      } else {
567 >        simnfo->est        = the_globals->getEST();
568 >      }
569 >    }
570 >  }  
571  
572 + #ifdef IS_MPI
573 +  strcpy( checkPointMsg, "electrostatic parameters check out" );
574 +  MPIcheckPoint();
575 + #endif // is_mpi
576  
577   if( the_globals->haveInitialConfig() ){
578  
# Line 587 | Line 731 | void SimSetup::createSim( void ){
731  
732   //   new AllLong( simnfo );
733  
590 –  if( !strcmp( force_field, "TraPPE" ) ) new Verlet( *simnfo, the_ff );
591 –  if( !strcmp( force_field, "DipoleTest" ) ) new Symplectic( simnfo, the_ff );
592 –  if( !strcmp( force_field, "TraPPE_Ex" ) ) new Symplectic( simnfo, the_ff );
593 –  if( !strcmp( force_field, "LJ" ) ) new Verlet( *simnfo, the_ff );
734  
735 +  if( !strcmp( force_field, "TraPPE_Ex" ) ){
736 +    new Symplectic(simnfo, the_ff, the_extendedsystem);
737 +  }
738 +  else if( !strcmp( force_field, "LJ" ) ){
739 +    new Verlet( *simnfo, the_ff, the_extendedsystem );
740 +  }
741 +  else {
742 +    std::cerr << "I'm a bug.\n";
743 +    fprintf( stderr, "Ima bug. stderr %s\n", force_field);
744 +  }
745 + #ifdef IS_MPI
746 +  mpiSim->mpiRefresh();
747 + #endif
748  
596 –
749    // initialize the Fortran
750 <  
750 >
751 >
752    simnfo->refreshSim();
753    
754    if( !strcmp( simnfo->mixingRule, "standard") ){
# Line 620 | Line 773 | void SimSetup::makeAtoms( void ){
773   #endif // is_mpi
774   }
775  
623 – void SimSetup::makeAtoms( void ){
776  
777 <  int i, j, k, index;
626 <  double ux, uy, uz, uSqr, u;
627 <  AtomStamp* current_atom;
777 > void SimSetup::makeMolecules( void ){
778  
779 +  int i, j, exI, exJ, tempEx, stampID, atomOffset, excludeOffset;
780 +  molInit info;
781    DirectionalAtom* dAtom;
782 <  int molIndex, molStart, molEnd, nMemb, lMolIndex;
782 >  LinkedAssign* extras;
783 >  LinkedAssign* current_extra;
784 >  AtomStamp* currentAtom;
785 >  BondStamp* currentBond;
786 >  BendStamp* currentBend;
787 >  TorsionStamp* currentTorsion;
788  
789 <  lMolIndex = 0;
790 <  molIndex = 0;
791 <  index = 0;
635 <  for( i=0; i<n_components; i++ ){
789 >  bond_pair* theBonds;
790 >  bend_set* theBends;
791 >  torsion_set* theTorsions;
792  
793 <    for( j=0; j<components_nmol[i]; j++ ){
793 >  
794 >  //init the forceField paramters
795  
796 < #ifdef IS_MPI
640 <      if( mpiSim->getMyMolStart() <= molIndex &&
641 <          molIndex <= mpiSim->getMyMolEnd() ){
642 < #endif // is_mpi        
796 >  the_ff->readParams();
797  
798 <        molStart = index;
799 <        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++;
798 >  
799 >  // init the atoms
800  
801 < #ifdef IS_MPI
802 <      }
803 < #endif //is_mpi
804 <      
805 <      molIndex++;
692 <    }
693 <  }
694 <
695 < #ifdef IS_MPI
696 <    for( i=0; i<mpiSim->getMyNlocal(); i++ ) the_atoms[i]->setGlobalIndex( globalIndex[i] );
801 >  double ux, uy, uz, u, uSqr;
802 >  
803 >  atomOffset = 0;
804 >  excludeOffset = 0;
805 >  for(i=0; i<simnfo->n_mol; i++){
806      
807 <    delete[] globalIndex;
807 >    stampID = the_molecules[i].getStampID();
808  
809 <    mpiSim->mpiRefresh();
810 < #endif //IS_MPI
811 <          
812 <  the_ff->initializeAtoms();
813 < }
705 <
706 < void SimSetup::makeBonds( void ){
707 <
708 <  int i, j, k, index, offset, molIndex, exI, exJ, tempEx;
709 <  bond_pair* the_bonds;
710 <  BondStamp* current_bond;
711 <
712 <  the_bonds = new bond_pair[tot_bonds];
713 <  index = 0;
714 <  offset = 0;
715 <  molIndex = 0;
716 <
717 <  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        
725 <        
726 <        for( k=0; k<comp_stamps[i]->getNBonds(); k++ ){
727 <          
728 <          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
809 >    info.nAtoms    = comp_stamps[stampID]->getNAtoms();
810 >    info.nBonds    = comp_stamps[stampID]->getNBonds();
811 >    info.nBends    = comp_stamps[stampID]->getNBends();
812 >    info.nTorsions = comp_stamps[stampID]->getNTorsions();
813 >    info.nExcludes = info.nBonds + info.nBends + info.nTorsions;
814  
815 <          the_excludes[index*2] =    
816 <            the_atoms[exI]->getGlobalIndex() + 1;
817 <          the_excludes[index*2 + 1] =
818 <            the_atoms[exJ]->getGlobalIndex() + 1;
815 >    info.myAtoms = &the_atoms[atomOffset];
816 >    info.myExcludes = &the_excludes[excludeOffset];
817 >    info.myBonds = new Bond*[info.nBonds];
818 >    info.myBends = new Bend*[info.nBends];
819 >    info.myTorsions = new Torsion*[info.nTorsions];
820  
821 < #else  // isn't MPI
822 <          
823 <          the_excludes[index*2] =     exI + 1;
824 <          the_excludes[index*2 + 1] = exJ + 1;
825 <          // fortran index from 1 (hence the +1 in the indexing)
826 < #endif  //is_mpi
827 <          
828 <          // increment the index and repeat;
829 <          index++;
830 <        }
760 <        offset += comp_stamps[i]->getNAtoms();
821 >    theBonds = new bond_pair[info.nBonds];
822 >    theBends = new bend_set[info.nBends];
823 >    theTorsions = new torsion_set[info.nTorsions];
824 >    
825 >    // make the Atoms
826 >    
827 >    for(j=0; j<info.nAtoms; j++){
828 >      
829 >      currentAtom = comp_stamps[stampID]->getAtom( j );
830 >      if( currentAtom->haveOrientation() ){
831          
832 < #ifdef IS_MPI
832 >        dAtom = new DirectionalAtom(j + atomOffset);
833 >        simnfo->n_oriented++;
834 >        info.myAtoms[j] = dAtom;
835 >        
836 >        ux = currentAtom->getOrntX();
837 >        uy = currentAtom->getOrntY();
838 >        uz = currentAtom->getOrntZ();
839 >        
840 >        uSqr = (ux * ux) + (uy * uy) + (uz * uz);
841 >        
842 >        u = sqrt( uSqr );
843 >        ux = ux / u;
844 >        uy = uy / u;
845 >        uz = uz / u;
846 >        
847 >        dAtom->setSUx( ux );
848 >        dAtom->setSUy( uy );
849 >        dAtom->setSUz( uz );
850        }
851 < #endif //is_mpi
851 >      else{
852 >        info.myAtoms[j] = new GeneralAtom(j + atomOffset);
853 >      }
854 >      info.myAtoms[j]->setType( currentAtom->getType() );
855 >    
856 > #ifdef IS_MPI
857        
858 <      molIndex++;
859 <    }      
860 <  }
858 >      info.myAtoms[j]->setGlobalIndex( globalIndex[j+atomOffset] );
859 >      
860 > #endif // is_mpi
861 >    }
862 >    
863 >    // make the bonds
864 >    for(j=0; j<info.nBonds; j++){
865 >      
866 >      currentBond = comp_stamps[stampID]->getBond( j );
867 >      theBonds[j].a = currentBond->getA() + atomOffset;
868 >      theBonds[j].b = currentBond->getB() + atomOffset;
869  
870 <  the_ff->initializeBonds( the_bonds );
871 < }
870 >      exI = theBonds[j].a;
871 >      exJ = theBonds[j].b;
872  
873 < void SimSetup::makeBends( void ){
874 <
875 <  int i, j, k, index, offset, molIndex, exI, exJ, tempEx;
876 <  bend_set* the_bends;
877 <  BendStamp* current_bend;
878 <  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 <
873 >      // exclude_I must always be the smaller of the pair
874 >      if( exI > exJ ){
875 >        tempEx = exI;
876 >        exI = exJ;
877 >        exJ = tempEx;
878 >      }
879   #ifdef IS_MPI
880 <      if( mpiSim->getMyMolStart() <= molIndex &&
881 <          molIndex <= mpiSim->getMyMolEnd() ){
882 < #endif // is_mpi        
880 >      tempEx = exI;
881 >      exI = the_atoms[tempEx]->getGlobalIndex() + 1;
882 >      tempEx = exJ;
883 >      exJ = the_atoms[tempEx]->getGlobalIndex() + 1;
884 >      
885 >      the_excludes[j+excludeOffset]->setPair( exI, exJ );
886 > #else  // isn't MPI
887  
888 <        for( k=0; k<comp_stamps[i]->getNBends(); k++ ){
888 >      the_excludes[j+excludeOffset]->setPair( (exI+1), (exJ+1) );
889 > #endif  //is_mpi
890 >    }
891 >    excludeOffset += info.nBonds;
892 >
893 >    //make the bends
894 >    for(j=0; j<info.nBends; j++){
895 >      
896 >      currentBend = comp_stamps[stampID]->getBend( j );
897 >      theBends[j].a = currentBend->getA() + atomOffset;
898 >      theBends[j].b = currentBend->getB() + atomOffset;
899 >      theBends[j].c = currentBend->getC() + atomOffset;
900            
901 <          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() ){
901 >      if( currentBend->haveExtras() ){
902              
903 <            extras = current_bend->getExtras();
904 <            current_extra = extras;
903 >        extras = currentBend->getExtras();
904 >        current_extra = extras;
905              
906 <            while( current_extra != NULL ){
907 <              if( !strcmp( current_extra->getlhs(), "ghostVectorSource" )){
906 >        while( current_extra != NULL ){
907 >          if( !strcmp( current_extra->getlhs(), "ghostVectorSource" )){
908                  
909 <                switch( current_extra->getType() ){
909 >            switch( current_extra->getType() ){
910 >              
911 >            case 0:
912 >              theBends[j].ghost =
913 >                current_extra->getInt() + atomOffset;
914 >              theBends[j].isGhost = 1;
915 >              break;
916                    
917 <                case 0:
918 <                  the_bends[index].ghost =
919 <                    current_extra->getInt() + offset;
920 <                  the_bends[index].isGhost = 1;
921 <                  break;
817 <                  
818 <                case 1:
819 <                  the_bends[index].ghost =
820 <                    (int)current_extra->getDouble() + offset;
821 <                  the_bends[index].isGhost = 1;
822 <                  break;
823 <                  
824 <                default:
825 <                  sprintf( painCave.errMsg,
826 <                           "SimSetup Error: ghostVectorSource was neiter a "
827 <                           "double nor an int.\n"
828 <                           "-->Bend[%d] in %s\n",
829 <                           k, comp_stamps[i]->getID() );
830 <                  painCave.isFatal = 1;
831 <                  simError();
832 <                }
833 <              }
917 >            case 1:
918 >              theBends[j].ghost =
919 >                (int)current_extra->getDouble() + atomOffset;
920 >              theBends[j].isGhost = 1;
921 >              break;
922                
923 <              else{
924 <                
925 <                sprintf( painCave.errMsg,
926 <                         "SimSetup Error: unhandled bend assignment:\n"
927 <                         "    -->%s in Bend[%d] in %s\n",
928 <                         current_extra->getlhs(),
929 <                         k, comp_stamps[i]->getID() );
930 <                painCave.isFatal = 1;
843 <                simError();
844 <              }
845 <              
846 <              current_extra = current_extra->getNext();
923 >            default:
924 >              sprintf( painCave.errMsg,
925 >                       "SimSetup Error: ghostVectorSource was neither a "
926 >                       "double nor an int.\n"
927 >                       "-->Bend[%d] in %s\n",
928 >                       j, comp_stamps[stampID]->getID() );
929 >              painCave.isFatal = 1;
930 >              simError();
931              }
932            }
933            
850 –          if( !the_bends[index].isGhost ){
851 –            
852 –            exI = the_bends[index].a;
853 –            exJ = the_bends[index].c;
854 –          }
934            else{
935              
936 <            exI = the_bends[index].a;
937 <            exJ = the_bends[index].b;
936 >            sprintf( painCave.errMsg,
937 >                     "SimSetup Error: unhandled bend assignment:\n"
938 >                     "    -->%s in Bend[%d] in %s\n",
939 >                     current_extra->getlhs(),
940 >                     j, comp_stamps[stampID]->getID() );
941 >            painCave.isFatal = 1;
942 >            simError();
943            }
944            
945 <          // exclude_I must always be the smaller of the pair
946 <          if( exI > exJ ){
947 <            tempEx = exI;
948 <            exI = exJ;
949 <            exJ = tempEx;
950 <          }
945 >          current_extra = current_extra->getNext();
946 >        }
947 >      }
948 >          
949 >      if( !theBends[j].isGhost ){
950 >            
951 >        exI = theBends[j].a;
952 >        exJ = theBends[j].c;
953 >      }
954 >      else{
955 >        
956 >        exI = theBends[j].a;
957 >        exJ = theBends[j].b;
958 >      }
959 >      
960 >      // exclude_I must always be the smaller of the pair
961 >      if( exI > exJ ){
962 >        tempEx = exI;
963 >        exI = exJ;
964 >        exJ = tempEx;
965 >      }
966 > #ifdef IS_MPI
967 >      tempEx = exI;
968 >      exI = the_atoms[tempEx]->getGlobalIndex() + 1;
969 >      tempEx = exJ;
970 >      exJ = the_atoms[tempEx]->getGlobalIndex() + 1;
971 >      
972 >      the_excludes[j+excludeOffset]->setPair( exI, exJ );
973 > #else  // isn't MPI
974 >      the_excludes[j+excludeOffset]->setPair( (exI+1), (exJ+1) );
975 > #endif  //is_mpi
976 >    }
977 >    excludeOffset += info.nBends;
978  
979 +    for(j=0; j<info.nTorsions; j++){
980 +      
981 +      currentTorsion = comp_stamps[stampID]->getTorsion( j );
982 +      theTorsions[j].a = currentTorsion->getA() + atomOffset;
983 +      theTorsions[j].b = currentTorsion->getB() + atomOffset;
984 +      theTorsions[j].c = currentTorsion->getC() + atomOffset;
985 +      theTorsions[j].d = currentTorsion->getD() + atomOffset;
986 +      
987 +      exI = theTorsions[j].a;
988 +      exJ = theTorsions[j].d;
989  
990 +      // exclude_I must always be the smaller of the pair
991 +      if( exI > exJ ){
992 +        tempEx = exI;
993 +        exI = exJ;
994 +        exJ = tempEx;
995 +      }
996   #ifdef IS_MPI
997 <
998 <          the_excludes[(index + tot_bonds)*2] =    
999 <            the_atoms[exI]->getGlobalIndex() + 1;
1000 <          the_excludes[(index + tot_bonds)*2 + 1] =
1001 <            the_atoms[exJ]->getGlobalIndex() + 1;
1002 <          
997 >      tempEx = exI;
998 >      exI = the_atoms[tempEx]->getGlobalIndex() + 1;
999 >      tempEx = exJ;
1000 >      exJ = the_atoms[tempEx]->getGlobalIndex() + 1;
1001 >      
1002 >      the_excludes[j+excludeOffset]->setPair( exI, exJ );
1003   #else  // isn't MPI
1004 <          
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)
1004 >      the_excludes[j+excludeOffset]->setPair( (exI+1), (exJ+1) );
1005   #endif  //is_mpi
882 –          
883 –          
884 –          // increment the index and repeat;
885 –          index++;
886 –        }
887 –        offset += comp_stamps[i]->getNAtoms();
888 –        
889 – #ifdef IS_MPI
890 –      }
891 – #endif //is_mpi
892 –
893 –      molIndex++;
1006      }
1007 <  }
1007 >    excludeOffset += info.nTorsions;
1008 >
1009 >    
1010 >    // send the arrays off to the forceField for init.
1011  
1012 < #ifdef IS_MPI
1013 <  sprintf( checkPointMsg,
1014 <           "Successfully created the bends list.\n" );
1015 <  MPIcheckPoint();
901 < #endif // is_mpi
902 <  
1012 >    the_ff->initializeAtoms( info.nAtoms, info.myAtoms );
1013 >    the_ff->initializeBonds( info.nBonds, info.myBonds, theBonds );
1014 >    the_ff->initializeBends( info.nBends, info.myBends, theBends );
1015 >    the_ff->initializeTorsions( info.nTorsions, info.myTorsions, theTorsions );
1016  
904 –  the_ff->initializeBends( the_bends );
905 – }
1017  
1018 < void SimSetup::makeTorsions( void ){
1018 >    the_molecules[i].initialize( info );
1019  
909 –  int i, j, k, index, offset, molIndex, exI, exJ, tempEx;
910 –  torsion_set* the_torsions;
911 –  TorsionStamp* current_torsion;
1020  
1021 <  the_torsions = new torsion_set[tot_torsions];
1022 <  index = 0;
1023 <  offset = 0;
1024 <  molIndex = 0;
1025 <  for( i=0; i<n_components; i++ ){
1021 >    atomOffset += info.nAtoms;
1022 >    delete[] theBonds;
1023 >    delete[] theBends;
1024 >    delete[] theTorsions;
1025 >  }
1026  
919 –    for( j=0; j<components_nmol[i]; j++ ){
920 –
1027   #ifdef IS_MPI
1028 <      if( mpiSim->getMyMolStart() <= molIndex &&
1029 <          molIndex <= mpiSim->getMyMolEnd() ){
1030 < #endif // is_mpi        
1028 >  sprintf( checkPointMsg, "all molecules initialized succesfully" );
1029 >  MPIcheckPoint();
1030 > #endif // is_mpi
1031  
1032 <      for( k=0; k<comp_stamps[i]->getNTorsions(); k++ ){
1032 >  // clean up the forcefield
1033 >  the_ff->calcRcut();
1034 >  the_ff->cleanMe();
1035  
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 );
1036   }
1037  
1038   void SimSetup::initFromBass( void ){

Diff Legend

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