diff --git a/CHANGELOG.md b/CHANGELOG.md index 88bd1c31..3fd571e2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -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 @@ -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 diff --git a/CMakeLists.txt b/CMakeLists.txt index 871674c8..d7ea5206 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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() diff --git a/src/propagation/Rothermel.cpp b/src/propagation/Rothermel.cpp index 517d68ab..8fe8faae 100644 --- a/src/propagation/Rothermel.cpp +++ b/src/propagation/Rothermel.cpp @@ -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; diff --git a/tests/runff/ForeFire.0.nc.ref b/tests/runff/ForeFire.0.nc.ref index 9083f602..43100b88 100644 --- a/tests/runff/ForeFire.0.nc.ref +++ b/tests/runff/ForeFire.0.nc.ref @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:45a2b159caad744d15d8cdd1b43d738a6626259ebc8542944d5daa06a2fad42a -size 99203 +oid sha256:666b4d1f9bbcff131aa6188741455ce2eeb4ebe2640f985ec57a82b7a00f8462 +size 134658 diff --git a/tests/runff/real_case.kml.ref b/tests/runff/real_case.kml.ref index bf5c8b20..49f4dc34 100644 --- a/tests/runff/real_case.kml.ref +++ b/tests/runff/real_case.kml.ref @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5124aba342990b9af402a2960c6ff1cc5bc36f91c19004d56dbfce1e03d80021 -size 8171 +oid sha256:b3d483a73911521aaf1eeca7005dcf8ef093a00176ecf16938c88be2ef3dec89 +size 12661 diff --git a/tests/unit/test_propagation_models.cpp b/tests/unit/test_propagation_models.cpp index ce1f9725..46cc3349 100644 --- a/tests/unit/test_propagation_models.cpp +++ b/tests/unit/test_propagation_models.cpp @@ -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},