--- trunk/src/applications/staticProps/StaticProps.cpp 2006/05/12 21:34:43 955 +++ trunk/src/applications/staticProps/StaticProps.cpp 2006/06/01 18:06:33 980 @@ -56,10 +56,13 @@ #include "applications/staticProps/GofAngle2.hpp" #include "applications/staticProps/GofXyz.hpp" #include "applications/staticProps/P2OrderParameter.hpp" +#include "applications/staticProps/RippleOP.hpp" #include "applications/staticProps/SCDOrderParameter.hpp" #include "applications/staticProps/DensityPlot.hpp" #include "applications/staticProps/RhoZ.hpp" +#if defined(HAVE_FFTW_H) || defined(HAVE_DFFTW_H) || defined(HAVE_FFTW3_H) #include "applications/staticProps/Hxy.hpp" +#endif using namespace oopse; @@ -146,7 +149,7 @@ int main(int argc, char* argv[]){ SimCreator creator; SimInfo* info = creator.createSim(mdFileName); - double maxLen; + RealType maxLen; if (args_info.length_given) { maxLen = args_info.length_arg; } else { @@ -175,7 +178,9 @@ int main(int argc, char* argv[]){ } } else if (args_info.p2_given) { analyser = new P2OrderParameter(info, dumpFileName, sele1, sele2); - } else if (args_info.scd_given) { + } else if (args_info.rp2_given){ + analyser = new RippleOP(info, dumpFileName, sele1, sele2); +}else if (args_info.scd_given) { if (batchMode) { analyser = new SCDOrderParameter(info, dumpFileName, args_info.molname_arg, args_info.begin_arg, args_info.end_arg); @@ -188,8 +193,10 @@ int main(int argc, char* argv[]){ } else if (args_info.slab_density_given) { Mat3x3d hmat = info->getSnapshotManager()->getCurrentSnapshot()->getHmat(); analyser = new RhoZ(info, dumpFileName, sele1, hmat(2, 2), args_info.nrbins_arg); +#if defined(HAVE_FFTW_H) || defined(HAVE_DFFTW_H) || defined(HAVE_FFTW3_H) }else if (args_info.hxy_given) { - analyser = new Hxy(info, dumpFileName, sele1, args_info.nbins_x_arg, args_info.nbins_y_arg, args_info.nrbins_arg); + analyser = new Hxy(info, dumpFileName, sele1, args_info.nbins_x_arg, args_info.nbins_y_arg, args_info.nrbins_arg); +#endif } if (args_info.output_given) {