crp/OpenMC
1
0
Fork 0
mirror of https://github.com/openmc-dev/openmc.git synced 2026-07-29 06:35:48 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Remove archaic 'all' nuclides tally feature

Browse source
This commit is contained in:
Paul Romano 2022-02-10 23:29:43 -06:00
parent 82e0a5116e
commit af4a8400c5
6 changed files with 50 additions and 166 deletions
Download patch file Download diff file Expand all files Collapse all files

3
include/openmc/tallies/tally.h
View file

@ -104,9 +104,6 @@ public:
//! Index of each nuclide to be tallied. -1 indicates total material.
vector<int> nuclides_ {-1};
//! True if this tally has a bin for every nuclide in the problem
bool all_nuclides_ {false};
//! Results for each bin -- the first dimension of the array is for the
//! combination of filters (e.g. specific cell, specific energy group, etc.)
//! and the second dimension of the array is for scores (e.g. flux, total

20
src/tallies/tally.cpp
View file

@ -542,22 +542,10 @@ void Tally::set_nuclides(pugi::xml_node node)
return;
}
if (get_node_value(node, "nuclides") == "all") {
// This tally should bin every nuclide in the problem. It should also bin
// the total material rates. To achieve this, set the nuclides_ vector to
// 0, 1, 2, ..., -1.
nuclides_.reserve(data::nuclides.size() + 1);
for (auto i = 0; i < data::nuclides.size(); ++i)
nuclides_.push_back(i);
nuclides_.push_back(-1);
all_nuclides_ = true;
} else {
// The user provided specifics nuclides. Parse it as an array with either
// "total" or a nuclide name like "U-235" in each position.
auto words = get_node_array<std::string>(node, "nuclides");
this->set_nuclides(words);
}
// The user provided specifics nuclides. Parse it as an array with either
// "total" or a nuclide name like "U235" in each position.
auto words = get_node_array<std::string>(node, "nuclides");
this->set_nuclides(words);
}
void Tally::set_nuclides(const vector<std::string>& nuclides)

151
src/tallies/tally_scoring.cpp
View file

@ -2095,43 +2095,6 @@ void score_general_mg(Particle& p, int i_tally, int start_index,
}
}
//! Tally rates for when the user requests a tally on all nuclides.
void score_all_nuclides(
Particle& p, int i_tally, double flux, int filter_index, double filter_weight)
{
const Tally& tally {*model::tallies[i_tally]};
const Material& material {*model::materials[p.material()]};
// Score all individual nuclide reaction rates.
for (auto i = 0; i < material.nuclide_.size(); ++i) {
auto i_nuclide = material.nuclide_[i];
auto atom_density = material.atom_density_(i);
// TODO: consider replacing this "if" with pointers or templates
if (settings::run_CE) {
score_general_ce(p, i_tally, i_nuclide * tally.scores_.size(),
filter_index, filter_weight, i_nuclide, atom_density, flux);
} else {
score_general_mg(p, i_tally, i_nuclide * tally.scores_.size(),
filter_index, filter_weight, i_nuclide, atom_density, flux);
}
}
// Score total material reaction rates.
int i_nuclide = -1;
double atom_density = 0.;
auto n_nuclides = data::nuclides.size();
// TODO: consider replacing this "if" with pointers or templates
if (settings::run_CE) {
score_general_ce(p, i_tally, n_nuclides * tally.scores_.size(),
filter_index, filter_weight, i_nuclide, atom_density, flux);
} else {
score_general_mg(p, i_tally, n_nuclides * tally.scores_.size(),
filter_index, filter_weight, i_nuclide, atom_density, flux);
}
}
void score_analog_tally_ce(Particle& p)
{
// Since electrons/positrons are not transported, we assign a flux of zero.
@ -2159,30 +2122,15 @@ void score_analog_tally_ce(Particle& p)
auto filter_weight = filter_iter.weight_;
// Loop over nuclide bins.
if (!tally.all_nuclides_) {
for (auto i = 0; i < tally.nuclides_.size(); ++i) {
auto i_nuclide = tally.nuclides_[i];
for (auto i = 0; i < tally.nuclides_.size(); ++i) {
auto i_nuclide = tally.nuclides_[i];
// Tally this event in the present nuclide bin if that bin represents
// the event nuclide or the total material. Note that the atomic
// density argument for score_general is not used for analog tallies.
if (i_nuclide == p.event_nuclide() || i_nuclide == -1)
score_general_ce(p, i_tally, i * tally.scores_.size(), filter_index,
filter_weight, i_nuclide, -1.0, flux);
}
} else {
// In the case that the user has requested to tally all nuclides, we
// can take advantage of the fact that we know exactly how nuclide
// bins correspond to nuclide indices. First, tally the nuclide.
auto i = p.event_nuclide();
score_general_ce(p, i_tally, i * tally.scores_.size(), filter_index,
filter_weight, -1, -1.0, flux);
// Now tally the total material.
i = tally.nuclides_.size();
score_general_ce(p, i_tally, i * tally.scores_.size(), filter_index,
filter_weight, -1, -1.0, flux);
// Tally this event in the present nuclide bin if that bin represents
// the event nuclide or the total material. Note that the atomic
// density argument for score_general is not used for analog tallies.
if (i_nuclide == p.event_nuclide() || i_nuclide == -1)
score_general_ce(p, i_tally, i * tally.scores_.size(), filter_index,
filter_weight, i_nuclide, -1.0, flux);
}
}
@ -2270,34 +2218,27 @@ void score_tracklength_tally(Particle& p, double distance)
auto filter_weight = filter_iter.weight_;
// Loop over nuclide bins.
if (tally.all_nuclides_) {
if (p.material() != MATERIAL_VOID)
score_all_nuclides(
p, i_tally, flux * filter_weight, filter_index, filter_weight);
for (auto i = 0; i < tally.nuclides_.size(); ++i) {
auto i_nuclide = tally.nuclides_[i];
} else {
for (auto i = 0; i < tally.nuclides_.size(); ++i) {
auto i_nuclide = tally.nuclides_[i];
double atom_density = 0.;
if (i_nuclide >= 0) {
if (p.material() != MATERIAL_VOID) {
auto j =
model::materials[p.material()]->mat_nuclide_index_[i_nuclide];
if (j == C_NONE)
continue;
atom_density = model::materials[p.material()]->atom_density_(j);
}
double atom_density = 0.;
if (i_nuclide >= 0) {
if (p.material() != MATERIAL_VOID) {
auto j =
model::materials[p.material()]->mat_nuclide_index_[i_nuclide];
if (j == C_NONE)
continue;
atom_density = model::materials[p.material()]->atom_density_(j);
}
}
// TODO: consider replacing this "if" with pointers or templates
if (settings::run_CE) {
score_general_ce(p, i_tally, i * tally.scores_.size(), filter_index,
filter_weight, i_nuclide, atom_density, flux);
} else {
score_general_mg(p, i_tally, i * tally.scores_.size(), filter_index,
filter_weight, i_nuclide, atom_density, flux);
}
// TODO: consider replacing this "if" with pointers or templates
if (settings::run_CE) {
score_general_ce(p, i_tally, i * tally.scores_.size(), filter_index,
filter_weight, i_nuclide, atom_density, flux);
} else {
score_general_mg(p, i_tally, i * tally.scores_.size(), filter_index,
filter_weight, i_nuclide, atom_density, flux);
}
}
}
@ -2340,31 +2281,25 @@ void score_collision_tally(Particle& p)
auto filter_weight = filter_iter.weight_;
// Loop over nuclide bins.
if (tally.all_nuclides_) {
score_all_nuclides(
p, i_tally, flux * filter_weight, filter_index, filter_weight);
for (auto i = 0; i < tally.nuclides_.size(); ++i) {
auto i_nuclide = tally.nuclides_[i];
} else {
for (auto i = 0; i < tally.nuclides_.size(); ++i) {
auto i_nuclide = tally.nuclides_[i];
double atom_density = 0.;
if (i_nuclide >= 0) {
auto j =
model::materials[p.material()]->mat_nuclide_index_[i_nuclide];
if (j == C_NONE)
continue;
atom_density = model::materials[p.material()]->atom_density_(j);
}
double atom_density = 0.;
if (i_nuclide >= 0) {
auto j =
model::materials[p.material()]->mat_nuclide_index_[i_nuclide];
if (j == C_NONE)
continue;
atom_density = model::materials[p.material()]->atom_density_(j);
}
// TODO: consider replacing this "if" with pointers or templates
if (settings::run_CE) {
score_general_ce(p, i_tally, i * tally.scores_.size(), filter_index,
filter_weight, i_nuclide, atom_density, flux);
} else {
score_general_mg(p, i_tally, i * tally.scores_.size(), filter_index,
filter_weight, i_nuclide, atom_density, flux);
}
// TODO: consider replacing this "if" with pointers or templates
if (settings::run_CE) {
score_general_ce(p, i_tally, i * tally.scores_.size(), filter_index,
filter_weight, i_nuclide, atom_density, flux);
} else {
score_general_mg(p, i_tally, i * tally.scores_.size(), filter_index,
filter_weight, i_nuclide, atom_density, flux);
}
}
}

26
tests/regression_tests/tallies/inputs_true.dat
View file

@ -446,7 +446,7 @@
<filters>12</filters>
<scores>total</scores>
</tally>
<tally id="34">
<tally id="30">
<filters>15</filters>
<scores>scatter</scores>
</tally>
@ -499,30 +499,6 @@
<estimator>collision</estimator>
</tally>
<tally id="29">
<filters>13</filters>
<nuclides>all</nuclides>
<scores>total</scores>
<estimator>tracklength</estimator>
</tally>
<tally id="30">
<filters>13</filters>
<nuclides>all</nuclides>
<scores>total</scores>
<estimator>collision</estimator>
</tally>
<tally id="31">
<filters>2</filters>
<nuclides>all</nuclides>
<scores>total</scores>
<estimator>tracklength</estimator>
</tally>
<tally id="32">
<filters>2</filters>
<nuclides>U235</nuclides>
<scores>total</scores>
<estimator>tracklength</estimator>
</tally>
<tally id="33">
<scores>H1-production H2-production H3-production He3-production He4-production heating damage-energy</scores>
</tally>
</tallies>

2
tests/regression_tests/tallies/results_true.dat
View file

@ -1 +1 @@
683a82a10c4254c7e503f9c86e192070224c0d19c1817e51da7acd74b9529a475020a6cbd658644f7cd18b244cc477d1810521aa720c4fa9354cb6955bce13f6
ad28e723270c25dc46f27f1482052e381c802cb111ea8224368d4ea3d903eeaba1a3dce541957f24ec0634ed2ada6f20f97c0270c269b9bcae4b34a1b317a165

14
tests/regression_tests/tallies/test.py
View file

@ -154,17 +154,6 @@ def test_tallies():
flux_tallies[1].estimator = 'analog'
flux_tallies[2].estimator = 'collision'
all_nuclide_tallies = [Tally() for i in range(4)]
for t in all_nuclide_tallies:
t.filters = [cell_filter]
t.estimator = 'tracklength'
t.nuclides = ['all']
t.scores = ['total']
all_nuclide_tallies[1].estimator = 'collision'
all_nuclide_tallies[2].filters = [mesh_filter]
all_nuclide_tallies[3].filters = [mesh_filter]
all_nuclide_tallies[3].nuclides = ['U235']
fusion_tally = Tally()
fusion_tally.scores = ['H1-production', 'H2-production', 'H3-production',
'He3-production', 'He4-production', 'heating', 'damage-energy']
@ -180,11 +169,10 @@ def test_tallies():
cellborn_tally, dg_tally, energy_tally, energyout_tally,
transfer_tally, material_tally, mu_tally1, mu_tally2,
polar_tally1, polar_tally2, polar_tally3, legendre_tally,
harmonics_tally, harmonics_tally2, harmonics_tally3,
harmonics_tally, harmonics_tally2, harmonics_tally3,
universe_tally, collision_tally]
model.tallies += score_tallies
model.tallies += flux_tallies
model.tallies += all_nuclide_tallies
model.tallies.append(fusion_tally)
harness.main()