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

Add Cell.__contains__ and Cell.rotation_matrix

Browse source
This commit is contained in:
Paul Romano 2016-05-19 10:25:27 -05:00
parent e8d4dbd5f4
commit 168f1269fd
1 changed files with 25 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

27
openmc/cell.py
View file

@ -1,9 +1,12 @@
from collections import OrderedDict, Iterable
from math import cos, sin, pi
from numbers import Real, Integral
from xml.etree import ElementTree as ET
import sys
import warnings
import numpy as np
import openmc
import openmc.checkvalue as cv
from openmc.surface import Halfspace
@ -83,6 +86,7 @@ class Cell(object):
self._type = None
self._region = None
self._rotation = None
self._rotation_matrix = None
self._translation = None
self._offsets = None
self._distribcell_index = None
@ -92,6 +96,9 @@ class Cell(object):
if region is not None:
self.region = region
def __contains__(self, point):
return point in self.region
def __eq__(self, other):
if not isinstance(other, Cell):
return False
@ -124,6 +131,8 @@ class Cell(object):
if isinstance(self._fill, openmc.Material):
string += '{0: <16}{1}{2}\n'.format('\tMaterial', '=\t',
self._fill._id)
elif isinstance(self._fill, basestring):
string += '{0: <16}=\tvoid\n'.format('\tMaterial')
elif isinstance(self._fill, Iterable):
string += '{0: <16}{1}'.format('\tMaterial', '=\t')
string += '['
@ -179,6 +188,10 @@ class Cell(object):
def rotation(self):
return self._rotation
@property
def rotation_matrix(self):
return self._rotation_matrix
@property
def translation(self):
return self._translation
@ -249,13 +262,23 @@ class Cell(object):
cv.check_type('cell rotation', rotation, Iterable, Real)
cv.check_length('cell rotation', rotation, 3)
self._rotation = rotation
self._rotation = np.asarray(rotation)
# Save rotation matrix
phi, theta, psi = self.rotation*(-pi/180.)
c3, s3 = cos(phi), sin(phi)
c2, s2 = cos(theta), sin(theta)
c1, s1 = cos(psi), sin(psi)
self._rotation_matrix = np.array([
[c1*c2, c1*s2*s3 - c3*s1, s1*s3 + c1*c3*s2],
[c2*s1, c1*c3 + s1*s2*s3, c3*s1*s2 - c1*s3],
[-s2, c2*s3, c2*c3]])
@translation.setter
def translation(self, translation):
cv.check_type('cell translation', translation, Iterable, Real)
cv.check_length('cell translation', translation, 3)
self._translation = translation
self._translation = np.asarray(translation)
@offsets.setter
def offsets(self, offsets):