Added option to read in vectors of ints and bools from input file, to…

… be used in GF calculation.
wavefunction91 · Sep 22, 2023 · 41cc116 · 41cc116
1 parent 3d3277d
commit 41cc116
Show file tree

Hide file tree

Showing 2 changed files with 46 additions and 6 deletions.
diff --git a/tests/ini_input.cxx b/tests/ini_input.cxx
@@ -7,6 +7,7 @@
  */
 
 #include "ini_input.hpp"
+#include <sstream>
 
 // Misc string functions
 
@@ -329,6 +330,25 @@ int INIFile::getData(std::string query) {
 
 }  // INIFile::getData<int>
 
+/**
+ *  \brief Specialization of getData to return vector<int> of query
+ *  data field
+ *
+ *  \param [in] query Formatted query string to be parsed
+ *  \return     Value of query data field as a vector<int>
+ */
+template <>
+std::vector<int> INIFile::getData(std::string query) {
+  std::string line = getData<std::string>(query);
+  std::istringstream iss( line );
+  std::vector<int> res;
+  int tmp;
+  while( iss >> tmp )
+    res.push_back(tmp);
+  return res;
+
+}  // INIFile::getData<std::vector<int>>
+
 /**
  *  \brief Specialization of getData to return bool of query
  *  data field
@@ -344,6 +364,28 @@ bool INIFile::getData(std::string query) {
 
 }  // INIFile::getData<bool>
 
+/**
+ *  \brief Specialization of getData to return std::vector<bool> of query
+ *  data field
+ *
+ *  \param [in] query Formatted query string to be parsed
+ *  \return     Value of query data field as a std::vector<bool>
+ */
+template <>
+std::vector<bool> INIFile::getData(std::string query) {
+  std::string line = getData<std::string>(query);
+  std::istringstream iss( line );
+  std::vector<bool> res;
+  std::string tmp;
+  while( iss >> tmp )
+  {
+    bool b = (not tmp.compare("TRUE") or not tmp.compare("ON"));
+    res.push_back(b);
+  }
+  return res;
+
+}  // INIFile::getData<std::vector<bool>>
+
 /**
  *  \brief Specialization of getData to return size_t of query
  *  data field

diff --git a/tests/standalone_driver.cxx b/tests/standalone_driver.cxx
@@ -345,12 +345,10 @@ int main(int argc, char** argv) {
           OPT_KEYWORD("GF.WRITE", gf_settings.writeGF, bool);
           OPT_KEYWORD("GF.PRINT", gf_settings.print, bool);
           OPT_KEYWORD("GF.SAVEGFMATS", gf_settings.saveGFmats, bool);
-          gf_settings.GF_orbs_basis = std::vector<int>(n_active, 0);
-          for(int i = 0; i < n_active; i++) gf_settings.GF_orbs_basis[i] = i;
-          gf_settings.GF_orbs_comp = std::vector<int>(n_active, 0);
-          for(int i = 0; i < n_active; i++) gf_settings.GF_orbs_comp[i] = i;
-          gf_settings.is_up_basis = std::vector<bool>(n_active, true);
-          gf_settings.is_up_comp = std::vector<bool>(n_active, true);
+	  OPT_KEYWORD("GF.ORBS_BASIS", gf_settings.GF_orbs_basis, std::vector<int>);
+	  OPT_KEYWORD("GF.IS_UP_BASIS", gf_settings.is_up_basis, std::vector<bool>);
+	  OPT_KEYWORD("GF.ORBS_COMP", gf_settings.GF_orbs_comp, std::vector<int>);
+	  OPT_KEYWORD("GF.IS_UP_COMP", gf_settings.is_up_comp, std::vector<bool>);
 
           // GF vector
           std::vector<std::vector<std::complex<double>>> GF(