21370062529

Committed 26 Jan 2026 06:56PM UTC coverage: 81.83% (-0.2%) from 82.069%

Build # 21370062529

Build Type

Pull #3738

github

Committed by

web-flow

Commit Message

Merge 7993c8237 into 5c502ddb3

Pull Request Pull Request #3738: Materials name persist when running depletion simulation

Run Details

16677 of 22973 branches covered (72.59%)

Branch coverage included in aggregate %.

16 of 16 new or added lines in 2 files covered. (100.0%)

726 existing lines in 32 files now uncovered.

54794 of 64368 relevant lines covered (85.13%)

42242353.39 hits per line

Source File
Press 'n' to go to next uncovered line, 'b' for previous

84.85

/src/tallies/filter_cell_instance.cpp

#include "openmc/tallies/filter_cell_instance.h"

#include <cassert>
#include <string>

#include <fmt/core.h>

#include "openmc/capi.h"
#include "openmc/cell.h"
#include "openmc/error.h"
#include "openmc/geometry.h"
#include "openmc/xml_interface.h"

namespace openmc {

CellInstanceFilter::CellInstanceFilter(span<CellInstance> instances)
{
  this->set_cell_instances(instances);
}

void CellInstanceFilter::from_xml(pugi::xml_node node)
{
  // Get cell IDs/instances
  auto cells = get_node_array<int32_t>(node, "bins");
  assert(cells.size() % 2 == 0);

  // Convert into vector of CellInstance
  vector<CellInstance> instances;
  for (int64_t i = 0; i < cells.size() / 2; ++i) {
    int32_t cell_id = cells[2 * i];
    int64_t instance = cells[2 * i + 1];
    auto search = model::cell_map.find(cell_id);
    if (search == model::cell_map.end()) {
      throw std::runtime_error {fmt::format(
        "Could not find cell {} specified on tally filter.", cell_id)};
    }
    int64_t index = search->second;
    instances.push_back({index, instance});
  }

  this->set_cell_instances(instances);
}

void CellInstanceFilter::set_cell_instances(span<CellInstance> instances)
{
  // Clear existing cells
  cell_instances_.clear();
  cell_instances_.reserve(instances.size());
  cells_.clear();
  map_.clear();

  // Update cells and mapping
  for (auto& x : instances) {
    assert(x.index_cell >= 0);
    assert(x.index_cell < model::cells.size());
    cell_instances_.push_back(x);
    cells_.insert(x.index_cell);
    map_[x] = cell_instances_.size() - 1;
  }

  n_bins_ = cell_instances_.size();

  material_cells_only_ = true;
  for (const auto& cell_inst : cell_instances_) {
    const auto& c = *model::cells[cell_inst.index_cell];
    if (c.type_ == Fill::MATERIAL)
      continue;
    material_cells_only_ = false;
    break;
  }
}

void CellInstanceFilter::get_all_bins(
  const Particle& p, TallyEstimator estimator, FilterMatch& match) const
{
  int64_t index_cell = p.lowest_coord().cell();
  int64_t instance = p.cell_instance();

  if (cells_.count(index_cell) > 0) {
    auto search = map_.find({index_cell, instance});
    if (search != map_.end()) {
      int index_bin = search->second;
      match.bins_.push_back(index_bin);
      match.weights_.push_back(1.0);
    }
  }

  if (material_cells_only_)
    return;

  for (int i = 0; i < p.n_coord() - 1; i++) {
    int64_t index_cell = p.coord(i).cell();
    // if this cell isn't used on the filter, move on
    if (cells_.count(index_cell) == 0)
      continue;

    // if this cell is used in the filter, check the instance as well
    int64_t instance = cell_instance_at_level(p, i);
    auto search = map_.find({index_cell, instance});
    if (search != map_.end()) {
      match.bins_.push_back(search->second);
      match.weights_.push_back(1.0);
    }
  }
}

void CellInstanceFilter::to_statepoint(hid_t filter_group) const
{
  Filter::to_statepoint(filter_group);
  size_t n = cell_instances_.size();
  xt::xtensor<size_t, 2> data({n, 2});
  for (int64_t i = 0; i < n; ++i) {
    const auto& x = cell_instances_[i];
    data(i, 0) = model::cells[x.index_cell]->id_;
    data(i, 1) = x.instance;
  }
  write_dataset(filter_group, "bins", data);
}

std::string CellInstanceFilter::text_label(int bin) const
{
  const auto& x = cell_instances_[bin];
  auto cell_id = model::cells[x.index_cell]->id_;
  return "Cell " + std::to_string(cell_id) + ", Instance " +
         std::to_string(x.instance);
}

} // namespace openmc

