| 52 |
|
#include "applications/dynamicProps/DipoleCorrFunc.hpp" |
| 53 |
|
#include "applications/dynamicProps/RCorrFunc.hpp" |
| 54 |
|
#include "applications/dynamicProps/VCorrFunc.hpp" |
| 55 |
+ |
#include "applications/dynamicProps/LegendreCorrFunc.hpp" |
| 56 |
+ |
#include "applications/dynamicProps/RadialRCorrFunc.hpp" |
| 57 |
+ |
#include "applications/dynamicProps/ThetaCorrFunc.hpp" |
| 58 |
+ |
#include "applications/dynamicProps/DirectionalRCorrFunc.hpp" |
| 59 |
+ |
#include "applications/dynamicProps/EnergyCorrFunc.hpp" |
| 60 |
|
|
| 61 |
+ |
|
| 62 |
|
using namespace oopse; |
| 63 |
|
|
| 64 |
|
int main(int argc, char* argv[]){ |
| 76 |
|
|
| 77 |
|
//get the dumpfile name and meta-data file name |
| 78 |
|
std::string dumpFileName = args_info.input_arg; |
| 73 |
– |
|
| 74 |
– |
std::string mdFileName = dumpFileName.substr(0, dumpFileName.rfind(".")) + ".md"; |
| 75 |
– |
|
| 79 |
|
|
| 80 |
|
std::string sele1; |
| 81 |
|
std::string sele2; |
| 108 |
|
|
| 109 |
|
//parse md file and set up the system |
| 110 |
|
SimCreator creator; |
| 111 |
< |
SimInfo* info = creator.createSim(mdFileName, false); |
| 111 |
> |
SimInfo* info = creator.createSim(dumpFileName, false); |
| 112 |
|
|
| 113 |
|
|
| 114 |
|
TimeCorrFunc* corrFunc; |
| 116 |
|
corrFunc = new DipoleCorrFunc(info, dumpFileName, sele1, sele2); |
| 117 |
|
} else if (args_info.rcorr_given) { |
| 118 |
|
corrFunc = new RCorrFunc(info, dumpFileName, sele1, sele2); |
| 119 |
< |
} |
| 120 |
< |
else if (args_info.vcorr_given) { |
| 119 |
> |
} else if (args_info.r_rcorr_given) { |
| 120 |
> |
corrFunc = new RadialRCorrFunc(info, dumpFileName, sele1, sele2); |
| 121 |
> |
} else if (args_info.thetacorr_given) { |
| 122 |
> |
corrFunc = new ThetaCorrFunc(info, dumpFileName, sele1, sele2); |
| 123 |
> |
} else if (args_info.drcorr_given) { |
| 124 |
> |
corrFunc = new DirectionalRCorrFunc(info, dumpFileName, sele1, sele2); |
| 125 |
> |
} else if (args_info.vcorr_given) { |
| 126 |
|
corrFunc = new VCorrFunc(info, dumpFileName, sele1, sele2); |
| 127 |
+ |
} else if (args_info.helfandEcorr_given){ |
| 128 |
+ |
corrFunc = new EnergyCorrFunc(info, dumpFileName, sele1, sele2); |
| 129 |
+ |
} else if (args_info.lcorr_given) { |
| 130 |
+ |
int order; |
| 131 |
+ |
if (args_info.order_given) |
| 132 |
+ |
order = args_info.order_arg; |
| 133 |
+ |
else { |
| 134 |
+ |
sprintf( painCave.errMsg, |
| 135 |
+ |
"--order must be set if --lcoor is set\n"); |
| 136 |
+ |
painCave.severity = OOPSE_ERROR; |
| 137 |
+ |
painCave.isFatal = 1; |
| 138 |
+ |
simError(); |
| 139 |
+ |
} |
| 140 |
+ |
|
| 141 |
+ |
corrFunc = new LegendreCorrFunc(info, dumpFileName, sele1, sele2, order); |
| 142 |
|
} |
| 143 |
|
|
| 144 |
|
if (args_info.output_given) { |
