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

Comparing trunk/OOPSE/libmdtools/EAM_FF.cpp (file contents):
Revision 672 by chuckv, Thu Aug 7 00:47:33 2003 UTC vs.
Revision 673 by chuckv, Fri Aug 8 21:22:37 2003 UTC

# Line 1023 | Line 1023 | int EAM_NS::parseEAM(atomStruct &info, char *eamPotFil
1023      myEam_rhovals[j+0] = atof( the_token );
1024  
1025      // Value 2
1026 <    if ( (the_token = strtok( eam_read_buffer, " \n\t,;")) == NULL){
1026 >    if ( (the_token = strtok( NULL, " \n\t,;")) == NULL){
1027        sprintf( painCave.errMsg,
1028                 "Error parseing EAM nrho: line in %s\n", eamPotFile );
1029        painCave.isFatal = 1;
# Line 1033 | Line 1033 | int EAM_NS::parseEAM(atomStruct &info, char *eamPotFil
1033      myEam_rhovals[j+1] = atof( the_token );
1034  
1035      // Value 3
1036 <    if ( (the_token = strtok( eam_read_buffer, " \n\t,;")) == NULL){
1036 >    if ( (the_token = strtok( NULL, " \n\t,;")) == NULL){
1037        sprintf( painCave.errMsg,
1038                 "Error parseing EAM nrho: line in %s\n", eamPotFile );
1039        painCave.isFatal = 1;
# Line 1043 | Line 1043 | int EAM_NS::parseEAM(atomStruct &info, char *eamPotFil
1043      myEam_rhovals[j+2] = atof( the_token );
1044  
1045      // Value 4
1046 <    if ( (the_token = strtok( eam_read_buffer, " \n\t,;")) == NULL){
1046 >    if ( (the_token = strtok( NULL, " \n\t,;")) == NULL){
1047        sprintf( painCave.errMsg,
1048                 "Error parseing EAM nrho: line in %s\n", eamPotFile );
1049        painCave.isFatal = 1;
# Line 1053 | Line 1053 | int EAM_NS::parseEAM(atomStruct &info, char *eamPotFil
1053      myEam_rhovals[j+3] = atof( the_token );
1054  
1055      // Value 5
1056 <    if ( (the_token = strtok( eam_read_buffer, " \n\t,;")) == NULL){
1056 >    if ( (the_token = strtok( NULL, " \n\t,;")) == NULL){
1057        sprintf( painCave.errMsg,
1058                 "Error parseing EAM nrho: line in %s\n", eamPotFile );
1059        painCave.isFatal = 1;
# Line 1061 | Line 1061 | int EAM_NS::parseEAM(atomStruct &info, char *eamPotFil
1061      }
1062    
1063      myEam_rhovals[j+4] = atof( the_token );
1064 <
1064 >
1065    }
1066    *eam_rvals = myEam_rvals;
1067    *eam_rhovals = myEam_rhovals;

Diff Legend

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