# | Line 695 | Line 695 | void SimSetup::makeMolecules( void ){ | |
---|---|---|
695 | BondStamp* currentBond; | |
696 | BendStamp* currentBend; | |
697 | TorsionStamp* currentTorsion; | |
698 | + | |
699 | + | bond_pair* theBonds; |
700 | + | bend_set* theBends; |
701 | + | torsion_set* theTorsions; |
702 | + | |
703 | ||
704 | //init the forceField paramters | |
705 | ||
706 | the_ff->readParams(); | |
707 | ||
708 | ||
709 | < | // init the molecules |
709 | > | // init the atoms |
710 | ||
711 | + | double ux, uy, uz, u, uSqr; |
712 | + | |
713 | atomOffset = 0; | |
714 | excludeOffset = 0; | |
715 | for(i=0; i<simnfo->n_mol; i++){ | |
# | Line 719 | Line 726 | void SimSetup::makeMolecules( void ){ | |
726 | info.myExcludes = &the_excludes[excludeOffset]; | |
727 | info.myBonds = new Bond*[info.nBonds]; | |
728 | info.myBends = new Bend*[info.nBends]; | |
729 | < | info.myTorsions = new Torsions*[info.nTorsions]; |
729 | > | info.myTorsions = new Torsion*[info.nTorsions]; |
730 | ||
731 | theBonds = new bond_pair[info.nBonds]; | |
732 | theBends = new bend_set[info.nBends]; | |
# | Line 729 | Line 736 | void SimSetup::makeMolecules( void ){ | |
736 | ||
737 | for(j=0; j<info.nAtoms; j++){ | |
738 | ||
739 | < | currentAtom = theComponents[stampID]->getAtom( j ); |
739 | > | currentAtom = comp_stamps[stampID]->getAtom( j ); |
740 | if( currentAtom->haveOrientation() ){ | |
741 | ||
742 | dAtom = new DirectionalAtom(j + atomOffset); | |
# | Line 802 | Line 809 | void SimSetup::makeMolecules( void ){ | |
809 | ||
810 | if( currentBend->haveExtras() ){ | |
811 | ||
812 | < | extras = current_bend->getExtras(); |
812 | > | extras = currentBend->getExtras(); |
813 | current_extra = extras; | |
814 | ||
815 | while( current_extra != NULL ){ | |
# | Line 919 | Line 926 | void SimSetup::makeMolecules( void ){ | |
926 | ||
927 | the_molecules[i].initialize( info ); | |
928 | atomOffset += info.nAtoms; | |
929 | + | delete[] theBonds; |
930 | + | delete[] theBends; |
931 | + | delete[] theTorsions; |
932 | } | |
933 | ||
934 | // clean up the forcefield |
– | Removed lines |
+ | Added lines |
< | Changed lines |
> | Changed lines |