refactor: replace --no-prob-map with --prob-map (opt-in instead of opt-out)

Default is now uniform random ignition (ignProb = 1.0 everywhere).
Pass --prob-map to activate probability-map-weighted ignition selection.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

Author: 2 people

Cell2Fire/DataGenerator.cpp

@@ -1083,7 +1083,7 @@ populateInputsDirect(inputs* df_ptr, int nCells, std::vector<float>& ignProb, ar
         df_ptr->FMC = std::isnan(FMC[i]) ? args_ptr->FMC : static_cast<int>(FMC[i]);
 
         // ignition probability — stored in ignProb, not in inputs
-        ignProb[i] = (args_ptr->NoProbMap || std::isnan(PM[i])) ? 1.f : PM[i];
+        ignProb[i] = (args_ptr->UseProbMap && !std::isnan(PM[i])) ? PM[i] : 1.f;
 
         // calendar / time (blank in Data.csv → 0 except time=20)
         df_ptr->jd     = 0;

Cell2Fire/ReadArgs.cpp

@@ -269,12 +269,12 @@ parseArgs(int argc, char* argv[], arguments* args_ptr)
         printf("CrownROS: %s \n", btoa(allow_cros));
     }
 
-    //--no-prob-map
-    bool no_prob_map = false;
-    if (cmdOptionExists(argv, argv + argc, "--no-prob-map"))
+    //--prob-map
+    bool use_prob_map = false;
+    if (cmdOptionExists(argv, argv + argc, "--prob-map"))
     {
-        no_prob_map = true;
-        printf("NoProbMap: true (uniform random ignition)\n");
+        use_prob_map = true;
+        printf("UseProbMap: true\n");
     }
 
     // Floats and ints
@@ -676,7 +676,7 @@ parseArgs(int argc, char* argv[], arguments* args_ptr)
     args_ptr->Stats = out_stats;
     args_ptr->BBOTuning = bbo_tuning;
     args_ptr->AllowCROS  = allow_cros;
-    args_ptr->NoProbMap  = no_prob_map;
+    args_ptr->UseProbMap = use_prob_map;
 }
 
 void

Cell2Fire/ReadArgs.h

@@ -18,7 +18,7 @@ typedef struct
     int IgnitionCell;
     bool OutMessages, OutFl, OutIntensity, OutRos, OutCrownConsumption, OutSurfConsumption, Trajectories,
         NoOutput, verbose, IgnitionsLog, Ignitions, OutputGrids, FinalGrid, PromTuned, Stats, BBOTuning, AllowCROS, UseWeatherWeights,
-        NoProbMap;
+        UseProbMap;
     float ROSCV, ROSThreshold, CROSThreshold, HFIThreshold, HFactor, FFactor, BFactor, EFactor, FirePeriodLen;
     float CBDFactor, CCFFactor, ROS10Factor, CROSActThreshold;
     int MinutesPerWP, MaxFirePeriods, TotalYears, TotalSims, NWeatherFiles, IgnitionRadius, seed, nthreads, FMC,

Cell2Fire/ReadCSV.cpp

@@ -525,7 +525,7 @@ CSVReader::parseDFDirect(inputs* df_ptr, const std::string& filename, arguments*
         df_ptr->FMC = row[13].empty() ? args_ptr->FMC : std::stoi(row[13], &sz);
 
         // col 14: probMap — fill ignProb, not stored in inputs
-        ignProb[count] = (args_ptr->NoProbMap || row[14].empty()) ? 1.f : std::stof(row[14], &sz);
+        ignProb[count] = (args_ptr->UseProbMap && !row[14].empty()) ? std::stof(row[14], &sz) : 1.f;
 
         // col 15: jd
         df_ptr->jd = row[15].empty() ? 0 : std::stoi(row[15], &sz);