50 |
|
#include "utils/simError.h" |
51 |
|
|
52 |
|
#include "applications/staticProps/StaticPropsCmd.h" |
53 |
+ |
#include "applications/staticProps/StaticAnalyser.hpp" |
54 |
|
#include "applications/staticProps/GofR.hpp" |
55 |
|
#include "applications/staticProps/GofRAngle.hpp" |
56 |
|
#include "applications/staticProps/GofAngle2.hpp" |
57 |
|
#include "applications/staticProps/GofXyz.hpp" |
58 |
+ |
#include "applications/staticProps/P2OrderParameter.hpp" |
59 |
|
|
60 |
+ |
|
61 |
|
using namespace oopse; |
62 |
|
|
63 |
|
int main(int argc, char* argv[]){ |
124 |
|
maxLen = std::min(std::min(hmat(0, 0), hmat(1, 1)), hmat(2, 2)) /2.0; |
125 |
|
} |
126 |
|
|
127 |
< |
RadialDistrFunc* rdf; |
127 |
> |
StaticAnalyser* analyser; |
128 |
|
if (args_info.gofr_given){ |
129 |
< |
rdf= new GofR(info, dumpFileName, sele1, sele2, maxLen, args_info.nrbins_arg); |
129 |
> |
analyser= new GofR(info, dumpFileName, sele1, sele2, maxLen, args_info.nrbins_arg); |
130 |
|
} else if (args_info.r_theta_given) { |
131 |
< |
rdf = new GofRTheta(info, dumpFileName, sele1, sele2, maxLen, args_info.nrbins_arg, args_info.nanglebins_arg); |
131 |
> |
analyser = new GofRTheta(info, dumpFileName, sele1, sele2, maxLen, args_info.nrbins_arg, args_info.nanglebins_arg); |
132 |
|
} else if (args_info.r_omega_given) { |
133 |
< |
rdf = new GofROmega(info, dumpFileName, sele1, sele2, maxLen, args_info.nrbins_arg, args_info.nanglebins_arg); |
133 |
> |
analyser = new GofROmega(info, dumpFileName, sele1, sele2, maxLen, args_info.nrbins_arg, args_info.nanglebins_arg); |
134 |
|
} else if (args_info.theta_omega_given) { |
135 |
< |
rdf = new GofAngle2(info, dumpFileName, sele1, sele2, args_info.nanglebins_arg); |
135 |
> |
analyser = new GofAngle2(info, dumpFileName, sele1, sele2, args_info.nanglebins_arg); |
136 |
|
} else if (args_info.gxyz_given) { |
137 |
|
if (args_info.refsele_given) { |
138 |
< |
rdf= new GofXyz(info, dumpFileName, sele1, sele2,args_info.refsele_arg, maxLen, args_info.nrbins_arg); |
138 |
> |
analyser= new GofXyz(info, dumpFileName, sele1, sele2,args_info.refsele_arg, maxLen, args_info.nrbins_arg); |
139 |
|
} else { |
140 |
|
sprintf( painCave.errMsg, |
141 |
|
"--refsele must set when --gxyz is used"); |
143 |
|
painCave.isFatal = 1; |
144 |
|
simError(); |
145 |
|
} |
146 |
+ |
} else if (args_info.p2_given) { |
147 |
+ |
analyser = new P2OrderParameter(info, dumpFileName, sele1, sele2); |
148 |
|
} |
149 |
|
|
150 |
|
if (args_info.output_given) { |
151 |
< |
rdf->setOutputName(args_info.output_arg); |
151 |
> |
analyser->setOutputName(args_info.output_arg); |
152 |
|
} |
153 |
|
if (args_info.step_given) { |
154 |
< |
rdf->setStep(args_info.step_arg); |
154 |
> |
analyser->setStep(args_info.step_arg); |
155 |
|
} |
156 |
|
|
157 |
< |
rdf->process(); |
157 |
> |
analyser->process(); |
158 |
|
|
159 |
< |
delete rdf; |
159 |
> |
delete analyser; |
160 |
|
delete info; |
161 |
|
|
162 |
|
return 0; |