ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/group/trunk/OOPSE-3.0/src/UseTheForce/WATER.cpp
(Generate patch)

Comparing trunk/OOPSE-3.0/src/UseTheForce/WATER.cpp (file contents):
Revision 1673 by chrisfen, Thu Oct 28 17:22:55 2004 UTC vs.
Revision 1706 by gezelter, Thu Nov 4 16:20:28 2004 UTC

# Line 559 | Line 559 | void WATER::readParams( void ){
559        if (currentAtomType->isDirectional) {
560          if (currentDirectionalType->isDipole) {
561            ((DirectionalAtomType*)at)->setDipole();
562 –          entry_plug->useDipoles = 1;
562          }
563        
564          if (currentDirectionalType->isSticky) {
565            ((DirectionalAtomType*)at)->setSticky();
567 –          entry_plug->useSticky = 1;
566          }
567        }
568        
# Line 663 | Line 661 | void WATER::initializeAtoms( int nAtoms, Atom** the_at
661      the_atoms[i]->setMass( currentAtomType->mass );
662      the_atoms[i]->setIdent( currentAtomType->ident );
663  
664 +    if (currentAtomType->isLJ) entry_plug->useLennardJones = 1;
665 +    if (currentAtomType->isCharge) entry_plug->useCharges = 1;
666 +    if (currentAtomType->isDirectional) {
667 +      if (currentDirectionalType->isDipole) entry_plug->useDipoles = 1;      
668 +      if (currentDirectionalType->isSticky) entry_plug->useSticky = 1;
669 +    }
670 +
671      if( bigSigma < currentAtomType->sigma ) bigSigma = currentAtomType->sigma;
672  
673      the_atoms[i]->setHasCharge(currentAtomType->isCharge);

Diff Legend

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