Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Flame length for crown fires in spain model #96

Merged
merged 40 commits into from
Jan 16, 2025

Conversation

matildeRivas
Copy link
Contributor

@matildeRivas matildeRivas commented Jan 8, 2025

Cambios realizados:

  • Agrega lectura de archivo hm.asc con altura de árboles
  • Calcula largo de llama e intensidad en fuego de copa para modelo S&B
  • Guarda rasters con la información calculada en punto anterior
  • Cambia nombre Intensity -> SurfaceIntensity y FlameLength->SurfaceFlameLength
  • Inicializa variables de salida a 0
  • Modifica resultado esperado de test para reflejar puntos anteriores

@matildeRivas matildeRivas requested a review from fdobad January 8, 2025 19:24
@matildeRivas matildeRivas self-assigned this Jan 8, 2025
@matildeRivas matildeRivas linked an issue Jan 8, 2025 that may be closed by this pull request
7 tasks
@matildeRivas matildeRivas marked this pull request as ready for review January 13, 2025 20:55
Copy link
Member

@fdobad fdobad left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

me opongo a nombrar la variable altura de arbol como "Height" es muy confuso
"CanopyHeight"

…' into 87-flame-length-for-crown-fires-in-spain-model

# Conflicts:
#	Cell2Fire/Cell2Fire.cpp
#	Cell2Fire/Cell2Fire.h
#	Cell2Fire/Cells.cpp
#	Cell2Fire/Cells.h
#	Cell2Fire/DataGenerator.cpp
#	Cell2Fire/DataGenerator.h
#	Cell2Fire/FuelModelKitral.cpp
#	Cell2Fire/FuelModelSpain.cpp
#	Cell2Fire/Lightning.cpp
#	Cell2Fire/ReadArgs.cpp
#	Cell2Fire/ReadArgs.h
#	Cell2Fire/ReadCSV.cpp
@matildeRivas
Copy link
Contributor Author

me opongo a nombrar la variable altura de arbol como "Height" es muy confuso "CanopyHeight"

Le pondré tree height porque canopy height es lo que calculo a partir de (tree_)height-cbh

@matildeRivas matildeRivas requested a review from fdobad January 15, 2025 15:57
@matildeRivas
Copy link
Contributor Author

@fdobad Ya está listo para revisar

Copy link
Member

@fdobad fdobad left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

hasta ahora bien, voy a integrar con el plugin y vemos.

Si entendi bien, al menos la especificacion de nuevos outputs esta aca fire2a/fire-analytics-qgis-processing-toolbox-plugin#90

@@ -478,7 +481,10 @@ Cells::manageFire(int period,
std::vector<float>& surfFraction,
std::vector<float>& Intensities,
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Intensities -> SurfaceIntensities

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

los nombres de las carpetas y los archivos deberia estar aca, y no en .cpp

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

resumen ok?

                                                    SB  C   K  
IgnitionsHistory / ignitions_log.csv                x   x   x
Grids / Grids num / ForestGrid%s.csv                x   x   x  OutputGrids FinalGrid

Messages / MessagesFile%d.asc                       x   x   x  OutMessages
RateOfSpread / RosFile%d.asc                        x   x   x  OutRoss

 - Intensity / Intensity%d.asc                      x   x   x  OutIntensity
 + SurfaceIntensity / SurfaceIntensity%d.asc        x   x   x  OutIntensity

 + CrownIntensity / CrownIntensity%d.asc            x   _   _  OutIntensity AllowCROS 

 - FlameLength / FL%d.asc                           x   x   x  OutFl
 + SurfaceFlameLength / SurfaceFlameLength %d.asc   x   x   x  OutFl 

 + CrownFlameLength / CrownFlameLength %d.asc       x   _   _  OutFl AllowCROS
 + MaxFlameLength / MaxFlameLength %d.asc           x   _   _  OutFl AllowCROS

CrownFire / Crown%d.asc                             x   x   x  OutCrown      AllowCROS 
CrownFractionBurn / Cfb%d.asc                       x   x   x  OutCrownConsumption  AllowCROS 

SurfFractionBurn / Sfb%d.asc                        _   x   _  OutSurfConsumption   AllowCROS 

@fdobad fdobad merged commit dc83bf6 into main Jan 16, 2025
2 checks passed
@fdobad fdobad deleted the 87-flame-length-for-crown-fires-in-spain-model branch January 16, 2025 21:58
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Flame length for crown fires in Spain model
2 participants