ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/group/trunk/OOPSE/libmdtools/TraPPE_ExFF.cpp
(Generate patch)

Comparing trunk/OOPSE/libmdtools/TraPPE_ExFF.cpp (file contents):
Revision 434 by chuckv, Fri Mar 28 19:30:59 2003 UTC vs.
Revision 463 by gezelter, Sat Apr 5 03:39:25 2003 UTC

# Line 12 | Line 12 | using namespace std;
12   #include "fortranWrappers.hpp"
13  
14   #ifdef IS_MPI
15 – #include <mpi++.h>
15   #include "mpiForceField.h"
16   #endif // is_mpi
17  
# Line 99 | Line 98 | namespace TPE {  // restrict the access of the folowin
98        return NULL;
99      }
100      
101 +    void printMe( void ){
102 +      
103 +      std::cerr << "LinkedAtype " << name << ": ident = " << ident << "\n";
104 +      if( next != NULL ) next->printMe();
105 +
106 +    }
107 +
108      void add( atomStruct &info ){
109  
110        // check for duplicates
# Line 140 | Line 146 | namespace TPE {  // restrict the access of the folowin
146        info.dipole   = dipole;
147        info.w0       = w0;
148        info.v0       = v0;
149 +      info.ident    = ident;
150        info.last     = 0;
151      }
152  
# Line 734 | Line 741 | void TraPPE_ExFF::readParams( void ){
741        recieveFrcStruct( &atomInfo, mpiAtomStructType );
742      }
743    }
744 +
745   #endif // is_mpi
746  
747 +
748 +
749    // call new A_types in fortran
750    
751    int isError;
# Line 747 | Line 757 | void TraPPE_ExFF::readParams( void ){
757    double GB_dummy = 0.0;
758    
759    
760 <  currentAtomType = headAtomType;
760 >  currentAtomType = headAtomType->next;;
761    while( currentAtomType != NULL ){
762      
763      if(currentAtomType->isDipole) entry_plug->useDipole = 1;
764 <    if(currentAtomType->isSSD)    entry_plug->useSticky = 1;
764 >    if(currentAtomType->isSSD) {
765 >      entry_plug->useSticky = 1;
766 >      set_sticky_params( &(currentAtomType->w0), &(currentAtomType->v0));
767 >    }
768  
769      if( currentAtomType->name[0] != '\0' ){
770        isError = 0;
# Line 763 | Line 776 | void TraPPE_ExFF::readParams( void ){
776                   &(currentAtomType->epslon),
777                   &(currentAtomType->sigma),
778                   &(currentAtomType->dipole),
766 –                 &(currentAtomType->w0),
767 –                 &(currentAtomType->v0),
768 –                 &GB_dummy,
769 –                 &GB_dummy,
770 –                 &GB_dummy,
771 –                 &GB_dummy,
772 –                 &GB_dummy,
773 –                 &GB_dummy,
779                   &isError );
780        if( isError ){
781          sprintf( painCave.errMsg,
# Line 842 | Line 847 | void TraPPE_ExFF::readParams( void ){
847               "TraPPE_Ex bond structures read successfully." );
848      MPIcheckPoint();
849      
850 <    currentBondType = headBondType;
850 >    currentBondType = headBondType->next;
851      while( currentBondType != NULL ){
852        currentBondType->duplicate( bondInfo );
853        sendFrcStruct( &bondInfo, mpiBondStructType );
# Line 857 | Line 862 | void TraPPE_ExFF::readParams( void ){
862      
863      // listen for node 0 to send out the force params
864      
865 <    MPIcheckPoint();
865 >    MPIcheckPoint();
866  
867      headBondType = new LinkedBondType;
868      recieveFrcStruct( &bondInfo, mpiBondStructType );
# Line 920 | Line 925 | void TraPPE_ExFF::readParams( void ){
925               "TraPPE_Ex bend structures read successfully." );
926      MPIcheckPoint();
927  
928 <    currentBendType = headBendType;
928 >    currentBendType = headBendType->next;
929      while( currentBendType != NULL ){
930        currentBendType->duplicate( bendInfo );
931        sendFrcStruct( &bendInfo, mpiBendStructType );
# Line 1000 | Line 1005 | void TraPPE_ExFF::readParams( void ){
1005               "TraPPE_Ex torsion structures read successfully." );
1006      MPIcheckPoint();
1007      
1008 <    currentTorsionType = headTorsionType;
1008 >    currentTorsionType = headTorsionType->next;
1009      while( currentTorsionType != NULL ){
1010        currentTorsionType->duplicate( torsionInfo );
1011        sendFrcStruct( &torsionInfo, mpiTorsionStructType );

Diff Legend

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