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); |
805 |
|
|
806 |
|
//push chi and integralOfChidt into SimInfo::properties which can be |
807 |
|
//retrieved by integrator later |
808 |
< |
DoubleData* chiValue = new DoubleData(); |
809 |
< |
chiValue->setID(CHIVALUE_ID); |
810 |
< |
chiValue->setData(chi); |
810 |
< |
simnfo->addProperty(chiValue); |
811 |
< |
|
812 |
< |
DoubleData* integralOfChidtValue = new DoubleData(); |
813 |
< |
integralOfChidtValue->setID(INTEGRALOFCHIDT_ID); |
814 |
< |
integralOfChidtValue->setData(integralOfChidt); |
815 |
< |
simnfo->addProperty(integralOfChidtValue); |
816 |
< |
|
808 |
> |
|
809 |
> |
myProps->add( CHIVALUE_ID, chi ); |
810 |
> |
myProps->add( INTEGRALOFCHIDT_ID, integralOfChidt ); |
811 |
|
} |
812 |
|
else |
813 |
|
return NULL; |
826 |
|
//push eta into SimInfo::properties which can be |
827 |
|
//retrieved by integrator later |
828 |
|
//simnfo->setBoxM( theBoxMat3 ); |
835 |
– |
DoubleArrayData* etaValue = new DoubleArrayData(); |
836 |
– |
etaValue->setID(ETAVALUE_ID); |
837 |
– |
etaValue->setData(eta, 9); |
838 |
– |
simnfo->addProperty(etaValue); |
829 |
|
|
830 |
+ |
myProps->add( ETAVALUE_ID, eta, 9); |
831 |
|
|
832 |
|
return NULL; |
833 |
|
|