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

Comparing trunk/src/applications/dynamicProps/DynamicPropsCmd.cpp (file contents):
Revision 1795 by gezelter, Fri Sep 7 18:13:55 2012 UTC vs.
Revision 1811 by gezelter, Fri Nov 16 15:12:21 2012 UTC

# Line 1 | Line 1
1   /*
2    File autogenerated by gengetopt version 2.22.4
3    generated with the following command:
4 <  gengetopt -F DynamicPropsCmd -u
4 >  gengetopt --file-name=DynamicPropsCmd --unamed-opts
5  
6    The developers of gengetopt consider the fixed text that goes in all
7    gengetopt output files to be in the public domain:
# Line 21 | Line 21
21   #define FIX_UNUSED(X) (void) (X) /* avoid warnings for unused params */
22   #endif
23  
24 – #ifdef WIN32
25 – #include "utils/wingetopt.h"
26 – #else
24   #include <getopt.h>
28 – #endif
25  
26   #include "DynamicPropsCmd.h"
27  
# Line 45 | Line 41 | const char *gengetopt_args_info_help[] = {
41    "      --order=INT               Lengendre Polynomial Order",
42    "  -m, --memory=memory specification\n                                Available memory (defaults to 2G)  \n                                  (default=`2G')",
43    "\n Group: dynamicProps\n   an option of this group is required",
44 +  "  -s, --selecorr                selection correlation function",
45    "  -r, --rcorr                   rmsd",
46    "  -v, --vcorr                   velocity correlation function",
47    "  -d, --dcorr                   dipole correlation function",
48    "  -l, --lcorr                   Lengendre correlation function",
49 <  "  -s, --sdcorr                  System dipole correlation function",
49 >  "  -M, --sdcorr                  System dipole correlation function",
50    "      --r_rcorr                 Radial rmsd",
51    "      --thetacorr               Angular rmsd",
52    "      --drcorr                  Directional rmsd for particles with unit \n                                  vectors",
# Line 90 | Line 87 | void clear_given (struct gengetopt_args_info *args_inf
87    args_info->sele2_given = 0 ;
88    args_info->order_given = 0 ;
89    args_info->memory_given = 0 ;
90 +  args_info->selecorr_given = 0 ;
91    args_info->rcorr_given = 0 ;
92    args_info->vcorr_given = 0 ;
93    args_info->dcorr_given = 0 ;
# Line 135 | Line 133 | void init_args_info(struct gengetopt_args_info *args_i
133    args_info->sele2_help = gengetopt_args_info_help[5] ;
134    args_info->order_help = gengetopt_args_info_help[6] ;
135    args_info->memory_help = gengetopt_args_info_help[7] ;
136 <  args_info->rcorr_help = gengetopt_args_info_help[9] ;
137 <  args_info->vcorr_help = gengetopt_args_info_help[10] ;
138 <  args_info->dcorr_help = gengetopt_args_info_help[11] ;
139 <  args_info->lcorr_help = gengetopt_args_info_help[12] ;
140 <  args_info->sdcorr_help = gengetopt_args_info_help[13] ;
141 <  args_info->r_rcorr_help = gengetopt_args_info_help[14] ;
142 <  args_info->thetacorr_help = gengetopt_args_info_help[15] ;
143 <  args_info->drcorr_help = gengetopt_args_info_help[16] ;
144 <  args_info->helfandEcorr_help = gengetopt_args_info_help[17] ;
145 <  args_info->momentum_help = gengetopt_args_info_help[18] ;
146 <  args_info->stresscorr_help = gengetopt_args_info_help[19] ;
136 >  args_info->selecorr_help = gengetopt_args_info_help[9] ;
137 >  args_info->rcorr_help = gengetopt_args_info_help[10] ;
138 >  args_info->vcorr_help = gengetopt_args_info_help[11] ;
139 >  args_info->dcorr_help = gengetopt_args_info_help[12] ;
140 >  args_info->lcorr_help = gengetopt_args_info_help[13] ;
141 >  args_info->sdcorr_help = gengetopt_args_info_help[14] ;
142 >  args_info->r_rcorr_help = gengetopt_args_info_help[15] ;
143 >  args_info->thetacorr_help = gengetopt_args_info_help[16] ;
144 >  args_info->drcorr_help = gengetopt_args_info_help[17] ;
145 >  args_info->helfandEcorr_help = gengetopt_args_info_help[18] ;
146 >  args_info->momentum_help = gengetopt_args_info_help[19] ;
147 >  args_info->stresscorr_help = gengetopt_args_info_help[20] ;
148    
149   }
150  
# Line 291 | Line 290 | cmdline_parser_dump(FILE *outfile, struct gengetopt_ar
290      write_into_file(outfile, "order", args_info->order_orig, 0);
291    if (args_info->memory_given)
292      write_into_file(outfile, "memory", args_info->memory_orig, 0);
293 +  if (args_info->selecorr_given)
294 +    write_into_file(outfile, "selecorr", 0, 0 );
295    if (args_info->rcorr_given)
296      write_into_file(outfile, "rcorr", 0, 0 );
297    if (args_info->vcorr_given)
# Line 366 | Line 367 | reset_group_dynamicProps(struct gengetopt_args_info *a
367    if (! args_info->dynamicProps_group_counter)
368      return;
369    
370 +  args_info->selecorr_given = 0 ;
371    args_info->rcorr_given = 0 ;
372    args_info->vcorr_given = 0 ;
373    args_info->dcorr_given = 0 ;
# Line 626 | Line 628 | cmdline_parser_internal (
628          { "sele2",      1, NULL, 0 },
629          { "order",      1, NULL, 0 },
630          { "memory",     1, NULL, 'm' },
631 +        { "selecorr",   0, NULL, 's' },
632          { "rcorr",      0, NULL, 'r' },
633          { "vcorr",      0, NULL, 'v' },
634          { "dcorr",      0, NULL, 'd' },
635          { "lcorr",      0, NULL, 'l' },
636 <        { "sdcorr",     0, NULL, 's' },
636 >        { "sdcorr",     0, NULL, 'M' },
637          { "r_rcorr",    0, NULL, 0 },
638          { "thetacorr",  0, NULL, 0 },
639          { "drcorr",     0, NULL, 0 },
# Line 640 | Line 643 | cmdline_parser_internal (
643          { 0,  0, 0, 0 }
644        };
645  
646 <      c = getopt_long (argc, argv, "hVi:o:m:rvdlsp", long_options, &option_index);
646 >      c = getopt_long (argc, argv, "hVi:o:m:srvdlMp", long_options, &option_index);
647  
648        if (c == -1) break;       /* Exit from `while (1)' loop.  */
649  
# Line 692 | Line 695 | cmdline_parser_internal (
695              goto failure;
696          
697            break;
698 +        case 's':       /* selection correlation function.  */
699 +        
700 +          if (args_info->dynamicProps_group_counter && override)
701 +            reset_group_dynamicProps (args_info);
702 +          args_info->dynamicProps_group_counter += 1;
703 +        
704 +          if (update_arg( 0 ,
705 +               0 , &(args_info->selecorr_given),
706 +              &(local_args_info.selecorr_given), optarg, 0, 0, ARG_NO,
707 +              check_ambiguity, override, 0, 0,
708 +              "selecorr", 's',
709 +              additional_error))
710 +            goto failure;
711 +        
712 +          break;
713          case 'r':       /* rmsd.  */
714          
715            if (args_info->dynamicProps_group_counter && override)
# Line 752 | Line 770 | cmdline_parser_internal (
770              goto failure;
771          
772            break;
773 <        case 's':       /* System dipole correlation function.  */
773 >        case 'M':       /* System dipole correlation function.  */
774          
775            if (args_info->dynamicProps_group_counter && override)
776              reset_group_dynamicProps (args_info);
# Line 762 | Line 780 | cmdline_parser_internal (
780                 0 , &(args_info->sdcorr_given),
781                &(local_args_info.sdcorr_given), optarg, 0, 0, ARG_NO,
782                check_ambiguity, override, 0, 0,
783 <              "sdcorr", 's',
783 >              "sdcorr", 'M',
784                additional_error))
785              goto failure;
786          

Diff Legend

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