ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/group/trunk/OOPSE/libmdtools/InitializeFromFile.cpp
(Generate patch)

Comparing trunk/OOPSE/libmdtools/InitializeFromFile.cpp (file contents):
Revision 906 by mmeineke, Thu Jan 8 15:44:47 2004 UTC vs.
Revision 909 by mmeineke, Thu Jan 8 17:57:19 2004 UTC

# Line 618 | Line 618 | char* InitializeFromFile::parseCommentLine(char* readL
618        return NULL;
619      
620      //get eta
621 <    for(int i = 0 ; i < 9; i++){
622 <      foo = strtok(NULL, " ,;\t");
623 <      if(foo == NULL){
624 <        sprintf( painCave.errMsg,
625 <                 "error in reading eta[%d] from %s\n", i, c_in_name );
626 <        return strdup( painCave.errMsg );
627 <      }
628 <      eta[i] = atof( foo );
621 >    foo = strtok(NULL, " ,;\t");
622 >    if(foo != NULL ){
623 >      for(int i = 0 ; i < 9; i++){
624 >        
625 >        if(foo == NULL){
626 >          sprintf( painCave.errMsg,
627 >                   "error in reading eta[%d] from %s\n", i, c_in_name );
628 >          return strdup( painCave.errMsg );
629 >        }
630 >        eta[i] = atof( foo );
631 >        foo = strtok(NULL, " ,;\t");
632 >      }
633      }
634 +    else
635 +      return NULL;
636      
637      //push eta into SimInfo::properties which can be
638      //retrieved by integrator later

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines