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

cherry pick fixes

Browse source
This commit is contained in:
Gavin Ridley 2021-04-22 15:39:06 -04:00
parent 4399645859
commit 711c60ea15
3 changed files with 3 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
include/openmc/lattice.h
View file

@ -257,7 +257,7 @@ public:
ReverseLatticeIter rbegin();
bool are_valid_indices(const int i_xyz[3]) const;
bool are_valid_indices(array<int, 3> const& i_xyz) const;
std::pair<double, std::array<int, 3>>
distance(Position r, Direction u, const std::array<int, 3>& i_xyz) const;

5
include/openmc/particle.h
View file

@ -4,7 +4,6 @@
//! \file particle.h
//! \brief Particle type
#include <array>
#include <cstdint>
#include <memory> // for unique_ptr
#include <sstream>
@ -55,9 +54,7 @@ public:
int cell {-1};
int universe {-1};
int lattice {-1};
int lattice_x {-1};
int lattice_y {-1};
int lattice_z {-1};
array<int, 3> lattice_i {-1, -1, -1};
bool rotated {false}; //!< Is the level rotated?
};

2
src/geometry.cpp
View file

@ -315,7 +315,7 @@ cross_lattice(Particle& p, const BoundaryInfo& boundary)
if (settings::verbosity >= 10 || p.trace_) {
write_message(fmt::format(
" Crossing lattice {}. Current position ({},{},{}). r={}",
lat.id_, coord.lattice_x, coord.lattice_y, coord.lattice_z, p.r()), 1);
lat.id_, coord.lattice_i[0], coord.lattice_i[1], coord.lattice_i[2], p.r()), 1);
}
// Set the lattice indices.