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
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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])
Expand Down Expand Up @@ -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
9 changes: 6 additions & 3 deletions src/DataBroker.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -324,7 +326,8 @@ namespace libforefire
DataLayer<double> *oldlayer = ilayer->second;
layersMap.erase(name);
layers.remove(oldlayer);
delete oldlayer;
if (oldlayer != domain->getPropagativeLayer())
delete oldlayer;
//}
}

Expand Down
3 changes: 2 additions & 1 deletion tests/runff/reload_case.ff
Original file line number Diff line number Diff line change
Expand Up @@ -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]
print[real_case.kml]
clear[]
Loading