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

Merge pull request #1500 from pshriwise/reorder_attrs

Browse source 
Reorder data members
This commit is contained in:
Paul Romano 2020-03-03 06:35:09 -06:00 • committed by GitHub
commit d62cc4105e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
include/openmc/mgxs.h
View file

@ -40,8 +40,8 @@ class Mgxs {
xt::xtensor<double, 1> kTs; // temperature in eV (k * T)
AngleDistributionType scatter_format; // flag for if this is legendre, histogram, or tabular
int num_delayed_groups; // number of delayed neutron groups
int num_groups; // number of energy groups
int num_delayed_groups; // number of delayed neutron groups
std::vector<XsData> xs; // Cross section data
// MGXS Incoming Flux Angular grid information
bool is_isotropic; // used to skip search for angle indices if isotropic

4
src/tallies/tally_scoring.cpp
View file

@ -27,7 +27,7 @@ namespace openmc {
//==============================================================================
FilterBinIter::FilterBinIter(const Tally& tally, Particle* p)
: tally_{tally}, filter_matches_{p->filter_matches_}
: filter_matches_{p->filter_matches_}, tally_{tally}
{
// Find all valid bins in each relevant filter if they have not already been
// found for this event.
@ -57,7 +57,7 @@ FilterBinIter::FilterBinIter(const Tally& tally, Particle* p)
FilterBinIter::FilterBinIter(const Tally& tally, bool end,
std::vector<FilterMatch>* particle_filter_matches)
: tally_{tally}, filter_matches_{*particle_filter_matches}
: filter_matches_{*particle_filter_matches}, tally_{tally}
{
// Handle the special case for an iterator that points to the end.
if (end) {