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

Comparing branches/new_design/OOPSE-2.0/src/UseTheForce/Shapes_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 306 | Line 306 | void Shapes_FF::initializeAtoms( int nAtoms, Atom** th
306  
307    for( i=0; i<nAtoms; i++ ){
308      
309 <    myTypeString = the_atoms[i]->getType();
309 >    myTypeString = the_atoms[i]->getType().c_str();
310      iter = atomTypeMap.find(myTypeString);
311  
312      if (iter == atomTypeMap.end()) {
313        sprintf( painCave.errMsg,
314                 "AtomType error, %s not found in force file.\n",
315 <               the_atoms[i]->getType() );
315 >               the_atoms[i]->getType().c_str() );
316        painCave.isFatal = 1;
317        simError();
318      } else {

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines