ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/group/trunk/OOPSE-3.0/src/applications/dynamicProps/RCorrFunc.cpp
(Generate patch)

Comparing trunk/OOPSE-3.0/src/applications/dynamicProps/RCorrFunc.cpp (file contents):
Revision 2053 by tim, Fri Feb 18 23:07:32 2005 UTC vs.
Revision 2204 by gezelter, Fri Apr 15 22:04:00 2005 UTC

# Line 42 | Line 42 | RCorrFunc::RCorrFunc(SimInfo* info, const std::string&
42   #include "applications/dynamicProps/RCorrFunc.hpp"
43  
44   namespace oopse {
45 < RCorrFunc::RCorrFunc(SimInfo* info, const std::string& filename, const std::string& sele1, const std::string& sele2)
45 >  RCorrFunc::RCorrFunc(SimInfo* info, const std::string& filename, const std::string& sele1, const std::string& sele2)
46      : ParticleTimeCorrFunc(info, filename, sele1, sele2, DataStorage::dslPosition){
47  
48 <    setCorrFuncType("RCorrFunc");
49 <    setOutputName(getPrefix(dumpFilename_) + ".rcorr");
48 >      setCorrFuncType("RCorrFunc");
49 >      setOutputName(getPrefix(dumpFilename_) + ".rcorr");
50  
51 < }
51 >    }
52  
53 < double RCorrFunc::calcCorrVal(int frame1, int frame2, StuntDouble* sd1, StuntDouble* sd2) {
53 >  double RCorrFunc::calcCorrVal(int frame1, int frame2, StuntDouble* sd1, StuntDouble* sd2) {
54      Vector3d r1 =sd1->getPos(frame1);
55      Vector3d r2 = sd2->getPos(frame2);
56  
57      return (r2-r1).lengthSquare();
58 < }
58 >  }
59  
60   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines