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

Comparing branches/new_design/OOPSE-4/src/UseTheForce/Shapes_FF.cpp (file contents):
Revision 1828 by tim, Thu Dec 2 05:06:26 2004 UTC vs.
Revision 1829 by tim, Thu Dec 2 05:14:58 2004 UTC

# Line 70 | Line 70 | void Shapes_FF::readParams( void ){
70  
71    char readLine[1024];
72  
73 <   std::stringfileName;
74 <   std::stringshapeFileName;
75 <   std::stringtempString;
73 >   std::string fileName;
74 >   std::string shapeFileName;
75 >   std::string tempString;
76  
77    char *nameToken;
78    char *delim = " ,;\t\n";
# Line 82 | Line 82 | void Shapes_FF::readParams( void ){
82    int nStrength = 0;
83    int myATID;
84    int isError;
85 <   std::stringnameString;
85 >   std::string nameString;
86    AtomType* at;
87    DirectionalAtomType* dat;
88    ShapeAtomType* st;
# Line 177 | Line 177 | void Shapes_FF::readParams( void ){
177            atomTypeMap.insert(make_pair(nameString, st));
178            
179          } else {
180 <          // atomType map already contained this  std::string(i.e. it was
180 >          // atomType map already contained this  std::string (i.e. it was
181            // declared in a previous block, and we just need to add
182            // the shape-specific information for this AtomType:
183  
# Line 302 | Line 302 | void Shapes_FF::initializeAtoms( int nAtoms, Atom** th
302    double ji[3];
303    double inertialMat[3][3];
304    Mat3x3d momInt;
305 <   std::stringmyTypeString;
305 >   std::string myTypeString;
306  
307    for( i=0; i<nAtoms; i++ ){
308      
# Line 402 | Line 402 | void Shapes_FF::parseShapeFile(string shapeFileName, S
402    RealSphericalHarmonic* rsh;
403     std::vector<RealSphericalHarmonic*> functionVector;
404    ifstrstream shapeFile;
405 <   std::stringtempString;
405 >   std::string tempString;
406  
407    shapeFile.open( shapeFileName.c_str() );
408    

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines