| 1 |
|
#include <math.h> |
| 2 |
|
|
| 3 |
< |
#include "Atom.hpp" |
| 4 |
< |
#include "SRI.hpp" |
| 5 |
< |
#include "AbstractClasses.hpp" |
| 6 |
< |
#include "SimInfo.hpp" |
| 7 |
< |
#include "ForceFields.hpp" |
| 8 |
< |
#include "Thermo.hpp" |
| 9 |
< |
#include "ReadWrite.hpp" |
| 10 |
< |
#include "Integrator.hpp" |
| 11 |
< |
#include "simError.h" |
| 3 |
> |
#include "primitives/Atom.hpp" |
| 4 |
> |
#include "primitives/SRI.hpp" |
| 5 |
> |
#include "primitives/AbstractClasses.hpp" |
| 6 |
> |
#include "brains/SimInfo.hpp" |
| 7 |
> |
#include "UseTheForce/ForceFields.hpp" |
| 8 |
> |
#include "brains/Thermo.hpp" |
| 9 |
> |
#include "io/ReadWrite.hpp" |
| 10 |
> |
#include "integrators/Integrator.hpp" |
| 11 |
> |
#include "utils/simError.h" |
| 12 |
|
|
| 13 |
|
#ifdef IS_MPI |
| 14 |
< |
#include "mpiSimulation.hpp" |
| 14 |
> |
#include "brains/mpiSimulation.hpp" |
| 15 |
|
#endif |
| 16 |
|
|
| 17 |
|
|
| 29 |
|
T( theInfo, the_ff ) |
| 30 |
|
{ |
| 31 |
|
GenericData* data; |
| 32 |
< |
DoubleData * chiValue; |
| 33 |
< |
DoubleData * integralOfChidtValue; |
| 32 |
> |
DoubleGenericData * chiValue; |
| 33 |
> |
DoubleGenericData * integralOfChidtValue; |
| 34 |
|
|
| 35 |
|
chiValue = NULL; |
| 36 |
|
integralOfChidtValue = NULL; |
| 48 |
|
// retrieve chi and integralOfChidt from simInfo |
| 49 |
|
data = info->getProperty(CHIVALUE_ID); |
| 50 |
|
if(data){ |
| 51 |
< |
chiValue = dynamic_cast<DoubleData*>(data); |
| 51 |
> |
chiValue = dynamic_cast<DoubleGenericData*>(data); |
| 52 |
|
} |
| 53 |
|
|
| 54 |
|
data = info->getProperty(INTEGRALOFCHIDT_ID); |
| 55 |
|
if(data){ |
| 56 |
< |
integralOfChidtValue = dynamic_cast<DoubleData*>(data); |
| 56 |
> |
integralOfChidtValue = dynamic_cast<DoubleGenericData*>(data); |
| 57 |
|
} |
| 58 |
|
|
| 59 |
|
// chi and integralOfChidt should appear by pair |
