| 43 |
|
|
| 44 |
|
namespace oopse { |
| 45 |
|
VCorrFunc::VCorrFunc(SimInfo* info, const std::string& filename, const std::string& sele1, const std::string& sele2) |
| 46 |
< |
: CorrelationFunction(info, filename, sele1, sele2, DataStorage::dslVelocity){ |
| 46 |
> |
: ParticleTimeCorrFunc(info, filename, sele1, sele2, DataStorage::dslVelocity){ |
| 47 |
|
|
| 48 |
|
setCorrFuncType("Velocity Correlation Function"); |
| 49 |
|
setOutputName(getPrefix(dumpFilename_) + ".vcf"); |
| 50 |
|
|
| 51 |
|
} |
| 52 |
|
|
| 53 |
< |
double VCorrFunc::calcCorrVal(StuntDouble* sd1, int frame1, StuntDouble* sd2, int frame2) { |
| 53 |
> |
double VCorrFunc::calcCorrVal(int frame1, int frame2, StuntDouble* sd1, StuntDouble* sd2) { |
| 54 |
|
Vector3d v1 =sd1->getVel(frame1); |
| 55 |
|
Vector3d v2 = sd2->getVel(frame2); |
| 56 |
|
|
| 57 |
|
return dot(v1, v2); |
| 58 |
|
} |
| 59 |
|
|
| 60 |
– |
void VCorrFunc::postCorrelate(){ |
| 61 |
– |
CorrelationFunction::postCorrelate(); |
| 62 |
– |
calcDiffConst(); |
| 60 |
|
} |
| 61 |
|
|
| 65 |
– |
void VCorrFunc::calcDiffConst() { |
| 66 |
– |
|
| 67 |
– |
} |
| 68 |
– |
|
| 69 |
– |
} |
| 70 |
– |
|
