moving from free floating variables defined somewhere in the input file to proper options

src/Algorithms/ParallelTTracker.cpp

@@ -965,13 +965,13 @@ void ParallelTTracker::dumpStats(long long step, bool psDump, bool statDump) {
 void ParallelTTracker::setOptionalVariables() {
     Inform msg("ParallelTTracker ", *gmsg);
 
-    minBinEmitted_m  = 10;
+    minBinEmitted_m  = Options::minBinEmitted;
     RealVariable *ar = dynamic_cast<RealVariable *>(OpalData::getInstance()->find("MINBINEMITTED"));
     if (ar)
         minBinEmitted_m = static_cast<size_t>(ar->getReal());
     msg << level2 << "MINBINEMITTED " << minBinEmitted_m << endl;
 
-    minStepforReBin_m  = 200;
+    minStepforReBin_m  = Options::minStepForRebin;
     RealVariable *br = dynamic_cast<RealVariable *>(OpalData::getInstance()->find("MINSTEPFORREBIN"));
     if (br)
         minStepforReBin_m = static_cast<int>(br->getReal());
@@ -981,7 +981,7 @@ void ParallelTTracker::setOptionalVariables() {
     if (Ippl::getNodes() == 1) {
         repartFreq_m = numeric_limits<unsigned int>::max();
     } else {
-        repartFreq_m = 1000;
+        repartFreq_m = Options::repartFreq * 100;
         RealVariable *rep = dynamic_cast<RealVariable *>(OpalData::getInstance()->find("REPARTFREQ"));
         if (rep)
             repartFreq_m = static_cast<int>(rep->getReal());

src/BasicActions/Option.cpp

@@ -86,6 +86,8 @@ namespace {
         AMR_YT_DUMP_FREQ,
 #endif
         MEMORYDUMP,
+        MINBINEMITTED,
+        MINSTEPFORREBIN,
         SIZE
     };
 }
@@ -160,7 +162,15 @@ Option::Option():
     itsAttr[REPARTFREQ] = Attributes::makeReal
                           ("REPARTFREQ", "The frequency to do particles repartition "
                            "for better load balance between nodes, its "
-                           "default value is 10.", repartFreq);
+                           "default value is " + std::to_string(repartFreq) + ".", repartFreq);
+
+    itsAttr[MINBINEMITTED] = Attributes::makeReal
+                             ("MINBINEMITTED", "The number of bins that have to be emitted before the bins are squashed into "
+                              "a single bin; the default value is " + std::to_string(minBinEmitted) + ".", minBinEmitted);
+
+    itsAttr[MINSTEPFORREBIN] = Attributes::makeReal
+                            ("MINSTEPFORREBIN", "The number of steps into the simulation before the bins are squashed into "
+                             "a single bin; the default value is " + std::to_string(minStepForRebin) + ".", minStepForRebin);
 
     itsAttr[REBINFREQ] = Attributes::makeReal
                          ("REBINFREQ", "The frequency to reset energy bin ID for "

src/Classic/Utilities/Options.cpp

@@ -60,6 +60,12 @@ namespace Options {
     // The frequency to do particles repartition for better load balance between nodes
     int repartFreq = 10;
 
+    // The number of bins that have to be emitted before the bin are squashed into a single bin
+    int minBinEmitted = 10;
+
+    // The number of steps into the simulation before the bins are squashed into a single bin
+    int minStepForRebin = 200;
+
     // The frequency to reset energy bin ID for all particles
     int rebinFreq = 100;
 

src/Classic/Utilities/Options.h

@@ -89,6 +89,12 @@ namespace Options {
     /// The frequency to do particles repartition for better load balance between nodes
     extern int repartFreq;
 
+    /// The number of bins that have to be emitted before the bin are squashed into a single bin
+    extern int minBinEmitted;
+
+    /// The number of steps into the simulation before the bins are squashed into a single bin
+    extern int minStepForRebin;
+
     /// The frequency to reset energy bin ID for all particles
     extern int rebinFreq;