Skip to content

Commit de21b8e

Browse files
committed
Separate active crown flame length
1 parent eab3bd5 commit de21b8e

1 file changed

Lines changed: 11 additions & 1 deletion

File tree

src/behave/spot.cpp

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -291,7 +291,7 @@ void Spot::calculateSpottingDistanceFromActiveCrown() {
291291
double treeHeight = calculateTreeHeight(LengthUnits::Meters);
292292

293293
double firelineIntensity = spotInputs_.getCrownFirelineIntensity(FirelineIntensityUnits::KilowattsPerMeter);
294-
double flameLength = spotInputs_.getSurfaceFlameLength(LengthUnits::Meters);
294+
double flameLength = spotInputs_.getActiveCrownFlameLength(LengthUnits::Meters);
295295

296296
// Use Byram (1959) FLI approximation if FLI is null
297297
if ((std::abs(firelineIntensity) < 0.01) && (flameLength > 0.0)) {
@@ -464,6 +464,11 @@ void Spot::setFlameLength(double flameLength, LengthUnits::LengthUnitsEnum flame
464464
spotInputs_.setSurfaceFlameLength(flameLength, flameLengthUnits);
465465
}
466466

467+
void Spot::setActiveCrownFlameLength(double activeCrownFlameLength, LengthUnits::LengthUnitsEnum flameLengthUnits)
468+
{
469+
spotInputs_.setActiveCrownFlameLength(activeCrownFlameLength, flameLengthUnits);
470+
}
471+
467472
void Spot::setFirelineIntensity(double firelineIntensity, FirelineIntensityUnits::FirelineIntensityUnitsEnum firelineIntensityUnits)
468473
{
469474
spotInputs_.setCrownFirelineIntensity(firelineIntensity, firelineIntensityUnits);
@@ -567,6 +572,11 @@ double Spot::getSurfaceFlameLength(LengthUnits::LengthUnitsEnum flameLengthUnits
567572
return spotInputs_.getSurfaceFlameLength(flameLengthUnits);
568573
}
569574

575+
double Spot::getActiveCrownFlameLength(LengthUnits::LengthUnitsEnum flameLengthUnits) const
576+
{
577+
return spotInputs_.getActiveCrownFlameLength(flameLengthUnits);
578+
}
579+
570580
double Spot::getCrownFirelineIntensity(FirelineIntensityUnits::FirelineIntensityUnitsEnum firelineIntensityUnits) const
571581
{
572582
return spotInputs_.getCrownFirelineIntensity(firelineIntensityUnits);

0 commit comments

Comments
 (0)