[cig-commits] r13711 - cs/cigma/trunk/src

[luis at geodynamics.org]

Author: luis
Date: 2008-12-17 02:31:49 -0800 (Wed, 17 Dec 2008)
New Revision: 13711

Modified:
   cs/cigma/trunk/src/cli_base_cmd.cpp
   cs/cigma/trunk/src/cli_base_cmd.h
   cs/cigma/trunk/src/cli_compare_cmd.cpp
   cs/cigma/trunk/src/cli_eval_cmd.cpp
   cs/cigma/trunk/src/cli_extract_cmd.cpp
Log:
Split cli options into two sections (main and secondary)

Modified: cs/cigma/trunk/src/cli_base_cmd.cpp
===================================================================
--- cs/cigma/trunk/src/cli_base_cmd.cpp	2008-12-17 10:31:46 UTC (rev 13710)
+++ cs/cigma/trunk/src/cli_base_cmd.cpp	2008-12-17 10:31:49 UTC (rev 13711)
@@ -27,6 +27,12 @@
         cout << opts << endl;
     }
 
+    if (opts2.options().size() > 0)
+    {
+        cout << opts2_section << endl;
+        cout << opts2 << endl;
+    }
+
     if (other.options().size() > 0)
     {
         cout << other_section << endl;
@@ -42,8 +48,11 @@
 void BaseCmd::defineOptions()
 {
     // main options
-    opts_section = "Options: ";
+    opts_section = "Main Options: ";
 
+    // secondary options
+    opts2_section = "Detailed Options: ";
+
     // other options
     other_section = "Other Options: ";
     other.add_options()
@@ -56,7 +65,7 @@
 void BaseCmd::parseOptions(int argc, char *argv[])
 {
     po::options_description all;
-    all.add(opts).add(other);
+    all.add(opts).add(opts2).add(other);
     po::store(po::command_line_parser(argc, argv).options(all).positional(args).run(), vm);
 }
 

Modified: cs/cigma/trunk/src/cli_base_cmd.h
===================================================================
--- cs/cigma/trunk/src/cli_base_cmd.h	2008-12-17 10:31:46 UTC (rev 13710)
+++ cs/cigma/trunk/src/cli_base_cmd.h	2008-12-17 10:31:49 UTC (rev 13711)
@@ -47,8 +47,10 @@
 
 public:
     std::string opts_section;
+    std::string opts2_section;
     std::string other_section;
     boost::program_options::options_description opts;
+    boost::program_options::options_description opts2;
     boost::program_options::options_description other;
     boost::program_options::positional_options_description args;
     boost::program_options::variables_map vm;

Modified: cs/cigma/trunk/src/cli_compare_cmd.cpp
===================================================================
--- cs/cigma/trunk/src/cli_compare_cmd.cpp	2008-12-17 10:31:46 UTC (rev 13710)
+++ cs/cigma/trunk/src/cli_compare_cmd.cpp	2008-12-17 10:31:49 UTC (rev 13711)
@@ -36,7 +36,7 @@
         ("output,o", po::value<string>(&outputfile), "Output file (for residuals)")
         ;
 
-    other.add_options()
+    opts2.add_options()
         ("freq,f", po::value<int>(&(op.freq)), "Output frequency of timer")
         ("threshold", po::value<double>(&threshold), "Threshold value for global residual")
         ("first-mesh", po::value<string>(&mesh1), "Mesh for first field")

Modified: cs/cigma/trunk/src/cli_eval_cmd.cpp
===================================================================
--- cs/cigma/trunk/src/cli_eval_cmd.cpp	2008-12-17 10:31:46 UTC (rev 13710)
+++ cs/cigma/trunk/src/cli_eval_cmd.cpp	2008-12-17 10:31:49 UTC (rev 13711)
@@ -38,7 +38,7 @@
         ("output,o", po::value<string>(&values), "Output values of function <QVALS-OUT>")
         ;
 
-    other.add_options()
+    opts2.add_options()
         ("field-mesh", po::value<string>(&mesh), "Path to associated mesh (if given a field)")
         ("field-mesh-cell", po::value<string>(&cell), "...cell type for mesh")
         ("field-mesh-coords", po::value<string>(&nc), "...node coords for mesh")

Modified: cs/cigma/trunk/src/cli_extract_cmd.cpp
===================================================================
--- cs/cigma/trunk/src/cli_extract_cmd.cpp	2008-12-17 10:31:46 UTC (rev 13710)
+++ cs/cigma/trunk/src/cli_extract_cmd.cpp	2008-12-17 10:31:49 UTC (rev 13711)
@@ -42,7 +42,7 @@
         ("output,o", po::value<string>(&points), "Output HDF5 file for quadrature points")
         ;
 
-    other.add_options()
+    opts2.add_options()
         //("rule-order", po::value<unsigned int>(&rule_order), "use a specific quadrature order")
         ("mesh-cell", po::value<string>(&cell), "cell type of mesh")
         ("mesh-coords", po::value<string>(&nc), "node coordinates for mesh")