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 2077 by gezelter, Mon Mar 9 17:10:26 2015 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 40 | Line 39 | GNU General Public License for more details.
39   #include "utils/simError.h"
40   #include "io/ifstrstream.hpp"
41  
43 #ifdef _MSC_VER
44 #define strncasecmp _strnicmp
45 #define strcasecmp _stricmp
46 #endif
47
48
42   #ifdef WIN32
43   #define FILE_SEP_CHAR "\\"
44   #else
# Line 69 | Line 62 | namespace OpenMD {
62    
63    ElementsTable::~ElementsTable() {
64      std::vector<Element*>::iterator i;
65 <    for (i = elements_.begin(); i != elements_.end(); i++)
65 >    for (i = elements_.begin(); i != elements_.end(); ++i)
66        delete *i;
67    }
68    
69    void ElementsTable::ParseLine(const char *line) {
70      int num, maxbonds;
71 <    char symbol[5];
71 >    char symbol[6];
72      char name[256];
73      RealType Rcov,Rvdw,mass, elNeg, ionize, elAffin;
74      RealType red, green, blue;
# Line 270 | Line 263 | namespace OpenMD {
263        Init();
264      
265      std::vector<Element*>::iterator i;
266 <    for (i = elements_.begin();i != elements_.end();i++)
266 >    for (i = elements_.begin();i != elements_.end(); ++i)
267        if (!strncasecmp(sym,(*i)->GetSymbol(),2))
268          return((*i)->GetAtomicNum());
269  
# Line 327 | Line 320 | namespace OpenMD {
320        simError();
321      }
322        
323 <    char charBuffer[BUFF_SIZE];
323 >
324      if ((*ifsP)) {
325 +      char charBuffer[BUFF_SIZE];
326        while(ifsP->getline(charBuffer,BUFF_SIZE))
327          ParseLine(charBuffer);
328 <
328 >      
329        if (ifs1)
330          ifs1.close();
331        if (ifs2)

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines