Merge pull request #199 from torbjoernk/feature/read-config-file

config: finally enable config-file parsing

Author: memmett

include/pfasst/config.hpp

@@ -196,6 +196,47 @@ namespace pfasst
       }
     }
 
+    /**
+     * Read config parameters from file.
+     *
+     * A potential INI file might look like the following:
+     *
+     * @code
+     * # Global
+     * quiet=yes
+     *
+     * # Duration
+     * dt=0.015625
+     * num_steps=2
+     * num_iter=10
+     * 
+     * # Tolerances
+     * rel_res_tol=1e-10
+     *
+     * # PFASST
+     * num_blocks=1
+     * @endcode
+     *
+     * @param[in] file_name name of the INI-like file containing config parameters;
+     *   path/name may be relative
+     * @throws invalid_argument if the given file could not be opened
+     *
+     * @see
+     *   [Boost Program Options Documentation on supported INI-like file format]
+     *   (http://www.boost.org/doc/libs/1_57_0/doc/html/program_options/overview.html#idp343292240)
+     */
+    static inline void read_config_file(const string& file_name)
+    {
+      ifstream ifs(file_name.c_str(), ios_base::in);
+      if (!ifs) {
+        throw invalid_argument("Config file '" + file_name + "' not found.");
+      } else {
+        po::store(po::parse_config_file(ifs, options::get_instance().get_all_options()),
+                  options::get_instance().get_variables_map());
+        po::notify(options::get_instance().get_variables_map());
+      }
+    }
+
     /**
      * Read and parse command line parameters.
      *
@@ -217,6 +258,11 @@ namespace pfasst
       po::store(parsed, options::get_instance().get_variables_map());
       po::notify(options::get_instance().get_variables_map());
 
+      if (options::get_instance().get_variables_map().count("input")) {
+        string input_file = config::get_value<string>("input");
+        read_config_file(input_file);
+      }
+
       if (options::get_instance().get_variables_map().count("help")) {
         if (get_rank() == 0) {
           cout << print_help() << endl;
@@ -231,29 +277,6 @@ namespace pfasst
       }
     }
 
-    /**
-     * Read config parameters from file.
-     *
-     * @param[in] file_name name of the INI-like file containing config parameters;
-     *   path/name may be relative
-     * @throws invalid_argument if the given file could not be opened
-     *
-     * @see
-     *   [Boost Program Options Documentation on supported INI-like file format]
-     *   (http://www.boost.org/doc/libs/1_57_0/doc/html/program_options/overview.html#idp343292240)
-     */
-    static inline void read_config_file(const string& file_name)
-    {
-      ifstream ifs(file_name.c_str(), ios_base::in);
-      if (!ifs) {
-        throw invalid_argument("Config file '" + file_name + "' not found.");
-      } else {
-        po::store(po::parse_config_file(ifs, options::get_instance().get_all_options()),
-                  options::get_instance().get_variables_map());
-        po::notify(options::get_instance().get_variables_map());
-      }
-    }
-
     /**
      * Initialize options detection and parsing.
      *
@@ -262,6 +285,8 @@ namespace pfasst
      * Group      | Parameter     | Type
      * -----------|---------------|---------
      * Global     | `h`, `help`   | `bool`
+     * Global     | `q`, `quiet`  | `bool`
+     * Global     | `input`       | `string`
      * Duration   | `dt`          | `double`
      * Duration   | `tend`        | `double`
      * Duration   | `num_iters`   | `size_t`
@@ -272,6 +297,7 @@ namespace pfasst
     {
       options::add_option("Global", "help,h", "display this help message");
       options::add_option("Global", "quiet,q", "don't log to stdout");
+      options::add_option<string>("Global", "input", "INI file with configuration options");
 
       options::add_option<double>("Duration", "dt", "time step size");
       options::add_option<double>("Duration", "tend", "final time of simulation");