Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -102,9 +102,18 @@ Merged since v2.5.0, not yet released.
dividing by it in eq. C7, which drove the radiant fraction to zero. It now
matches `Balbi2020.py` in `wildfire_ROS_models`, and its rate of spread is
floored at zero on a downslope with no wind. ([#196])
- `Rothermel` wrote the wind exponent coefficient as `3.59*10E-4`, which is
3.59e-3 in C++, ten times the 3.59e-4 of Rothermel (1972), so wind raised
the rate of spread too little. Results with wind
change: +6% on the `runff` fuel at 5 m/s, several times more in loose fuel
beds such as sparse shrub. The `runff` references and the unit test pin are
regenerated. ([#195])

### Changed

- Release builds compile with `-ffp-contract=off`, so the compiler no longer
fuses multiply-adds (FMA) where the CPU allows it. `-march=native` and ARM
builds now give the same simulation results as x86 builds without it.
- Linux wheels are built against a NetCDF without DAP and HDF4, roughly halving
the wheel. ([#154])
- Free-threaded (`cp314t`) wheels are no longer published, because the core is
Expand Down Expand Up @@ -255,6 +264,7 @@ repository stays easy to return to.
[#197]: https://github.com/forefireAPI/forefire/pull/197
[#194]: https://github.com/forefireAPI/forefire/pull/194
[#196]: https://github.com/forefireAPI/forefire/issues/196
[#195]: https://github.com/forefireAPI/forefire/pull/195
[#202]: https://github.com/forefireAPI/forefire/pull/202
[#199]: https://github.com/forefireAPI/forefire/pull/199
[#179]: https://github.com/forefireAPI/forefire/pull/179
Expand Down
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -256,7 +256,7 @@ elseif(FOREFIRE_SANITIZE)
else()
# uncomment if want to debug
# set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -O0")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O3 -flto -fomit-frame-pointer -finline-functions -funroll-loops -ftree-vectorize -fno-strict-aliasing")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O3 -ffp-contract=off -flto -fomit-frame-pointer -finline-functions -funroll-loops -ftree-vectorize -fno-strict-aliasing")
if(FOREFIRE_NATIVE_ARCH)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=native")
endif()
Expand Down
2 changes: 1 addition & 1 deletion src/propagation/Rothermel.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -208,7 +208,7 @@ double Rothermel::getSpeed(double* valueOf){

double B = 0.02526*pow(lsd, 0.54);

double E = 0.715* exp(-3.59*(10E-4 * lsd));
double E = 0.715* exp(-3.59e-4 * lsd);

double Ir = Rprime*Wn*lDeltaH*Etam*Etas;
double Uf = 0.9*Ir;
Expand Down
4 changes: 2 additions & 2 deletions tests/runff/ForeFire.0.nc.ref
Git LFS file not shown
4 changes: 2 additions & 2 deletions tests/runff/real_case.kml.ref
Git LFS file not shown
2 changes: 1 addition & 1 deletion tests/unit/test_propagation_models.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -249,7 +249,7 @@ TEST_CASE("recorded rates of spread for the standard fuel") {
double ros;
};
const Expectation expected[] = {
{"Rothermel", 0.369131},
{"Rothermel", 0.392218},
{"Balbi2015", 0.069659},
{"Balbi2020", 0.0823161},
{"BalbiNov2011", 8.16139e-05},
Expand Down
Loading