From 08cddada88df1e4498d4bd056ca52ff03c2d0eea Mon Sep 17 00:00:00 2001 From: Daniel Neves <79768506+danielneves1@users.noreply.github.com> Date: Tue, 21 Mar 2023 17:32:59 +0000 Subject: [PATCH] Update fire_ellipse.py --- src/pyfirestation/propagation/fire_ellipse.py | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/src/pyfirestation/propagation/fire_ellipse.py b/src/pyfirestation/propagation/fire_ellipse.py index cd5ec10..c8e4771 100755 --- a/src/pyfirestation/propagation/fire_ellipse.py +++ b/src/pyfirestation/propagation/fire_ellipse.py @@ -24,13 +24,16 @@ class FireEllipseType(Enum): class FireEllipse: - def __init__(self, wind_speed: float, theta: float, *, d: float = 1.0) -> None: + def __init__(self, wind: float, wind_equiv: float, theta: float, *, d: float = 1.0) -> None: """Defines the ellipse considered in the fire spread simulation.""" self._mode: FireEllipseType self._wind_speed: float - self.wind_speed = wind_speed - + self.wind_speed = wind_equiv + + self._wind: float + self.wind = wind + self.theta = theta self.d = d @@ -45,7 +48,7 @@ def mode(self) -> FireEllipseType: return self._mode def update_mode(self) -> None: - if self.wind_speed > 0.2: + if self.wind > 0.2: self._mode = FireEllipseType.DOUBLE else: self._mode = FireEllipseType.SINGLE