Corrections after rebase.

This commit is contained in:
Patrick Shriwise 2020-06-04 14:48:52 -05:00
parent 1780c96051
commit 80e62611c1
2 changed files with 7 additions and 10 deletions

View file

@ -344,14 +344,11 @@ public:
std::vector<int>& bins,
std::vector<double>& lengths) const override;
std::pair<std::vector<double>, std::vector<double>>
plot(Position plot_ll, Position plot_ur) const override;
//! Determine which surface bins were crossed by a particle.
//
//! \param[in] p Particle to check
//! \param[out] bins Surface bins that were crossed
void surface_bins_crossed(const Particle* p, std::vector<int>& bins) const;
void surface_bins_crossed(const Particle& p, std::vector<int>& bins) const;
int get_bin(Position r) const;
@ -503,11 +500,11 @@ public:
LibMesh(const std::string& filename);
// Methods
void bins_crossed(const Particle* p,
void bins_crossed(const Particle& p,
std::vector<int>& bins,
std::vector<double>& lengths) const override;
void surface_bins_crossed(const Particle* p, std::vector<int>& bins) const override;
void surface_bins_crossed(const Particle& p, std::vector<int>& bins) const override;
int get_bin(Position r) const override;

View file

@ -1743,7 +1743,7 @@ MOABUnstructuredMesh::intersect_track(const moab::CartVect& start,
}
void
MOABUnstructuredMesh::bins_crossed(const Particle* p,
MOABUnstructuredMesh::bins_crossed(const Particle& p,
std::vector<int>& bins,
std::vector<double>& lengths) const
{
@ -1869,7 +1869,7 @@ double MOABUnstructuredMesh::tet_volume(moab::EntityHandle tet) const {
return 1.0 / 6.0 * (((p[1] - p[0]) * (p[2] - p[0])) % (p[3] - p[0]));
}
void MOABUnstructuredMesh::surface_bins_crossed(const Particle* p, std::vector<int>& bins) const {
void MOABUnstructuredMesh::surface_bins_crossed(const Particle& p, std::vector<int>& bins) const {
// TODO: Implement triangle crossings here
throw std::runtime_error{"Unstructured mesh surface tallies are not implemented."};
}
@ -2237,7 +2237,7 @@ int LibMesh::n_surface_bins() const {
}
void
LibMesh::surface_bins_crossed(const Particle* p,
LibMesh::surface_bins_crossed(const Particle& p,
std::vector<int>& bins) const
{
// TODO: Implement triangle crossings here
@ -2308,7 +2308,7 @@ void LibMesh::write(std::string filename) const {
}
void
LibMesh::bins_crossed(const Particle* p,
LibMesh::bins_crossed(const Particle& p,
std::vector<int>& bins,
std::vector<double>& lengths) const
{