crp/OpenMC
1
0
Fork 0
mirror of https://github.com/openmc-dev/openmc.git synced 2026-07-28 14:15:42 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

code was corrected,tabs were replaced by spaces, results for tallies test get from current version

Browse source
This commit is contained in:
dr.yuri 2019-04-11 12:23:44 +03:00
parent 4ef5ad64e3
commit 7813b284ad
4 changed files with 164 additions and 157 deletions
Download patch file Download diff file Expand all files Collapse all files

2
include/openmc/lattice.h
View file

@ -278,7 +278,7 @@ public:
private:
int n_rings_; //!< Number of radial tile positions
int n_axial_; //!< Number of axial tile positions
int hextype; //!DR type of hexagonal lattice orientation //0 - OY by default;1-OX
int hextype; //!DR type of hexagonal lattice orientation //0 - OY by default;1-OX
Position center_; //!< Global center of lattice
std::array<double, 2> pitch_; //!< Lattice tile width and height
};

27
openmc/lattice.py
View file

@ -141,7 +141,11 @@ class Lattice(IDManagerMixin, metaclass=ABCMeta):
center = group['center'][...]
pitch = group['pitch'][...]
outer = group['outer'].value
orientation = group['orientation'].value
#DR Temp added for compatibility with previous version
if ('orientation' in group.keys()):
orientation = group['orientation'].value
else:
orientation = "oy"
universe_ids = group['universes'][...]
@ -1133,14 +1137,16 @@ class HexLattice(Lattice):
else:
z = point[2] - self.center[2]
iz = floor(z/self.pitch[1] + 0.5*self.num_axial)
if self._hextype is 0:#//DR
if self._hextype:#//DR
alpha = y - x*sqrt(3.)
ix = 0
ia = floor(-alpha/(sqrt(3.0) * self.pitch[0]))
iy = floor(y/(sqrt(0.75) * self.pitch[0]))
else:
alpha = y - x/sqrt(3.)
ix = floor(x/(sqrt(0.75) * self.pitch[0]))
ia = floor(alpha/self.pitch[0])
else:
alpha = y - x*sqrt(3.)
ia = floor(-alpha/(sqrt(3.0) * self.pitch[0]))
iy = floor(y/(sqrt(0.75) * self.pitch[0]))
iy = 0
# Check four lattice elements to see which one is closest based on local
@ -1169,7 +1175,8 @@ class HexLattice(Lattice):
point : Iterable of float
Cartesian coordinates of point
idx : Iterable of int
Indices of lattice element in :math:`(x,\alpha,z)` bases
Indices of lattice element in :math:`(x,\alpha,z)`
or :math:`(\alpha,y,z)` basesis
Returns
-------
@ -1179,11 +1186,11 @@ class HexLattice(Lattice):
"""
if self._hextype:#//DR
x = point[0] - (self.center[0] + sqrt(0.75)*self.pitch[0]*idx[0])
y = point[1] - (self.center[1] + (0.5*idx[0] + idx[1])*self.pitch[0])
else:
x = point[0] - (self.center[0] + self.pitch[0]*idx[0] + 0.5*self.pitch[0]*idx[1])
y = point[1] - (self.center[1] + (sqrt(0.75)*self.pitch[0]*idx[1]))
else:
x = point[0] - (self.center[0] + sqrt(0.75)*self.pitch[0]*idx[0])
y = point[1] - (self.center[1] + (0.5*idx[0] + idx[1])*self.pitch[0])
if self._num_axial is None:
z = point[2]

290
src/lattice.cpp
View file

@ -443,8 +443,8 @@ HexLattice::HexLattice(pugi::xml_node lat_node)
//DR Check if "OX" orientation desc in node
if (check_for_node(lat_node, "orient")) {
std :: string orientation = get_node_value(lat_node, "orient");
if (orientation == "OX") {hextype=1;}
std :: string orientation = get_node_value(lat_node, "orient");
if (orientation == "OX") {hextype=1;}
}
// Read the lattice center.
@ -500,10 +500,10 @@ HexLattice::HexLattice(pugi::xml_node lat_node)
universes_.resize((2*n_rings_-1) * (2*n_rings_-1) * n_axial_, C_NONE);
if (hextype==0) {
fill_lattice_oy(univ_words);
fill_lattice_oy(univ_words);
} else
{
fill_lattice_ox(univ_words);
fill_lattice_ox(univ_words);
}
@ -513,55 +513,55 @@ HexLattice::HexLattice(pugi::xml_node lat_node)
void
HexLattice::fill_lattice_ox(std::vector<std::string> univ_words){
int input_index = 0;
for (int m = 0; m < n_axial_; m++) {
// Initialize lattice indecies.
int i_a = -(n_rings_ - 1);
int i_y = n_rings_ - 1;
int input_index = 0;
for (int m = 0; m < n_axial_; m++) {
// Initialize lattice indecies.
int i_a = -(n_rings_ - 1);
int i_y = n_rings_ - 1;
//DR Map upper region of hexagonal lattice which is found in the
// first n_rings-1 rows of the input.
for (int k = 0; k < n_rings_-1; k++) {
//DR Map upper region of hexagonal lattice which is found in the
// first n_rings-1 rows of the input.
for (int k = 0; k < n_rings_-1; k++) {
// Iterate over the input columns.
for (int j = 0; j < k+n_rings_; j++) {
int indx = (2*n_rings_-1)*(2*n_rings_-1) * m
+ (2*n_rings_-1) * (i_y+n_rings_-1)
+ (i_a+n_rings_-1);
universes_[indx] = std::stoi(univ_words[input_index]);
input_index++;
//DR Move to the next right neighbour cell
i_a += 1;
// Iterate over the input columns.
for (int j = 0; j < k+n_rings_; j++) {
int indx = (2*n_rings_-1)*(2*n_rings_-1) * m
+ (2*n_rings_-1) * (i_y+n_rings_-1)
+ (i_a+n_rings_-1);
universes_[indx] = std::stoi(univ_words[input_index]);
input_index++;
//DR Move to the next right neighbour cell
i_a += 1;
}
}
// Return the lattice index to the start of the current row.
i_a = -(n_rings_ - 1);
i_y -= 1;
}
// Return the lattice index to the start of the current row.
i_a = -(n_rings_ - 1);
i_y -= 1;
}
// Map the lower region from the centerline of cart to down side
for (int k = 0; k < n_rings_; k++) {
// Walk the index to the lower-right neighbor of the last row start.
i_a = -(n_rings_ - 1) + k;
// Map the lower region from the centerline of cart to down side
for (int k = 0; k < n_rings_; k++) {
// Walk the index to the lower-right neighbor of the last row start.
i_a = -(n_rings_ - 1) + k;
// Iterate over the input columns.
for (int j = 0; j < 2*n_rings_-k-1; j++) {
int indx = (2*n_rings_-1)*(2*n_rings_-1) * m
+ (2*n_rings_-1) * (i_y+n_rings_-1)
+ (i_a+n_rings_-1);
universes_[indx] = std::stoi(univ_words[input_index]);
input_index++;
//DR Move to the next right neighbour cell
i_a += 1;
// Iterate over the input columns.
for (int j = 0; j < 2*n_rings_-k-1; j++) {
int indx = (2*n_rings_-1)*(2*n_rings_-1) * m
+ (2*n_rings_-1) * (i_y+n_rings_-1)
+ (i_a+n_rings_-1);
universes_[indx] = std::stoi(univ_words[input_index]);
input_index++;
//DR Move to the next right neighbour cell
i_a += 1;
}
}
// Return lattice index to start of current row.
i_y -= 1;
}
}
// Return lattice index to start of current row.
i_y -= 1;
}
}
}
//==============================================================================
@ -572,87 +572,87 @@ HexLattice::fill_lattice_ox(std::vector<std::string> univ_words){
void
HexLattice::fill_lattice_oy(std::vector<std::string> univ_words){
int input_index = 0;
for (int m = 0; m < n_axial_; m++) {
// Initialize lattice indecies.
int i_x = 1;
int i_a = n_rings_ - 1;
int input_index = 0;
for (int m = 0; m < n_axial_; m++) {
// Initialize lattice indecies.
int i_x = 1;
int i_a = n_rings_ - 1;
// Map upper triangular region of hexagonal lattice which is found in the
// first n_rings-1 rows of the input.
for (int k = 0; k < n_rings_-1; k++) {
// Walk the index to lower-left neighbor of last row start.
i_x -= 1;
// Map upper triangular region of hexagonal lattice which is found in the
// first n_rings-1 rows of the input.
for (int k = 0; k < n_rings_-1; k++) {
// Walk the index to lower-left neighbor of last row start.
i_x -= 1;
// Iterate over the input columns.
for (int j = 0; j < k+1; j++) {
int indx = (2*n_rings_-1)*(2*n_rings_-1) * m
+ (2*n_rings_-1) * (i_a+n_rings_-1)
+ (i_x+n_rings_-1);
universes_[indx] = std::stoi(univ_words[input_index]);
input_index++;
// Walk the index to the right neighbor (which is not adjacent).
i_x += 2;
i_a -= 1;
}
// Iterate over the input columns.
for (int j = 0; j < k+1; j++) {
int indx = (2*n_rings_-1)*(2*n_rings_-1) * m
+ (2*n_rings_-1) * (i_a+n_rings_-1)
+ (i_x+n_rings_-1);
universes_[indx] = std::stoi(univ_words[input_index]);
input_index++;
// Walk the index to the right neighbor (which is not adjacent).
i_x += 2;
i_a -= 1;
}
// Return the lattice index to the start of the current row.
i_x -= 2 * (k+1);
i_a += (k+1);
}
// Return the lattice index to the start of the current row.
i_x -= 2 * (k+1);
i_a += (k+1);
}
// Map the middle square region of the hexagonal lattice which is found in
// the next 2*n_rings-1 rows of the input.
for (int k = 0; k < 2*n_rings_-1; k++) {
if ((k % 2) == 0) {
// Walk the index to the lower-left neighbor of the last row start.
i_x -= 1;
} else {
// Walk the index to the lower-right neighbor of the last row start.
i_x += 1;
i_a -= 1;
}
// Map the middle square region of the hexagonal lattice which is found in
// the next 2*n_rings-1 rows of the input.
for (int k = 0; k < 2*n_rings_-1; k++) {
if ((k % 2) == 0) {
// Walk the index to the lower-left neighbor of the last row start.
i_x -= 1;
} else {
// Walk the index to the lower-right neighbor of the last row start.
i_x += 1;
i_a -= 1;
}
// Iterate over the input columns.
for (int j = 0; j < n_rings_ - (k % 2); j++) {
int indx = (2*n_rings_-1)*(2*n_rings_-1) * m
+ (2*n_rings_-1) * (i_a+n_rings_-1)
+ (i_x+n_rings_-1);
universes_[indx] = std::stoi(univ_words[input_index]);
input_index++;
// Walk the index to the right neighbor (which is not adjacent).
i_x += 2;
i_a -= 1;
}
// Iterate over the input columns.
for (int j = 0; j < n_rings_ - (k % 2); j++) {
int indx = (2*n_rings_-1)*(2*n_rings_-1) * m
+ (2*n_rings_-1) * (i_a+n_rings_-1)
+ (i_x+n_rings_-1);
universes_[indx] = std::stoi(univ_words[input_index]);
input_index++;
// Walk the index to the right neighbor (which is not adjacent).
i_x += 2;
i_a -= 1;
}
// Return the lattice index to the start of the current row.
i_x -= 2*(n_rings_ - (k % 2));
i_a += n_rings_ - (k % 2);
}
// Return the lattice index to the start of the current row.
i_x -= 2*(n_rings_ - (k % 2));
i_a += n_rings_ - (k % 2);
}
// Map the lower triangular region of the hexagonal lattice.
for (int k = 0; k < n_rings_-1; k++) {
// Walk the index to the lower-right neighbor of the last row start.
i_x += 1;
i_a -= 1;
// Map the lower triangular region of the hexagonal lattice.
for (int k = 0; k < n_rings_-1; k++) {
// Walk the index to the lower-right neighbor of the last row start.
i_x += 1;
i_a -= 1;
// Iterate over the input columns.
for (int j = 0; j < n_rings_-k-1; j++) {
int indx = (2*n_rings_-1)*(2*n_rings_-1) * m
+ (2*n_rings_-1) * (i_a+n_rings_-1)
+ (i_x+n_rings_-1);
universes_[indx] = std::stoi(univ_words[input_index]);
input_index++;
// Walk the index to the right neighbor (which is not adjacent).
i_x += 2;
i_a -= 1;
}
// Iterate over the input columns.
for (int j = 0; j < n_rings_-k-1; j++) {
int indx = (2*n_rings_-1)*(2*n_rings_-1) * m
+ (2*n_rings_-1) * (i_a+n_rings_-1)
+ (i_x+n_rings_-1);
universes_[indx] = std::stoi(univ_words[input_index]);
input_index++;
// Walk the index to the right neighbor (which is not adjacent).
i_x += 2;
i_a -= 1;
}
// Return lattice index to start of current row.
i_x -= 2*(n_rings_ - k - 1);
i_a += n_rings_ - k - 1;
}
}
// Return lattice index to start of current row.
i_x -= 2*(n_rings_ - k - 1);
i_a += n_rings_ - k - 1;
}
}
}
//==============================================================================
@ -693,11 +693,11 @@ std::pair<double, std::array<int, 3>>
HexLattice::distance(Position r, Direction u, const std::array<int, 3>& i_xyz)
const
{
if (hextype==0){
return distance_oy(r,u,i_xyz);
} else {
return distance_ox(r,u,i_xyz);
}
if (hextype==0){
return distance_oy(r,u,i_xyz);
} else {
return distance_ox(r,u,i_xyz);
}
}
//DR OX distance calculation
@ -994,32 +994,32 @@ Position
HexLattice::get_local_position(Position r, const std::array<int, 3> i_xyz)
const
{
// DR for OY implementation
if (hextype == 0){
// x_l = x_g - (center + pitch_x*cos(30)*index_x)
r.x -= center_.x + std::sqrt(3.0)/2.0 * (i_xyz[0] - n_rings_ + 1) * pitch_[0];
// y_l = y_g - (center + pitch_x*index_x + pitch_y*sin(30)*index_y)
r.y -= (center_.y + (i_xyz[1] - n_rings_ + 1) * pitch_[0]
+ (i_xyz[0] - n_rings_ + 1) * pitch_[0] / 2.0);
if (is_3d_) {
r.z -= center_.z - (0.5 * n_axial_ - i_xyz[2] - 0.5) * pitch_[1];
}
// DR for OY implementation
if (hextype == 0){
// x_l = x_g - (center + pitch_x*cos(30)*index_x)
r.x -= center_.x + std::sqrt(3.0)/2.0 * (i_xyz[0] - n_rings_ + 1) * pitch_[0];
// y_l = y_g - (center + pitch_x*index_x + pitch_y*sin(30)*index_y)
r.y -= (center_.y + (i_xyz[1] - n_rings_ + 1) * pitch_[0]
+ (i_xyz[0] - n_rings_ + 1) * pitch_[0] / 2.0);
if (is_3d_) {
r.z -= center_.z - (0.5 * n_axial_ - i_xyz[2] - 0.5) * pitch_[1];
}
}
else {// DR for OX implementation
}
else {// DR for OX implementation
// x_l = x_g - (center + pitch_x*index_a + pitch_y*sin(30)*index_y)
r.x -= (center_.x + (i_xyz[0] - n_rings_ + 1) * pitch_[0]
+ (i_xyz[1] - n_rings_ + 1) * pitch_[0] / 2.0);
// y_l = y_g - (center + pitch_y*cos(30)*index_y)
r.y -= center_.y + std::sqrt(3.0)/2.0 * (i_xyz[1] - n_rings_ + 1) * pitch_[0];
// x_l = x_g - (center + pitch_x*index_a + pitch_y*sin(30)*index_y)
r.x -= (center_.x + (i_xyz[0] - n_rings_ + 1) * pitch_[0]
+ (i_xyz[1] - n_rings_ + 1) * pitch_[0] / 2.0);
// y_l = y_g - (center + pitch_y*cos(30)*index_y)
r.y -= center_.y + std::sqrt(3.0)/2.0 * (i_xyz[1] - n_rings_ + 1) * pitch_[0];
if (is_3d_) {
r.z -= center_.z - (0.5 * n_axial_ - i_xyz[2] - 0.5) * pitch_[1];
}
if (is_3d_) {
r.z -= center_.z - (0.5 * n_axial_ - i_xyz[2] - 0.5) * pitch_[1];
}
}
return r;
}
return r;
}
//==============================================================================
@ -1078,10 +1078,10 @@ HexLattice::to_hdf5_inner(hid_t lat_group) const
write_dataset(lat_group, "n_rings", n_rings_);
write_dataset(lat_group, "n_axial", n_axial_);
if (hextype == 0){
write_string(lat_group, "orientation", "oy",false);
write_string(lat_group, "orientation", "oy",false);
}
else {
write_string(lat_group, "orientation", "ox",false);
write_string(lat_group, "orientation", "ox",false);
}
if (is_3d_) {
write_dataset(lat_group, "pitch", pitch_);

2
tests/regression_tests/tallies/results_true.dat
View file

@ -1 +1 @@
de773a799f84348241ebd65bf7beae8114861d8674b652bfd443d578c146a7d37ca38f2efc5d05124fdbb1cf12829907768351e6b2d6b5f4bd2c121417757507
c37e0468f1684f7810429332721762884f3cdf0429d38caa99500bbde04ad84cf1e1639adc46b6db44b28b6f31028ed029f85920c8164d77463b6d89336043a8