--- trunk/src/applications/staticProps/StaticProps.cpp 2014/04/24 17:30:00 1992 +++ trunk/src/applications/staticProps/StaticProps.cpp 2014/08/13 20:42:43 2015 @@ -77,7 +77,10 @@ #include "applications/staticProps/AngleR.hpp" #include "applications/staticProps/TetrahedralityParam.hpp" #include "applications/staticProps/TetrahedralityParamZ.hpp" +#include "applications/staticProps/TetrahedralityParamXYZ.hpp" #include "applications/staticProps/RNEMDStats.hpp" +#include "applications/staticProps/NitrileFrequencyMap.hpp" +#include "applications/staticProps/MultipoleSum.hpp" using namespace OpenMD; @@ -242,7 +245,9 @@ int main(int argc, char* argv[]){ painCave.isFatal = 1; simError(); } - + } else if (args_info.multipole_given){ + analyser = new MultipoleSum(info, dumpFileName, sele1, + maxLen, args_info.nbins_arg); } else if (args_info.tet_param_given) { if (args_info.rcut_given) { analyser = new TetrahedralityParam(info, dumpFileName, sele1, @@ -267,6 +272,35 @@ int main(int argc, char* argv[]){ painCave.isFatal = 1; simError(); } + } else if (args_info.tet_param_xyz_given) { + if (!args_info.rcut_given) { + sprintf( painCave.errMsg, + "A cutoff radius (rcut) must be specified when calculating" + " Tetrahedrality Parameters"); + painCave.severity = OPENMD_ERROR; + painCave.isFatal = 1; + simError(); + } + if (!args_info.voxelSize_given) { + sprintf( painCave.errMsg, + "A voxel size must be specified when calculating" + " volume-resolved Tetrahedrality Parameters"); + painCave.severity = OPENMD_ERROR; + painCave.isFatal = 1; + simError(); + } + if (!args_info.gaussWidth_given) { + sprintf( painCave.errMsg, + "A gaussian width must be specified when calculating" + " volume-resolved Tetrahedrality Parameters"); + painCave.severity = OPENMD_ERROR; + painCave.isFatal = 1; + simError(); + } + analyser = new TetrahedralityParamXYZ(info, dumpFileName, sele1, sele2, + args_info.rcut_arg, + args_info.voxelSize_arg, + args_info.gaussWidth_arg); } else if (args_info.ior_given){ if (args_info.rcut_given) { analyser = new IcosahedralOfR(info, dumpFileName, sele1, @@ -326,6 +360,9 @@ int main(int argc, char* argv[]){ } else if (args_info.rnemdrt_given) { analyser = new RNEMDRTheta(info, dumpFileName, sele1, args_info.nbins_arg, args_info.nanglebins_arg); + } else if (args_info.nitrile_given) { + analyser = new NitrileFrequencyMap(info, dumpFileName, sele1, + args_info.nbins_arg); } else if (args_info.p_angle_given) { if (args_info.sele1_given) { if (args_info.sele2_given)