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

Updating name of Universer counter class.

Browse source
This commit is contained in:
Patrick Shriwise 2019-11-06 09:31:56 -06:00
parent cc6822f171
commit 4860bd5ed2
3 changed files with 17 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

14
include/openmc/geometry_aux.h
View file

@ -10,21 +10,21 @@
#include <map>
namespace openmc {
struct CellCountStorage {
struct UniverseCellCounter {
private:
CellCountStorage() {}
CellCountStorage(CellCountStorage& c) {}
CellCountStorage(const CellCountStorage& c) {}
UniverseCellCounter() {}
UniverseCellCounter(UniverseCellCounter& c) {}
UniverseCellCounter(const UniverseCellCounter& c) {}
static CellCountStorage* instance_;
static UniverseCellCounter* instance_;
std::map<int32_t, std::map<int32_t, int>> counts;
public:
static CellCountStorage* instance() {
static UniverseCellCounter* instance() {
if (instance_ == nullptr)
instance_ = new CellCountStorage;
instance_ = new UniverseCellCounter;
return instance_;
}

2
src/finalize.cpp
View file

@ -136,7 +136,7 @@ int openmc_finalize()
int openmc_reset()
{
CellCountStorage::instance()->clear();
UniverseCellCounter::instance()->clear();
LevelCountStorage::instance()->clear();
for (auto& t : model::tallies) {

18
src/geometry_aux.cpp
View file

@ -60,18 +60,18 @@ void read_geometry_xml()
model::root_universe = find_root_universe();
}
void CellCountStorage::clear() {
void UniverseCellCounter::clear() {
if (instance_ != nullptr) {
delete instance_;
instance_ = nullptr;
}
}
void CellCountStorage::set_cell_count_for_univ(int32_t univ, int32_t cell, int count) {
void UniverseCellCounter::set_cell_count_for_univ(int32_t univ, int32_t cell, int count) {
counts[univ][cell] = count;
}
void CellCountStorage::increment_count_for_univ(int32_t univ, int32_t cell) {
void UniverseCellCounter::increment_count_for_univ(int32_t univ, int32_t cell) {
if (has_count(univ,cell)) {
counts[univ][cell] += 1;
} else {
@ -79,15 +79,15 @@ void CellCountStorage::set_cell_count_for_univ(int32_t univ, int32_t cell, int c
}
}
bool CellCountStorage::has_count(int32_t univ, int32_t cell) {
bool UniverseCellCounter::has_count(int32_t univ, int32_t cell) {
return counts.count(univ) && counts[univ].count(cell);
}
bool CellCountStorage::has_count(int32_t univ) {
bool UniverseCellCounter::has_count(int32_t univ) {
return counts.count(univ);
}
void CellCountStorage::absorb_b_into_a(int32_t a, int32_t b) {
void UniverseCellCounter::absorb_b_into_a(int32_t a, int32_t b) {
std::map<int32_t, int> b_map = counts[b];
for (auto it : b_map) {
@ -99,7 +99,7 @@ void CellCountStorage::absorb_b_into_a(int32_t a, int32_t b) {
}
}
auto CellCountStorage::get_count(int32_t univ) {
auto UniverseCellCounter::get_count(int32_t univ) {
return counts[univ];
}
@ -142,7 +142,7 @@ int LevelCountStorage::get_count(int32_t univ) {
return counts[univ];
}
CellCountStorage* CellCountStorage::instance_ = nullptr;
UniverseCellCounter* UniverseCellCounter::instance_ = nullptr;
LevelCountStorage* LevelCountStorage::instance_ = nullptr;
//==============================================================================
@ -480,7 +480,7 @@ prepare_distribcell()
void
count_cell_instances(int32_t univ_indx)
{
CellCountStorage* counter = CellCountStorage::instance();
UniverseCellCounter* counter = UniverseCellCounter::instance();
if (counter->has_count(univ_indx)) {
std::map<int32_t, int> univ_counts = counter->get_count(univ_indx);