Separate active crown flame length

Author: rjsheperd

src/behave/spot.cpp

@@ -291,7 +291,7 @@ void Spot::calculateSpottingDistanceFromActiveCrown() {
     double treeHeight = calculateTreeHeight(LengthUnits::Meters);
 
     double firelineIntensity = spotInputs_.getCrownFirelineIntensity(FirelineIntensityUnits::KilowattsPerMeter);
-    double flameLength = spotInputs_.getSurfaceFlameLength(LengthUnits::Meters);
+    double flameLength = spotInputs_.getActiveCrownFlameLength(LengthUnits::Meters);
 
     // Use Byram (1959) FLI approximation if FLI is null
     if ((std::abs(firelineIntensity) < 0.01) && (flameLength > 0.0)) {
@@ -464,6 +464,11 @@ void Spot::setFlameLength(double flameLength, LengthUnits::LengthUnitsEnum flame
     spotInputs_.setSurfaceFlameLength(flameLength, flameLengthUnits);
 }
 
+void Spot::setActiveCrownFlameLength(double activeCrownFlameLength, LengthUnits::LengthUnitsEnum flameLengthUnits)
+{
+    spotInputs_.setActiveCrownFlameLength(activeCrownFlameLength, flameLengthUnits);
+}
+
 void Spot::setFirelineIntensity(double firelineIntensity, FirelineIntensityUnits::FirelineIntensityUnitsEnum firelineIntensityUnits)
 {
     spotInputs_.setCrownFirelineIntensity(firelineIntensity, firelineIntensityUnits);
@@ -567,6 +572,11 @@ double Spot::getSurfaceFlameLength(LengthUnits::LengthUnitsEnum flameLengthUnits
     return spotInputs_.getSurfaceFlameLength(flameLengthUnits);
 }
 
+double Spot::getActiveCrownFlameLength(LengthUnits::LengthUnitsEnum flameLengthUnits) const
+{
+    return spotInputs_.getActiveCrownFlameLength(flameLengthUnits);
+}
+
 double Spot::getCrownFirelineIntensity(FirelineIntensityUnits::FirelineIntensityUnitsEnum firelineIntensityUnits) const
 {
     return spotInputs_.getCrownFirelineIntensity(firelineIntensityUnits);

src/behave/spot.h

@@ -57,6 +57,7 @@ class Spot
     void setDownwindCoverHeight(double downwindCoverHeight, LengthUnits::LengthUnitsEnum coverHeightUnits);
     void setDownwindCanopyMode(SpotDownWindCanopyMode::SpotDownWindCanopyModeEnum downwindCanopyMode);
     void setFlameLength(double flameLength, LengthUnits::LengthUnitsEnum flameLengthUnits);
+    void setActiveCrownFlameLength(double activeCrownFlameLength, LengthUnits::LengthUnitsEnum flameLengthUnits);
     void setFirelineIntensity(double firelineIntensity, FirelineIntensityUnits::FirelineIntensityUnitsEnum firelineIntensityUnits);
     void setLocation(SpotFireLocation::SpotFireLocationEnum location);
     void setRidgeToValleyDistance(double ridgeToValleyDistance, LengthUnits::LengthUnitsEnum ridgeToValleyDistanceUnits);
@@ -91,6 +92,7 @@ class Spot
     double getDownwindCoverHeight(LengthUnits::LengthUnitsEnum coverHeightUnits) const;
     SpotDownWindCanopyMode::SpotDownWindCanopyModeEnum getDownwindCanopyMode() const;
     double getSurfaceFlameLength(LengthUnits::LengthUnitsEnum surfaceFlameLengthUnits) const;
+    double getActiveCrownFlameLength(LengthUnits::LengthUnitsEnum flameLengthUnits) const;
     double getCrownFirelineIntensity(FirelineIntensityUnits::FirelineIntensityUnitsEnum firelineIntensityUnits) const;
     SpotFireLocation::SpotFireLocationEnum getLocation() const;
     double getRidgeToValleyDistance(LengthUnits::LengthUnitsEnum ridgeToValleyDistanceUnits) const;

src/behave/spotInputs.cpp

@@ -57,6 +57,11 @@ void SpotInputs::setSurfaceFlameLength(double surfaceFlameLength, LengthUnits::L
     surfaceFlameLength_ = LengthUnits::toBaseUnits(surfaceFlameLength, flameLengthUnits);
 }
 
+void SpotInputs::setActiveCrownFlameLength(double activeCrownFlameLength, LengthUnits::LengthUnitsEnum flameLengthUnits)
+{
+    activeCrownFlameLength_ = LengthUnits::toBaseUnits(activeCrownFlameLength, flameLengthUnits);
+}
+
 void SpotInputs::setCrownFirelineIntensity(double crownFirelineIntensity, FirelineIntensityUnits::FirelineIntensityUnitsEnum firelineIntensityUnits) {
     crownFirelineIntensity_ = FirelineIntensityUnits::toBaseUnits(crownFirelineIntensity, firelineIntensityUnits);
 }
@@ -156,7 +161,7 @@ void SpotInputs::updateSpotInputsForActiveCrownFire(
 {
     initializeMembers();
     setLocation(location);
-    setSurfaceFlameLength(activeCrownFlameLength, flameLengthUnits);
+    setActiveCrownFlameLength(activeCrownFlameLength, flameLengthUnits);
     setRidgeToValleyDistance(ridgeToValleyDistance, ridgeToValleyDistanceUnits);
     setRidgeToValleyElevation(ridgeToValleyElevation, elevationUnits);
     setTreeHeight(treeHeight, treeHeightUnits);
@@ -189,6 +194,11 @@ double SpotInputs::getSurfaceFlameLength(LengthUnits::LengthUnitsEnum surfaceFla
     return LengthUnits::fromBaseUnits(surfaceFlameLength_, surfaceFlameLengthUnits);
 }
 
+double SpotInputs::getActiveCrownFlameLength(LengthUnits::LengthUnitsEnum activeCrownFlameLengthUnits) const
+{
+    return LengthUnits::fromBaseUnits(activeCrownFlameLength_, activeCrownFlameLengthUnits);
+}
+
 double SpotInputs::getCrownFirelineIntensity(FirelineIntensityUnits::FirelineIntensityUnitsEnum firelineIntensityUnits) const
 {
     return FirelineIntensityUnits::fromBaseUnits(crownFirelineIntensity_, firelineIntensityUnits);
@@ -231,6 +241,7 @@ double SpotInputs::getWindSpeedAtTwentyFeet(SpeedUnits::SpeedUnitsEnum windSpeed
 
 void SpotInputs::initializeMembers()
 {
+    activeCrownFlameLength_ = 0.0;
     downwindCoverHeight_ = 0.0;
     downwindCanopyMode_ = SpotDownWindCanopyMode::CLOSED;
     crownFirelineIntensity_ = 0.0;

src/behave/spotInputs.h

@@ -82,6 +82,7 @@ class SpotInputs
     void setDownwindCoverHeight(double downwindCoverHeight, LengthUnits::LengthUnitsEnum coverHeightUnits);
     void setDownwindCanopyMode(SpotDownWindCanopyMode::SpotDownWindCanopyModeEnum downwindCanopyMode);
     void setSurfaceFlameLength(double surfaceFlameLength, LengthUnits::LengthUnitsEnum flameLengthUnits);
+    void setActiveCrownFlameLength(double activeCrownFlameLength, LengthUnits::LengthUnitsEnum flameLengthUnits);
     void setCrownFirelineIntensity(double crownFirelineIntensity, FirelineIntensityUnits::FirelineIntensityUnitsEnum firelineIntensityUnits);
     void setLocation(SpotFireLocation::SpotFireLocationEnum location);
     void setRidgeToValleyDistance(double ridgeToValleyDistance, LengthUnits::LengthUnitsEnum ridgeToValleyDistanceUnits);
@@ -114,6 +115,7 @@ class SpotInputs
     double getDownwindCoverHeight(LengthUnits::LengthUnitsEnum coverHeightUnits) const;
     SpotDownWindCanopyMode::SpotDownWindCanopyModeEnum getDownWindCanopyMode() const;
     double getSurfaceFlameLength(LengthUnits::LengthUnitsEnum flameLengthUnits) const;
+    double getActiveCrownFlameLength(LengthUnits::LengthUnitsEnum activeCrownFlameLengthUnits) const;
     double getCrownFirelineIntensity(FirelineIntensityUnits::FirelineIntensityUnitsEnum firelineIntensityUnits) const;
     SpotFireLocation::SpotFireLocationEnum getLocation() const;
     double getRidgeToValleyDistance(LengthUnits::LengthUnitsEnum ridgeToValleyDistanceUnits) const;
@@ -136,6 +138,7 @@ class SpotInputs
 protected:
     void initializeMembers();
 
+    double activeCrownFlameLength_ = 0.0;
     double DBH_ = 0.0;
     double downwindCoverHeight_ = 0.0;
     SpotDownWindCanopyMode::SpotDownWindCanopyModeEnum downwindCanopyMode_;