50 |
|
#include "utils/simError.h" |
51 |
|
|
52 |
|
#include "applications/dynamicProps/DynamicPropsCmd.h" |
53 |
+ |
#include "applications/dynamicProps/SelectionCorrFunc.hpp" |
54 |
|
#include "applications/dynamicProps/DipoleCorrFunc.hpp" |
55 |
|
#include "applications/dynamicProps/RCorrFunc.hpp" |
56 |
|
#include "applications/dynamicProps/VCorrFunc.hpp" |
63 |
|
#include "applications/dynamicProps/SystemDipoleCorrFunc.hpp" |
64 |
|
#include "applications/dynamicProps/MomentumCorrFunc.hpp" |
65 |
|
|
65 |
– |
|
66 |
– |
|
66 |
|
using namespace OpenMD; |
67 |
|
|
68 |
|
int main(int argc, char* argv[]){ |
98 |
|
|
99 |
|
if (args_info.sele2_given) { |
100 |
|
sele2 = args_info.sele2_arg; |
101 |
< |
}else { |
101 |
> |
} else { |
102 |
|
char* sele2Env = getenv("SELECTION2"); |
103 |
|
if (sele2Env) { |
104 |
|
sele2 = sele2Env; |
120 |
|
SimCreator creator; |
121 |
|
SimInfo* info = creator.createSim(dumpFileName, false); |
122 |
|
|
124 |
– |
|
123 |
|
TimeCorrFunc* corrFunc; |
124 |
|
if(args_info.sdcorr_given){ |
125 |
|
corrFunc = new SystemDipoleCorrFunc(info, dumpFileName, sele1, sele2, memSize); |
126 |
+ |
} else if (args_info.selecorr_given){ |
127 |
+ |
corrFunc = new SelectionCorrFunc(info, dumpFileName, sele1, sele2, memSize); |
128 |
|
} else if (args_info.dcorr_given){ |
129 |
|
corrFunc = new DipoleCorrFunc(info, dumpFileName, sele1, sele2, memSize); |
130 |
|
} else if (args_info.rcorr_given) { |