Multiple ignition points

Cell2Fire/Cell2Fire.cpp

@@ -18,6 +18,7 @@ __maintainer__ = "Jaime Carrasco, Cristobal Pais, David Woodruff, David Palacios
 
 // Include libraries
 #include <omp.h>
+#include <typeinfo>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string>
@@ -48,6 +49,7 @@ std::unordered_map<int, std::vector<float>> BBOFactors;
 std::unordered_map<int, std::vector<int>> HarvestedCells;   
 std::vector<int> NFTypesCells;
 std::unordered_map<int,int> IgnitionHistory;
+std::vector<int> initialPoints;
 
 /******************************************************************************
 																Utils
@@ -289,7 +291,7 @@ Cell2Fire::Cell2Fire(arguments _args) : CSVWeather(_args.InFolder + "Weather.csv
 	std::vector<int> IgnitionPoints;   
 
 	if(this->args.Ignitions){
-		//DEBUGstd::cout << "\nWe have specific ignition points:" << std::endl;
+		//DEBUG std::cout << "\nWe have specific ignition points:" << std::endl;
 
 		/* Ignition points */
 		std::string ignitionFile = args.InFolder + "Ignitions.csv";
@@ -310,9 +312,11 @@ Cell2Fire::Cell2Fire(arguments _args) : CSVWeather(_args.InFolder + "Weather.csv
 
 		// Ignition points 
 		this->IgnitionPoints = std::vector<int>(IgnitionYears, 0);
+		//std::cout << this->IgnitionPoints[1] << std::endl;
+
 		CSVIgnitions.parseIgnitionDF(this->IgnitionPoints, IgnitionsDF, IgnitionYears);
 		//this->IgnitionSets = std::vector<unordered_set<int>>(this->IgnitionPoints.size());
-		this->IgnitionSets = std::vector<std::vector<int>>(this->args.TotalYears);
+		this->IgnitionSets = std::vector<std::vector<int>>(args.TotalYears);
 
 
 		// Ignition radius
@@ -850,7 +854,18 @@ bool Cell2Fire::RunIgnition(std::default_random_engine generator, int ep){
 
 	// Ignitions with provided points from CSV
 	else {
-		int temp = IgnitionPoints[this->year-1];
+
+		if (initialPoints.empty()) {
+            initialPoints = this->IgnitionPoints;
+		}
+
+		std::random_device dev;
+		std::mt19937 rng(dev());
+		std::uniform_int_distribution<std::mt19937::result_type> dist(1,initialPoints.size());
+		int rd = dist(rng);
+
+		int temp = initialPoints[rd-1];
+		initialPoints.erase(initialPoints.begin() + rd-1);
 
 		// If ignition Radius != 0, sample from the Radius set
 		if (this->args.IgnitionRadius > 0){
@@ -909,8 +924,6 @@ bool Cell2Fire::RunIgnition(std::default_random_engine generator, int ep){
 	}
 
 
-
-
 	// If ignition occurs, we update the forest status
 	if (!this->noIgnition) {
 		int newId = it->second.realId;

Cell2Fire/Cell2Fire.h

@@ -106,6 +106,7 @@ class Cell2Fire {
 		 std::vector<float>RateOfSpreads;
 		 std::vector<float>FlameLengths;
 		 std::vector<std::vector<int>> IgnitionSets;
+		 std::vector<int> initialPoints;
 		 // std::vector<int> IgnitionHistory;
 
 		 // Sets

Cell2Fire/FuelModelKitral.cpp

@@ -587,8 +587,10 @@ float rate_of_spread_k(inputs *data, fuel_coefs *ptr, main_outs *at) //incluir e
    p2 = 0.04316;
    p3 = 13.8;
    ch = (-2.97374 + 0.262 * rh - 0.00982 * tmp);
+   // ch = max(1.0, -2.97374 + 0.262 * rh - 0.00982 * tmp);
    fmc = fmcs[data->nftype][0]*60; //factor de propagacion en m/min
-   fch = (389.1624 + 14.3 * ch + 0.02 * pow(ch, 2.0)) / (3.559 + 1.6615 * ch + 2.62392 * pow(ch, 2.0)); //es -14.3 segun el libro
+   // fch = (389.1624 + 14.3 * ch + 0.02 * pow(ch, 2.0)) / (3.559 + 1.6615 * ch + 2.62392 * pow(ch, 2.0)); //es -14.3 segun el libro
+   fch = min(51.43, 52.3342 * pow(ch, -1.3035));
    fv = p1 * exp(-p2 * ws) + p3;
    if (ps==0){
         at->rss = fmc*fch*(fv);

Cell2Fire/ReadCSV.cpp

@@ -454,7 +454,7 @@ void CSVReader::parseIgnitionDF(std::vector<int> & ig, std::vector<std::vector<s
 
 		// Set values
 		ig[i-1]= igcell;
-
+		std::cout << igcell << std::endl;	
 		// Next pointer
 		//ig_ptr++;
 	}

data/CanadianFBP/400cellsC1-asc/Ignitions.csv

@@ -1,5 +1,5 @@
 Year,Ncell
-1,205
+1,305
 2,350
 3,100
 4,380

test/test.sh

@@ -18,21 +18,22 @@ set -x # enable debug tracing
 # run
 for format in asc tif; do
     for model in fbp kitral sb; do
-        echo running $model-$format
-        output_folder=test_results/$model-$format
-        mkdir -p $output_folder
-        rm -rf $output_folder/*
-        if [ "$model" == "fbp" ]; then
-            additional_args="--cros"
-            sim_code="C"
-        elif [ "$model" == "sb" ]; then
-            additional_args="--scenario 1"
-            sim_code="S"
-        elif [ "$model" == "kitral" ]; then
-            additional_args=""
-            sim_code="K"
-        fi
-        Cell2Fire$1 --input-instance-folder model/$model-$format --output-folder $output_folder --nsims 113 --output-messages --grids --out-ros --out-intensity --sim ${sim_code} --seed 123 --ignitionsLog $additional_args > test_results/$model-$format/log.txt
+        for ignition_mode in random raster; do
+            echo running $model-$format
+            output_folder=test_results/$model-$format
+            mkdir -p $output_folder
+            rm -rf $output_folder/*
+            if [ "$model" == "fbp" ]; then
+                additional_args="--cros"
+                sim_code="C"
+            elif [ "$model" == "sb" ]; then
+                additional_args="--scenario 1"
+                sim_code="S"
+            elif [ "$model" == "kitral" ]; then
+                additional_args=""
+                sim_code="K"
+            fi
+            Cell2Fire$1 --input-instance-folder model/$model-$format --output-folder $output_folder --nsims 113 --ignitions-$ignition_mode --output-messages --grids --out-ros --out-intensity --sim ${sim_code} --seed 123 --ignitionsLog $additional_args > test_results/$model-$format-$ignition_mode/log.txt
     done
 done
 set +x # disable debug tracing