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 451 by mmeineke, Thu Apr 3 22:01:29 2003 UTC vs.
Revision 941 by gezelter, Tue Jan 13 23:01:43 2004 UTC

# Line 1 | Line 1
1 < #include <cstdlib>
2 < #include <cstdio>
3 < #include <cstring>
1 > #include <stdlib.h>
2 > #include <stdio.h>
3 > #include <string.h>
4  
5   #include <iostream>
6   using namespace std;
# Line 754 | Line 754 | void TraPPE_ExFF::readParams( void ){
754    
755    int isGB = 0;
756    int isLJ = 1;
757 +  int isEAM = 0;
758 +  int isCharge = 0;
759    double GB_dummy = 0.0;
760 +  double charge = 0.0;
761    
762    
763    currentAtomType = headAtomType->next;;
764    while( currentAtomType != NULL ){
765      
766      if(currentAtomType->isDipole) entry_plug->useDipole = 1;
767 <    if(currentAtomType->isSSD)    entry_plug->useSticky = 1;
767 >    if(currentAtomType->isSSD) {
768 >      entry_plug->useSticky = 1;
769 >      set_sticky_params( &(currentAtomType->w0), &(currentAtomType->v0));
770 >    }
771  
772      if( currentAtomType->name[0] != '\0' ){
773        isError = 0;
# Line 770 | Line 776 | void TraPPE_ExFF::readParams( void ){
776                   &(currentAtomType->isSSD),
777                   &(currentAtomType->isDipole),
778                   &isGB,
779 +                 &isEAM,
780 +                 &isCharge,
781                   &(currentAtomType->epslon),
782                   &(currentAtomType->sigma),
783 +                 &charge,
784                   &(currentAtomType->dipole),
776 –                 &(currentAtomType->w0),
777 –                 &(currentAtomType->v0),
778 –                 &GB_dummy,
779 –                 &GB_dummy,
780 –                 &GB_dummy,
781 –                 &GB_dummy,
782 –                 &GB_dummy,
783 –                 &GB_dummy,
785                   &isError );
786        if( isError ){
787          sprintf( painCave.errMsg,
# Line 877 | Line 878 | void TraPPE_ExFF::readParams( void ){
878        recieveFrcStruct( &bondInfo, mpiBondStructType );
879      }
880    }
881 +
882 +  sprintf( checkPointMsg,
883 +           "TraPPE_ExFF bond structures broadcast successfully." );
884 +  MPIcheckPoint();
885 +
886   #endif // is_mpi
887    
888  
# Line 955 | Line 961 | void TraPPE_ExFF::readParams( void ){
961        recieveFrcStruct( &bendInfo, mpiBendStructType );
962      }
963    }
964 +
965 +  sprintf( checkPointMsg,
966 +           "TraPPE_ExFF bend structures broadcast successfully." );
967 +  MPIcheckPoint();
968 +
969   #endif // is_mpi
970  
971  
# Line 1035 | Line 1046 | void TraPPE_ExFF::readParams( void ){
1046        recieveFrcStruct( &torsionInfo, mpiTorsionStructType );
1047      }
1048    }
1049 +
1050 +  sprintf( checkPointMsg,
1051 +           "TraPPE_ExFF torsion structures broadcast successfully." );
1052 +  MPIcheckPoint();
1053 +
1054   #endif // is_mpi
1055  
1056    entry_plug->useLJ = 1;
# Line 1235 | Line 1251 | void TraPPE_ExFF::initializeBends( int nBends, Bend**
1251          else if( the_bends[i].ghost == a ){
1252            c = a;
1253            a = b;
1254 <          b = a;
1254 >          b = c;
1255          }
1256          else{
1257            sprintf( painCave.errMsg,

Diff Legend

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