--- trunk/OOPSE-3.0/src/io/DumpReader.cpp 2004/09/24 04:16:43 1490 +++ trunk/OOPSE-3.0/src/io/DumpReader.cpp 2004/10/21 16:22:01 1625 @@ -12,12 +12,12 @@ #include -#include "ReadWrite.hpp" -#include "simError.h" +#include "io/ReadWrite.hpp" +#include "utils/simError.h" #ifdef IS_MPI #include -#include "mpiSimulation.hpp" +#include "brains/mpiSimulation.hpp" #define TAKE_THIS_TAG_CHAR 0 #define TAKE_THIS_TAG_INT 1 #endif // is_mpi @@ -698,12 +698,12 @@ char* DumpReader::parseCommentLine(char* readLine, Sim //push chi and integralOfChidt into SimInfo::properties which can be //retrieved by integrator later - DoubleData* chiValue = new DoubleData(); + DoubleGenericData* chiValue = new DoubleGenericData(); chiValue->setID(CHIVALUE_ID); chiValue->setData(chi); entry_plug->addProperty(chiValue); - DoubleData* integralOfChidtValue = new DoubleData(); + DoubleGenericData* integralOfChidtValue = new DoubleGenericData(); integralOfChidtValue->setID(INTEGRALOFCHIDT_ID); integralOfChidtValue->setData(integralOfChidt); entry_plug->addProperty(integralOfChidtValue); @@ -733,9 +733,8 @@ char* DumpReader::parseCommentLine(char* readLine, Sim //push eta into SimInfo::properties which can be //retrieved by integrator later //entry_plug->setBoxM( theBoxMat3 ); - DoubleArrayData* etaValue = new DoubleArrayData(); - etaValue->setID(ETAVALUE_ID); - etaValue->setData(eta, 9); + DoubleVectorGenericData* etaValue = new DoubleVectorGenericData(ETAVALUE_ID); + etaValue->insert(etaValue->end(), eta, eta+9); entry_plug->addProperty(etaValue); }