ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/OpenMD/trunk/src/utils/ElementsTable.cpp
(Generate patch)

Comparing trunk/src/utils/ElementsTable.cpp (file contents):
Revision 1782 by gezelter, Wed Aug 22 02:28:28 2012 UTC vs.
Revision 1879 by gezelter, Sun Jun 16 15:15:42 2013 UTC

# Line 25 | Line 25 | GNU General Public License for more details.
25   * @file ElementsTable.cpp
26   * @author gezelter
27   * @date 12/21/2007
28 * @time 11:30am
28   * @version 1.0
29   */
30  
# Line 69 | Line 68 | namespace OpenMD {
68    
69    ElementsTable::~ElementsTable() {
70      std::vector<Element*>::iterator i;
71 <    for (i = elements_.begin(); i != elements_.end(); i++)
71 >    for (i = elements_.begin(); i != elements_.end(); ++i)
72        delete *i;
73    }
74    
75    void ElementsTable::ParseLine(const char *line) {
76      int num, maxbonds;
77 <    char symbol[5];
77 >    char symbol[6];
78      char name[256];
79      RealType Rcov,Rvdw,mass, elNeg, ionize, elAffin;
80      RealType red, green, blue;
# Line 270 | Line 269 | namespace OpenMD {
269        Init();
270      
271      std::vector<Element*>::iterator i;
272 <    for (i = elements_.begin();i != elements_.end();i++)
272 >    for (i = elements_.begin();i != elements_.end(); ++i)
273        if (!strncasecmp(sym,(*i)->GetSymbol(),2))
274          return((*i)->GetAtomicNum());
275  
# Line 327 | Line 326 | namespace OpenMD {
326        simError();
327      }
328        
329 <    char charBuffer[BUFF_SIZE];
329 >
330      if ((*ifsP)) {
331 +      char charBuffer[BUFF_SIZE];
332        while(ifsP->getline(charBuffer,BUFF_SIZE))
333          ParseLine(charBuffer);
334 <
334 >      
335        if (ifs1)
336          ifs1.close();
337        if (ifs2)

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines