ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/group/branches/new_design/OOPSE-4/src/UseTheForce/EAM_FF.cpp
(Generate patch)

Comparing branches/new_design/OOPSE-4/src/UseTheForce/EAM_FF.cpp (file contents):
Revision 1701, Thu Oct 28 22:34:02 2004 UTC vs.
Revision 1702 by tim, Wed Nov 3 18:00:36 2004 UTC

# Line 69 | Line 69 | namespace EAM_NS{
69        if( eam_Frhovals != NULL ) delete[] eam_Frhovals;
70      }
71  
72 <    LinkedAtomType* find(char* key){
72 >    LinkedAtomType* find(const char* key){
73        if( !strcmp(name, key) ) return this;
74        if( next != NULL ) return next->find(key);
75        return NULL;
# Line 527 | Line 527 | void EAM_FF::initializeAtoms( int nAtoms, Atom** the_a
527    
528    for( i=0; i<nAtoms; i++ ){
529      
530 <    currentAtomType = headAtomType->find( the_atoms[i]->getType() );
530 >    currentAtomType = headAtomType->find(the_atoms[i]->getType().c_str() );
531      if( currentAtomType == NULL ){
532        sprintf( painCave.errMsg,
533                 "AtomType error, %s not found in force file.\n",
534 <               the_atoms[i]->getType() );
534 >               the_atoms[i]->getType().c_str() );
535        painCave.isFatal = 1;
536        simError();
537      }

Diff Legend

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