Merge branch 'develop' into cpp-settings

This commit is contained in:
Paul Romano 2018-08-28 09:27:45 -05:00
commit 323e6d3551
87 changed files with 2886 additions and 3050 deletions

View file

@ -167,9 +167,9 @@ Bank SourceDistribution::sample() const
if (space_box) {
if (space_box->only_fissionable()) {
// Determine material
auto c = global_cells[cell_index - 1];
int32_t mat_index = c->material[instance];
auto m = global_materials[mat_index];
auto c = cells[cell_index - 1];
int32_t mat_index = c->material_[instance];
auto m = materials[mat_index];
if (mat_index == MATERIAL_VOID) {
found = false;