Breaching shading fat

.gitattributes

@@ -1,2 +1,7 @@
 *.py export-subst
 *.git* export-ignore
+
+# Los makefiles van en LF: con CRLF, la continuacion de linea (\ + CR) rompe make
+makefile text eol=lf
+makefile.* text eol=lf
+*.sh text eol=lf

.gitignore

@@ -207,3 +207,12 @@ test/target_results
 docs/html
 docs/latex
 Data.csv
+
+# Binarios con el sufijo de plataforma que espera get_ext() del plugin FAT
+Cell2Fire/Cell2Fire.exe
+Cell2Fire/Cell2Fire_Darwin*
+Cell2Fire/Cell2Fire.Ubuntu*
+Cell2Fire/Cell2Fire.Debian*
+
+# Salidas generadas por el simulador dentro de las instancias
+Results/

Cell2Fire/FuelModelFBP.cpp → Cell2Fire/CanadianFBPKernel.cpp

@@ -75,7 +75,7 @@ is 10.0 5.0  Oct 2014
             - forgot to change the encoded version number to 5.0.  now 5.0001
             - updated header to FBP5.h
 */
-#include "FuelModelFBP.h"
+#include "CanadianFBPKernel.h"
 #include "Cells.h"
 #include <math.h>
 #include <stdlib.h>

Cell2Fire/FuelModelFBP.h → Cell2Fire/CanadianFBPKernel.h

@@ -1,109 +1,109 @@
-/*  fbp.h  -- header file for fbp program  bmw
-  function prototypes and structures for fbp.c prog
-   nov/92
-  modified for version 4.3 of the code
-   Aug/2005 bmw
-  modified for version 4.5 of the code
-   Nov/2007 bmw
-   change of name for 5.0
-*/
-
-#if !defined(_FBPHEAD)
-#define _FBPHEAD
-
-#include "Cells.h"
-#include <stdio.h>
-
-float grass(fuel_coefs* ptr, float cur, float isi, float* mu);
-
-float mixed_wood(fuel_coefs* ptr, float isi, float* mult, int pc);
-
-float ISF_mixedwood(fuel_coefs* ptr, float isz, int pc, float sf);
-
-float ISF_deadfir(fuel_coefs* ptr, float isz, int pdf, float sf);
-
-float dead_fir(fuel_coefs* ptr, int pdf, float isi, float* mult);
-
-float D2_ROS(fuel_coefs* ptr, float isi, float bui, float* mu);
-
-float conifer(fuel_coefs* ptr, float isi, float* mult);
-
-float bui_effect(fuel_coefs* ptr, main_outs* at, float bui);
-
-float ros_calc(inputs* inp, fuel_coefs* ptr, float isi, float* mu, weatherDF* wdf_ptr);
-
-float rate_of_spread(inputs* inp, fuel_coefs* ptr, main_outs* at, weatherDF* wdf_ptr);
-
-float slope_effect(inputs* inp, fuel_coefs* ptr, main_outs* at, float isi, weatherDF* wdf_ptr);
-
-float surf_fuel_consump(inputs* inp, weatherDF* wdf_ptr);
-
-float fire_intensity(float fc, float ros);
-
-void setup_const(fuel_coefs* ptr);
-
-char get_fueltype_number(fuel_coefs** ptr, char ft[4]);
-
-float foliar_moisture(inputs* inp, main_outs* at);
-
-float crit_surf_intensity(fuel_coefs* ptr, float fmc);
-
-float critical_ros(char ft[3], float sfc, float csi);
-
-int fire_type(float csi, float sfi);
-
-float crown_frac_burn(float ros, float rso);
-
-char fire_description(float cfb);
-
-float final_ros(inputs* inp, float fmc, float isi, float cfb, float rss);
-
-float crown_consump(inputs* inp, fuel_coefs* ptr, float cfb);
-
-float foliar_mois_effect(float isi, float fmc);
-
-float l_to_b(char ft[3], float ws);
-
-float ffmc_effect(float ffmc);
-
-float backfire_ros(inputs* inp, fuel_coefs* ptr, main_outs* at, float bisi, weatherDF* wdf_ptr);
-
-float backfire_isi(main_outs* at);
-
-float area(float dt, float df);
-
-float perimeter(fire_struc* h, fire_struc* b, snd_outs* sec, float lb);
-
-float acceleration(inputs* inp, float cfb);
-
-float flankfire_ros(float ros, float bros, float lb);
-
-float spread_distance(inputs* inp, fire_struc* ptr, float accn);
-
-float flank_spread_distance(
-    inputs* inp, fire_struc* ptr, snd_outs* sec, float hrost, float brost, float hd, float bd, float lb, float a);
-
-int time_to_crown(float ros, float rso, float a);
-
-float fire_behaviour(inputs* inp, fuel_coefs* ptr, main_outs* at, fire_struc* f);
-float flank_fire_behaviour(inputs* inp, fuel_coefs* ptr, main_outs* at, fire_struc* f);
-
-void set_all(fire_struc* ptr, int time);
-
-void calculate_fbp(inputs* data,
-                   fuel_coefs* ptr,
-                   main_outs* at,
-                   snd_outs* sec,
-                   fire_struc* hptr,
-                   fire_struc* fptr,
-                   fire_struc* bptr,
-                   weatherDF* wdf_ptr);
-void determine_destiny_metrics_fbp(
-    inputs* data, fuel_coefs* pt, main_outs* metrics, fire_struc* metrics2, weatherDF* wdf_ptr);
-void zero_main(main_outs* m);
-
-void zero_sec(snd_outs* s);
-
-void zero_fire(fire_struc* a);
-
-#endif
+/*  fbp.h  -- header file for fbp program  bmw
+  function prototypes and structures for fbp.c prog
+   nov/92
+  modified for version 4.3 of the code
+   Aug/2005 bmw
+  modified for version 4.5 of the code
+   Nov/2007 bmw
+   change of name for 5.0
+*/
+
+#if !defined(CANADIANFBPKERNEL)
+#define CANADIANFBPKERNEL
+
+#include "Cells.h"
+#include <stdio.h>
+
+float grass(fuel_coefs* ptr, float cur, float isi, float* mu);
+
+float mixed_wood(fuel_coefs* ptr, float isi, float* mult, int pc);
+
+float ISF_mixedwood(fuel_coefs* ptr, float isz, int pc, float sf);
+
+float ISF_deadfir(fuel_coefs* ptr, float isz, int pdf, float sf);
+
+float dead_fir(fuel_coefs* ptr, int pdf, float isi, float* mult);
+
+float D2_ROS(fuel_coefs* ptr, float isi, float bui, float* mu);
+
+float conifer(fuel_coefs* ptr, float isi, float* mult);
+
+float bui_effect(fuel_coefs* ptr, main_outs* at, float bui);
+
+float ros_calc(inputs* inp, fuel_coefs* ptr, float isi, float* mu, weatherDF* wdf_ptr);
+
+float rate_of_spread(inputs* inp, fuel_coefs* ptr, main_outs* at, weatherDF* wdf_ptr);
+
+float slope_effect(inputs* inp, fuel_coefs* ptr, main_outs* at, float isi, weatherDF* wdf_ptr);
+
+float surf_fuel_consump(inputs* inp, weatherDF* wdf_ptr);
+
+float fire_intensity(float fc, float ros);
+
+void setup_const(fuel_coefs* ptr);
+
+char get_fueltype_number(fuel_coefs** ptr, char ft[4]);
+
+float foliar_moisture(inputs* inp, main_outs* at);
+
+float crit_surf_intensity(fuel_coefs* ptr, float fmc);
+
+float critical_ros(char ft[3], float sfc, float csi);
+
+int fire_type(float csi, float sfi);
+
+float crown_frac_burn(float ros, float rso);
+
+char fire_description(float cfb);
+
+float final_ros(inputs* inp, float fmc, float isi, float cfb, float rss);
+
+float crown_consump(inputs* inp, fuel_coefs* ptr, float cfb);
+
+float foliar_mois_effect(float isi, float fmc);
+
+float l_to_b(char ft[3], float ws);
+
+float ffmc_effect(float ffmc);
+
+float backfire_ros(inputs* inp, fuel_coefs* ptr, main_outs* at, float bisi, weatherDF* wdf_ptr);
+
+float backfire_isi(main_outs* at);
+
+float area(float dt, float df);
+
+float perimeter(fire_struc* h, fire_struc* b, snd_outs* sec, float lb);
+
+float acceleration(inputs* inp, float cfb);
+
+float flankfire_ros(float ros, float bros, float lb);
+
+float spread_distance(inputs* inp, fire_struc* ptr, float accn);
+
+float flank_spread_distance(
+    inputs* inp, fire_struc* ptr, snd_outs* sec, float hrost, float brost, float hd, float bd, float lb, float a);
+
+int time_to_crown(float ros, float rso, float a);
+
+float fire_behaviour(inputs* inp, fuel_coefs* ptr, main_outs* at, fire_struc* f);
+float flank_fire_behaviour(inputs* inp, fuel_coefs* ptr, main_outs* at, fire_struc* f);
+
+void set_all(fire_struc* ptr, int time);
+
+void calculate_fbp(inputs* data,
+                   fuel_coefs* ptr,
+                   main_outs* at,
+                   snd_outs* sec,
+                   fire_struc* hptr,
+                   fire_struc* fptr,
+                   fire_struc* bptr,
+                   weatherDF* wdf_ptr);
+void determine_destiny_metrics_fbp(
+    inputs* data, fuel_coefs* pt, main_outs* metrics, fire_struc* metrics2, weatherDF* wdf_ptr);
+void zero_main(main_outs* m);
+
+void zero_sec(snd_outs* s);
+
+void zero_fire(fire_struc* a);
+
+#endif