ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/group/branches/new-templateless/OOPSE/libmdtools/DumpReader.cpp
(Generate patch)

Comparing:
trunk/OOPSE/libmdtools/DumpReader.cpp (file contents), Revision 829 by gezelter, Tue Oct 28 16:03:37 2003 UTC vs.
branches/new-templateless/OOPSE/libmdtools/DumpReader.cpp (file contents), Revision 851 by mmeineke, Wed Nov 5 19:18:17 2003 UTC

# Line 686 | Line 686 | char* DumpReader::parseCommentLine(char* readLine, dou
686  
687    char *foo; // the pointer to the current string token
688    int j;
689 +  double chi, integralOfChidt;
690 +  double eta[9];
691  
692    // set the string tokenizer
693    
# Line 786 | Line 788 | char* DumpReader::parseCommentLine(char* readLine, dou
788    boxMat[8] = atof( foo );    
789  
790    return NULL;
791 +
792 +  //get chi and integralOfChidt, they should appear by pair
793 +  GenericData* myProps = simnfo->getProperties();
794 +  foo = strtok(NULL, " ,;\t\n");
795 +  if(foo != NULL){
796 +    chi = atof(foo);
797 +    
798 +    foo = strtok(NULL, " ,;\t\n");
799 +    if(foo == NULL){
800 +      sprintf( painCave.errMsg,
801 +               "chi and integralOfChidt should appear by pair in %s\n", inName );
802 +      return strdup( painCave.errMsg );
803 +    }
804 +    integralOfChidt = atof( foo );
805 +    
806 +    //push chi and integralOfChidt into SimInfo::properties which can be
807 +    //retrieved by integrator later
808 +
809 +    myProps->add( CHIVALUE_ID, chi );
810 +    myProps->add( INTEGRALOFCHIDT_ID, integralOfChidt );
811 +  }
812 +  else
813 +    return NULL;
814 +  
815 +  //get eta
816 +  for(int i = 0 ; i < 9; i++){
817 +    foo = strtok(NULL, " ,;\t");
818 +    if(foo == NULL){
819 +      sprintf( painCave.errMsg,
820 +               "error in reading eta[%d] from %s\n", i, inName );
821 +      return strdup( painCave.errMsg );
822 +    }
823 +    eta[i] = atof( foo );
824 +  }
825 +  
826 +  //push eta into SimInfo::properties which can be
827 +  //retrieved by integrator later
828 +  //simnfo->setBoxM( theBoxMat3 );
829 +  
830 +  myProps->add( ETAVALUE_ID, eta, 9);  
831 +  
832 +  return NULL;
833 +  
834 +  
835 +
836   }
837  
838  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines