diff --git a/CHANGELOG.md b/CHANGELOG.md index a1a534c1..ade7e648 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -48,6 +48,9 @@ Merged since v2.5.0, not yet released. - `pyforefire` calls that read the domain (`ff[key]`, `addLayer`, `addScalarLayer`, `addIndexLayer`, `getDoubleArray`) segfaulted Python when run before `FireDomain[...]`. They now raise `RuntimeError`. ([#202]) +- `clear[]` after `loadData` freed the propagative layer twice and crashed. + The data broker lists that layer but no longer deletes it; the domain does. + ([#205]) - Rate of spread stayed finite and decreasing at high dead fuel moisture, and `DataBroker` no longer serves `moisture` through the five-slot getter, which returned a neighbouring property. ([#158]) @@ -222,3 +225,4 @@ repository stays easy to return to. [#196]: https://github.com/forefireAPI/forefire/issues/196 [#202]: https://github.com/forefireAPI/forefire/pull/202 [#199]: https://github.com/forefireAPI/forefire/pull/199 +[#205]: https://github.com/forefireAPI/forefire/issues/205 diff --git a/src/DataBroker.cpp b/src/DataBroker.cpp index b67cd5f8..bf89c961 100644 --- a/src/DataBroker.cpp +++ b/src/DataBroker.cpp @@ -42,10 +42,12 @@ namespace libforefire DataBroker::~DataBroker() { - // Deleting layers + // Deleting layers. loadData lists the domain's propagative layer here + // too, so it can be looked up, but the domain frees that one (#205). while (!layers.empty()) { - delete layers.back(); + if (layers.back() != domain->getPropagativeLayer()) + delete layers.back(); layers.pop_back(); } // Deleting atmospheric and parallel data @@ -324,7 +326,8 @@ namespace libforefire DataLayer *oldlayer = ilayer->second; layersMap.erase(name); layers.remove(oldlayer); - delete oldlayer; + if (oldlayer != domain->getPropagativeLayer()) + delete oldlayer; //} } diff --git a/tests/runff/reload_case.ff b/tests/runff/reload_case.ff index 00e5c874..1a10beef 100644 --- a/tests/runff/reload_case.ff +++ b/tests/runff/reload_case.ff @@ -3,4 +3,5 @@ loadData[data.nc;2025-02-10T17:35:54Z] include[to_reload.ff] step[dt=1200] setParameter[dumpMode=kml] -print[real_case.kml] \ No newline at end of file +print[real_case.kml] +clear[]