crp/OpenMC
1
0
Fork 0
mirror of https://github.com/openmc-dev/openmc.git synced 2026-07-28 22:26:08 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

pass index instead of ID to remove tally from tallies and tally_map

Browse source
This commit is contained in:
lewisgross1296 2022-08-12 12:58:37 -05:00
parent 74e093ae45
commit 7d429ab45e
1 changed files with 6 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/tallies/tally.cpp
View file

@ -1273,19 +1273,18 @@ extern "C" size_t tallies_size()
}
// given a tally ID, remove it from the tallies vector
extern "C" int openmc_remove_tally(int32_t id)
extern "C" int openmc_remove_tally(int32_t index)
{
// check that id is in the map
if (model::tally_map.count(id)!=1) {
return OPENMC_E_INVALID_ID;
if (index <= 0 || index > model::tallies.size()) {
return OPENMC_E_OUT_OF_BOUNDS;
}
// query map for index corersponding to the given id
int32_t index = model::tally_map.at(id);
// grab tally so it's ID can be obtained to remove the (ID,index) pair from tally_map
auto& tally = model::tallies[index];
model::tally_map.erase(tally->id_);
// delete the tally via iterator pointing to correct position
model::tallies.erase(model::tallies.begin() + index);
// after erasing tally, remove id from map
model::tally_map.erase(id);
return 0;
}