1	#include "openmc/tallies/filter_cell_instance.h"
2
3	#include <cassert>
4	#include <string>
5
6	#include <fmt/core.h>
7
8	#include "openmc/capi.h"
9	#include "openmc/cell.h"
10	#include "openmc/error.h"
11	#include "openmc/geometry.h"
12	#include "openmc/xml_interface.h"
13
14	namespace openmc {
15
16	CellInstanceFilter::CellInstanceFilter(span<CellInstance> instances)	×
17	{
18	this->set_cell_instances(instances);	×
19	}	×
20
21	void CellInstanceFilter::from_xml(pugi::xml_node node)	28✔
22	{
23	// Get cell IDs/instances
24	auto cells = get_node_array<int32_t>(node, "bins");	28✔
25	assert(cells.size() % 2 == 0);	22!
26
27	// Convert into vector of CellInstance
28	vector<CellInstance> instances;	28✔
29	for (int64_t i = 0; i < cells.size() / 2; ++i) {	588✔
30	int32_t cell_id = cells[2 * i];	560✔
31	int64_t instance = cells[2 * i + 1];	560✔
32	auto search = model::cell_map.find(cell_id);	560✔
33	if (search == model::cell_map.end()) {	560!
34	throw std::runtime_error {fmt::format(	×
35	"Could not find cell {} specified on tally filter.", cell_id)};	×
36	}
37	int64_t index = search->second;	560✔
38	instances.push_back({index, instance});	560✔
39	}
40
41	this->set_cell_instances(instances);	28✔
42	}	28✔
43
44	void CellInstanceFilter::set_cell_instances(span<CellInstance> instances)	28✔
45	{
46	// Clear existing cells
47	cell_instances_.clear();	28✔
48	cell_instances_.reserve(instances.size());	28✔
49	cells_.clear();	28✔
50	map_.clear();	28✔
51
52	// Update cells and mapping
53	for (auto& x : instances) {	588✔
54	assert(x.index_cell >= 0);	440!
55	assert(x.index_cell < model::cells.size());	440!
56	cell_instances_.push_back(x);	560✔
57	cells_.insert(x.index_cell);	560✔
58	map_[x] = cell_instances_.size() - 1;	560✔
59	}
60
61	n_bins_ = cell_instances_.size();	28✔
62
63	material_cells_only_ = true;	28✔
64	for (const auto& cell_inst : cell_instances_) {	252!
65	const auto& c = *model::cells[cell_inst.index_cell];	252✔
66	if (c.type_ == Fill::MATERIAL)	252✔
67	continue;	224✔
68	material_cells_only_ = false;	28✔
69	break;	28✔
70	}
71	}	28✔
72
73	void CellInstanceFilter::get_all_bins(	6,919,080✔
74	const Particle& p, TallyEstimator estimator, FilterMatch& match) const
75	{
76	int64_t index_cell = p.lowest_coord().cell();	6,919,080✔
77	int64_t instance = p.cell_instance();	6,919,080✔
78
79	if (cells_.count(index_cell) > 0) {	6,919,080✔
80	auto search = map_.find({index_cell, instance});	1,872,260✔
81	if (search != map_.end()) {	1,872,260!
82	int index_bin = search->second;	1,872,260✔
83	match.bins_.push_back(index_bin);	1,872,260✔
84	match.weights_.push_back(1.0);	1,872,260✔
85	}
86	}
87
88	if (material_cells_only_)	6,919,080!
UNCOV 89	return;	×
90
91	for (int i = 0; i < p.n_coord() - 1; i++) {	15,597,940✔
92	int64_t index_cell = p.coord(i).cell();	8,678,860✔
93	// if this cell isn't used on the filter, move on
94	if (cells_.count(index_cell) == 0)	8,678,860✔
95	continue;	6,919,080✔
96
97	// if this cell is used in the filter, check the instance as well
98	int64_t instance = cell_instance_at_level(p, i);	1,759,780✔
99	auto search = map_.find({index_cell, instance});	1,759,780✔
100	if (search != map_.end()) {	1,759,780!
101	match.bins_.push_back(search->second);	1,759,780✔
102	match.weights_.push_back(1.0);	1,759,780✔
103	}
104	}
105	}
106
107	void CellInstanceFilter::to_statepoint(hid_t filter_group) const	20✔
108	{
109	Filter::to_statepoint(filter_group);	20✔
110	size_t n = cell_instances_.size();	20✔
111	xt::xtensor<size_t, 2> data({n, 2});	20✔
112	for (int64_t i = 0; i < n; ++i) {	420✔
113	const auto& x = cell_instances_[i];	400✔
114	data(i, 0) = model::cells[x.index_cell]->id_;	400✔
115	data(i, 1) = x.instance;	400✔
116	}
117	write_dataset(filter_group, "bins", data);	20✔
118	}	20✔
119
120	std::string CellInstanceFilter::text_label(int bin) const	400✔
121	{
122	const auto& x = cell_instances_[bin];	400✔
123	auto cell_id = model::cells[x.index_cell]->id_;	400✔
124	return "Cell " + std::to_string(cell_id) + ", Instance " +	800✔
125	std::to_string(x.instance);	1,200✔
126	}
127
128	} // namespace openmc

openmc-dev / openmc / 21370062529

Source File Press 'n' to go to next uncovered line, 'b' for previous

Source File
Press 'n' to go to next uncovered line, 'b' for previous