--- trunk/src/applications/dynamicProps/DynamicPropsCmd.cpp	2013/08/26 14:15:09	1934
+++ trunk/src/applications/dynamicProps/DynamicPropsCmd.cpp	2014/06/01 19:28:44	2003
@@ -21,7 +21,11 @@
 #define FIX_UNUSED(X) (void) (X) /* avoid warnings for unused params */
 #endif
 
+#ifdef WIN32
+#include "utils/wingetopt.h"
+#else
 #include <getopt.h>
+#endif
 
 #include "DynamicPropsCmd.h"
 
@@ -56,6 +60,8 @@ const char *gengetopt_args_info_help[] = {
   "      --helfandEcorr            Helfand moment for thermal conductvity",
   "  -p, --momentum                Helfand momentum for viscosity",
   "      --stresscorr              Stress tensor correlation function",
+  "  -b, --bondcorr                Bond extension correlation function",
+  "  -f, --freqfluccorr            Frequency Fluctuation correlation function",
     0
 };
 
@@ -105,6 +111,8 @@ void clear_given (struct gengetopt_args_info *args_inf
   args_info->helfandEcorr_given = 0 ;
   args_info->momentum_given = 0 ;
   args_info->stresscorr_given = 0 ;
+  args_info->bondcorr_given = 0 ;
+  args_info->freqfluccorr_given = 0 ;
   args_info->dynamicProps_group_counter = 0 ;
 }
 
@@ -156,6 +164,8 @@ void init_args_info(struct gengetopt_args_info *args_i
   args_info->helfandEcorr_help = gengetopt_args_info_help[21] ;
   args_info->momentum_help = gengetopt_args_info_help[22] ;
   args_info->stresscorr_help = gengetopt_args_info_help[23] ;
+  args_info->bondcorr_help = gengetopt_args_info_help[24] ;
+  args_info->freqfluccorr_help = gengetopt_args_info_help[25] ;
   
 }
 
@@ -332,6 +342,10 @@ cmdline_parser_dump(FILE *outfile, struct gengetopt_ar
     write_into_file(outfile, "momentum", 0, 0 );
   if (args_info->stresscorr_given)
     write_into_file(outfile, "stresscorr", 0, 0 );
+  if (args_info->bondcorr_given)
+    write_into_file(outfile, "bondcorr", 0, 0 );
+  if (args_info->freqfluccorr_given)
+    write_into_file(outfile, "freqfluccorr", 0, 0 );
   
 
   i = EXIT_SUCCESS;
@@ -399,6 +413,8 @@ reset_group_dynamicProps(struct gengetopt_args_info *a
   args_info->helfandEcorr_given = 0 ;
   args_info->momentum_given = 0 ;
   args_info->stresscorr_given = 0 ;
+  args_info->bondcorr_given = 0 ;
+  args_info->freqfluccorr_given = 0 ;
 
   args_info->dynamicProps_group_counter = 0;
 }
@@ -663,10 +679,12 @@ cmdline_parser_internal (
         { "helfandEcorr",	0, NULL, 0 },
         { "momentum",	0, NULL, 'p' },
         { "stresscorr",	0, NULL, 0 },
+        { "bondcorr",	0, NULL, 'b' },
+        { "freqfluccorr",	0, NULL, 'f' },
         { 0,  0, 0, 0 }
       };
 
-      c = getopt_long (argc, argv, "hVi:o:z:m:srvdlMp", long_options, &option_index);
+      c = getopt_long (argc, argv, "hVi:o:z:m:srvdlMpbf", long_options, &option_index);
 
       if (c == -1) break;	/* Exit from `while (1)' loop.  */
 
@@ -831,10 +849,40 @@ cmdline_parser_internal (
               &(local_args_info.momentum_given), optarg, 0, 0, ARG_NO,
               check_ambiguity, override, 0, 0,
               "momentum", 'p',
+              additional_error))
+            goto failure;
+        
+          break;
+        case 'b':	/* Bond extension correlation function.  */
+        
+          if (args_info->dynamicProps_group_counter && override)
+            reset_group_dynamicProps (args_info);
+          args_info->dynamicProps_group_counter += 1;
+        
+          if (update_arg( 0 , 
+               0 , &(args_info->bondcorr_given),
+              &(local_args_info.bondcorr_given), optarg, 0, 0, ARG_NO,
+              check_ambiguity, override, 0, 0,
+              "bondcorr", 'b',
               additional_error))
             goto failure;
         
           break;
+        case 'f':	/* Frequency Fluctuation correlation function.  */
+        
+          if (args_info->dynamicProps_group_counter && override)
+            reset_group_dynamicProps (args_info);
+          args_info->dynamicProps_group_counter += 1;
+        
+          if (update_arg( 0 , 
+               0 , &(args_info->freqfluccorr_given),
+              &(local_args_info.freqfluccorr_given), optarg, 0, 0, ARG_NO,
+              check_ambiguity, override, 0, 0,
+              "freqfluccorr", 'f',
+              additional_error))
+            goto failure;
+        
+          break;
 
         case 0:	/* Long option with no short option */
           /* select first stuntdouble set.  */