--- trunk/src/applications/staticProps/StaticPropsCmd.h 2010/06/23 19:25:02 1454 +++ trunk/src/applications/staticProps/StaticPropsCmd.h 2012/08/22 02:28:28 1782 @@ -1,6 +1,6 @@ /** @file StaticPropsCmd.h * @brief The header file for the command line option parser - * generated by GNU Gengetopt version 2.22 + * generated by GNU Gengetopt version 2.22.4 * http://www.gnu.org/software/gengetopt. * DO NOT modify this file, since it can be overwritten * @author GNU Gengetopt by Lorenzo Bettini */ @@ -20,10 +20,15 @@ extern "C" { #endif /* __cplusplus */ #ifndef CMDLINE_PARSER_PACKAGE -/** @brief the program name */ +/** @brief the program name (used for printing errors) */ #define CMDLINE_PARSER_PACKAGE "StaticProps" #endif +#ifndef CMDLINE_PARSER_PACKAGE_NAME +/** @brief the complete program name (used for help and version) */ +#define CMDLINE_PARSER_PACKAGE_NAME "StaticProps" +#endif + #ifndef CMDLINE_PARSER_VERSION /** @brief the program version */ #define CMDLINE_PARSER_VERSION "1.00" @@ -103,6 +108,7 @@ struct gengetopt_args_info const char *bo_help; /**< @brief bond order parameter (--rcut must be specified) help description. */ const char *bor_help; /**< @brief bond order parameter as a function of radius (--rcut must be specified) help description. */ const char *bad_help; /**< @brief N(theta) bond angle density within (--rcut must be specified) help description. */ + const char *count_help; /**< @brief count of molecules matching selection criteria (and associated statistics) help description. */ const char *gofr_help; /**< @brief g(r) help description. */ const char *gofz_help; /**< @brief g(z) help description. */ const char *r_theta_help; /**< @brief g(r, cos(theta)) help description. */ @@ -111,7 +117,7 @@ struct gengetopt_args_info const char *theta_omega_help; /**< @brief g(cos(theta), cos(omega)) help description. */ const char *gxyz_help; /**< @brief g(x, y, z) help description. */ const char *twodgofr_help; /**< @brief 2D g(r) (Slab width --dz must be specified) help description. */ - const char *p2_help; /**< @brief p2 order parameter (--sele1 and --sele2 must be specified) help description. */ + const char *p2_help; /**< @brief p2 order parameter (--sele1 must be specified, --sele2 is optional) help description. */ const char *rp2_help; /**< @brief rp2 order parameter (--sele1 and --sele2 must be specified) help description. */ const char *scd_help; /**< @brief scd order parameter (either --sele1, --sele2, --sele3 are specified or --molname, --begin, --end are specified) help description. */ const char *density_help; /**< @brief density plot help description. */ @@ -119,7 +125,11 @@ struct gengetopt_args_info const char *p_angle_help; /**< @brief p(cos(theta)) help description. */ const char *hxy_help; /**< @brief hxy help description. */ const char *rho_r_help; /**< @brief rho of R help description. */ + const char *angle_r_help; /**< @brief angle of R help description. */ const char *hullvol_help; /**< @brief hull volume of nanoparticle help description. */ + const char *rodlength_help; /**< @brief length of nanorod help description. */ + const char *tet_param_help; /**< @brief tetrahedrality order parameter help description. */ + const char *tet_param_z_help; /**< @brief tetrahedrality order parameter by zbin(--sele1 must be specified) help description. */ unsigned int help_given ; /**< @brief Whether help was given. */ unsigned int version_given ; /**< @brief Whether version was given. */ @@ -148,6 +158,7 @@ struct gengetopt_args_info unsigned int bo_given ; /**< @brief Whether bo was given. */ unsigned int bor_given ; /**< @brief Whether bor was given. */ unsigned int bad_given ; /**< @brief Whether bad was given. */ + unsigned int count_given ; /**< @brief Whether count was given. */ unsigned int gofr_given ; /**< @brief Whether gofr was given. */ unsigned int gofz_given ; /**< @brief Whether gofz was given. */ unsigned int r_theta_given ; /**< @brief Whether r_theta was given. */ @@ -164,7 +175,11 @@ struct gengetopt_args_info unsigned int p_angle_given ; /**< @brief Whether p_angle was given. */ unsigned int hxy_given ; /**< @brief Whether hxy was given. */ unsigned int rho_r_given ; /**< @brief Whether rho_r was given. */ + unsigned int angle_r_given ; /**< @brief Whether angle_r was given. */ unsigned int hullvol_given ; /**< @brief Whether hullvol was given. */ + unsigned int rodlength_given ; /**< @brief Whether rodlength was given. */ + unsigned int tet_param_given ; /**< @brief Whether tet_param was given. */ + unsigned int tet_param_z_given ; /**< @brief Whether tet_param_z was given. */ char **inputs ; /**< @brief unamed options (options without names) */ unsigned inputs_num ; /**< @brief unamed options number */ @@ -195,7 +210,7 @@ extern const char *gengetopt_args_info_help[]; * @param args_info the structure where option information will be stored * @return 0 if everything went fine, NON 0 if an error took place */ -int cmdline_parser (int argc, char * const *argv, +int cmdline_parser (int argc, char **argv, struct gengetopt_args_info *args_info); /** @@ -209,7 +224,7 @@ int cmdline_parser (int argc, char * const *argv, * @return 0 if everything went fine, NON 0 if an error took place * @deprecated use cmdline_parser_ext() instead */ -int cmdline_parser2 (int argc, char * const *argv, +int cmdline_parser2 (int argc, char **argv, struct gengetopt_args_info *args_info, int override, int initialize, int check_required); @@ -221,7 +236,7 @@ int cmdline_parser2 (int argc, char * const *argv, * @param params additional parameters for the parser * @return 0 if everything went fine, NON 0 if an error took place */ -int cmdline_parser_ext (int argc, char * const *argv, +int cmdline_parser_ext (int argc, char **argv, struct gengetopt_args_info *args_info, struct cmdline_parser_params *params);