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 1097 by gezelter, Mon Apr 12 20:32:20 2004 UTC vs.
Revision 1266 by gezelter, Fri Jun 11 16:46:13 2004 UTC

# Line 80 | Line 80 | namespace EAM_NS{
80        
81        if( !strcmp( info.name, name ) ){
82          sprintf( painCave.errMsg,
83 <                 "Duplicate LJ atom type \"%s\" found in "
84 <                 "the LJ_FF param file./n",
83 >                 "Duplicate EAM atom type \"%s\" found in "
84 >                 "the EAM_FF param file./n",
85                   name );
86          painCave.isFatal = 1;
87          simError();
# Line 155 | Line 155 | using namespace EAM_NS;
155   // begins the actual forcefield stuff.  
156   //****************************************************************
157  
158 + EAM_FF::EAM_FF() {
159 +  EAM_FF("");
160 + }
161  
162 < EAM_FF::EAM_FF(){
162 > EAM_FF::EAM_FF(char* the_variant){
163  
164    char fileName[200];
165    char* ffPath_env = "FORCE_PARAM_PATH";
# Line 201 | Line 204 | EAM_FF::EAM_FF(){
204    if( worldRank == 0 ){
205   #endif
206      
207 <    // generate the force file name
208 <    
209 <    strcpy( fileName, "EAM_FF.frc" );
210 <    //    fprintf( stderr,"Trying to open %s\n", fileName );
207 >    // generate the force file name  
208 >
209 >    strcpy( fileName, "EAM" );
210 >
211 >    if (strlen(the_variant) > 0) {
212 >      has_variant = 1;
213 >      strcpy( variant, the_variant);
214 >      strcat( fileName, ".");
215 >      strcat( fileName, variant );
216 >
217 >      sprintf( painCave.errMsg,
218 >               "Using %s variant of EAM force field.\n",
219 >               variant );
220 >      painCave.severity = OOPSE_INFO;
221 >      painCave.isFatal = 0;
222 >      simError();
223 >    }
224 >    strcat( fileName, ".frc");
225 >
226 >    //fprintf( stderr,"Trying to open %s\n", fileName );
227      
228      // attempt to open the file in the current directory first.
229      
# Line 228 | Line 247 | EAM_FF::EAM_FF(){
247        frcFile = fopen( fileName, "r" );
248        
249        if( frcFile == NULL ){
250 <        
250 >        
251          sprintf( painCave.errMsg,
252 <                 "Error opening the force field parameter file: %s\n"
253 <                 "Have you tried setting the FORCE_PARAM_PATH environment "
254 <                 "vairable?\n",
252 >                 "Error opening the force field parameter file:\n"
253 >                 "\t%s\n"
254 >                 "\tHave you tried setting the FORCE_PARAM_PATH environment "
255 >                 "variable?\n",
256                   fileName );
257 +        painCave.severity = OOPSE_ERROR;
258          painCave.isFatal = 1;
259          simError();
260        }
261      }
262 +
263      
264   #ifdef IS_MPI
265    }
# Line 317 | Line 339 | void EAM_FF::readParams( void ){
339      // read in the atom types.
340  
341      headAtomType = new LinkedAtomType;
342 <    
342 >
343      fastForward( "AtomTypes", "eam atom readParams" );
344  
345      // we are now at the AtomTypes section.
# Line 727 | Line 749 | int EAM_NS::parseEAM(atomStruct &info, char *eamPotFil
749        sprintf( painCave.errMsg,
750                 "Error opening the EAM force parameter file: %s\n"
751                 "Have you tried setting the FORCE_PARAM_PATH environment "
752 <               "vairable?\n",
752 >               "variable?\n",
753                 eamPotFile );
754        painCave.isFatal = 1;
755        simError();
# Line 761 | Line 783 | int EAM_NS::parseEAM(atomStruct &info, char *eamPotFil
783      
784    if ( (the_token = strtok( eam_read_buffer, " \n\t,;")) == NULL){
785      sprintf( painCave.errMsg,
786 <             "Error parseing EAM ident  line in %s\n", eamPotFile );
786 >             "Error parsing EAM ident  line in %s\n", eamPotFile );
787      painCave.isFatal = 1;
788      simError();
789    }
# Line 770 | Line 792 | int EAM_NS::parseEAM(atomStruct &info, char *eamPotFil
792  
793    if( ( the_token = strtok( NULL, " \n\t,;" ) ) == NULL ){
794      sprintf( painCave.errMsg,
795 <             "Error parseing EAM mass in %s\n", eamPotFile );
795 >             "Error parsing EAM mass in %s\n", eamPotFile );
796      painCave.isFatal = 1;
797      simError();
798    }
# Line 778 | Line 800 | int EAM_NS::parseEAM(atomStruct &info, char *eamPotFil
800  
801    if( ( the_token = strtok( NULL, " \n\t,;" ) ) == NULL ){
802      sprintf( painCave.errMsg,
803 <             "Error parseing EAM Lattice Constant %s\n", eamPotFile );
803 >             "Error parsing EAM Lattice Constant %s\n", eamPotFile );
804      painCave.isFatal = 1;
805      simError();
806    }
# Line 804 | Line 826 | int EAM_NS::parseEAM(atomStruct &info, char *eamPotFil
826    
827    if( ( the_token = strtok( NULL, " \n\t,;" ) ) == NULL ){
828      sprintf( painCave.errMsg,
829 <             "Error parseing EAM drho in %s\n", eamPotFile );
829 >             "Error parsing EAM drho in %s\n", eamPotFile );
830      painCave.isFatal = 1;
831      simError();
832    }
# Line 812 | Line 834 | int EAM_NS::parseEAM(atomStruct &info, char *eamPotFil
834  
835    if( ( the_token = strtok( NULL, " \n\t,;" ) ) == NULL ){
836      sprintf( painCave.errMsg,
837 <             "Error parseing EAM # r in %s\n", eamPotFile );
837 >             "Error parsing EAM # r in %s\n", eamPotFile );
838      painCave.isFatal = 1;
839      simError();
840    }
# Line 820 | Line 842 | int EAM_NS::parseEAM(atomStruct &info, char *eamPotFil
842    
843    if( ( the_token = strtok( NULL, " \n\t,;" ) ) == NULL ){
844      sprintf( painCave.errMsg,
845 <             "Error parseing EAM dr in %s\n", eamPotFile );
845 >             "Error parsing EAM dr in %s\n", eamPotFile );
846      painCave.isFatal = 1;
847      simError();
848    }
# Line 828 | Line 850 | int EAM_NS::parseEAM(atomStruct &info, char *eamPotFil
850  
851    if( ( the_token = strtok( NULL, " \n\t,;" ) ) == NULL ){
852      sprintf( painCave.errMsg,
853 <             "Error parseing EAM rcut in %s\n", eamPotFile );
853 >             "Error parsing EAM rcut in %s\n", eamPotFile );
854      painCave.isFatal = 1;
855      simError();
856    }
# Line 869 | Line 891 | int EAM_NS::parseEAM(atomStruct &info, char *eamPotFil
891      // Value 1
892      if ( (the_token = strtok( eam_read_buffer, " \n\t,;")) == NULL){
893        sprintf( painCave.errMsg,
894 <               "Error parseing EAM nrho: line in %s\n", eamPotFile );
894 >               "Error parsing EAM nrho: line in %s\n", eamPotFile );
895        painCave.isFatal = 1;
896        simError();
897      }
# Line 879 | Line 901 | int EAM_NS::parseEAM(atomStruct &info, char *eamPotFil
901      // Value 2
902      if ( (the_token = strtok( NULL, " \n\t,;")) == NULL){
903        sprintf( painCave.errMsg,
904 <               "Error parseing EAM nrho: line in %s\n", eamPotFile );
904 >               "Error parsing EAM nrho: line in %s\n", eamPotFile );
905        painCave.isFatal = 1;
906        simError();
907      }
# Line 889 | Line 911 | int EAM_NS::parseEAM(atomStruct &info, char *eamPotFil
911      // Value 3
912      if ( (the_token = strtok( NULL, " \n\t,;")) == NULL){
913        sprintf( painCave.errMsg,
914 <               "Error parseing EAM nrho: line in %s\n", eamPotFile );
914 >               "Error parsing EAM nrho: line in %s\n", eamPotFile );
915        painCave.isFatal = 1;
916        simError();
917      }
# Line 899 | Line 921 | int EAM_NS::parseEAM(atomStruct &info, char *eamPotFil
921      // Value 4
922      if ( (the_token = strtok( NULL, " \n\t,;")) == NULL){
923        sprintf( painCave.errMsg,
924 <               "Error parseing EAM nrho: line in %s\n", eamPotFile );
924 >               "Error parsing EAM nrho: line in %s\n", eamPotFile );
925        painCave.isFatal = 1;
926        simError();
927      }
# Line 909 | Line 931 | int EAM_NS::parseEAM(atomStruct &info, char *eamPotFil
931      // Value 5
932      if ( (the_token = strtok( NULL, " \n\t,;")) == NULL){
933        sprintf( painCave.errMsg,
934 <               "Error parseing EAM nrho: line in %s\n", eamPotFile );
934 >               "Error parsing EAM nrho: line in %s\n", eamPotFile );
935        painCave.isFatal = 1;
936        simError();
937      }
# Line 940 | Line 962 | int EAM_NS::parseEAM(atomStruct &info, char *eamPotFil
962      // Value 1
963      if ( (the_token = strtok( eam_read_buffer, " \n\t,;")) == NULL){
964        sprintf( painCave.errMsg,
965 <               "Error parseing EAM nrho: line in %s\n", eamPotFile );
965 >               "Error parsing EAM nrho: line in %s\n", eamPotFile );
966        painCave.isFatal = 1;
967        simError();
968      }
# Line 950 | Line 972 | int EAM_NS::parseEAM(atomStruct &info, char *eamPotFil
972      // Value 2
973      if ( (the_token = strtok( NULL, " \n\t,;")) == NULL){
974        sprintf( painCave.errMsg,
975 <               "Error parseing EAM nrho: line in %s\n", eamPotFile );
975 >               "Error parsing EAM nrho: line in %s\n", eamPotFile );
976        painCave.isFatal = 1;
977        simError();
978      }
# Line 960 | Line 982 | int EAM_NS::parseEAM(atomStruct &info, char *eamPotFil
982      // Value 3
983      if ( (the_token = strtok( NULL, " \n\t,;")) == NULL){
984        sprintf( painCave.errMsg,
985 <               "Error parseing EAM nrho: line in %s\n", eamPotFile );
985 >               "Error parsing EAM nrho: line in %s\n", eamPotFile );
986        painCave.isFatal = 1;
987        simError();
988      }
# Line 970 | Line 992 | int EAM_NS::parseEAM(atomStruct &info, char *eamPotFil
992      // Value 4
993      if ( (the_token = strtok( NULL, " \n\t,;")) == NULL){
994        sprintf( painCave.errMsg,
995 <               "Error parseing EAM nrho: line in %s\n", eamPotFile );
995 >               "Error parsing EAM nrho: line in %s\n", eamPotFile );
996        painCave.isFatal = 1;
997        simError();
998      }
# Line 980 | Line 1002 | int EAM_NS::parseEAM(atomStruct &info, char *eamPotFil
1002      // Value 5
1003      if ( (the_token = strtok( NULL, " \n\t,;")) == NULL){
1004        sprintf( painCave.errMsg,
1005 <               "Error parseing EAM nrho: line in %s\n", eamPotFile );
1005 >               "Error parsing EAM nrho: line in %s\n", eamPotFile );
1006        painCave.isFatal = 1;
1007        simError();
1008      }
# Line 1010 | Line 1032 | int EAM_NS::parseEAM(atomStruct &info, char *eamPotFil
1032      // Value 1
1033      if ( (the_token = strtok( eam_read_buffer, " \n\t,;")) == NULL){
1034        sprintf( painCave.errMsg,
1035 <               "Error parseing EAM nrho: line in %s\n", eamPotFile );
1035 >               "Error parsing EAM nrho: line in %s\n", eamPotFile );
1036        painCave.isFatal = 1;
1037        simError();
1038      }
# Line 1020 | Line 1042 | int EAM_NS::parseEAM(atomStruct &info, char *eamPotFil
1042      // Value 2
1043      if ( (the_token = strtok( NULL, " \n\t,;")) == NULL){
1044        sprintf( painCave.errMsg,
1045 <               "Error parseing EAM nrho: line in %s\n", eamPotFile );
1045 >               "Error parsing EAM nrho: line in %s\n", eamPotFile );
1046        painCave.isFatal = 1;
1047        simError();
1048      }
# Line 1030 | Line 1052 | int EAM_NS::parseEAM(atomStruct &info, char *eamPotFil
1052      // Value 3
1053      if ( (the_token = strtok( NULL, " \n\t,;")) == NULL){
1054        sprintf( painCave.errMsg,
1055 <               "Error parseing EAM nrho: line in %s\n", eamPotFile );
1055 >               "Error parsing EAM nrho: line in %s\n", eamPotFile );
1056        painCave.isFatal = 1;
1057        simError();
1058      }
# Line 1040 | Line 1062 | int EAM_NS::parseEAM(atomStruct &info, char *eamPotFil
1062      // Value 4
1063      if ( (the_token = strtok( NULL, " \n\t,;")) == NULL){
1064        sprintf( painCave.errMsg,
1065 <               "Error parseing EAM nrho: line in %s\n", eamPotFile );
1065 >               "Error parsing EAM nrho: line in %s\n", eamPotFile );
1066        painCave.isFatal = 1;
1067        simError();
1068      }
# Line 1050 | Line 1072 | int EAM_NS::parseEAM(atomStruct &info, char *eamPotFil
1072      // Value 5
1073      if ( (the_token = strtok( NULL, " \n\t,;")) == NULL){
1074        sprintf( painCave.errMsg,
1075 <               "Error parseing EAM nrho: line in %s\n", eamPotFile );
1075 >               "Error parsing EAM nrho: line in %s\n", eamPotFile );
1076        painCave.isFatal = 1;
1077        simError();
1078      }

Diff Legend

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