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

Fixes after rebase.

Browse source
This commit is contained in:
Patrick Shriwise 2020-03-04 18:47:19 -06:00
parent 483ec403fd
commit e79932e442
2 changed files with 7 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

4
include/openmc/mesh.h
View file

@ -219,6 +219,10 @@ public:
double negative_grid_boundary(int* ijk, int i) const override;
std::string bin_label(int bin) const override;
int n_surface_bins() const override;
std::pair<std::vector<double>, std::vector<double>>
plot(Position plot_ll, Position plot_ur) const override;

13
src/mesh.cpp
View file

@ -1054,7 +1054,7 @@ RegularMesh::count_sites(const Particle::Bank* bank,
return counts;
}
std::string RegularMesh::get_label_for_bin(int bin) const {
std::string RegularMesh::bin_label(int bin) const {
int ijk[n_dimension_];
get_indices_from_bin(bin, ijk);
@ -1067,10 +1067,6 @@ std::string RegularMesh::get_label_for_bin(int bin) const {
return out.str();
}
double RegularMesh::get_volume_frac(int bin) const {
return volume_frac_;
}
//==============================================================================
// RectilinearMesh implementation
//==============================================================================
@ -1775,15 +1771,12 @@ UnstructuredMesh::bins_crossed(const Particle& p,
auto tet = get_tet(segment_midpoint);
if (tet) {
bins.push_back(get_bin_from_ent_handle(tet));
lengths.push_back((hit.first - last_dist) / track_len);
lengths.push_back((hit->first - last_dist) / track_len);
} else {
// if in the loop, we should always find a tet
warning("No tet found for location between trianle hits");
}
bins.push_back(bin);
lengths.push_back(segment_length / track_len);
}
// tally remaining portion of track after last hit if
@ -2334,7 +2327,7 @@ LibMesh::bins_crossed(const Particle* p,
lengths.clear();
for (const auto& hit : hits) {
lengths.push_back(hit.first / track_len);
lengths.push_back(hit->first / track_len);
bins.push_back(get_bin_from_element(hit.second));
}
}