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

Comparing trunk/OOPSE-4/src/io/InitializeFromFile.cpp (file contents):
Revision 1624 by tim, Fri Sep 24 16:27:58 2004 UTC vs.
Revision 1625 by tim, Thu Oct 21 16:22:01 2004 UTC

# Line 604 | Line 604 | char* InitializeFromFile::parseCommentLine(char* readL
604        
605        //push chi and integralOfChidt into SimInfo::properties which can be
606        //retrieved by integrator later
607 <      DoubleData* chiValue = new DoubleData();
607 >      DoubleGenericData* chiValue = new DoubleGenericData();
608        chiValue->setID(CHIVALUE_ID);
609        chiValue->setData(chi);
610        entry_plug->addProperty(chiValue);
611        
612 <      DoubleData* integralOfChidtValue = new DoubleData();
612 >      DoubleGenericData* integralOfChidtValue = new DoubleGenericData();
613        integralOfChidtValue->setID(INTEGRALOFCHIDT_ID);
614        integralOfChidtValue->setData(integralOfChidt);
615        entry_plug->addProperty(integralOfChidtValue);
# Line 639 | Line 639 | char* InitializeFromFile::parseCommentLine(char* readL
639      //push eta into SimInfo::properties which can be
640      //retrieved by integrator later
641      
642 <    DoubleArrayData* etaValue = new DoubleArrayData();
643 <    etaValue->setID(ETAVALUE_ID);
644 <    etaValue->setData(eta, 9);
642 >    DoubleVectorGenericData* etaValue = new DoubleVectorGenericData(ETAVALUE_ID);
643 >    etaValue->insert(etaValue->end(), eta, eta+9);
644      entry_plug->addProperty(etaValue);
645    }
646  

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines