--- trunk/src/applications/staticProps/StaticProps.cpp 2010/11/19 20:26:36 1522 +++ trunk/src/applications/staticProps/StaticProps.cpp 2011/06/19 17:51:15 1585 @@ -69,6 +69,7 @@ #include "applications/staticProps/pAngle.hpp" #include "applications/staticProps/BondAngleDistribution.hpp" #include "applications/staticProps/NanoVolume.hpp" +#include "applications/staticProps/NanoLength.hpp" #if defined(HAVE_FFTW_H) || defined(HAVE_DFFTW_H) || defined(HAVE_FFTW3_H) #include "applications/staticProps/Hxy.hpp" #endif @@ -233,7 +234,18 @@ int main(int argc, char* argv[]){ simError(); } } else if (args_info.p2_given) { - analyser = new P2OrderParameter(info, dumpFileName, sele1, sele2); + if (args_info.sele1_given) { + if (args_info.sele2_given) + analyser = new P2OrderParameter(info, dumpFileName, sele1, sele2); + else + analyser = new P2OrderParameter(info, dumpFileName, sele1); + } else { + sprintf( painCave.errMsg, + "At least one selection script (--sele1) must be specified when calculating P2 order parameters"); + painCave.severity = OPENMD_ERROR; + painCave.isFatal = 1; + simError(); + } } else if (args_info.rp2_given){ analyser = new RippleOP(info, dumpFileName, sele1, sele2); } else if (args_info.bo_given){ @@ -317,6 +329,8 @@ int main(int argc, char* argv[]){ } } else if (args_info.hullvol_given) { analyser = new NanoVolume(info, dumpFileName, sele1); + } else if (args_info.rodlength_given) { + analyser = new NanoLength(info, dumpFileName, sele1); } else if (args_info.angle_r_given) { analyser = new AngleR(info, dumpFileName, sele1, maxLen,args_info.nbins_arg); }