12 |
|
#include <string.h> |
13 |
|
|
14 |
|
|
15 |
< |
#include "ReadWrite.hpp" |
16 |
< |
#include "simError.h" |
15 |
> |
#include "io/ReadWrite.hpp" |
16 |
> |
#include "utils/simError.h" |
17 |
|
|
18 |
|
#ifdef IS_MPI |
19 |
|
#include <mpi.h> |
20 |
< |
#include "mpiSimulation.hpp" |
20 |
> |
#include "brains/mpiSimulation.hpp" |
21 |
|
#define TAKE_THIS_TAG_CHAR 0 |
22 |
|
#define TAKE_THIS_TAG_INT 1 |
23 |
|
#endif // is_mpi |
698 |
|
|
699 |
|
//push chi and integralOfChidt into SimInfo::properties which can be |
700 |
|
//retrieved by integrator later |
701 |
< |
DoubleData* chiValue = new DoubleData(); |
701 |
> |
DoubleGenericData* chiValue = new DoubleGenericData(); |
702 |
|
chiValue->setID(CHIVALUE_ID); |
703 |
|
chiValue->setData(chi); |
704 |
|
entry_plug->addProperty(chiValue); |
705 |
|
|
706 |
< |
DoubleData* integralOfChidtValue = new DoubleData(); |
706 |
> |
DoubleGenericData* integralOfChidtValue = new DoubleGenericData(); |
707 |
|
integralOfChidtValue->setID(INTEGRALOFCHIDT_ID); |
708 |
|
integralOfChidtValue->setData(integralOfChidt); |
709 |
|
entry_plug->addProperty(integralOfChidtValue); |
733 |
|
//push eta into SimInfo::properties which can be |
734 |
|
//retrieved by integrator later |
735 |
|
//entry_plug->setBoxM( theBoxMat3 ); |
736 |
< |
DoubleArrayData* etaValue = new DoubleArrayData(); |
737 |
< |
etaValue->setID(ETAVALUE_ID); |
738 |
< |
etaValue->setData(eta, 9); |
736 |
> |
DoubleVectorGenericData* etaValue = new DoubleVectorGenericData(ETAVALUE_ID); |
737 |
> |
etaValue->insert(etaValue->end(), eta, eta+9); |
738 |
|
entry_plug->addProperty(etaValue); |
739 |
|
} |
740 |
|
|