| 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 |
+ |
#if defined(HAVE_FFTW_H) || defined(HAVE_DFFTW_H) || defined(HAVE_FFTW3_H) |
| 63 |
+ |
#include "applications/staticProps/Hxy.hpp" |
| 64 |
+ |
#endif |
| 65 |
|
|
| 66 |
|
using namespace oopse; |
| 67 |
|
|
| 108 |
|
char* sele2Env = getenv("OOPSE_SELE2"); |
| 109 |
|
if (sele2Env) { |
| 110 |
|
sele2 = sele2Env; |
| 111 |
< |
} else if(!args_info.scd_given && !args_info.density_given) { |
| 111 |
> |
} else if (args_info.density_given) { |
| 112 |
> |
sele2 = "select all"; |
| 113 |
> |
} else if(!args_info.scd_given && !args_info.density_given && !args_info.slab_density_given) { |
| 114 |
|
sprintf( painCave.errMsg, |
| 115 |
|
"neither --sele2 option nor $OOPSE_SELE2 is set"); |
| 116 |
|
painCave.severity = OOPSE_ERROR; |
| 186 |
|
analyser = new SCDOrderParameter(info, dumpFileName, sele1, sele2, sele3); |
| 187 |
|
} |
| 188 |
|
}else if (args_info.density_given) { |
| 189 |
< |
analyser= new DensityPlot(info, dumpFileName, sele1, maxLen, args_info.nrbins_arg); |
| 189 |
> |
analyser= new DensityPlot(info, dumpFileName, sele1, sele2, maxLen, args_info.nrbins_arg); |
| 190 |
> |
} else if (args_info.slab_density_given) { |
| 191 |
> |
Mat3x3d hmat = info->getSnapshotManager()->getCurrentSnapshot()->getHmat(); |
| 192 |
> |
analyser = new RhoZ(info, dumpFileName, sele1, hmat(2, 2), args_info.nrbins_arg); |
| 193 |
> |
#if defined(HAVE_FFTW_H) || defined(HAVE_DFFTW_H) || defined(HAVE_FFTW3_H) |
| 194 |
> |
}else if (args_info.hxy_given) { |
| 195 |
> |
analyser = new Hxy(info, dumpFileName, sele1, args_info.nbins_x_arg, args_info.nbins_y_arg, args_info.nrbins_arg); |
| 196 |
> |
#endif |
| 197 |
|
} |
| 198 |
|
|
| 199 |
|
if (args_info.output_given) { |
