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

Eliminated references to MATERIAL_IDS

Browse source
This commit is contained in:
wbinventor@gmail.com 2015-12-21 20:52:12 -05:00
parent ffd0070654
commit 37d4d2e9ed
1 changed files with 2 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

15
openmc/material.py
View file

@ -12,17 +12,13 @@ from openmc.checkvalue import check_type, check_value, check_greater_than
from openmc.clean_xml import *
# A list of all IDs for all Materials created
MATERIAL_IDS = []
# A static variable for auto-generated Material IDs
AUTO_MATERIAL_ID = 10000
def reset_auto_material_id():
global AUTO_MATERIAL_ID, MATERIAL_IDS
global AUTO_MATERIAL_ID
AUTO_MATERIAL_ID = 10000
MATERIAL_IDS = []
# Units for density supported by OpenMC
@ -192,22 +188,15 @@ class Material(object):
@id.setter
def id(self, material_id):
global AUTO_MATERIAL_ID, MATERIAL_IDS
if material_id is None:
global AUTO_MATERIAL_ID
self._id = AUTO_MATERIAL_ID
MATERIAL_IDS.append(AUTO_MATERIAL_ID)
AUTO_MATERIAL_ID += 1
else:
check_type('material ID', material_id, Integral)
if material_id in MATERIAL_IDS:
msg = 'Unable to set Material ID to "{0}" since a Material with ' \
'this ID was already initialized'.format(material_id)
raise ValueError(msg)
check_greater_than('material ID', material_id, 0, equality=True)
self._id = material_id
MATERIAL_IDS.append(material_id)
@name.setter
def name(self, name):