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

Update name of universe level counter.

Browse source
This commit is contained in:
Patrick Shriwise 2019-11-06 09:36:41 -06:00
parent 4860bd5ed2
commit c20e942f1c
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

@ -46,21 +46,21 @@ namespace openmc {
auto get_count(int32_t univ);
};
struct LevelCountStorage {
struct UniverseLevelCounter {
private:
LevelCountStorage() {}
LevelCountStorage(LevelCountStorage& c) {}
LevelCountStorage(const LevelCountStorage& c) {}
UniverseLevelCounter() {}
UniverseLevelCounter(UniverseLevelCounter& c) {}
UniverseLevelCounter(const UniverseLevelCounter& c) {}
static LevelCountStorage* instance_;
static UniverseLevelCounter* instance_;
std::map<int32_t, int> counts;
public:
static LevelCountStorage* instance() {
static UniverseLevelCounter* instance() {
if (instance_ == nullptr)
instance_ = new LevelCountStorage;
instance_ = new UniverseLevelCounter;
return instance_;
}

2
src/finalize.cpp
View file

@ -137,7 +137,7 @@ int openmc_reset()
{
UniverseCellCounter::instance()->clear();
LevelCountStorage::instance()->clear();
UniverseLevelCounter::instance()->clear();
for (auto& t : model::tallies) {
t->reset();

18
src/geometry_aux.cpp
View file

@ -103,18 +103,18 @@ auto UniverseCellCounter::get_count(int32_t univ) {
return counts[univ];
}
void LevelCountStorage::clear() {
void UniverseLevelCounter::clear() {
if (instance_ != nullptr) {
delete instance_;
instance_ = nullptr;
}
}
void LevelCountStorage::set_cell_count_for_univ(int32_t univ, int count) {
void UniverseLevelCounter::set_cell_count_for_univ(int32_t univ, int count) {
counts[univ] = count;
}
void LevelCountStorage::increment_count_for_univ(int32_t univ) {
void UniverseLevelCounter::increment_count_for_univ(int32_t univ) {
if (has_count(univ)) {
counts[univ] += 1;
} else {
@ -122,11 +122,11 @@ void LevelCountStorage::increment_count_for_univ(int32_t univ) {
}
}
bool LevelCountStorage::has_count(int32_t univ) {
bool UniverseLevelCounter::has_count(int32_t univ) {
return counts.count(univ);
}
void LevelCountStorage::absorb_b_into_a(int32_t a, int32_t b) {
void UniverseLevelCounter::absorb_b_into_a(int32_t a, int32_t b) {
if (has_count(a)) {
counts[a] += counts[b];
} else {
@ -134,16 +134,16 @@ void LevelCountStorage::absorb_b_into_a(int32_t a, int32_t b) {
}
}
void LevelCountStorage::set_count(int32_t univ, int count) {
void UniverseLevelCounter::set_count(int32_t univ, int count) {
counts[univ] = count;
}
int LevelCountStorage::get_count(int32_t univ) {
int UniverseLevelCounter::get_count(int32_t univ) {
return counts[univ];
}
UniverseCellCounter* UniverseCellCounter::instance_ = nullptr;
LevelCountStorage* LevelCountStorage::instance_ = nullptr;
UniverseLevelCounter* UniverseLevelCounter::instance_ = nullptr;
//==============================================================================
@ -626,7 +626,7 @@ distribcell_path(int32_t target_cell, int32_t map, int32_t target_offset)
int
maximum_levels(int32_t univ)
{
LevelCountStorage* counter = LevelCountStorage::instance();
UniverseLevelCounter* counter = UniverseLevelCounter::instance();
if (counter->has_count(univ)) {
return counter->get_count(univ);