--- branches/development/src/applications/staticProps/StaticPropsCmd.c 2011/09/14 21:15:17 1629 +++ branches/development/src/applications/staticProps/StaticPropsCmd.cpp 2012/06/28 20:17:33 1762 @@ -1,7 +1,7 @@ /* File autogenerated by gengetopt version 2.22.4 generated with the following command: - gengetopt -F StaticPropsCmd -u + gengetopt -i StaticProps.ggo -c cpp -F StaticPropsCmd -u The developers of gengetopt consider the fixed text that goes in all gengetopt output files to be in the public domain: @@ -81,6 +81,7 @@ const char *gengetopt_args_info_help[] = { " --hullvol hull volume of nanoparticle", " --rodlength length of nanorod", " -Q, --tet_param tetrahedrality order parameter", + " --tet_param_z tetrahedrality order parameter by zbin(--sele1 \n must be specified)", 0 }; @@ -156,6 +157,7 @@ void clear_given (struct gengetopt_args_info *args_inf args_info->hullvol_given = 0 ; args_info->rodlength_given = 0 ; args_info->tet_param_given = 0 ; + args_info->tet_param_z_given = 0 ; args_info->staticProps_group_counter = 0 ; } @@ -256,6 +258,7 @@ void init_args_info(struct gengetopt_args_info *args_i args_info->hullvol_help = gengetopt_args_info_help[46] ; args_info->rodlength_help = gengetopt_args_info_help[47] ; args_info->tet_param_help = gengetopt_args_info_help[48] ; + args_info->tet_param_z_help = gengetopt_args_info_help[49] ; } @@ -500,6 +503,8 @@ cmdline_parser_dump(FILE *outfile, struct gengetopt_ar write_into_file(outfile, "rodlength", 0, 0 ); if (args_info->tet_param_given) write_into_file(outfile, "tet_param", 0, 0 ); + if (args_info->tet_param_z_given) + write_into_file(outfile, "tet_param_z", 0, 0 ); i = EXIT_SUCCESS; @@ -577,6 +582,7 @@ reset_group_staticProps(struct gengetopt_args_info *ar args_info->hullvol_given = 0 ; args_info->rodlength_given = 0 ; args_info->tet_param_given = 0 ; + args_info->tet_param_z_given = 0 ; args_info->staticProps_group_counter = 0; } @@ -870,6 +876,7 @@ cmdline_parser_internal ( { "hullvol", 0, NULL, 0 }, { "rodlength", 0, NULL, 0 }, { "tet_param", 0, NULL, 'Q' }, + { "tet_param_z", 0, NULL, 0 }, { 0, 0, 0, 0 } }; @@ -1575,6 +1582,23 @@ cmdline_parser_internal ( &(local_args_info.rodlength_given), optarg, 0, 0, ARG_NO, check_ambiguity, override, 0, 0, "rodlength", '-', + additional_error)) + goto failure; + + } + /* tetrahedrality order parameter by zbin(--sele1 must be specified). */ + else if (strcmp (long_options[option_index].name, "tet_param_z") == 0) + { + + if (args_info->staticProps_group_counter && override) + reset_group_staticProps (args_info); + args_info->staticProps_group_counter += 1; + + if (update_arg( 0 , + 0 , &(args_info->tet_param_z_given), + &(local_args_info.tet_param_z_given), optarg, 0, 0, ARG_NO, + check_ambiguity, override, 0, 0, + "tet_param_z", '-', additional_error)) goto failure;