--- trunk/src/applications/staticProps/StaticProps.cpp 2010/04/29 14:41:48 1440 +++ trunk/src/applications/staticProps/StaticProps.cpp 2010/11/19 20:26:36 1522 @@ -57,12 +57,14 @@ #include "applications/staticProps/GofRAngle.hpp" #include "applications/staticProps/GofAngle2.hpp" #include "applications/staticProps/GofXyz.hpp" +#include "applications/staticProps/TwoDGofR.hpp" #include "applications/staticProps/P2OrderParameter.hpp" #include "applications/staticProps/BondOrderParameter.hpp" #include "applications/staticProps/BOPofR.hpp" #include "applications/staticProps/RippleOP.hpp" #include "applications/staticProps/SCDOrderParameter.hpp" #include "applications/staticProps/DensityPlot.hpp" +#include "applications/staticProps/ObjectCount.hpp" #include "applications/staticProps/RhoZ.hpp" #include "applications/staticProps/pAngle.hpp" #include "applications/staticProps/BondAngleDistribution.hpp" @@ -71,6 +73,9 @@ #include "applications/staticProps/Hxy.hpp" #endif #include "applications/staticProps/RhoR.hpp" +#include "applications/staticProps/AngleR.hpp" +#include "applications/staticProps/RhoAngleR.hpp" +#include "applications/staticProps/TetrahedralityParam.hpp" using namespace OpenMD; @@ -78,24 +83,24 @@ int main(int argc, char* argv[]){ //register force fields registerForceFields(); - + gengetopt_args_info args_info; - + //parse the command line option if (cmdline_parser (argc, argv, &args_info) != 0) { exit(1) ; } - + //get the dumpfile name std::string dumpFileName = args_info.input_arg; std::string sele1; std::string sele2; bool userSpecifiedSelect1; bool userSpecifiedSelect2; - + // check the first selection argument, or set it to the environment // variable, or failing that, set it to "select all" - + if (args_info.sele1_given) { sele1 = args_info.sele1_arg; } else { @@ -106,7 +111,7 @@ int main(int argc, char* argv[]){ sele1 = "select all"; } } - + // check the second selection argument, or set it to the environment // variable, or failing that, set it to "select all" @@ -120,29 +125,29 @@ int main(int argc, char* argv[]){ sele2 = "select all"; } } - - + + // Problems if sele1 wasn't specified, but -// if (!args_info.scd_given) { -// sprintf( painCave.errMsg, -// "neither --sele1 option nor $SELECTION1 is set"); -// painCave.severity = OPENMD_ERROR; -// painCave.isFatal = 1; -// simError(); -// } -// } - + // if (!args_info.scd_given) { + // sprintf( painCave.errMsg, + // "neither --sele1 option nor $SELECTION1 is set"); + // painCave.severity = OPENMD_ERROR; + // painCave.isFatal = 1; + // simError(); + // } + // } + // Problems if sele1 wasn't specified - -// if(!args_info.scd_given && !args_info.density_given && !args_info.slab_density_given) { -// sprintf( painCave.errMsg, -// "neither --sele2 option nor $SELECTION1 is set"); -// painCave.severity = OPENMD_ERROR; -// painCave.isFatal = 1; -// simError(); -// } -// } - + + // if(!args_info.scd_given && !args_info.density_given && !args_info.slab_density_given) { + // sprintf( painCave.errMsg, + // "neither --sele2 option nor $SELECTION1 is set"); + // painCave.severity = OPENMD_ERROR; + // painCave.isFatal = 1; + // simError(); + // } + // } + bool batchMode; if (args_info.scd_given){ if (args_info.sele1_given && args_info.sele2_given && args_info.sele3_given) { @@ -164,53 +169,69 @@ int main(int argc, char* argv[]){ painCave.severity = OPENMD_ERROR; painCave.isFatal = 1; simError(); - + } } - + //parse md file and set up the system SimCreator creator; std::cout << "dumpFile = " << dumpFileName << "\n"; SimInfo* info = creator.createSim(dumpFileName); RealType maxLen; + RealType zmaxLen; if (args_info.length_given) { maxLen = args_info.length_arg; + if (args_info.zlength_given){ + zmaxLen = args_info.zlength_arg; + } } else { Mat3x3d hmat = info->getSnapshotManager()->getCurrentSnapshot()->getHmat(); - maxLen = std::min(std::min(hmat(0, 0), hmat(1, 1)), hmat(2, 2)) /2.0; + maxLen = std::min(std::min(hmat(0, 0), hmat(1, 1)), hmat(2, 2)) /2.0; + zmaxLen = hmat(2,2); } - + StaticAnalyser* analyser; if (args_info.gofr_given){ analyser= new GofR(info, dumpFileName, sele1, sele2, maxLen, - args_info.nbins_arg); + args_info.nbins_arg); } else if (args_info.gofz_given) { analyser= new GofZ(info, dumpFileName, sele1, sele2, maxLen, - args_info.nbins_arg); + args_info.nbins_arg); } else if (args_info.r_z_given) { - analyser = new GofRZ(info, dumpFileName, sele1, sele2, maxLen, - args_info.nbins_arg, args_info.nbins_z_arg); + analyser = new GofRZ(info, dumpFileName, sele1, sele2, maxLen, zmaxLen, + args_info.nbins_arg, args_info.nbins_z_arg); } else if (args_info.r_theta_given) { analyser = new GofRTheta(info, dumpFileName, sele1, sele2, maxLen, - args_info.nbins_arg, args_info.nanglebins_arg); + args_info.nbins_arg, args_info.nanglebins_arg); } else if (args_info.r_omega_given) { analyser = new GofROmega(info, dumpFileName, sele1, sele2, maxLen, - args_info.nbins_arg, args_info.nanglebins_arg); + args_info.nbins_arg, args_info.nanglebins_arg); } else if (args_info.theta_omega_given) { analyser = new GofAngle2(info, dumpFileName, sele1, sele2, - args_info.nanglebins_arg); + args_info.nanglebins_arg); } else if (args_info.gxyz_given) { if (args_info.refsele_given) { analyser= new GofXyz(info, dumpFileName, sele1, sele2,args_info.refsele_arg, - maxLen, args_info.nbins_arg); + maxLen, args_info.nbins_arg); } else { sprintf( painCave.errMsg, - "--refsele must set when --gxyz is used"); + "--refsele must set when --gxyz is used"); painCave.severity = OPENMD_ERROR; painCave.isFatal = 1; simError(); } + } else if (args_info.twodgofr_given){ + if (args_info.dz_given) { + analyser= new TwoDGofR(info, dumpFileName, sele1, sele2, maxLen, + args_info.dz_arg, args_info.nbins_arg); + } else { + sprintf( painCave.errMsg, + "A slab width (dz) must be specified when calculating TwoDGofR"); + painCave.severity = OPENMD_ERROR; + painCave.isFatal = 1; + simError(); + } } else if (args_info.p2_given) { analyser = new P2OrderParameter(info, dumpFileName, sele1, sele2); } else if (args_info.rp2_given){ @@ -218,22 +239,35 @@ int main(int argc, char* argv[]){ } else if (args_info.bo_given){ if (args_info.rcut_given) { analyser = new BondOrderParameter(info, dumpFileName, sele1, - args_info.rcut_arg, - args_info.nbins_arg); + args_info.rcut_arg, + args_info.nbins_arg); } else { sprintf( painCave.errMsg, - "A cutoff radius (rcut) must be specified when calculating Bond Order Parameters"); + "A cutoff radius (rcut) must be specified when calculating Bond Order Parameters"); painCave.severity = OPENMD_ERROR; painCave.isFatal = 1; simError(); } + + } else if (args_info.tet_param_given) { + if (args_info.rcut_given) { + analyser = new TetrahedralityParam(info, dumpFileName, sele1, + args_info.rcut_arg, + args_info.nbins_arg); + } else { + sprintf( painCave.errMsg, + "A cutoff radius (rcut) must be specified when calculating Tetrahedrality Parameters"); + painCave.severity = OPENMD_ERROR; + painCave.isFatal = 1; + simError(); + } } else if (args_info.bor_given){ if (args_info.rcut_given) { analyser = new BOPofR(info, dumpFileName, sele1, args_info.rcut_arg, args_info.nbins_arg, maxLen); } else { sprintf( painCave.errMsg, - "A cutoff radius (rcut) must be specified when calculating Bond Order Parameters"); + "A cutoff radius (rcut) must be specified when calculating Bond Order Parameters"); painCave.severity = OPENMD_ERROR; painCave.isFatal = 1; simError(); @@ -241,25 +275,27 @@ int main(int argc, char* argv[]){ } else if (args_info.bad_given){ if (args_info.rcut_given) { analyser = new BondAngleDistribution(info, dumpFileName, sele1, args_info.rcut_arg, - args_info.nbins_arg); + args_info.nbins_arg); } else { sprintf( painCave.errMsg, - "A cutoff radius (rcut) must be specified when calculating Bond Angle Distributions"); + "A cutoff radius (rcut) must be specified when calculating Bond Angle Distributions"); painCave.severity = OPENMD_ERROR; painCave.isFatal = 1; simError(); - } + } } 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); + args_info.begin_arg, args_info.end_arg); } else{ std::string sele3 = args_info.sele3_arg; analyser = new SCDOrderParameter(info, dumpFileName, sele1, sele2, sele3); } }else if (args_info.density_given) { analyser= new DensityPlot(info, dumpFileName, sele1, sele2, maxLen, - args_info.nbins_arg); + args_info.nbins_arg); + } else if (args_info.count_given) { + analyser = new ObjectCount(info, dumpFileName, sele1 ); } else if (args_info.slab_density_given) { analyser = new RhoZ(info, dumpFileName, sele1, args_info.nbins_arg); } else if (args_info.p_angle_given) { @@ -267,31 +303,33 @@ int main(int argc, char* argv[]){ #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.nbins_arg); + args_info.nbins_y_arg, args_info.nbins_arg); #endif }else if (args_info.rho_r_given) { if (args_info.radius_given){ analyser = new RhoR(info, dumpFileName, sele1, maxLen,args_info.nbins_arg,args_info.radius_arg); }else{ sprintf( painCave.errMsg, - "A particle radius (radius) must be specified when calculating Rho(r)"); + "A particle radius (radius) must be specified when calculating Rho(r)"); painCave.severity = OPENMD_ERROR; painCave.isFatal = 1; simError(); } - }else if (args_info.hullvol_given) { + } else if (args_info.hullvol_given) { analyser = new NanoVolume(info, dumpFileName, sele1); + } else if (args_info.angle_r_given) { + analyser = new AngleR(info, dumpFileName, sele1, maxLen,args_info.nbins_arg); } - + if (args_info.output_given) { analyser->setOutputName(args_info.output_arg); } if (args_info.step_given) { analyser->setStep(args_info.step_arg); } - + analyser->process(); - + delete analyser; delete info;