| 1 |
|
#include <math.h> |
| 2 |
< |
#include "Atom.hpp" |
| 3 |
< |
#include "SRI.hpp" |
| 4 |
< |
#include "AbstractClasses.hpp" |
| 5 |
< |
#include "SimInfo.hpp" |
| 6 |
< |
#include "ForceFields.hpp" |
| 7 |
< |
#include "Thermo.hpp" |
| 8 |
< |
#include "ReadWrite.hpp" |
| 9 |
< |
#include "Integrator.hpp" |
| 10 |
< |
#include "simError.h" |
| 2 |
> |
#include "primitives/Atom.hpp" |
| 3 |
> |
#include "primitives/SRI.hpp" |
| 4 |
> |
#include "primitives/AbstractClasses.hpp" |
| 5 |
> |
#include "brains/SimInfo.hpp" |
| 6 |
> |
#include "UseTheForce/ForceFields.hpp" |
| 7 |
> |
#include "brains/Thermo.hpp" |
| 8 |
> |
#include "io/ReadWrite.hpp" |
| 9 |
> |
#include "integrators/Integrator.hpp" |
| 10 |
> |
#include "utils/simError.h" |
| 11 |
|
|
| 12 |
|
#ifdef IS_MPI |
| 13 |
< |
#include "mpiSimulation.hpp" |
| 13 |
> |
#include "brains/mpiSimulation.hpp" |
| 14 |
|
#endif |
| 15 |
|
|
| 16 |
|
// Basic isotropic thermostating and barostating via the Melchionna |
| 27 |
|
T( theInfo, the_ff ) |
| 28 |
|
{ |
| 29 |
|
GenericData* data; |
| 30 |
< |
DoubleArrayData * etaValue; |
| 30 |
> |
DoubleVectorGenericData * etaValue; |
| 31 |
|
vector<double> etaArray; |
| 32 |
|
|
| 33 |
|
eta = 0.0; |
| 37 |
|
// retrieve eta from simInfo if |
| 38 |
|
data = info->getProperty(ETAVALUE_ID); |
| 39 |
|
if(data){ |
| 40 |
< |
etaValue = dynamic_cast<DoubleArrayData*>(data); |
| 40 |
> |
etaValue = dynamic_cast<DoubleVectorGenericData*>(data); |
| 41 |
|
|
| 42 |
|
if(etaValue){ |
| 43 |
< |
etaArray = etaValue->getData(); |
| 44 |
< |
eta = etaArray[0]; |
| 43 |
> |
eta = (*etaValue)[0]; |
| 44 |
|
oldEta = eta; |
| 45 |
|
} |
| 46 |
|
} |
