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 1097 by gezelter, Mon Apr 12 20:32:20 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 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 );
174  
# 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->setDefaultRcut(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 396 | Line 407 | void EAM_FF::readParams( void ){
407      MPIcheckPoint();
408  
409      headAtomType = new LinkedAtomType;
410 <    recieveFrcStruct( &info, mpiAtomStructType );
410 >    receiveFrcStruct( &info, mpiAtomStructType );
411  
412      while( !info.last ){
413        
# Line 422 | Line 433 | void EAM_FF::readParams( void ){
433        
434        MPIcheckPoint();
435  
436 <      recieveFrcStruct( &info, mpiAtomStructType );
436 >      receiveFrcStruct( &info, mpiAtomStructType );
437  
438  
439      }
# Line 438 | Line 449 | void EAM_FF::readParams( void ){
449    int isDipole = 0;
450    int isSSD = 0;
451    int isGB = 0;
452 <  int isEAM= 1;
452 >  int isEAM = 1;
453 >  int isCharge = 0;
454    double dipole = 0.0;
455 +  double charge = 0.0;
456    double eamSigma = 0.0;
457    double eamEpslon = 0.0;
458    
# Line 454 | Line 467 | void EAM_FF::readParams( void ){
467                   &isDipole,
468                   &isGB,
469                   &isEAM,
470 +                 &isCharge,
471                   &eamEpslon,
472                   &eamSigma,
473 +                 &charge,
474                   &dipole,
475                   &isError );
476        if( isError ){
# Line 470 | Line 485 | void EAM_FF::readParams( void ){
485    }
486        
487    entry_plug->useLJ = 0;
488 <
488 >  entry_plug->useEAM = 1;
489    // Walk down again and send out EAM type
490    currentAtomType = headAtomType->next;
491    while( currentAtomType != NULL ){
492      
493      if( currentAtomType->name[0] != '\0' ){
494        isError = 0;
495 +
496        newEAMtype( &(currentAtomType->lattice_constant),
497                    &(currentAtomType->eam_nrho),
498                    &(currentAtomType->eam_drho),
# Line 488 | Line 504 | void EAM_FF::readParams( void ){
504                    currentAtomType->eam_Frhovals,
505                    &(currentAtomType->eam_ident),
506                    &isError);
507 +
508        if( isError ){
509          sprintf( painCave.errMsg,
510                   "Error initializing the \"%s\" atom type in fortran EAM\n",
# Line 507 | Line 524 | void EAM_FF::readParams( void ){
524    MPIcheckPoint();
525   #endif // is_mpi
526  
527 +
528 +
529   }
530  
531  
532   void EAM_FF::initializeAtoms( int nAtoms, Atom** the_atoms ){
533    
534    int i;
535 <
535 >  
536    // initialize the atoms
537    
519 –
520 –  Atom* thisAtom;
521 –
538    for( i=0; i<nAtoms; i++ ){
539      
540      currentAtomType = headAtomType->find( the_atoms[i]->getType() );
# Line 532 | Line 548 | void EAM_FF::initializeAtoms( int nAtoms, Atom** the_a
548      
549      the_atoms[i]->setMass( currentAtomType->mass );
550      the_atoms[i]->setIdent( currentAtomType->ident );
535 –    the_atoms[i]->setEAM();
551  
552 +    if (eamRcut < currentAtomType->eam_rcut) eamRcut = currentAtomType->eam_rcut;
553 +    
554    }
555   }
556  
# Line 661 | Line 678 | int EAM_NS::parseEAM(atomStruct &info, char *eamPotFil
678                       double **eam_rvals,
679                       double **eam_rhovals,
680                       double **eam_Frhovals){
681 <  
681 >  double* myEam_rvals;
682 >  double* myEam_rhovals;
683 >  double* myEam_Frhovals;
684 >
685    char* ffPath_env = "FORCE_PARAM_PATH";
686    char* ffPath;
687    char* the_token;
688    char* eam_eof_test;
689    FILE *eamFile;
690 <  const int BUFFERSIZE = 2000;
690 >  const int BUFFERSIZE = 3000;
691  
692    char temp[200];
693    int linenumber;
694    int nReadLines;
695    char eam_read_buffer[BUFFERSIZE];
696  
697 +
698    int i,j;
699  
700    linenumber = 0;
# Line 814 | Line 835 | int EAM_NS::parseEAM(atomStruct &info, char *eamPotFil
835    info.eam_rcut = atof( the_token);
836  
837  
838 +
839 +
840 +
841    // Ok now we have to allocate point arrays and read in number of points
842    // Index the arrays for fortran, starting at 1
843 <  *eam_Frhovals = new double[info.eam_nrho];
844 <  *eam_rvals    = new double[info.eam_nr];
845 <  *eam_rhovals  = new double[info.eam_nr];
843 >  myEam_Frhovals = new double[info.eam_nrho];
844 >  myEam_rvals    = new double[info.eam_nr];
845 >  myEam_rhovals  = new double[info.eam_nr];
846  
847    // Parse F of rho vals.
848  
849    // Assume for now that we have a complete number of lines
850    nReadLines = int(info.eam_nrho/5);
851 +  
852  
853 +
854    for (i=0;i<nReadLines;i++){
855      j = i*5;
856 <    
856 >
857      // Read next line
858      eam_eof_test = fgets(eam_read_buffer, sizeof(eam_read_buffer),eamFile);
859      linenumber++;
# Line 847 | Line 873 | int EAM_NS::parseEAM(atomStruct &info, char *eamPotFil
873        painCave.isFatal = 1;
874        simError();
875      }
876 +
877 +    myEam_Frhovals[j+0] = atof( the_token );
878      
851 –    *eam_Frhovals[j+0] = atof( the_token );
852 –    
879      // Value 2
880      if ( (the_token = strtok( NULL, " \n\t,;")) == NULL){
881        sprintf( painCave.errMsg,
# Line 857 | Line 883 | int EAM_NS::parseEAM(atomStruct &info, char *eamPotFil
883        painCave.isFatal = 1;
884        simError();
885      }
886 <  
887 <    *eam_Frhovals[j+1] = atof( the_token );
886 >
887 >    myEam_Frhovals[j+1] = atof( the_token );
888      
889      // Value 3
890      if ( (the_token = strtok( NULL, " \n\t,;")) == NULL){
# Line 867 | Line 893 | int EAM_NS::parseEAM(atomStruct &info, char *eamPotFil
893        painCave.isFatal = 1;
894        simError();
895      }
896 +
897 +    myEam_Frhovals[j+2] = atof( the_token );
898      
871 –    *eam_Frhovals[j+2] = atof( the_token );
872 –    
899      // Value 4
900      if ( (the_token = strtok( NULL, " \n\t,;")) == NULL){
901        sprintf( painCave.errMsg,
# Line 877 | Line 903 | int EAM_NS::parseEAM(atomStruct &info, char *eamPotFil
903        painCave.isFatal = 1;
904        simError();
905      }
880 –    
881 –    *eam_Frhovals[j+3] = atof( the_token );
906  
907 +    myEam_Frhovals[j+3] = atof( the_token );
908 +
909      // Value 5
910      if ( (the_token = strtok( NULL, " \n\t,;")) == NULL){
911        sprintf( painCave.errMsg,
# Line 887 | Line 913 | int EAM_NS::parseEAM(atomStruct &info, char *eamPotFil
913        painCave.isFatal = 1;
914        simError();
915      }
916 +
917 +    myEam_Frhovals[j+4] = atof( the_token );
918      
891 –    *eam_Frhovals[j+4] = atof( the_token );
892 –    
919    }
920    // Parse Z of r vals
921    
# Line 919 | Line 945 | int EAM_NS::parseEAM(atomStruct &info, char *eamPotFil
945        simError();
946      }
947      
948 <    *eam_rvals[j+0] = atof( the_token );
948 >    myEam_rvals[j+0] = atof( the_token );
949  
950      // Value 2
951      if ( (the_token = strtok( NULL, " \n\t,;")) == NULL){
# Line 929 | Line 955 | int EAM_NS::parseEAM(atomStruct &info, char *eamPotFil
955        simError();
956      }
957    
958 <    *eam_rvals[j+1] = atof( the_token );
958 >    myEam_rvals[j+1] = atof( the_token );
959  
960      // Value 3
961      if ( (the_token = strtok( NULL, " \n\t,;")) == NULL){
# Line 939 | Line 965 | int EAM_NS::parseEAM(atomStruct &info, char *eamPotFil
965        simError();
966      }
967    
968 <    *eam_rvals[j+2] = atof( the_token );
968 >    myEam_rvals[j+2] = atof( the_token );
969  
970      // Value 4
971      if ( (the_token = strtok( NULL, " \n\t,;")) == NULL){
# Line 949 | Line 975 | int EAM_NS::parseEAM(atomStruct &info, char *eamPotFil
975        simError();
976      }
977    
978 <    *eam_rvals[j+3] = atof( the_token );
978 >    myEam_rvals[j+3] = atof( the_token );
979  
980      // Value 5
981      if ( (the_token = strtok( NULL, " \n\t,;")) == NULL){
# Line 959 | Line 985 | int EAM_NS::parseEAM(atomStruct &info, char *eamPotFil
985        simError();
986      }
987    
988 <    *eam_rvals[j+4] = atof( the_token );
988 >    myEam_rvals[j+4] = atof( the_token );
989  
990    }
991    // Parse rho of r vals
# Line 989 | Line 1015 | int EAM_NS::parseEAM(atomStruct &info, char *eamPotFil
1015        simError();
1016      }
1017    
1018 <    *eam_rhovals[j+0] = atof( the_token );
1018 >    myEam_rhovals[j+0] = atof( the_token );
1019  
1020      // Value 2
1021 <    if ( (the_token = strtok( eam_read_buffer, " \n\t,;")) == NULL){
1021 >    if ( (the_token = strtok( NULL, " \n\t,;")) == NULL){
1022        sprintf( painCave.errMsg,
1023                 "Error parseing EAM nrho: line in %s\n", eamPotFile );
1024        painCave.isFatal = 1;
1025        simError();
1026      }
1027    
1028 <    *eam_rhovals[j+1] = atof( the_token );
1028 >    myEam_rhovals[j+1] = atof( the_token );
1029  
1030      // Value 3
1031 <    if ( (the_token = strtok( eam_read_buffer, " \n\t,;")) == NULL){
1031 >    if ( (the_token = strtok( NULL, " \n\t,;")) == NULL){
1032        sprintf( painCave.errMsg,
1033                 "Error parseing EAM nrho: line in %s\n", eamPotFile );
1034        painCave.isFatal = 1;
1035        simError();
1036      }
1037    
1038 <    *eam_rhovals[j+2] = atof( the_token );
1038 >    myEam_rhovals[j+2] = atof( the_token );
1039  
1040      // Value 4
1041 <    if ( (the_token = strtok( eam_read_buffer, " \n\t,;")) == NULL){
1041 >    if ( (the_token = strtok( NULL, " \n\t,;")) == NULL){
1042        sprintf( painCave.errMsg,
1043                 "Error parseing EAM nrho: line in %s\n", eamPotFile );
1044        painCave.isFatal = 1;
1045        simError();
1046      }
1047    
1048 <    *eam_rhovals[j+3] = atof( the_token );
1048 >    myEam_rhovals[j+3] = atof( the_token );
1049  
1050      // Value 5
1051 <    if ( (the_token = strtok( eam_read_buffer, " \n\t,;")) == NULL){
1051 >    if ( (the_token = strtok( NULL, " \n\t,;")) == NULL){
1052        sprintf( painCave.errMsg,
1053                 "Error parseing EAM nrho: line in %s\n", eamPotFile );
1054        painCave.isFatal = 1;
1055        simError();
1056      }
1057    
1058 <    *eam_rhovals[j+4] = atof( the_token );
1059 <
1058 >    myEam_rhovals[j+4] = atof( the_token );
1059 >
1060    }
1061 +  *eam_rvals = myEam_rvals;
1062 +  *eam_rhovals = myEam_rhovals;
1063 +  *eam_Frhovals = myEam_Frhovals;
1064  
1065    fclose(eamFile);
1066    return 0;

Diff Legend

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