mirror of
https://github.com/openmc-dev/openmc.git
synced 2026-07-26 13:15:39 -04:00
Some corrections from the rebase onto develop.
This commit is contained in:
parent
a002c5b060
commit
0cd8b88ca4
2 changed files with 3 additions and 5 deletions
|
|
@ -112,8 +112,6 @@ public:
|
|||
|
||||
explicit Cell(pugi::xml_node cell_node);
|
||||
|
||||
explicit Cell();
|
||||
|
||||
//! Determine if a cell contains the particle at a given location.
|
||||
//!
|
||||
//! The bounds of the cell are detemined by a logical expression involving
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@
|
|||
//TODO: remove this include
|
||||
#include <iostream>
|
||||
|
||||
extern "C" {int32_t n_cells {0};}
|
||||
//extern "C" {int32_t n_cells {0};}
|
||||
|
||||
namespace openmc {
|
||||
|
||||
|
|
@ -637,7 +637,7 @@ read_cells(pugi::xml_node* node)
|
|||
// Loop over XML cell elements and populate the array.
|
||||
cells.reserve(n_cells);
|
||||
for (pugi::xml_node cell_node: node->children("cell")) {
|
||||
cells_c.push_back(new CSGCell(cell_node));
|
||||
global_cells.push_back(new CSGCell(cell_node));
|
||||
}
|
||||
|
||||
// Populate the Universe vector and map.
|
||||
|
|
@ -806,7 +806,7 @@ extern "C" {
|
|||
{
|
||||
cells.reserve(cells.size() + n);
|
||||
for (int32_t i = 0; i < n; i++) {
|
||||
cells_c.push_back(new CSGCell());
|
||||
global_cells.push_back(new CSGCell());
|
||||
}
|
||||
n_cells = cells.size();
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue