--- trunk/src/applications/staticProps/StaticProps.cpp 2006/05/17 21:51:42 963 +++ trunk/src/applications/staticProps/StaticProps.cpp 2006/08/30 21:04:04 1026 @@ -56,6 +56,7 @@ #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" @@ -81,8 +82,6 @@ int main(int argc, char* argv[]){ //get the dumpfile name and meta-data file name std::string dumpFileName = args_info.input_arg; - std::string mdFileName = dumpFileName.substr(0, dumpFileName.rfind(".")) + ".md"; - std::string sele1; std::string sele2; @@ -146,7 +145,7 @@ int main(int argc, char* argv[]){ //parse md file and set up the system SimCreator creator; - SimInfo* info = creator.createSim(mdFileName); + SimInfo* info = creator.createSim(dumpFileName); RealType maxLen; if (args_info.length_given) { @@ -177,7 +176,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);