crp/OpenMC
1
0
Fork 0
mirror of https://github.com/openmc-dev/openmc.git synced 2026-07-27 21:55:41 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Fix off-by-one on LocalCoord.lattice

Browse source
This commit is contained in:
Paul Romano 2019-03-01 07:10:54 -06:00
parent e3f9446c23
commit 477309c917
4 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/geometry.cpp
View file

@ -127,11 +127,11 @@ find_cell_inner(Particle* p, const NeighborList* neighbor_list)
if (c.material_.size() > 1 || c.sqrtkT_.size() > 1) {
int offset = 0;
for (int i = 0; i < p->n_coord_; i++) {
Cell& c_i {*model::cells[p->coord_[i].cell]};
const auto& c_i {*model::cells[p->coord_[i].cell]};
if (c_i.type_ == FILL_UNIVERSE) {
offset += c_i.offset_[c.distribcell_index_];
} else if (c_i.type_ == FILL_LATTICE) {
Lattice& lat {*model::lattices[p->coord_[i+1].lattice-1]};
auto& lat {*model::lattices[p->coord_[i+1].lattice]};
int i_xyz[3] {p->coord_[i+1].lattice_x,
p->coord_[i+1].lattice_y,
p->coord_[i+1].lattice_z};
@ -227,7 +227,7 @@ find_cell_inner(Particle* p, const NeighborList* neighbor_list)
p->coord_[p->n_coord_].uvw[2] = u.z;
// Set lattice indices.
p->coord_[p->n_coord_].lattice = c.fill_ + 1;
p->coord_[p->n_coord_].lattice = c.fill_;
p->coord_[p->n_coord_].lattice_x = i_xyz[0];
p->coord_[p->n_coord_].lattice_y = i_xyz[1];
p->coord_[p->n_coord_].lattice_z = i_xyz[2];
@ -304,7 +304,7 @@ find_cell(Particle* p, bool use_neighbor_lists)
extern "C" void
cross_lattice(Particle* p, int lattice_translation[3])
{
Lattice& lat {*model::lattices[p->coord_[p->n_coord_-1].lattice-1]};
auto& lat {*model::lattices[p->coord_[p->n_coord_-1].lattice]};
if (settings::verbosity >= 10 || simulation::trace) {
std::stringstream msg;
@ -387,8 +387,8 @@ distance_to_boundary(Particle* p, double* dist, int* surface_crossed,
level_surf_cross = surface_distance.second;
// Find the distance to the next lattice tile crossing.
if (p->coord_[i].lattice != F90_NONE) {
Lattice& lat {*model::lattices[p->coord_[i].lattice-1]};
if (p->coord_[i].lattice != C_NONE) {
auto& lat {*model::lattices[p->coord_[i].lattice]};
std::array<int, 3> i_xyz {p->coord_[i].lattice_x, p->coord_[i].lattice_y,
p->coord_[i].lattice_z};
//TODO: refactor so both lattice use the same position argument (which

2
src/output.cpp
View file

@ -174,7 +174,7 @@ extern "C" void print_particle(Particle* p)
std::cout << " Universe = " << u.id_ << "\n";
}
if (p->coord_[i].lattice != F90_NONE) {
if (p->coord_[i].lattice != C_NONE) {
const Lattice& lat {*model::lattices[p->coord_[i].lattice]};
std::cout << " Lattice = " << lat.id_ << "\n";
std::cout << " Lattice position = (" << p->coord_[i].lattice_x

2
src/particle.cpp
View file

@ -37,7 +37,7 @@ LocalCoord::reset()
{
cell = C_NONE;
universe = C_NONE;
lattice = 0;
lattice = C_NONE;
lattice_x = 0;
lattice_y = 0;
rotated = false;

2
src/tallies/filter_distribcell.cpp
View file

@ -45,7 +45,7 @@ DistribcellFilter::get_all_bins(const Particle* p, int estimator,
if (c.type_ == FILL_UNIVERSE) {
offset += c.offset_[distribcell_index];
} else if (c.type_ == FILL_LATTICE) {
auto& lat {*model::lattices[p->coord_[i+1].lattice-1]};
auto& lat {*model::lattices[p->coord_[i+1].lattice]};
int i_xyz[3] {p->coord_[i+1].lattice_x,
p->coord_[i+1].lattice_y,
p->coord_[i+1].lattice_z};