ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/OpenMD/trunk/src/applications/staticProps/StaticPropsCmd.cpp
(Generate patch)

Comparing:
trunk/src/applications/staticProps/StaticPropsCmd.c (file contents), Revision 1454 by gezelter, Wed Jun 23 19:25:02 2010 UTC vs.
branches/development/src/applications/staticProps/StaticPropsCmd.cpp (file contents), Revision 1655 by gezelter, Mon Oct 3 20:32:45 2011 UTC

# Line 1 | Line 1
1   /*
2 <  File autogenerated by gengetopt version 2.22
2 >  File autogenerated by gengetopt version 2.22.4
3    generated with the following command:
4    gengetopt -F StaticPropsCmd -u
5  
# Line 17 | Line 17
17   #include <stdlib.h>
18   #include <string.h>
19  
20 < #include "getopt.h"
20 > #ifndef FIX_UNUSED
21 > #define FIX_UNUSED(X) (void) (X) /* avoid warnings for unused params */
22 > #endif
23  
24 + #include <getopt.h>
25 +
26   #include "StaticPropsCmd.h"
27  
28   const char *gengetopt_args_info_purpose = "";
# Line 56 | Line 60 | const char *gengetopt_args_info_help[] = {
60    "      --bo                      bond order parameter (--rcut must be specified)",
61    "      --bor                     bond order parameter as a function of radius \n                                  (--rcut must be specified)",
62    "      --bad                     N(theta) bond angle density within (--rcut must \n                                  be specified)",
63 +  "      --count                   count of molecules matching selection criteria \n                                  (and associated statistics)",
64    "  -g, --gofr                    g(r)",
65    "      --gofz                    g(z)",
66    "      --r_theta                 g(r, cos(theta))",
# Line 64 | Line 69 | const char *gengetopt_args_info_help[] = {
69    "      --theta_omega             g(cos(theta), cos(omega))",
70    "      --gxyz                    g(x, y, z)",
71    "      --twodgofr                2D g(r) (Slab width --dz must be specified)",
72 <  "  -p, --p2                      p2 order parameter (--sele1 and --sele2 must be \n                                  specified)",
72 >  "  -p, --p2                      p2 order parameter (--sele1 must be specified, \n                                  --sele2 is optional)",
73    "      --rp2                     rp2 order parameter (--sele1 and --sele2 must \n                                  be specified)",
74    "  -s, --scd                     scd order parameter (either --sele1, --sele2, \n                                  --sele3 are specified or --molname, --begin, \n                                  --end are specified)",
75    "  -d, --density                 density plot",
# Line 72 | Line 77 | const char *gengetopt_args_info_help[] = {
77    "      --p_angle                 p(cos(theta))",
78    "      --hxy                     hxy",
79    "      --rho_r                   rho of R",
80 +  "      --angle_r                 angle of R",
81    "      --hullvol                 hull volume of nanoparticle",
82 +  "      --rodlength               length of nanorod",
83 +  "  -Q, --tet_param               tetrahedrality order parameter",
84      0
85   };
86  
# Line 88 | Line 96 | static int
96   void clear_args (struct gengetopt_args_info *args_info);
97  
98   static int
99 < cmdline_parser_internal (int argc, char * const *argv, struct gengetopt_args_info *args_info,
99 > cmdline_parser_internal (int argc, char **argv, struct gengetopt_args_info *args_info,
100                          struct cmdline_parser_params *params, const char *additional_error);
101  
102   static int
# Line 127 | Line 135 | void clear_given (struct gengetopt_args_info *args_inf
135    args_info->bo_given = 0 ;
136    args_info->bor_given = 0 ;
137    args_info->bad_given = 0 ;
138 +  args_info->count_given = 0 ;
139    args_info->gofr_given = 0 ;
140    args_info->gofz_given = 0 ;
141    args_info->r_theta_given = 0 ;
# Line 143 | Line 152 | void clear_given (struct gengetopt_args_info *args_inf
152    args_info->p_angle_given = 0 ;
153    args_info->hxy_given = 0 ;
154    args_info->rho_r_given = 0 ;
155 +  args_info->angle_r_given = 0 ;
156    args_info->hullvol_given = 0 ;
157 +  args_info->rodlength_given = 0 ;
158 +  args_info->tet_param_given = 0 ;
159    args_info->staticProps_group_counter = 0 ;
160   }
161  
162   static
163   void clear_args (struct gengetopt_args_info *args_info)
164   {
165 +  FIX_UNUSED (args_info);
166    args_info->input_arg = NULL;
167    args_info->input_orig = NULL;
168    args_info->output_arg = NULL;
# Line 222 | Line 235 | void init_args_info(struct gengetopt_args_info *args_i
235    args_info->bo_help = gengetopt_args_info_help[25] ;
236    args_info->bor_help = gengetopt_args_info_help[26] ;
237    args_info->bad_help = gengetopt_args_info_help[27] ;
238 <  args_info->gofr_help = gengetopt_args_info_help[28] ;
239 <  args_info->gofz_help = gengetopt_args_info_help[29] ;
240 <  args_info->r_theta_help = gengetopt_args_info_help[30] ;
241 <  args_info->r_omega_help = gengetopt_args_info_help[31] ;
242 <  args_info->r_z_help = gengetopt_args_info_help[32] ;
243 <  args_info->theta_omega_help = gengetopt_args_info_help[33] ;
244 <  args_info->gxyz_help = gengetopt_args_info_help[34] ;
245 <  args_info->twodgofr_help = gengetopt_args_info_help[35] ;
246 <  args_info->p2_help = gengetopt_args_info_help[36] ;
247 <  args_info->rp2_help = gengetopt_args_info_help[37] ;
248 <  args_info->scd_help = gengetopt_args_info_help[38] ;
249 <  args_info->density_help = gengetopt_args_info_help[39] ;
250 <  args_info->slab_density_help = gengetopt_args_info_help[40] ;
251 <  args_info->p_angle_help = gengetopt_args_info_help[41] ;
252 <  args_info->hxy_help = gengetopt_args_info_help[42] ;
253 <  args_info->rho_r_help = gengetopt_args_info_help[43] ;
254 <  args_info->hullvol_help = gengetopt_args_info_help[44] ;
238 >  args_info->count_help = gengetopt_args_info_help[28] ;
239 >  args_info->gofr_help = gengetopt_args_info_help[29] ;
240 >  args_info->gofz_help = gengetopt_args_info_help[30] ;
241 >  args_info->r_theta_help = gengetopt_args_info_help[31] ;
242 >  args_info->r_omega_help = gengetopt_args_info_help[32] ;
243 >  args_info->r_z_help = gengetopt_args_info_help[33] ;
244 >  args_info->theta_omega_help = gengetopt_args_info_help[34] ;
245 >  args_info->gxyz_help = gengetopt_args_info_help[35] ;
246 >  args_info->twodgofr_help = gengetopt_args_info_help[36] ;
247 >  args_info->p2_help = gengetopt_args_info_help[37] ;
248 >  args_info->rp2_help = gengetopt_args_info_help[38] ;
249 >  args_info->scd_help = gengetopt_args_info_help[39] ;
250 >  args_info->density_help = gengetopt_args_info_help[40] ;
251 >  args_info->slab_density_help = gengetopt_args_info_help[41] ;
252 >  args_info->p_angle_help = gengetopt_args_info_help[42] ;
253 >  args_info->hxy_help = gengetopt_args_info_help[43] ;
254 >  args_info->rho_r_help = gengetopt_args_info_help[44] ;
255 >  args_info->angle_r_help = gengetopt_args_info_help[45] ;
256 >  args_info->hullvol_help = gengetopt_args_info_help[46] ;
257 >  args_info->rodlength_help = gengetopt_args_info_help[47] ;
258 >  args_info->tet_param_help = gengetopt_args_info_help[48] ;
259    
260   }
261  
262   void
263   cmdline_parser_print_version (void)
264   {
265 <  printf ("%s %s\n", CMDLINE_PARSER_PACKAGE, CMDLINE_PARSER_VERSION);
265 >  printf ("%s %s\n",
266 >     (strlen(CMDLINE_PARSER_PACKAGE_NAME) ? CMDLINE_PARSER_PACKAGE_NAME : CMDLINE_PARSER_PACKAGE),
267 >     CMDLINE_PARSER_VERSION);
268   }
269  
270   static void print_help_common(void) {
# Line 260 | Line 279 | static void print_help_common(void) {
279    printf("\n");
280  
281    if (strlen(gengetopt_args_info_description) > 0)
282 <    printf("%s\n", gengetopt_args_info_description);
282 >    printf("%s\n\n", gengetopt_args_info_description);
283   }
284  
285   void
# Line 279 | Line 298 | cmdline_parser_init (struct gengetopt_args_info *args_
298    clear_args (args_info);
299    init_args_info (args_info);
300  
301 <  args_info->inputs = NULL;
301 >  args_info->inputs = 0;
302    args_info->inputs_num = 0;
303   }
304  
# Line 363 | Line 382 | static void
382  
383  
384   static void
385 < write_into_file(FILE *outfile, const char *opt, const char *arg, char *values[])
385 > write_into_file(FILE *outfile, const char *opt, const char *arg, const char *values[])
386   {
387 +  FIX_UNUSED (values);
388    if (arg) {
389      fprintf(outfile, "%s=\"%s\"\n", opt, arg);
390    } else {
# Line 438 | Line 458 | cmdline_parser_dump(FILE *outfile, struct gengetopt_ar
458      write_into_file(outfile, "bor", 0, 0 );
459    if (args_info->bad_given)
460      write_into_file(outfile, "bad", 0, 0 );
461 +  if (args_info->count_given)
462 +    write_into_file(outfile, "count", 0, 0 );
463    if (args_info->gofr_given)
464      write_into_file(outfile, "gofr", 0, 0 );
465    if (args_info->gofz_given)
# Line 470 | Line 492 | cmdline_parser_dump(FILE *outfile, struct gengetopt_ar
492      write_into_file(outfile, "hxy", 0, 0 );
493    if (args_info->rho_r_given)
494      write_into_file(outfile, "rho_r", 0, 0 );
495 +  if (args_info->angle_r_given)
496 +    write_into_file(outfile, "angle_r", 0, 0 );
497    if (args_info->hullvol_given)
498      write_into_file(outfile, "hullvol", 0, 0 );
499 +  if (args_info->rodlength_given)
500 +    write_into_file(outfile, "rodlength", 0, 0 );
501 +  if (args_info->tet_param_given)
502 +    write_into_file(outfile, "tet_param", 0, 0 );
503    
504  
505    i = EXIT_SUCCESS;
# Line 508 | Line 536 | gengetopt_strdup (const char *s)
536   char *
537   gengetopt_strdup (const char *s)
538   {
539 <  char *result = NULL;
539 >  char *result = 0;
540    if (!s)
541      return result;
542  
# Line 528 | Line 556 | reset_group_staticProps(struct gengetopt_args_info *ar
556    args_info->bo_given = 0 ;
557    args_info->bor_given = 0 ;
558    args_info->bad_given = 0 ;
559 +  args_info->count_given = 0 ;
560    args_info->gofr_given = 0 ;
561    args_info->gofz_given = 0 ;
562    args_info->r_theta_given = 0 ;
# Line 544 | Line 573 | reset_group_staticProps(struct gengetopt_args_info *ar
573    args_info->p_angle_given = 0 ;
574    args_info->hxy_given = 0 ;
575    args_info->rho_r_given = 0 ;
576 +  args_info->angle_r_given = 0 ;
577    args_info->hullvol_given = 0 ;
578 +  args_info->rodlength_given = 0 ;
579 +  args_info->tet_param_given = 0 ;
580  
581    args_info->staticProps_group_counter = 0;
582   }
583  
584   int
585 < cmdline_parser (int argc, char * const *argv, struct gengetopt_args_info *args_info)
585 > cmdline_parser (int argc, char **argv, struct gengetopt_args_info *args_info)
586   {
587    return cmdline_parser2 (argc, argv, args_info, 0, 1, 1);
588   }
589  
590   int
591 < cmdline_parser_ext (int argc, char * const *argv, struct gengetopt_args_info *args_info,
591 > cmdline_parser_ext (int argc, char **argv, struct gengetopt_args_info *args_info,
592                     struct cmdline_parser_params *params)
593   {
594    int result;
595 <  result = cmdline_parser_internal (argc, argv, args_info, params, NULL);
595 >  result = cmdline_parser_internal (argc, argv, args_info, params, 0);
596  
597    if (result == EXIT_FAILURE)
598      {
# Line 572 | Line 604 | int
604   }
605  
606   int
607 < cmdline_parser2 (int argc, char * const *argv, struct gengetopt_args_info *args_info, int override, int initialize, int check_required)
607 > cmdline_parser2 (int argc, char **argv, struct gengetopt_args_info *args_info, int override, int initialize, int check_required)
608   {
609    int result;
610    struct cmdline_parser_params params;
# Line 583 | Line 615 | cmdline_parser2 (int argc, char * const *argv, struct
615    params.check_ambiguity = 0;
616    params.print_errors = 1;
617  
618 <  result = cmdline_parser_internal (argc, argv, args_info, &params, NULL);
618 >  result = cmdline_parser_internal (argc, argv, args_info, &params, 0);
619  
620    if (result == EXIT_FAILURE)
621      {
# Line 599 | Line 631 | cmdline_parser_required (struct gengetopt_args_info *a
631   {
632    int result = EXIT_SUCCESS;
633  
634 <  if (cmdline_parser_required2(args_info, prog_name, NULL) > 0)
634 >  if (cmdline_parser_required2(args_info, prog_name, 0) > 0)
635      result = EXIT_FAILURE;
636  
637    if (result == EXIT_FAILURE)
# Line 615 | Line 647 | cmdline_parser_required2 (struct gengetopt_args_info *
647   cmdline_parser_required2 (struct gengetopt_args_info *args_info, const char *prog_name, const char *additional_error)
648   {
649    int error = 0;
650 +  FIX_UNUSED (additional_error);
651  
652    /* checks for required options */
653    if (! args_info->input_given)
# Line 625 | Line 658 | cmdline_parser_required2 (struct gengetopt_args_info *
658    
659    if (args_info->staticProps_group_counter == 0)
660      {
661 <      fprintf (stderr, "%s: %d options of group staticProps were given. One is required.%s\n", prog_name, args_info->staticProps_group_counter, (additional_error ? additional_error : ""));
661 >      fprintf (stderr, "%s: %d options of group staticProps were given. One is required%s.\n", prog_name, args_info->staticProps_group_counter, (additional_error ? additional_error : ""));
662        error = 1;
663      }
664    
# Line 659 | Line 692 | int update_arg(void *field, char **orig_field,
692   static
693   int update_arg(void *field, char **orig_field,
694                 unsigned int *field_given, unsigned int *prev_given,
695 <               char *value, char *possible_values[], const char *default_value,
695 >               char *value, const char *possible_values[],
696 >               const char *default_value,
697                 cmdline_parser_arg_type arg_type,
698                 int check_ambiguity, int override,
699                 int no_free, int multiple_option,
# Line 670 | Line 704 | int update_arg(void *field, char **orig_field,
704    const char *val = value;
705    int found;
706    char **string_field;
707 +  FIX_UNUSED (field);
708  
709    stop_char = 0;
710    found = 0;
# Line 687 | Line 722 | int update_arg(void *field, char **orig_field,
722        return 1; /* failure */
723      }
724  
725 +  FIX_UNUSED (default_value);
726      
727    if (field_given && *field_given && ! override)
728      return 0;
# Line 750 | Line 786 | int
786  
787  
788   int
789 < cmdline_parser_internal (int argc, char * const *argv, struct gengetopt_args_info *args_info,
789 > cmdline_parser_internal (
790 >  int argc, char **argv, struct gengetopt_args_info *args_info,
791                          struct cmdline_parser_params *params, const char *additional_error)
792   {
793    int c;        /* Character of the parsed option.  */
# Line 812 | Line 849 | cmdline_parser_internal (int argc, char * const *argv,
849          { "bo", 0, NULL, 0 },
850          { "bor",        0, NULL, 0 },
851          { "bad",        0, NULL, 0 },
852 +        { "count",      0, NULL, 0 },
853          { "gofr",       0, NULL, 'g' },
854          { "gofz",       0, NULL, 0 },
855          { "r_theta",    0, NULL, 0 },
# Line 828 | Line 866 | cmdline_parser_internal (int argc, char * const *argv,
866          { "p_angle",    0, NULL, 0 },
867          { "hxy",        0, NULL, 0 },
868          { "rho_r",      0, NULL, 0 },
869 +        { "angle_r",    0, NULL, 0 },
870          { "hullvol",    0, NULL, 0 },
871 <        { NULL, 0, NULL, 0 }
871 >        { "rodlength",  0, NULL, 0 },
872 >        { "tet_param",  0, NULL, 'Q' },
873 >        { 0,  0, 0, 0 }
874        };
875  
876 <      c = getopt_long (argc, argv, "hVi:o:n:b:x:y:a:c:z:gpsd", long_options, &option_index);
876 >      c = getopt_long (argc, argv, "hVi:o:n:b:x:y:a:c:z:gpsdQ", long_options, &option_index);
877  
878        if (c == -1) break;       /* Exit from `while (1)' loop.  */
879  
# Line 971 | Line 1012 | cmdline_parser_internal (int argc, char * const *argv,
1012              goto failure;
1013          
1014            break;
1015 <        case 'p':       /* p2 order parameter (--sele1 and --sele2 must be specified).  */
1015 >        case 'p':       /* p2 order parameter (--sele1 must be specified, --sele2 is optional).  */
1016          
1017            if (args_info->staticProps_group_counter && override)
1018              reset_group_staticProps (args_info);
# Line 1012 | Line 1053 | cmdline_parser_internal (int argc, char * const *argv,
1053                &(local_args_info.density_given), optarg, 0, 0, ARG_NO,
1054                check_ambiguity, override, 0, 0,
1055                "density", 'd',
1056 +              additional_error))
1057 +            goto failure;
1058 +        
1059 +          break;
1060 +        case 'Q':       /* tetrahedrality order parameter.  */
1061 +        
1062 +          if (args_info->staticProps_group_counter && override)
1063 +            reset_group_staticProps (args_info);
1064 +          args_info->staticProps_group_counter += 1;
1065 +        
1066 +          if (update_arg( 0 ,
1067 +               0 , &(args_info->tet_param_given),
1068 +              &(local_args_info.tet_param_given), optarg, 0, 0, ARG_NO,
1069 +              check_ambiguity, override, 0, 0,
1070 +              "tet_param", 'Q',
1071                additional_error))
1072              goto failure;
1073          
# Line 1247 | Line 1303 | cmdline_parser_internal (int argc, char * const *argv,
1303                  &(local_args_info.bad_given), optarg, 0, 0, ARG_NO,
1304                  check_ambiguity, override, 0, 0,
1305                  "bad", '-',
1306 +                additional_error))
1307 +              goto failure;
1308 +          
1309 +          }
1310 +          /* count of molecules matching selection criteria (and associated statistics).  */
1311 +          else if (strcmp (long_options[option_index].name, "count") == 0)
1312 +          {
1313 +          
1314 +            if (args_info->staticProps_group_counter && override)
1315 +              reset_group_staticProps (args_info);
1316 +            args_info->staticProps_group_counter += 1;
1317 +          
1318 +            if (update_arg( 0 ,
1319 +                 0 , &(args_info->count_given),
1320 +                &(local_args_info.count_given), optarg, 0, 0, ARG_NO,
1321 +                check_ambiguity, override, 0, 0,
1322 +                "count", '-',
1323                  additional_error))
1324                goto failure;
1325            
# Line 1455 | Line 1528 | cmdline_parser_internal (int argc, char * const *argv,
1528                goto failure;
1529            
1530            }
1531 +          /* angle of R.  */
1532 +          else if (strcmp (long_options[option_index].name, "angle_r") == 0)
1533 +          {
1534 +          
1535 +            if (args_info->staticProps_group_counter && override)
1536 +              reset_group_staticProps (args_info);
1537 +            args_info->staticProps_group_counter += 1;
1538 +          
1539 +            if (update_arg( 0 ,
1540 +                 0 , &(args_info->angle_r_given),
1541 +                &(local_args_info.angle_r_given), optarg, 0, 0, ARG_NO,
1542 +                check_ambiguity, override, 0, 0,
1543 +                "angle_r", '-',
1544 +                additional_error))
1545 +              goto failure;
1546 +          
1547 +          }
1548            /* hull volume of nanoparticle.  */
1549            else if (strcmp (long_options[option_index].name, "hullvol") == 0)
1550            {
# Line 1472 | Line 1562 | cmdline_parser_internal (int argc, char * const *argv,
1562                goto failure;
1563            
1564            }
1565 +          /* length of nanorod.  */
1566 +          else if (strcmp (long_options[option_index].name, "rodlength") == 0)
1567 +          {
1568            
1569 +            if (args_info->staticProps_group_counter && override)
1570 +              reset_group_staticProps (args_info);
1571 +            args_info->staticProps_group_counter += 1;
1572 +          
1573 +            if (update_arg( 0 ,
1574 +                 0 , &(args_info->rodlength_given),
1575 +                &(local_args_info.rodlength_given), optarg, 0, 0, ARG_NO,
1576 +                check_ambiguity, override, 0, 0,
1577 +                "rodlength", '-',
1578 +                additional_error))
1579 +              goto failure;
1580 +          
1581 +          }
1582 +          
1583            break;
1584          case '?':       /* Invalid option.  */
1585            /* `getopt_long' already printed an error message.  */
# Line 1486 | Line 1593 | cmdline_parser_internal (int argc, char * const *argv,
1593  
1594    if (args_info->staticProps_group_counter > 1)
1595      {
1596 <      fprintf (stderr, "%s: %d options of group staticProps were given. One is required.%s\n", argv[0], args_info->staticProps_group_counter, (additional_error ? additional_error : ""));
1596 >      fprintf (stderr, "%s: %d options of group staticProps were given. One is required%s.\n", argv[0], args_info->staticProps_group_counter, (additional_error ? additional_error : ""));
1597        error = 1;
1598      }
1599    

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines