ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/group/trunk/OOPSE-4/src/applications/staticProps/StaticPropsCmd.c
(Generate patch)

Comparing trunk/OOPSE-4/src/applications/staticProps/StaticPropsCmd.c (file contents):
Revision 2763 by xsun, Mon May 22 15:30:42 2006 UTC vs.
Revision 3009 by gezelter, Wed Sep 20 20:13:40 2006 UTC

# Line 43 | Line 43 | void clear_given (struct gengetopt_args_info *args_inf
43    args_info->input_given = 0 ;
44    args_info->output_given = 0 ;
45    args_info->step_given = 0 ;
46 <  args_info->nrbins_given = 0 ;
46 >  args_info->nbins_given = 0 ;
47    args_info->nbins_x_given = 0 ;
48    args_info->nbins_y_given = 0 ;
49    args_info->nanglebins_given = 0 ;
50    args_info->length_given = 0 ;
51 +  args_info->LegendreL_given = 0 ;
52 +  args_info->rcut_given = 0 ;
53    args_info->zoffset_given = 0 ;
54    args_info->sele1_given = 0 ;
55    args_info->sele2_given = 0 ;
# Line 56 | Line 58 | void clear_given (struct gengetopt_args_info *args_inf
58    args_info->molname_given = 0 ;
59    args_info->begin_given = 0 ;
60    args_info->end_given = 0 ;
61 +  args_info->bo_given = 0 ;
62    args_info->gofr_given = 0 ;
63    args_info->r_theta_given = 0 ;
64    args_info->r_omega_given = 0 ;
65    args_info->theta_omega_given = 0 ;
66    args_info->gxyz_given = 0 ;
67    args_info->p2_given = 0 ;
68 +  args_info->rp2_given = 0 ;
69    args_info->scd_given = 0 ;
70    args_info->density_given = 0 ;
71    args_info->slab_density_given = 0 ;
# Line 78 | Line 82 | void clear_args (struct gengetopt_args_info *args_info
82    args_info->output_orig = NULL;
83    args_info->step_arg = 1;
84    args_info->step_orig = NULL;
85 <  args_info->nrbins_arg = 100;
86 <  args_info->nrbins_orig = NULL;
85 >  args_info->nbins_arg = 100;
86 >  args_info->nbins_orig = NULL;
87    args_info->nbins_x_arg = 100;
88    args_info->nbins_x_orig = NULL;
89    args_info->nbins_y_arg = 100;
# Line 87 | Line 91 | void clear_args (struct gengetopt_args_info *args_info
91    args_info->nanglebins_arg = 50;
92    args_info->nanglebins_orig = NULL;
93    args_info->length_orig = NULL;
94 +  args_info->LegendreL_orig = NULL;
95 +  args_info->rcut_orig = NULL;
96    args_info->zoffset_arg = 0;
97    args_info->zoffset_orig = NULL;
98    args_info->sele1_arg = NULL;
# Line 120 | Line 126 | cmdline_parser_print_help (void)
126    printf("%s\n","  -i, --input=filename          input dump file");
127    printf("%s\n","  -o, --output=filename         output file name");
128    printf("%s\n","  -n, --step=INT                process every n frame  (default=`1')");
129 <  printf("%s\n","  -r, --nrbins=INT              number of bins for distance  (default=`100')");
129 >  printf("%s\n","  -b, --nbins=INT               number of bins (general purpose)  \n                                  (default=`100')");
130    printf("%s\n","  -x, --nbins_x=INT             number of bins in x axis  (default=`100')");
131    printf("%s\n","  -y, --nbins_y=INT             number of bins in y axis  (default=`100')");
132    printf("%s\n","  -a, --nanglebins=INT          number of bins for cos(angle)  (default=`50')");
133 <  printf("%s\n","  -l, --length=DOUBLE           maximum length (Defaults to 1/2 smallest length \n                                  of first frame)");
133 >  printf("%s\n","      --length=DOUBLE           maximum length (Defaults to 1/2 smallest length \n                                  of first frame)");
134 >  printf("%s\n","  -l, --LegendreL=INT           Order of Legendre Polynomial (used for Bond \n                                  Order calculations)");
135 >  printf("%s\n","  -c, --rcut=DOUBLE             cutoff radius (rcut)");
136    printf("%s\n","  -z, --zoffset=DOUBLE          Where to set the zero for the slab_density \n                                  calculation  (default=`0')");
137    printf("%s\n","      --sele1=selection script  select the first stuntdouble set");
138    printf("%s\n","      --sele2=selection script  select the second stuntdouble set");
139    printf("%s\n","      --sele3=selection script  select the third stuntdouble set");
140    printf("%s\n","      --refsele=selection script\n                                select reference (use and only use with --gxyz)");
141    printf("%s\n","      --molname=STRING          molecule name");
142 <  printf("%s\n","      --begin=INT               begin interanl index");
142 >  printf("%s\n","      --begin=INT               begin internal index");
143    printf("%s\n","      --end=INT                 end internal index");
144    printf("%s\n","\n Group: staticProps\n   an option of this group is required");
145 <  printf("%s\n","      --gofr                    g(r)");
145 >  printf("%s\n","      --bo                      bond order parameter (--rcut and --LegendreL \n                                  must be specified");
146 >  printf("%s\n","  -g, --gofr                    g(r)");
147    printf("%s\n","      --r_theta                 g(r, cos(theta))");
148    printf("%s\n","      --r_omega                 g(r, cos(omega))");
149    printf("%s\n","      --theta_omega             g(cos(theta), cos(omega))");
150    printf("%s\n","      --gxyz                    g(x, y, z)");
151 <  printf("%s\n","      --p2                      p2 order parameter (--sele1 and --sele2 must be \n                                  specified)");
152 <  printf("%s\n","      --scd                     scd order parameter(either --sele1, --sele2, \n                                  --sele3 are specified or --molname, --begin, \n                                  --end are specified)");
153 <  printf("%s\n","      --density                 density plot (--sele1 must be specified)");
154 <  printf("%s\n","      --slab_density            slab density (--sele1 must be specified)");
155 <  printf("%s\n","      --hxy                     hxy (--sele1 must be specified)");
151 >  printf("%s\n","  -p, --p2                      p2 order parameter (--sele1 and --sele2 must be \n                                  specified)");
152 >  printf("%s\n","      --rp2                     rp2 order parameter (--sele1 and --sele2 must \n                                  be specified)");
153 >  printf("%s\n","  -s, --scd                     scd order parameter (either --sele1, --sele2, \n                                  --sele3 are specified or --molname, --begin, \n                                  --end are specified)");
154 >  printf("%s\n","  -d, --density                 density plot");
155 >  printf("%s\n","      --slab_density            slab density");
156 >  printf("%s\n","      --hxy                     hxy");
157    
158   }
159  
# Line 183 | Line 193 | cmdline_parser_release (struct gengetopt_args_info *ar
193        free (args_info->step_orig); /* free previous argument */
194        args_info->step_orig = 0;
195      }
196 <  if (args_info->nrbins_orig)
196 >  if (args_info->nbins_orig)
197      {
198 <      free (args_info->nrbins_orig); /* free previous argument */
199 <      args_info->nrbins_orig = 0;
198 >      free (args_info->nbins_orig); /* free previous argument */
199 >      args_info->nbins_orig = 0;
200      }
201    if (args_info->nbins_x_orig)
202      {
# Line 207 | Line 217 | cmdline_parser_release (struct gengetopt_args_info *ar
217      {
218        free (args_info->length_orig); /* free previous argument */
219        args_info->length_orig = 0;
220 +    }
221 +  if (args_info->LegendreL_orig)
222 +    {
223 +      free (args_info->LegendreL_orig); /* free previous argument */
224 +      args_info->LegendreL_orig = 0;
225      }
226 +  if (args_info->rcut_orig)
227 +    {
228 +      free (args_info->rcut_orig); /* free previous argument */
229 +      args_info->rcut_orig = 0;
230 +    }
231    if (args_info->zoffset_orig)
232      {
233        free (args_info->zoffset_orig); /* free previous argument */
# Line 318 | Line 338 | cmdline_parser_file_save(const char *filename, struct
338        fprintf(outfile, "%s\n", "step");
339      }
340    }
341 <  if (args_info->nrbins_given) {
342 <    if (args_info->nrbins_orig) {
343 <      fprintf(outfile, "%s=\"%s\"\n", "nrbins", args_info->nrbins_orig);
341 >  if (args_info->nbins_given) {
342 >    if (args_info->nbins_orig) {
343 >      fprintf(outfile, "%s=\"%s\"\n", "nbins", args_info->nbins_orig);
344      } else {
345 <      fprintf(outfile, "%s\n", "nrbins");
345 >      fprintf(outfile, "%s\n", "nbins");
346      }
347    }
348    if (args_info->nbins_x_given) {
# Line 351 | Line 371 | cmdline_parser_file_save(const char *filename, struct
371        fprintf(outfile, "%s=\"%s\"\n", "length", args_info->length_orig);
372      } else {
373        fprintf(outfile, "%s\n", "length");
374 +    }
375 +  }
376 +  if (args_info->LegendreL_given) {
377 +    if (args_info->LegendreL_orig) {
378 +      fprintf(outfile, "%s=\"%s\"\n", "LegendreL", args_info->LegendreL_orig);
379 +    } else {
380 +      fprintf(outfile, "%s\n", "LegendreL");
381      }
382    }
383 +  if (args_info->rcut_given) {
384 +    if (args_info->rcut_orig) {
385 +      fprintf(outfile, "%s=\"%s\"\n", "rcut", args_info->rcut_orig);
386 +    } else {
387 +      fprintf(outfile, "%s\n", "rcut");
388 +    }
389 +  }
390    if (args_info->zoffset_given) {
391      if (args_info->zoffset_orig) {
392        fprintf(outfile, "%s=\"%s\"\n", "zoffset", args_info->zoffset_orig);
# Line 409 | Line 443 | cmdline_parser_file_save(const char *filename, struct
443        fprintf(outfile, "%s\n", "end");
444      }
445    }
446 +  if (args_info->bo_given) {
447 +    fprintf(outfile, "%s\n", "bo");
448 +  }
449    if (args_info->gofr_given) {
450      fprintf(outfile, "%s\n", "gofr");
451    }
# Line 427 | Line 464 | cmdline_parser_file_save(const char *filename, struct
464    if (args_info->p2_given) {
465      fprintf(outfile, "%s\n", "p2");
466    }
467 +  if (args_info->rp2_given) {
468 +    fprintf(outfile, "%s\n", "rp2");
469 +  }
470    if (args_info->scd_given) {
471      fprintf(outfile, "%s\n", "scd");
472    }
# Line 478 | Line 518 | reset_group_staticProps(struct gengetopt_args_info *ar
518    if (! args_info->staticProps_group_counter)
519      return;
520    
521 +  args_info->bo_given = 0 ;
522    args_info->gofr_given = 0 ;
523    args_info->r_theta_given = 0 ;
524    args_info->r_omega_given = 0 ;
525    args_info->theta_omega_given = 0 ;
526    args_info->gxyz_given = 0 ;
527    args_info->p2_given = 0 ;
528 +  args_info->rp2_given = 0 ;
529    args_info->scd_given = 0 ;
530    args_info->density_given = 0 ;
531    args_info->slab_density_given = 0 ;
# Line 580 | Line 622 | cmdline_parser_internal (int argc, char * const *argv,
622          { "input",      1, NULL, 'i' },
623          { "output",     1, NULL, 'o' },
624          { "step",       1, NULL, 'n' },
625 <        { "nrbins",     1, NULL, 'r' },
625 >        { "nbins",      1, NULL, 'b' },
626          { "nbins_x",    1, NULL, 'x' },
627          { "nbins_y",    1, NULL, 'y' },
628          { "nanglebins", 1, NULL, 'a' },
629 <        { "length",     1, NULL, 'l' },
629 >        { "length",     1, NULL, 0 },
630 >        { "LegendreL",  1, NULL, 'l' },
631 >        { "rcut",       1, NULL, 'c' },
632          { "zoffset",    1, NULL, 'z' },
633          { "sele1",      1, NULL, 0 },
634          { "sele2",      1, NULL, 0 },
# Line 593 | Line 637 | cmdline_parser_internal (int argc, char * const *argv,
637          { "molname",    1, NULL, 0 },
638          { "begin",      1, NULL, 0 },
639          { "end",        1, NULL, 0 },
640 <        { "gofr",       0, NULL, 0 },
640 >        { "bo", 0, NULL, 0 },
641 >        { "gofr",       0, NULL, 'g' },
642          { "r_theta",    0, NULL, 0 },
643          { "r_omega",    0, NULL, 0 },
644          { "theta_omega",        0, NULL, 0 },
645          { "gxyz",       0, NULL, 0 },
646 <        { "p2", 0, NULL, 0 },
647 <        { "scd",        0, NULL, 0 },
648 <        { "density",    0, NULL, 0 },
646 >        { "p2", 0, NULL, 'p' },
647 >        { "rp2",        0, NULL, 0 },
648 >        { "scd",        0, NULL, 's' },
649 >        { "density",    0, NULL, 'd' },
650          { "slab_density",       0, NULL, 0 },
651          { "hxy",        0, NULL, 0 },
652          { NULL, 0, NULL, 0 }
653        };
654  
655        stop_char = 0;
656 <      c = getopt_long (argc, argv, "hVi:o:n:r:x:y:a:l:z:", long_options, &option_index);
656 >      c = getopt_long (argc, argv, "hVi:o:n:b:x:y:a:l:c:z:gpsd", long_options, &option_index);
657  
658        if (c == -1) break;       /* Exit from `while (1)' loop.  */
659  
# Line 679 | Line 725 | cmdline_parser_internal (int argc, char * const *argv,
725            args_info->step_orig = gengetopt_strdup (optarg);
726            break;
727  
728 <        case 'r':       /* number of bins for distance.  */
729 <          if (local_args_info.nrbins_given)
728 >        case 'b':       /* number of bins (general purpose).  */
729 >          if (local_args_info.nbins_given)
730              {
731 <              fprintf (stderr, "%s: `--nrbins' (`-r') option given more than once%s\n", argv[0], (additional_error ? additional_error : ""));
731 >              fprintf (stderr, "%s: `--nbins' (`-b') option given more than once%s\n", argv[0], (additional_error ? additional_error : ""));
732                goto failure;
733              }
734 <          if (args_info->nrbins_given && ! override)
734 >          if (args_info->nbins_given && ! override)
735              continue;
736 <          local_args_info.nrbins_given = 1;
737 <          args_info->nrbins_given = 1;
738 <          args_info->nrbins_arg = strtol (optarg, &stop_char, 0);
736 >          local_args_info.nbins_given = 1;
737 >          args_info->nbins_given = 1;
738 >          args_info->nbins_arg = strtol (optarg, &stop_char, 0);
739            if (!(stop_char && *stop_char == '\0')) {
740              fprintf(stderr, "%s: invalid numeric value: %s\n", argv[0], optarg);
741              goto failure;
742            }
743 <          if (args_info->nrbins_orig)
744 <            free (args_info->nrbins_orig); /* free previous string */
745 <          args_info->nrbins_orig = gengetopt_strdup (optarg);
743 >          if (args_info->nbins_orig)
744 >            free (args_info->nbins_orig); /* free previous string */
745 >          args_info->nbins_orig = gengetopt_strdup (optarg);
746            break;
747  
748          case 'x':       /* number of bins in x axis.  */
# Line 759 | Line 805 | cmdline_parser_internal (int argc, char * const *argv,
805            args_info->nanglebins_orig = gengetopt_strdup (optarg);
806            break;
807  
808 <        case 'l':       /* maximum length (Defaults to 1/2 smallest length of first frame).  */
809 <          if (local_args_info.length_given)
808 >        case 'l':       /* Order of Legendre Polynomial (used for Bond Order calculations).  */
809 >          if (local_args_info.LegendreL_given)
810              {
811 <              fprintf (stderr, "%s: `--length' (`-l') option given more than once%s\n", argv[0], (additional_error ? additional_error : ""));
811 >              fprintf (stderr, "%s: `--LegendreL' (`-l') option given more than once%s\n", argv[0], (additional_error ? additional_error : ""));
812                goto failure;
813              }
814 <          if (args_info->length_given && ! override)
814 >          if (args_info->LegendreL_given && ! override)
815              continue;
816 <          local_args_info.length_given = 1;
817 <          args_info->length_given = 1;
818 <          args_info->length_arg = strtod (optarg, &stop_char);
816 >          local_args_info.LegendreL_given = 1;
817 >          args_info->LegendreL_given = 1;
818 >          args_info->LegendreL_arg = strtol (optarg, &stop_char, 0);
819            if (!(stop_char && *stop_char == '\0')) {
820              fprintf(stderr, "%s: invalid numeric value: %s\n", argv[0], optarg);
821              goto failure;
822            }
823 <          if (args_info->length_orig)
824 <            free (args_info->length_orig); /* free previous string */
825 <          args_info->length_orig = gengetopt_strdup (optarg);
823 >          if (args_info->LegendreL_orig)
824 >            free (args_info->LegendreL_orig); /* free previous string */
825 >          args_info->LegendreL_orig = gengetopt_strdup (optarg);
826            break;
827  
828 +        case 'c':       /* cutoff radius (rcut).  */
829 +          if (local_args_info.rcut_given)
830 +            {
831 +              fprintf (stderr, "%s: `--rcut' (`-c') option given more than once%s\n", argv[0], (additional_error ? additional_error : ""));
832 +              goto failure;
833 +            }
834 +          if (args_info->rcut_given && ! override)
835 +            continue;
836 +          local_args_info.rcut_given = 1;
837 +          args_info->rcut_given = 1;
838 +          args_info->rcut_arg = strtod (optarg, &stop_char);
839 +          if (!(stop_char && *stop_char == '\0')) {
840 +            fprintf(stderr, "%s: invalid numeric value: %s\n", argv[0], optarg);
841 +            goto failure;
842 +          }
843 +          if (args_info->rcut_orig)
844 +            free (args_info->rcut_orig); /* free previous string */
845 +          args_info->rcut_orig = gengetopt_strdup (optarg);
846 +          break;
847 +
848          case 'z':       /* Where to set the zero for the slab_density calculation.  */
849            if (local_args_info.zoffset_given)
850              {
# Line 799 | Line 865 | cmdline_parser_internal (int argc, char * const *argv,
865            args_info->zoffset_orig = gengetopt_strdup (optarg);
866            break;
867  
868 +        case 'g':       /* g(r).  */
869 +          if (local_args_info.gofr_given)
870 +            {
871 +              fprintf (stderr, "%s: `--gofr' (`-g') option given more than once%s\n", argv[0], (additional_error ? additional_error : ""));
872 +              goto failure;
873 +            }
874 +          if (args_info->gofr_given && ! override)
875 +            continue;
876 +          local_args_info.gofr_given = 1;
877 +          args_info->gofr_given = 1;
878 +          if (args_info->staticProps_group_counter && override)
879 +            reset_group_staticProps (args_info);
880 +          args_info->staticProps_group_counter += 1;
881 +          break;
882  
883 +        case 'p':       /* p2 order parameter (--sele1 and --sele2 must be specified).  */
884 +          if (local_args_info.p2_given)
885 +            {
886 +              fprintf (stderr, "%s: `--p2' (`-p') option given more than once%s\n", argv[0], (additional_error ? additional_error : ""));
887 +              goto failure;
888 +            }
889 +          if (args_info->p2_given && ! override)
890 +            continue;
891 +          local_args_info.p2_given = 1;
892 +          args_info->p2_given = 1;
893 +          if (args_info->staticProps_group_counter && override)
894 +            reset_group_staticProps (args_info);
895 +          args_info->staticProps_group_counter += 1;
896 +          break;
897 +
898 +        case 's':       /* scd order parameter (either --sele1, --sele2, --sele3 are specified or --molname, --begin, --end are specified).  */
899 +          if (local_args_info.scd_given)
900 +            {
901 +              fprintf (stderr, "%s: `--scd' (`-s') option given more than once%s\n", argv[0], (additional_error ? additional_error : ""));
902 +              goto failure;
903 +            }
904 +          if (args_info->scd_given && ! override)
905 +            continue;
906 +          local_args_info.scd_given = 1;
907 +          args_info->scd_given = 1;
908 +          if (args_info->staticProps_group_counter && override)
909 +            reset_group_staticProps (args_info);
910 +          args_info->staticProps_group_counter += 1;
911 +          break;
912 +
913 +        case 'd':       /* density plot.  */
914 +          if (local_args_info.density_given)
915 +            {
916 +              fprintf (stderr, "%s: `--density' (`-d') option given more than once%s\n", argv[0], (additional_error ? additional_error : ""));
917 +              goto failure;
918 +            }
919 +          if (args_info->density_given && ! override)
920 +            continue;
921 +          local_args_info.density_given = 1;
922 +          args_info->density_given = 1;
923 +          if (args_info->staticProps_group_counter && override)
924 +            reset_group_staticProps (args_info);
925 +          args_info->staticProps_group_counter += 1;
926 +          break;
927 +
928 +
929          case 0: /* Long option with no short option */
930 +          /* maximum length (Defaults to 1/2 smallest length of first frame).  */
931 +          if (strcmp (long_options[option_index].name, "length") == 0)
932 +          {
933 +            if (local_args_info.length_given)
934 +              {
935 +                fprintf (stderr, "%s: `--length' option given more than once%s\n", argv[0], (additional_error ? additional_error : ""));
936 +                goto failure;
937 +              }
938 +            if (args_info->length_given && ! override)
939 +              continue;
940 +            local_args_info.length_given = 1;
941 +            args_info->length_given = 1;
942 +            args_info->length_arg = strtod (optarg, &stop_char);
943 +            if (!(stop_char && *stop_char == '\0')) {
944 +              fprintf(stderr, "%s: invalid numeric value: %s\n", argv[0], optarg);
945 +              goto failure;
946 +            }
947 +            if (args_info->length_orig)
948 +              free (args_info->length_orig); /* free previous string */
949 +            args_info->length_orig = gengetopt_strdup (optarg);
950 +          }
951            /* select the first stuntdouble set.  */
952 <          if (strcmp (long_options[option_index].name, "sele1") == 0)
952 >          else if (strcmp (long_options[option_index].name, "sele1") == 0)
953            {
954              if (local_args_info.sele1_given)
955                {
# Line 896 | Line 1043 | cmdline_parser_internal (int argc, char * const *argv,
1043                free (args_info->molname_orig); /* free previous string */
1044              args_info->molname_orig = gengetopt_strdup (optarg);
1045            }
1046 <          /* begin interanl index.  */
1046 >          /* begin internal index.  */
1047            else if (strcmp (long_options[option_index].name, "begin") == 0)
1048            {
1049              if (local_args_info.begin_given)
# Line 938 | Line 1085 | cmdline_parser_internal (int argc, char * const *argv,
1085                free (args_info->end_orig); /* free previous string */
1086              args_info->end_orig = gengetopt_strdup (optarg);
1087            }
1088 <          /* g(r).  */
1089 <          else if (strcmp (long_options[option_index].name, "gofr") == 0)
1088 >          /* bond order parameter (--rcut and --LegendreL must be specified.  */
1089 >          else if (strcmp (long_options[option_index].name, "bo") == 0)
1090            {
1091 <            if (local_args_info.gofr_given)
1091 >            if (local_args_info.bo_given)
1092                {
1093 <                fprintf (stderr, "%s: `--gofr' option given more than once%s\n", argv[0], (additional_error ? additional_error : ""));
1093 >                fprintf (stderr, "%s: `--bo' option given more than once%s\n", argv[0], (additional_error ? additional_error : ""));
1094                  goto failure;
1095                }
1096 <            if (args_info->gofr_given && ! override)
1096 >            if (args_info->bo_given && ! override)
1097                continue;
1098 <            local_args_info.gofr_given = 1;
1099 <            args_info->gofr_given = 1;
1098 >            local_args_info.bo_given = 1;
1099 >            args_info->bo_given = 1;
1100              if (args_info->staticProps_group_counter && override)
1101                reset_group_staticProps (args_info);
1102              args_info->staticProps_group_counter += 1;
# Line 1023 | Line 1170 | cmdline_parser_internal (int argc, char * const *argv,
1170              args_info->staticProps_group_counter += 1;
1171              break;
1172            }
1173 <          /* p2 order parameter (--sele1 and --sele2 must be specified).  */
1174 <          else if (strcmp (long_options[option_index].name, "p2") == 0)
1173 >          /* rp2 order parameter (--sele1 and --sele2 must be specified).  */
1174 >          else if (strcmp (long_options[option_index].name, "rp2") == 0)
1175            {
1176 <            if (local_args_info.p2_given)
1176 >            if (local_args_info.rp2_given)
1177                {
1178 <                fprintf (stderr, "%s: `--p2' option given more than once%s\n", argv[0], (additional_error ? additional_error : ""));
1178 >                fprintf (stderr, "%s: `--rp2' option given more than once%s\n", argv[0], (additional_error ? additional_error : ""));
1179                  goto failure;
1180                }
1181 <            if (args_info->p2_given && ! override)
1181 >            if (args_info->rp2_given && ! override)
1182                continue;
1183 <            local_args_info.p2_given = 1;
1184 <            args_info->p2_given = 1;
1183 >            local_args_info.rp2_given = 1;
1184 >            args_info->rp2_given = 1;
1185              if (args_info->staticProps_group_counter && override)
1186                reset_group_staticProps (args_info);
1187              args_info->staticProps_group_counter += 1;
1188              break;
1189            }
1190 <          /* scd order parameter(either --sele1, --sele2, --sele3 are specified or --molname, --begin, --end are specified).  */
1044 <          else if (strcmp (long_options[option_index].name, "scd") == 0)
1045 <          {
1046 <            if (local_args_info.scd_given)
1047 <              {
1048 <                fprintf (stderr, "%s: `--scd' option given more than once%s\n", argv[0], (additional_error ? additional_error : ""));
1049 <                goto failure;
1050 <              }
1051 <            if (args_info->scd_given && ! override)
1052 <              continue;
1053 <            local_args_info.scd_given = 1;
1054 <            args_info->scd_given = 1;
1055 <            if (args_info->staticProps_group_counter && override)
1056 <              reset_group_staticProps (args_info);
1057 <            args_info->staticProps_group_counter += 1;
1058 <            break;
1059 <          }
1060 <          /* density plot (--sele1 must be specified).  */
1061 <          else if (strcmp (long_options[option_index].name, "density") == 0)
1062 <          {
1063 <            if (local_args_info.density_given)
1064 <              {
1065 <                fprintf (stderr, "%s: `--density' option given more than once%s\n", argv[0], (additional_error ? additional_error : ""));
1066 <                goto failure;
1067 <              }
1068 <            if (args_info->density_given && ! override)
1069 <              continue;
1070 <            local_args_info.density_given = 1;
1071 <            args_info->density_given = 1;
1072 <            if (args_info->staticProps_group_counter && override)
1073 <              reset_group_staticProps (args_info);
1074 <            args_info->staticProps_group_counter += 1;
1075 <            break;
1076 <          }
1077 <          /* slab density (--sele1 must be specified).  */
1190 >          /* slab density.  */
1191            else if (strcmp (long_options[option_index].name, "slab_density") == 0)
1192            {
1193              if (local_args_info.slab_density_given)
# Line 1091 | Line 1204 | cmdline_parser_internal (int argc, char * const *argv,
1204              args_info->staticProps_group_counter += 1;
1205              break;
1206            }
1207 <          /* hxy (--sele1 must be specified).  */
1207 >          /* hxy.  */
1208            else if (strcmp (long_options[option_index].name, "hxy") == 0)
1209            {
1210              if (local_args_info.hxy_given)

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines