[ViewVC] Diff of: group/branches/new_design/OOPSE-4/src/UseTheForce/DUFF.cpp

Comparing trunk/OOPSE-4/src/UseTheForce/DUFF.cpp (file contents):
Revision 1617 by chuckv, Wed Oct 20 20:46:20 2004 UTC vs.
Revision 1628 by gezelter, Thu Oct 21 20:15:31 2004 UTC

#	Line 653 \| Line 653 \| void DUFF::initForceField( int ljMixRule ){
653		}
654
655
656	<	void DUFF::initForceField( int ljMixRule ){
656	>	void DUFF::initForceField(){
657
658	<	initFortran( ljMixRule, entry_plug->useReactionField );
658	>	initFortran( entry_plug->useReactionField );
659		}
660
661		double DUFF::getAtomTypeMass (char* atomType) {
#	Line 801 \| Line 801 \| void DUFF::readParams( void ){
801		if(currentAtomType->isDipole) entry_plug->useDipoles = 1;
802		if(currentAtomType->isSSD) {
803		entry_plug->useSticky = 1;
804	<	set_sticky_params( &(currentAtomType->w0), &(currentAtomType->v0),
805	<	&(currentAtomType->v0p),
806	<	&(currentAtomType->rl), &(currentAtomType->ru),
807	<	&(currentAtomType->rlp), &(currentAtomType->rup));
804	>	makeStickyType( &(currentAtomType->w0), &(currentAtomType->v0),
805	>	&(currentAtomType->v0p),
806	>	&(currentAtomType->rl), &(currentAtomType->ru),
807	>	&(currentAtomType->rlp), &(currentAtomType->rup));
808		}
809
810		if( currentAtomType->name[0] != '\0' ){

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