57 |
|
#include "applications/staticProps/GofXyz.hpp" |
58 |
|
#include "applications/staticProps/P2OrderParameter.hpp" |
59 |
|
#include "applications/staticProps/SCDOrderParameter.hpp" |
60 |
+ |
#include "applications/staticProps/DensityPlot.hpp" |
61 |
+ |
#include "applications/staticProps/RhoZ.hpp" |
62 |
+ |
#include "applications/staticProps/Hxy.hpp" |
63 |
|
|
64 |
|
using namespace oopse; |
65 |
|
|
91 |
|
char* sele1Env= getenv("OOPSE_SELE1"); |
92 |
|
if (sele1Env) { |
93 |
|
sele1 = sele1Env; |
94 |
< |
}else { |
94 |
> |
}else if (!args_info.scd_given) { |
95 |
|
sprintf( painCave.errMsg, |
96 |
|
"neither --sele1 option nor $OOPSE_SELE1 is set"); |
97 |
|
painCave.severity = OOPSE_ERROR; |
106 |
|
char* sele2Env = getenv("OOPSE_SELE2"); |
107 |
|
if (sele2Env) { |
108 |
|
sele2 = sele2Env; |
109 |
< |
} else { |
109 |
> |
} else if (args_info.density_given) { |
110 |
> |
sele2 = "select all"; |
111 |
> |
} else if(!args_info.scd_given && !args_info.density_given && !args_info.slab_density_given) { |
112 |
|
sprintf( painCave.errMsg, |
113 |
|
"neither --sele2 option nor $OOPSE_SELE2 is set"); |
114 |
|
painCave.severity = OOPSE_ERROR; |
183 |
|
std::string sele3 = args_info.sele3_arg; |
184 |
|
analyser = new SCDOrderParameter(info, dumpFileName, sele1, sele2, sele3); |
185 |
|
} |
186 |
+ |
}else if (args_info.density_given) { |
187 |
+ |
analyser= new DensityPlot(info, dumpFileName, sele1, sele2, maxLen, args_info.nrbins_arg); |
188 |
+ |
} else if (args_info.slab_density_given) { |
189 |
+ |
Mat3x3d hmat = info->getSnapshotManager()->getCurrentSnapshot()->getHmat(); |
190 |
+ |
analyser = new RhoZ(info, dumpFileName, sele1, hmat(2, 2), args_info.nrbins_arg); |
191 |
+ |
}else if (args_info.hxy_given) { |
192 |
+ |
analyser = new Hxy(info, dumpFileName, sele1, args_info.nbins_x_arg, args_info.nbins_y_arg, args_info.nrbins_arg); |
193 |
|
} |
194 |
|
|
195 |
|
if (args_info.output_given) { |