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

Some cleanup and removal of commented sections after rebase.

Browse source
This commit is contained in:
Patrick Shriwise 2019-11-28 06:28:45 -06:00
parent 36e99d70fb
commit 01f4e5674e
3 changed files with 1 additions and 54 deletions
Download patch file Download diff file Expand all files Collapse all files

53
include/openmc/mesh.h
View file

@ -318,6 +318,7 @@ public:
bool intersects(Position& r0, Position r1, int* ijk);
private:
//! Find all intersections with faces of the mesh.
@ -410,59 +411,7 @@ private:
std::pair<moab::Tag, moab::Tag>
get_score_tags(std::string score) const;
<<<<<<< HEAD
// data members
=======
public:
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;
//! Write mesh data to an HDF5 group.
//
//! \param[in] group HDF5 group
void to_hdf5(hid_t group) const;
//! Get bin at a given position.
//
//! \param[in] r Position to get bin for
//! \return Mesh bin
int get_bin(Position r) const;
std::string get_label_for_bin(int bin) const;
int n_bins() const override;
int n_surface_bins() const override;
Position centroid(moab::EntityHandle tet) const;
std::string bin_label(int bin) const override;
//! Add a score to the mesh instance
void add_score(std::string score) const;
//! Set data for a score
void set_score_data(const std::string& score,
std::vector<double> values,
std::vector<double> std_dev) const;
//! Write the mesh with any current tally data
void write(std::string base_filename) const;
std::string filename_; //<! Path to unstructured mesh file
std::string get_label_for_bin(int bin) const;
double get_volume_frac(int bin = -1) const;
private:
>>>>>>> Using a common count_sites implementation.
moab::Range ehs_; //!< Range of tetrahedra EntityHandle's in the mesh
moab::EntityHandle tetset_; //!< EntitySet containing all tetrahedra
moab::EntityHandle kdtree_root_; //!< Root of the MOAB KDTree

1
src/eigenvalue.cpp
View file

@ -585,7 +585,6 @@ double ufs_get_weight(const Particle& p)
if (simulation::source_frac(mesh_bin) != 0.0) {
return simulation::ufs_mesh->volume_frac_
/ simulation::source_frac(mesh_bin);
// return m->get_volume_frac() / simulation::source_frac(mesh_bin);
} else {
return 1.0;
}

1
src/mesh.cpp
View file

@ -5,7 +5,6 @@
#include <cmath> // for ceil
#include <memory> // for allocator
#include <string>
#include <sstream>
#ifdef OPENMC_MPI
#include "mpi.h"