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

Updates to enable plotting of individual universe levels.

Browse source
This commit is contained in:
Patrick Shriwise 2020-09-02 15:41:03 -05:00
parent 4fb66912a9
commit e0689fda07
4 changed files with 23 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

2
include/openmc/geometry.h
View file

@ -18,7 +18,7 @@ namespace openmc {
namespace model {
extern int root_universe; //!< Index of root universe
extern int n_coord_levels; //!< Number of CSG coordinate levels
extern "C" int n_coord_levels; //!< Number of CSG coordinate levels
extern std::vector<int64_t> overlap_check_count;

2
include/openmc/plot.h
View file

@ -184,7 +184,7 @@ T PlotBase::get_map() const {
// local variables
bool found_cell = find_cell(p, 0);
j = p.n_coord_ - 1;
if (level >=0) {j = level + 1;}
if (level >= 0) {j = level;}
if (found_cell) {
data.set_value(y, x, p, j);
}

5
openmc/lib/__init__.py
View file

@ -12,7 +12,7 @@ functions or objects in :mod:`openmc.lib`, for example:
"""
from ctypes import CDLL, c_bool
from ctypes import CDLL, c_bool, c_int
import os
import sys
@ -42,6 +42,9 @@ else:
def _dagmc_enabled():
return c_bool.in_dll(_dll, "dagmc_enabled").value
def _coord_levels():
return c_int.in_dll(_dll, "n_coord_levels").value
from .error import *
from .core import *
from .nuclide import *

26
src/plot.cpp
View file

@ -41,14 +41,21 @@ IdData::IdData(size_t h_res, size_t v_res)
void
IdData::set_value(size_t y, size_t x, const Particle& p, int level) {
Cell* c = model::cells[p.coord_[level].cell].get();
data_(y,x,0) = c->id_;
// set cell data
if (p.n_coord_ <= level) {
data_(y, x, 0) = NOT_FOUND;
} else {
data_(y, x, 0) = model::cells[p.coord_[level].cell]->id_;
}
// set material data
Cell* c = model::cells[p.coord_[p.n_coord_ - 1].cell].get();
if (p.material_ == MATERIAL_VOID) {
data_(y,x,1) = MATERIAL_VOID;
data_(y, x, 1) = MATERIAL_VOID;
return;
} else if (c->type_ != Fill::UNIVERSE) {
} else if (c->type_ == Fill::MATERIAL) {
Material* m = model::materials[p.material_].get();
data_(y,x,1) = m->id_;
data_(y, x, 1) = m->id_;
}
}
@ -62,7 +69,7 @@ PropertyData::PropertyData(size_t h_res, size_t v_res)
void
PropertyData::set_value(size_t y, size_t x, const Particle& p, int level) {
Cell* c = model::cells[p.coord_[level].cell].get();
Cell* c = model::cells[p.coord_[p.n_coord_ - 1].cell].get();
data_(y,x,0) = (p.sqrtkT_ * p.sqrtkT_) / K_BOLTZMANN;
if (c->type_ != Fill::UNIVERSE && p.material_ != MATERIAL_VOID) {
Material* m = model::materials[p.material_].get();
@ -80,8 +87,8 @@ void PropertyData::set_overlap(size_t y, size_t x) {
namespace model {
std::unordered_map<int, int> plot_map;
std::vector<Plot> plots;
std::unordered_map<int, int> plot_map;
uint64_t plotter_seed = 1;
} // namespace model
@ -94,7 +101,8 @@ extern "C"
int openmc_plot_geometry()
{
for (auto pl : model::plots) {
write_message(5, "Processing plot {}: {}...", pl.id_, pl.path_plot_);
write_message(fmt::format("Processing plot {}: {}...",
pl.id_, pl.path_plot_), 5);
if (PlotType::slice == pl.type_) {
// create 2D image
@ -113,7 +121,7 @@ void read_plots_xml()
// Check if plots.xml exists
std::string filename = settings::path_input + "plots.xml";
if (!file_exists(filename)) {
fatal_error(fmt::format("Plots XML file '{}' does not exist!", filename));
fatal_error("Plots XML file '" + filename + "' does not exist!");
}
write_message("Reading plot XML file...", 5);