Added dht_signif_digits to simparams

src/kin.cpp

@@ -85,8 +85,8 @@ int main(int argc, char *argv[]) {
   double cummul_chemistry = 0.f;
   double cummul_master_seq = 0.f;
 
-  argh::parser cmdl(argv);
-  int dht_significant_digits;
+  // argh::parser cmdl(argv);
+  // int dht_significant_digits;
   // cout << "CPP: Start Init (MPI)" << endl;
 
   t_simparams params;
@@ -315,7 +315,7 @@ int main(int argc, char *argv[]) {
     if (signif_vector_exists) {
       params.dht_signif_vector = as<std::vector<int>>(R["signif_vector"]);
     } else {
-      params.dht_signif_vector.assign(grid.getCols(), dht_significant_digits);
+      params.dht_signif_vector.assign(grid.getCols(), params.dht_significant_digits);
     }
 
     /*Load property type vector from R setup file (or set default)*/
@@ -341,7 +341,7 @@ int main(int argc, char *argv[]) {
             "digits=signif_vector))");
       } else {
         cout << "CPP: using DHT default rounding digits = "
-             << dht_significant_digits << endl;
+             << params.dht_significant_digits << endl;
       }
 
       // MDL: pass to R the DHT stuff. These variables exist

src/util/Parser.cpp

@@ -54,7 +54,7 @@ int Parser::parseCmdl() {
     cmdl("dht-strategy", 0) >> simparams.dht_strategy;
     // cout << "CPP: DHT strategy is " << dht_strategy << endl;
 
-    cmdl("dht-signif", 5) >> dht_significant_digits;
+    cmdl("dht-signif", 5) >> simparams.dht_significant_digits;
     // cout << "CPP: DHT significant digits = " << dht_significant_digits <<
     // endl;
 
@@ -86,7 +86,7 @@ int Parser::parseCmdl() {
       cout << "CPP: DHT strategy is " << simparams.dht_strategy << endl;
       cout << "CPP: DHT key default digits (ignored if 'signif_vector' is "
               "defined) = "
-           << dht_significant_digits << endl;
+           << simparams.dht_significant_digits << endl;
       cout << "CPP: DHT logarithm before rounding: "
            << (simparams.dht_log ? "ON" : "OFF") << endl;
       cout << "CPP: DHT size per process (Byte) = "

src/util/Parser.h

@@ -36,8 +36,7 @@ class Parser {
 
   int world_rank;
   int world_size;
-
-  int dht_significant_digits;
+  
 };
 }  // namespace poet
 #endif  // PARSER_H

src/util/SimParams.h

@@ -14,6 +14,7 @@ typedef struct {
   int dht_snaps;
   int dht_strategy;
   unsigned int dht_size_per_process;
+  int dht_significant_digits;
   std::vector<int> dht_signif_vector;
   std::vector<std::string> dht_prop_type_vector;
   std::string dht_file;