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

Merge remote-tracking branch 'upstream/release-0.7.1' into tally-align

Browse source
This commit is contained in:
Sam Shaner 2015-12-14 14:55:08 -05:00
commit b52d940857
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
openmc/region.py
View file

@ -355,6 +355,8 @@ class Complement(Region):
temp_region = Intersection(*[~n for n in self.node.nodes])
elif isinstance(self.node, Intersection):
temp_region = Union(*[~n for n in self.node.nodes])
elif isinstance(self.node, Complement):
temp_region = self.node.node
else:
temp_region = ~n
temp_region = ~self.node
return temp_region.bounding_box

2
src/state_point.F90
View file

@ -870,7 +870,6 @@ contains
integer(HSIZE_T) :: dims(1)
type(c_ptr) :: f_ptr
#ifdef PHDF5
integer :: data_xfer_mode
integer(HID_T) :: plist ! property list
#else
integer :: i
@ -989,7 +988,6 @@ contains
integer(HSIZE_T) :: offset(1) ! offset of data
type(c_ptr) :: f_ptr
#ifdef PHDF5
integer :: data_xfer_mode
integer(HID_T) :: plist ! property list
#endif