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 631 by chuckv, Thu Jul 17 19:25:51 2003 UTC vs.
Revision 814 by mmeineke, Thu Oct 23 19:57:25 2003 UTC

# Line 30 | Line 30 | namespace EAM_NS{
30      double mass;
31      double lattice_constant;
32      double eam_drho;  // The distance between each of the points indexed by rho.
33 +    double eam_rcut;  // The cutoff radius for eam.
34      double eam_dr;    // The distance between each of the rho points.    
35      int eam_nrho;  // Number of points indexed by rho
36      int eam_nr;    // The number of points based on r (Both Phi(r) and Rho(r)).
36 –    double eam_rcut;  // The cutoff radius for eam.
37      int eam_ident; // Atomic number
38      int ident;
39      int last;      //  0  -> default
# Line 76 | Line 76 | namespace EAM_NS{
76      void add( atomStruct &info, double *the_eam_rvals,
77                double *the_eam_rhovals,double *the_eam_Frhovals ){
78  
79 –      int i;
80 –
79        // check for duplicates
80        
81        if( !strcmp( info.name, name ) ){
# Line 164 | Line 162 | EAM_FF::EAM_FF(){
162    char* ffPath_env = "FORCE_PARAM_PATH";
163    char* ffPath;
164    char temp[200];
167 –  char errMsg[1000];
165  
166    headAtomType = NULL;
167    currentAtomType = NULL;
168 +
169 +  // Set eamRcut to 0.0
170 +  eamRcut = 0.0;
171  
172    // do the funtion wrapping
173    wrapMeFF( this );
# Line 179 | Line 179 | EAM_FF::EAM_FF(){
179    // Init the atomStruct mpi type
180  
181    atomStruct atomProto; // mpiPrototype
182 <  int atomBC[3] = {15,4,6};  // block counts
182 >  int atomBC[3] = {15,5,5};  // block counts
183    MPI_Aint atomDspls[3];           // displacements
184    MPI_Datatype atomMbrTypes[3];    // member mpi types
185  
# Line 264 | Line 264 | EAM_FF::~EAM_FF(){
264   #endif // is_mpi
265   }
266  
267 < void EAM_FF::initForceField( int ljMixRule ){
267 >
268 > void EAM_FF::calcRcut( void ){
269    
270 +  #ifdef IS_MPI
271 +  double tempEamRcut = eamRcut;
272 +  MPI_Allreduce( &tempEamRcut, &eamRcut, 1, MPI_DOUBLE, MPI_MAX,
273 +                 MPI_COMM_WORLD);
274 + #endif  //is_mpi
275 +  entry_plug->setRcut(eamRcut);
276 + }
277 +
278 +
279 + void EAM_FF::initForceField( int ljMixRule ){
280    initFortran( ljMixRule, 0 );
281   }
282  
# Line 284 | Line 295 | void EAM_FF::cleanMe( void ){
295   #endif // is_mpi
296   }
297  
298 +
299   void EAM_FF::readParams( void ){
300  
301    atomStruct info;
302    info.last = 1; // initialize last to have the last set.
303                   // if things go well, last will be set to 0
304  
293 –  int i;
305    int identNum;
306    double *eam_rvals;    // Z of r values
307    double *eam_rhovals;  // rho of r values
# Line 470 | Line 481 | void EAM_FF::readParams( void ){
481    }
482        
483    entry_plug->useLJ = 0;
484 <
484 >  entry_plug->useEAM = 1;
485    // Walk down again and send out EAM type
486    currentAtomType = headAtomType->next;
487    while( currentAtomType != NULL ){
488      
489      if( currentAtomType->name[0] != '\0' ){
490        isError = 0;
491 +
492        newEAMtype( &(currentAtomType->lattice_constant),
493                    &(currentAtomType->eam_nrho),
494                    &(currentAtomType->eam_drho),
# Line 488 | Line 500 | void EAM_FF::readParams( void ){
500                    currentAtomType->eam_Frhovals,
501                    &(currentAtomType->eam_ident),
502                    &isError);
503 +
504        if( isError ){
505          sprintf( painCave.errMsg,
506                   "Error initializing the \"%s\" atom type in fortran EAM\n",
# Line 507 | Line 520 | void EAM_FF::readParams( void ){
520    MPIcheckPoint();
521   #endif // is_mpi
522  
523 +
524 +
525   }
526  
527  
528   void EAM_FF::initializeAtoms( int nAtoms, Atom** the_atoms ){
529    
530    int i;
531 <
531 >  
532    // initialize the atoms
533    
519 –
520 –  Atom* thisAtom;
521 –
534    for( i=0; i<nAtoms; i++ ){
535      
536      currentAtomType = headAtomType->find( the_atoms[i]->getType() );
# Line 533 | Line 545 | void EAM_FF::initializeAtoms( int nAtoms, Atom** the_a
545      the_atoms[i]->setMass( currentAtomType->mass );
546      the_atoms[i]->setIdent( currentAtomType->ident );
547      the_atoms[i]->setEAM();
548 +    the_atoms[i]->setEamRcut( currentAtomType->eam_rcut);
549  
550 +    if (eamRcut < currentAtomType->eam_rcut) eamRcut = currentAtomType->eam_rcut;
551 +
552    }
553   }
554  
# Line 661 | Line 676 | int EAM_NS::parseEAM(atomStruct &info, char *eamPotFil
676                       double **eam_rvals,
677                       double **eam_rhovals,
678                       double **eam_Frhovals){
679 <  
679 >  double* myEam_rvals;
680 >  double* myEam_rhovals;
681 >  double* myEam_Frhovals;
682 >
683    char* ffPath_env = "FORCE_PARAM_PATH";
684    char* ffPath;
685    char* the_token;
686    char* eam_eof_test;
687    FILE *eamFile;
688 <  const int BUFFERSIZE = 2000;
688 >  const int BUFFERSIZE = 3000;
689  
690    char temp[200];
691    int linenumber;
692    int nReadLines;
693    char eam_read_buffer[BUFFERSIZE];
694  
695 +
696    int i,j;
697  
698    linenumber = 0;
# Line 814 | Line 833 | int EAM_NS::parseEAM(atomStruct &info, char *eamPotFil
833    info.eam_rcut = atof( the_token);
834  
835  
836 +
837 +
838 +
839    // Ok now we have to allocate point arrays and read in number of points
840    // Index the arrays for fortran, starting at 1
841 <  *eam_Frhovals = new double[info.eam_nrho];
842 <  *eam_rvals    = new double[info.eam_nr];
843 <  *eam_rhovals  = new double[info.eam_nr];
841 >  myEam_Frhovals = new double[info.eam_nrho];
842 >  myEam_rvals    = new double[info.eam_nr];
843 >  myEam_rhovals  = new double[info.eam_nr];
844  
845    // Parse F of rho vals.
846  
847    // Assume for now that we have a complete number of lines
848    nReadLines = int(info.eam_nrho/5);
849 +  
850  
851 +
852    for (i=0;i<nReadLines;i++){
853      j = i*5;
854 <    
854 >
855      // Read next line
856      eam_eof_test = fgets(eam_read_buffer, sizeof(eam_read_buffer),eamFile);
857      linenumber++;
# Line 847 | Line 871 | int EAM_NS::parseEAM(atomStruct &info, char *eamPotFil
871        painCave.isFatal = 1;
872        simError();
873      }
874 +
875 +    myEam_Frhovals[j+0] = atof( the_token );
876      
851 –    *eam_Frhovals[j+0] = atof( the_token );
852 –    
877      // Value 2
878      if ( (the_token = strtok( NULL, " \n\t,;")) == NULL){
879        sprintf( painCave.errMsg,
# Line 857 | Line 881 | int EAM_NS::parseEAM(atomStruct &info, char *eamPotFil
881        painCave.isFatal = 1;
882        simError();
883      }
884 <  
885 <    *eam_Frhovals[j+1] = atof( the_token );
884 >
885 >    myEam_Frhovals[j+1] = atof( the_token );
886      
887      // Value 3
888      if ( (the_token = strtok( NULL, " \n\t,;")) == NULL){
# Line 867 | Line 891 | int EAM_NS::parseEAM(atomStruct &info, char *eamPotFil
891        painCave.isFatal = 1;
892        simError();
893      }
894 +
895 +    myEam_Frhovals[j+2] = atof( the_token );
896      
871 –    *eam_Frhovals[j+2] = atof( the_token );
872 –    
897      // Value 4
898      if ( (the_token = strtok( NULL, " \n\t,;")) == NULL){
899        sprintf( painCave.errMsg,
# Line 877 | Line 901 | int EAM_NS::parseEAM(atomStruct &info, char *eamPotFil
901        painCave.isFatal = 1;
902        simError();
903      }
880 –    
881 –    *eam_Frhovals[j+3] = atof( the_token );
904  
905 +    myEam_Frhovals[j+3] = atof( the_token );
906 +
907      // Value 5
908      if ( (the_token = strtok( NULL, " \n\t,;")) == NULL){
909        sprintf( painCave.errMsg,
# Line 887 | Line 911 | int EAM_NS::parseEAM(atomStruct &info, char *eamPotFil
911        painCave.isFatal = 1;
912        simError();
913      }
914 +
915 +    myEam_Frhovals[j+4] = atof( the_token );
916      
891 –    *eam_Frhovals[j+4] = atof( the_token );
892 –    
917    }
918    // Parse Z of r vals
919    
# Line 919 | Line 943 | int EAM_NS::parseEAM(atomStruct &info, char *eamPotFil
943        simError();
944      }
945      
946 <    *eam_rvals[j+0] = atof( the_token );
946 >    myEam_rvals[j+0] = atof( the_token );
947  
948      // Value 2
949      if ( (the_token = strtok( NULL, " \n\t,;")) == NULL){
# Line 929 | Line 953 | int EAM_NS::parseEAM(atomStruct &info, char *eamPotFil
953        simError();
954      }
955    
956 <    *eam_rvals[j+1] = atof( the_token );
956 >    myEam_rvals[j+1] = atof( the_token );
957  
958      // Value 3
959      if ( (the_token = strtok( NULL, " \n\t,;")) == NULL){
# Line 939 | Line 963 | int EAM_NS::parseEAM(atomStruct &info, char *eamPotFil
963        simError();
964      }
965    
966 <    *eam_rvals[j+2] = atof( the_token );
966 >    myEam_rvals[j+2] = atof( the_token );
967  
968      // Value 4
969      if ( (the_token = strtok( NULL, " \n\t,;")) == NULL){
# Line 949 | Line 973 | int EAM_NS::parseEAM(atomStruct &info, char *eamPotFil
973        simError();
974      }
975    
976 <    *eam_rvals[j+3] = atof( the_token );
976 >    myEam_rvals[j+3] = atof( the_token );
977  
978      // Value 5
979      if ( (the_token = strtok( NULL, " \n\t,;")) == NULL){
# Line 959 | Line 983 | int EAM_NS::parseEAM(atomStruct &info, char *eamPotFil
983        simError();
984      }
985    
986 <    *eam_rvals[j+4] = atof( the_token );
986 >    myEam_rvals[j+4] = atof( the_token );
987  
988    }
989    // Parse rho of r vals
# Line 989 | Line 1013 | int EAM_NS::parseEAM(atomStruct &info, char *eamPotFil
1013        simError();
1014      }
1015    
1016 <    *eam_rhovals[j+0] = atof( the_token );
1016 >    myEam_rhovals[j+0] = atof( the_token );
1017  
1018      // Value 2
1019 <    if ( (the_token = strtok( eam_read_buffer, " \n\t,;")) == NULL){
1019 >    if ( (the_token = strtok( NULL, " \n\t,;")) == NULL){
1020        sprintf( painCave.errMsg,
1021                 "Error parseing EAM nrho: line in %s\n", eamPotFile );
1022        painCave.isFatal = 1;
1023        simError();
1024      }
1025    
1026 <    *eam_rhovals[j+1] = atof( the_token );
1026 >    myEam_rhovals[j+1] = atof( the_token );
1027  
1028      // Value 3
1029 <    if ( (the_token = strtok( eam_read_buffer, " \n\t,;")) == NULL){
1029 >    if ( (the_token = strtok( NULL, " \n\t,;")) == NULL){
1030        sprintf( painCave.errMsg,
1031                 "Error parseing EAM nrho: line in %s\n", eamPotFile );
1032        painCave.isFatal = 1;
1033        simError();
1034      }
1035    
1036 <    *eam_rhovals[j+2] = atof( the_token );
1036 >    myEam_rhovals[j+2] = atof( the_token );
1037  
1038      // Value 4
1039 <    if ( (the_token = strtok( eam_read_buffer, " \n\t,;")) == NULL){
1039 >    if ( (the_token = strtok( NULL, " \n\t,;")) == NULL){
1040        sprintf( painCave.errMsg,
1041                 "Error parseing EAM nrho: line in %s\n", eamPotFile );
1042        painCave.isFatal = 1;
1043        simError();
1044      }
1045    
1046 <    *eam_rhovals[j+3] = atof( the_token );
1046 >    myEam_rhovals[j+3] = atof( the_token );
1047  
1048      // Value 5
1049 <    if ( (the_token = strtok( eam_read_buffer, " \n\t,;")) == NULL){
1049 >    if ( (the_token = strtok( NULL, " \n\t,;")) == NULL){
1050        sprintf( painCave.errMsg,
1051                 "Error parseing EAM nrho: line in %s\n", eamPotFile );
1052        painCave.isFatal = 1;
1053        simError();
1054      }
1055    
1056 <    *eam_rhovals[j+4] = atof( the_token );
1057 <
1056 >    myEam_rhovals[j+4] = atof( the_token );
1057 >
1058    }
1059 +  *eam_rvals = myEam_rvals;
1060 +  *eam_rhovals = myEam_rhovals;
1061 +  *eam_Frhovals = myEam_Frhovals;
1062  
1063    fclose(eamFile);
1064    return 0;

Diff Legend

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